asm.symbol: Improve code/test a bit more (#15798) ##disasm

radareorg · Jan 14, 2020 · bf80920 · bf80920
1 parent 32d8fd8
commit bf80920
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/libr/core/disasm.c b/libr/core/disasm.c
@@ -2674,10 +2674,7 @@ static void ds_print_lines_left(RDisasmState *ds) {
 			sfi.name = ds->fcn->name;
 			ds->lastflag = &sfi;
 		} else {
-			RFlagItem *fi = r_flag_get_at (core->flags, ds->at, false);
-			if (!fi && !ds->lastflag) {
-				fi = r_flag_get_at (core->flags, ds->at, true);
-			}
+			RFlagItem *fi = r_flag_get_at (core->flags, ds->at, !ds->lastflag);
 			if (fi) { // && (!ds->lastflag || fi->offset != ds->at))
 				sfi.offset = fi->offset;
 				sfi.name = fi->name;

diff --git a/test/new/db/cmd/cmd_pd2 b/test/new/db/cmd/cmd_pd2
@@ -780,6 +780,9 @@ pd 2
 ?e
 s segment.LOAD0 + 83
 pd 4
+?e
+s entry0
+pd 3
 EOF
 EXPECT=<<EOF
    entry0 + 2                   xor eax, eax
@@ -790,5 +793,10 @@ EXPECT=<<EOF
    entry0 + 0                   mov bl, 0x2a
    entry0 + 2                   xor eax, eax
    entry0 + 4                   inc eax
+
+   entry0 + 0                   ;-- entry0:
+   entry0 + 0                   mov bl, 0x2a
+   entry0 + 2                   xor eax, eax
+   entry0 + 4                   inc eax
 EOF
 RUN