Mercurial > repos > blastem
diff menu.c @ 2499:d74d3998482c
Make some progress on compiling full emulator with new 68K core
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 30 Apr 2024 00:02:14 -0700 |
| parents | bdd83b47d78a |
| children |
line wrap: on
line diff
--- a/menu.c Mon Apr 29 22:57:49 2024 -0700 +++ b/menu.c Tue Apr 30 00:02:14 2024 -0700 @@ -50,7 +50,7 @@ { if (!src || !(guest_addr & 0xFFFF)) { //we may have walked off the end of a memory block, get a fresh native pointer - src = get_native_pointer(guest_addr, (void **)m68k->mem_pointers, &m68k->options->gen); + src = get_native_pointer(guest_addr, (void **)m68k->mem_pointers, &m68k->opts->gen); if (!src) { break; } @@ -72,7 +72,7 @@ { if (!dst || !(guest_addr & 0xFFFF)) { //we may have walked off the end of a memory block, get a fresh native pointer - dst = get_native_pointer(guest_addr, (void **)m68k->mem_pointers, &m68k->options->gen); + dst = get_native_pointer(guest_addr, (void **)m68k->mem_pointers, &m68k->opts->gen); if (!dst) { break; } @@ -86,7 +86,7 @@ uint32_t copy_dir_entry_to_guest(uint32_t dst, m68k_context *m68k, char *name, uint8_t is_dir) { - uint8_t *dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->options->gen); + uint8_t *dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->opts->gen); if (!dest) { return 0; } @@ -106,7 +106,7 @@ dst += 2; if (!(dst & 0xFFFF)) { //we may have walked off the end of a memory block, get a fresh native pointer - dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->options->gen); + dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->opts->gen); if (!dest) { break; } @@ -158,7 +158,7 @@ } free(ext_list); //terminate list - uint8_t *dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->options->gen); + uint8_t *dest = get_native_pointer(dst, (void **)m68k->mem_pointers, &m68k->opts->gen); if (dest) { *dest = dest[1] = 0; } @@ -256,7 +256,7 @@ menu->state = 1; } if (m68k->should_return) { - m68k->target_cycle = m68k->current_cycle; + m68k->target_cycle = m68k->cycles; } return context;