Fix for the PPC64 "dis" command to prevent conditional branch

target addresses from being displayed as kernel system call alias/wrapper names, for example, "SyS_read+<offset>" instead of "sys_read+<offset>". ([email protected])
d3dave · Aug 13, 2015 · 48add7d · 48add7d
1 parent 0807455
commit 48add7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ppc64.c b/ppc64.c
@@ -2496,10 +2496,10 @@ ppc64_dis_filter(ulong vaddr, char *inbuf, unsigned int output_radix)
 	if ((FIRSTCHAR(argv[argc-1]) == '<') && 
 	    (LASTCHAR(argv[argc-1]) == '>')) {
 		p1 = rindex(inbuf, '<');
-		while ((p1 > inbuf) && !STRNEQ(p1, " 0x")) 
+		while ((p1 > inbuf) && !(STRNEQ(p1, " 0x") || STRNEQ(p1, ",0x"))) 
 			p1--;
 
-		if (!STRNEQ(p1, " 0x"))
+		if (!(STRNEQ(p1, " 0x") || STRNEQ(p1, ",0x")))
 			return FALSE;
 		p1++;