[3/4] winedbg: Simplify Coprocessor operators in the Thumb2 disassembler
André Hentschel
nerv at dawncrow.de
Sun Oct 7 10:35:43 CDT 2012
---
programs/winedbg/be_arm.c | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c
index 3009e70..2380f88 100644
--- a/programs/winedbg/be_arm.c
+++ b/programs/winedbg/be_arm.c
@@ -1058,15 +1058,11 @@ static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr)
{
WORD opc2 = (inst >> 5) & 0x07;
- if (opc2)
- dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u, #%u", (inst & 0x10000000)?"2":"",
- get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3),
- get_nibble(inst, 4), get_nibble(inst, 0), opc2);
- else
- dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"",
- get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3),
- get_nibble(inst, 4), get_nibble(inst, 0));
+ dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"",
+ get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3),
+ get_nibble(inst, 4), get_nibble(inst, 0));
+ if (opc2) dbg_printf(", #%u", opc2);
return 0;
}
@@ -1075,15 +1071,11 @@ static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr)
WORD opc1 = (inst >> 21) & 0x07;
WORD opc2 = (inst >> 5) & 0x07;
- if (opc2)
- dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u, #%u", (inst & 0x00100000)?"mrc":"mcr",
- (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1,
- tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0), opc2);
- else
- dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr",
- (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1,
- tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0));
+ dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr",
+ (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1,
+ tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0));
+ if (opc2) dbg_printf(", #%u", opc2);
return 0;
}
--
1.7.4.1
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list