diff options
| author | Mike Pavone <pavone@retrodev.com> | 2012-12-26 18:20:23 -0800 |
|---|---|---|
| committer | Mike Pavone <pavone@retrodev.com> | 2012-12-26 18:20:23 -0800 |
| commit | f0d831f2b1e343592d0987dffdb5eb1064bd83ae (patch) | |
| tree | 2f78d7ea659ba28e2f2ba741fb03704c25a8ea7e | |
| parent | 448658907c7a8f6caa8ea785d2eae8ea24471b30 (diff) | |
RTE doesn't crash the emulator anymore
| -rw-r--r-- | m68k_to_x86.c | 3 | ||||
| -rw-r--r-- | m68k_to_x86.h | 2 | ||||
| -rw-r--r-- | runtime.S | 12 |
3 files changed, 11 insertions, 6 deletions
diff --git a/m68k_to_x86.c b/m68k_to_x86.c index d53f98b..7a7a90c 100644 --- a/m68k_to_x86.c +++ b/m68k_to_x86.c @@ -479,6 +479,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) { + printf("get_native_address: %X\n", address); + } uint32_t chunk = address / NATIVE_CHUNK_SIZE; if (!native_code_map[chunk].base) { return NULL; diff --git a/m68k_to_x86.h b/m68k_to_x86.h index 12d4f8b..a066f39 100644 --- a/m68k_to_x86.h +++ b/m68k_to_x86.h @@ -2,7 +2,7 @@ #include "68kinst.h" #define NUM_MEM_AREAS 4 -#define NATIVE_MAP_CHUNKS (32*1024) +#define NATIVE_MAP_CHUNKS (64*1024) #define NATIVE_CHUNK_SIZE ((16 * 1024 * 1024 / NATIVE_MAP_CHUNKS)/2) #define INVALID_OFFSET 0xFFFFFFFF @@ -268,10 +268,12 @@ vdp_psg_wb: .global m68k_write_long_lowfirst m68k_write_long_lowfirst: push %rdi + push %rcx add $2, %edi call m68k_write_word - shr $16, %ecx + pop %rcx pop %rdi + shr $16, %ecx jmp m68k_write_word .global m68k_write_long_highfirst @@ -391,8 +393,8 @@ m68k_modified_ret_addr: dyn_addr_msg: .asciz "Program needs dynamically calculated native address\n" - .global m68k_native_addr -m68k_native_addr: + .global m68k_native_addr_and_sync +m68k_native_addr_and_sync: call m68k_save_context push %rcx mov %rsi, %rdi @@ -406,8 +408,8 @@ m68k_native_addr: call m68k_load_context ret - .global m68k_native_addr_and_sync -m68k_native_addr_and_sync: + .global m68k_native_addr +m68k_native_addr: call m68k_save_context push %rsi mov 144(%rsi), %rdi |