Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[M68K] fixup increment pc only if the instruction_is_valid() 

m68k_disassemble() should return the number of decoded bytes, aim to help
M68K_getInstruction() to return if it was a good instruction or not.

Signed-off-by: Nicolas PLANEL <nplanel@gmail.com>
This commit is contained in:
Nicolas PLANEL 2015-10-08 15:35:39 +11:00
parent ee33bcf967
commit b9f66d63c9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/M68K/M68KDisassembler.c
View File

@ -3782,7 +3782,8 @@ static int instruction_is_valid(m68k_info *info, const unsigned int word_check)
const unsigned int instruction = info->ir;
instruction_struct *i = &g_instruction_table[instruction];
if (i->word2_mask && ((word_check & i->word2_mask) != i->word2_match)) {
if ( (i->word2_mask && ((word_check & i->word2_mask) != i->word2_match)) ||
(i->instruction == d68000_invalid) ) {
d68000_invalid(info);
return 0;
}
@ -3850,8 +3851,9 @@ static unsigned int m68k_disassemble(m68k_info *info, uint64_t pc)
for (i = 0; i < M68K_OPERAND_COUNT; ++i)
ext->operands[i].type = M68K_OP_REG;
info->ir = read_imm_16(info);
if (instruction_is_valid(info, peek_imm_16(info))) {
info->ir = peek_imm_16(info);
if (instruction_is_valid(info, peek_imm_32(info) & 0xffff)) {
info->ir = read_imm_16(info);
g_instruction_table[info->ir].instruction(info);
}