diff options
| author | Mike Pavone <pavone@retrodev.com> | 2012-12-27 21:23:55 -0800 |
|---|---|---|
| committer | Mike Pavone <pavone@retrodev.com> | 2012-12-27 21:23:55 -0800 |
| commit | 9df58d6c89cd0ce88772d042e5ddf948416bd224 (patch) | |
| tree | 28d360a9cd7140f9fa89d2514bb0e79eb6fa62c3 /m68k_to_x86.c | |
| parent | e20c4dfeab1bbfb208f5ecfcf25ca4185babe750 (diff) | |
Fix pc indexed addressing (probably) when used as a source
Diffstat (limited to 'm68k_to_x86.c')
| -rw-r--r-- | m68k_to_x86.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/m68k_to_x86.c b/m68k_to_x86.c index 9f12248..a5494ea 100644 --- a/m68k_to_x86.c +++ b/m68k_to_x86.c @@ -245,7 +245,7 @@ uint8_t * translate_m68k_src(m68kinst * inst, x86_ea * ea, uint8_t * out, x86_68 break; case MODE_PC_INDEX_DISP8: out = cycles(out, 6); - out = mov_ir(out, inst->address, SCRATCH1, SZ_D); + out = mov_ir(out, inst->address+2, SCRATCH1, SZ_D); sec_reg = (inst->src.params.regs.sec >> 1) & 0x7; if (inst->src.params.regs.sec & 1) { if (inst->src.params.regs.sec & 0x10) { @@ -280,6 +280,20 @@ uint8_t * translate_m68k_src(m68kinst * inst, x86_ea * ea, uint8_t * out, x86_68 if (inst->src.params.regs.displacement) { out = add_ir(out, inst->src.params.regs.displacement, SCRATCH1, SZ_D); } + switch (inst->extra.size) + { + case OPSIZE_BYTE: + out = call(out, (char *)m68k_read_byte_scratch1); + break; + case OPSIZE_WORD: + out = call(out, (char *)m68k_read_word_scratch1); + break; + case OPSIZE_LONG: + out = call(out, (char *)m68k_read_long_scratch1); + break; + } + ea->mode = MODE_REG_DIRECT; + ea->base = SCRATCH1; break; case MODE_ABSOLUTE: case MODE_ABSOLUTE_SHORT: @@ -487,9 +501,9 @@ uint8_t * m68k_save_result(m68kinst * inst, uint8_t * out, x86_68k_options * opt uint8_t * get_native_address(native_map_slot * native_code_map, uint32_t address) { address &= 0xFFFFFF; - //if (address > 0x400000) { + if (address > 0x400000) { printf("get_native_address: %X\n", address); - //} + } address /= 2; uint32_t chunk = address / NATIVE_CHUNK_SIZE; if (!native_code_map[chunk].base) { |