d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disassembly by adding back some deleted lines.

Browse Source 
When importing for r309309, as part of conflict resolution, too much extra was
removed, resulting in bad disassembly for branches.  Correct this.

Also re-apply the 0->NULL change from r298052.

X-MFC-With:	r309309
This commit is contained in:
Justin Hibbits 2016-12-16 04:47:29 +00:00
parent df85a9edd9
commit 8d58dade1a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/powerpc/powerpc/db_disasm.c
View File

@ -871,8 +871,11 @@ disasm_fields(const struct opcode *popcode, instr_t instr, vm_offset_t loc,
func &= ~Op_crbB;
}
if (func & Op_LI) {
u_int LI;
int LI;
LI = extract_field(instr, 31 - 29, 24);
LI = LI << 8;
LI = LI >> 6;
LI += loc;
APP_PSTR("0x%x", LI);
func &= ~Op_LI;
}
@ -897,8 +900,11 @@ disasm_fields(const struct opcode *popcode, instr_t instr, vm_offset_t loc,
;
}
if (func & Op_BD) {
u_int BD;
int BD;
BD = extract_field(instr, 31 - 29, 14);
BD = BD << 18;
BD = BD >> 16;
BD += loc;
/* Need to sign extend and shift up 2, then add addr */
APP_PSTR("0x%x", BD);
func &= ~Op_BD;
@ -968,9 +974,9 @@ disasm_fields(const struct opcode *popcode, instr_t instr, vm_offset_t loc,
reg = "tbu";
break;
default:
reg = 0;
reg = NULL;
}
if (reg == 0)
if (reg == NULL)
APP_PSTR(", [unknown tbr %d ]", tbr);
else
APP_PSTR(", %s", reg);