Mercurial > repos > blastem
diff m68k_to_x86.c @ 95:dd3c680c618c
Initial work on allowing dynamic branches and code in RAM plus a small fix to effective address decoding
| author | Mike Pavone <pavone@retrodev.com> |
|---|---|
| date | Thu, 27 Dec 2012 21:19:58 -0800 |
| parents | f63b0e58e2d5 |
| children | f894f85cf39d |
line wrap: on
line diff
--- a/m68k_to_x86.c Thu Dec 27 18:47:33 2012 -0800 +++ b/m68k_to_x86.c Thu Dec 27 21:19:58 2012 -0800 @@ -1,5 +1,6 @@ #include "gen_x86.h" #include "m68k_to_x86.h" +#include "mem.h" #include <stdio.h> #include <stddef.h> #include <stdlib.h> @@ -486,9 +487,10 @@ 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) { return NULL; @@ -539,6 +541,7 @@ void map_native_address(native_map_slot * native_code_map, uint32_t address, uint8_t * native_addr) { address &= 0xFFFFFF; + address/= 2; uint32_t chunk = address / NATIVE_CHUNK_SIZE; if (!native_code_map[chunk].base) { native_code_map[chunk].base = native_addr; @@ -1880,15 +1883,25 @@ return dst; } -uint8_t * translate_m68k_stream(uint8_t * dst, uint8_t * dst_end, uint32_t address, m68k_context * context) +uint8_t * translate_m68k_stream(uint32_t address, m68k_context * context) { m68kinst instbuf; x86_68k_options * opts = context->options; + uint8_t * dst = opts->cur_code; + uint8_t * dst_end = opts->code_end; if(get_native_address(opts->native_code_map, address)) { return dst; } char disbuf[1024]; - uint16_t *encoded = context->mem_pointers[0] + address/2, *next; + uint16_t *encoded, *next; + if ((address & 0xFFFFFF) < 0x400000) { + encoded = context->mem_pointers[0] + (address & 0xFFFFFF)/2; + } else if ((address & 0xFFFFFF) > 0xE00000) { + encoded = context->mem_pointers[1] + (address & 0xFFFF)/2; + } else { + printf("attempt to translate non-memory address: %X\n", address); + exit(1); + } do { do { if (dst_end-dst < 128) { @@ -1910,9 +1923,21 @@ encoded = NULL; } } while(encoded != NULL); + opts->cur_code = dst; return dst; } +uint8_t * get_native_address_trans(m68k_context * context, uint32_t address) +{ + address &= 0xFFFFFF; + uint8_t * ret = get_native_address(context->native_code_map, address); + if (!ret) { + translate_m68k_stream(address, context); + ret = get_native_address(context->native_code_map, address); + } + return ret; +} + void start_68k_context(m68k_context * context, uint32_t address) { uint8_t * addr = get_native_address(context->native_code_map, address); @@ -1941,6 +1966,9 @@ opts->native_code_map = malloc(sizeof(native_map_slot) * NATIVE_MAP_CHUNKS); memset(opts->native_code_map, 0, sizeof(native_map_slot) * NATIVE_MAP_CHUNKS); opts->deferred = NULL; + size_t size = 1024 * 1024; + opts->cur_code = alloc_code(&size); + opts->code_end = opts->cur_code + size; } void init_68k_context(m68k_context * context, native_map_slot * native_code_map, void * opts)