Magic-Mirror/capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/capstone.git synced 2025-02-21 15:02:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #627 from nplanel/fixup.20160411

Browse Source 
Fixup.20160411
This commit is contained in:
Nguyen Anh Quynh 2016-04-12 09:31:30 +07:00
commit 6588833a56
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/objdump/objdump-m68k.py
View File

@ -149,14 +149,14 @@ def dump_op_ea(insn, op):
if op.address_mode in [ M68K_AM_PCI_INDEX_8_BIT_DISP, M68K_AM_AREGI_INDEX_8_BIT_DISP ]:
disp = op.mem.disp
if op.mem.register_bits == 2:
if op.register_bits == 2:
disp = extsign8(op.mem.disp)
if op.mem.register_bits == 4:
if op.register_bits == 4:
disp = extsign1632(op.mem.disp)
str = dump_op_reg(insn, op.mem.base_reg) + "@(" + "{0:016x}".format(disp) + "," + dump_op_reg(insn, op.mem.index_reg) + ":" + map_index_size_str[op.mem.index_size]
if op.mem.register_bits:
str += format(":%u" % (op.mem.register_bits))
if op.register_bits:
str += format(":%u" % (op.register_bits))
return str + ")"
@ -165,8 +165,8 @@ def dump_op_ea(insn, op):
str += format("@(%016x)@(%016x" % (extsign1632(op.mem.in_disp), extsign1632(op.mem.out_disp)))
if op.mem.index_reg:
str += "," + dump_op_reg(insn, op.mem.index_reg) + ":" + map_index_size_str[op.mem.index_size]
if op.mem.register_bits:
str += format(":%u" % (op.mem.register_bits))
if op.register_bits:
str += format(":%u" % (op.register_bits))
str += ")"
return str

6
include/capstone/m68k.h
View File

@ -77,7 +77,7 @@ typedef enum m68k_reg {
} m68k_reg;
//> M68K Addressing Modes
typedef enum m68k_adress_mode {
typedef enum m68k_address_mode {
M68K_AM_NONE = 0, // No address mode.
M68K_AM_REG_DIRECT_DATA, // Register Direct - Data
@ -105,7 +105,7 @@ typedef enum m68k_adress_mode {
M68K_AM_ABSOLUTE_DATA_SHORT, // Absolute Data Addressing - Short
M68K_AM_ABSOLUTE_DATA_LONG, // Absolute Data Addressing - Long
M68K_AM_IMMIDIATE, // Immidate value
} m68k_adress_mode;
} m68k_address_mode;
//> Operand type for instruction's operands
typedef enum m68k_op_type {
@ -145,7 +145,7 @@ typedef struct cs_m68k_op {
uint32_t register_bits; // register bits for movem/cas2/etc (always in d0-d7, a0-a7, fp0 - fp7 order)
};
m68k_op_type type;
m68k_adress_mode address_mode; // M68K addressing mode for this op
m68k_address_mode address_mode; // M68K addressing mode for this op
} cs_m68k_op;
// Operation size of the CPU instructions