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

cleanup peek/read macros

Browse Source 
Remove unused m68k_read_disassembler_8(), rework peek/read macros.

Signed-off-by: Nicolas PLANEL <nplanel@gmail.com>
This commit is contained in:
Nicolas PLANEL 2015-10-08 22:16:39 +11:00
parent 051140f3ba
commit af1d39d336
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/M68K/M68KDisassembler.c
View File

@ -143,15 +143,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
unsigned int m68k_read_disassembler_8(m68k_info *info, const uint64_t address)
{
const uint64_t addr = (address - info->baseAddress) & info->address_mask;
if (addr > (info->code_len - 1)) {
return 0x08;
}
return info->code[addr];
}
unsigned int m68k_read_disassembler_16(m68k_info *info, const uint64_t address)
{
const uint64_t addr = (address - info->baseAddress) & info->address_mask;
@ -290,14 +281,15 @@ static m68k_insn s_trap_lut[] = {
} \
} while (0)
#define read_imm_8(info) (m68k_read_disassembler_16((info), (((info)->pc+=2)-2))&0xff)
#define read_imm_16(info) m68k_read_disassembler_16((info), (((info)->pc+=2)-2))
#define read_imm_32(info) m68k_read_disassembler_32((info), (((info)->pc+=4)-4))
#define read_imm_64(info) m68k_read_disassembler_64((info), (((info)->pc+=8)-8))
#define peek_imm_8(info) (m68k_read_disassembler_16((info), (info)->pc)&0xff)
#define peek_imm_16(info) m68k_read_disassembler_16((info), (info)->pc)
#define peek_imm_32(info) m68k_read_disassembler_32((info), (info)->pc)
#define peek_imm_64(info) m68k_read_disassembler_64((info), (info)->pc)
#define read_imm_8(info) ( { unsigned int value = peek_imm_8(info); (info)->pc+=2; value; } )
#define read_imm_16(info) ( { unsigned int value = peek_imm_16(info); (info)->pc+=2; value; } )
#define read_imm_32(info) ( { unsigned int value = peek_imm_32(info); (info)->pc+=4; value; } )
#define read_imm_64(info) ( { unsigned int value = peek_imm_64(info); (info)->pc+=8; value; } )
/* Fake a split interface */
#define get_ea_mode_str_8(instruction) get_ea_mode_str(instruction, 0)

1
arch/M68K/M68KDisassembler.h
View File

@ -190,7 +190,6 @@ unsigned int m68k_read_pcrelative_16(m68k_info *info, uint64_t address);
unsigned int m68k_read_pcrelative_32(m68k_info *info, uint64_t address);
/* Memory access for the disassembler */
unsigned int m68k_read_disassembler_8 (m68k_info *info, const uint64_t address);
unsigned int m68k_read_disassembler_16 (m68k_info *info, const uint64_t address);
unsigned int m68k_read_disassembler_32 (m68k_info *info, const uint64_t address);
uint64_t m68k_read_disassembler_64 (m68k_info *info, const uint64_t address);