diff options
| author | Michael Pavone <pavone@retrodev.com> | 2015-01-14 09:38:54 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2015-01-14 09:38:54 -0800 |
| commit | f439d8688758710b74d4909e77ebce6444b8a448 (patch) | |
| tree | 6d000eba25209ae902c5360402b15118c79559ad /backend_x86.c | |
| parent | d42234e4af41481a3db6f6ea5173bb1623b30d22 (diff) | |
Removed hardcoded assumptions in M68K core about which parts of the memory map are RAM
Diffstat (limited to 'backend_x86.c')
| -rw-r--r-- | backend_x86.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/backend_x86.c b/backend_x86.c index 7c289de..5a1f5d5 100644 --- a/backend_x86.c +++ b/backend_x86.c @@ -50,6 +50,7 @@ code_ptr gen_mem_fun(cpu_options * opts, memmap_chunk const * memmap, uint32_t n uint8_t adr_reg = is_write ? opts->scratch2 : opts->scratch1; uint16_t access_flag = is_write ? MMAP_WRITE : MMAP_READ; uint8_t size = (fun_type == READ_16 || fun_type == WRITE_16) ? SZ_W : SZ_B; + uint32_t ram_flags_off = opts->ram_flags_off; for (uint32_t chunk = 0; chunk < num_chunks; chunk++) { if (memmap[chunk].start > 0) { @@ -173,7 +174,12 @@ code_ptr gen_mem_fun(cpu_options * opts, memmap_chunk const * memmap, uint32_t n if (is_write && (memmap[chunk].flags & MMAP_CODE)) { mov_rr(code, opts->scratch2, opts->scratch1, opts->address_size); shr_ir(code, opts->ram_flags_shift, opts->scratch1, opts->address_size); - bt_rrdisp(code, opts->scratch1, opts->context_reg, opts->ram_flags_off, opts->address_size); + bt_rrdisp(code, opts->scratch1, opts->context_reg, ram_flags_off, opts->address_size); + if (memmap[chunk].mask == opts->address_mask) { + ram_flags_off += memmap[chunk].end - memmap[chunk].start; + } else { + ram_flags_off += memmap[chunk].mask + 1; + } code_ptr not_code = code->cur + 1; jcc(code, CC_NC, code->cur + 2); call(code, opts->save_context); |