Mercurial > repos > blastem
changeset 2042:3142602d21d8 mame_interp
Fix compile error post-merge
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 05 Aug 2021 09:43:29 -0700 |
parents | 638eb2d25696 |
children | 804954731e3f |
files | backend.c |
diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/backend.c Thu Aug 05 09:29:33 2021 -0700 +++ b/backend.c Thu Aug 05 09:43:29 2021 -0700 @@ -58,12 +58,14 @@ if (size_sum) { *size_sum = 0; } +#ifndef NEW_CORE uint32_t minsize; if (flags == MMAP_CODE) { minsize = 1 << (opts->ram_flags_shift + 3); } else { minsize = 0; } +#endif address &= opts->address_mask; for (memmap_chunk const *cur = opts->memmap, *end = opts->memmap + opts->memmap_chunks; cur != end; cur++) { @@ -71,9 +73,11 @@ return cur; } else if (size_sum && (cur->flags & flags) == flags) { uint32_t size = chunk_size(opts, cur); +#ifndef NEW_CORE if (size < minsize) { size = minsize; } +#endif *size_sum += size; } } @@ -281,16 +285,22 @@ uint32_t ram_size(cpu_options *opts) { uint32_t size = 0; +#ifndef NEW_CORE uint32_t minsize = 1 << (opts->ram_flags_shift + 3); +#endif for (int i = 0; i < opts->memmap_chunks; i++) { if (opts->memmap[i].flags & MMAP_CODE) { uint32_t cursize = chunk_size(opts, opts->memmap + i); +#ifndef NEW_CORE if (cursize < minsize) { size += minsize; } else { +#endif size += cursize; +#ifndef NEW_CORE } +#endif } } return size;