Mercurial > repos > blastem

comparison backend.c @ 2042:3142602d21d8 mame_interp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile error post-merge
author Michael Pavone <pavone@retrodev.com>
date Thu, 05 Aug 2021 09:43:29 -0700
parents 638eb2d25696
children
comparison
equal deleted inserted replaced
2041:638eb2d25696 2042:3142602d21d8
56 memmap_chunk const *find_map_chunk(uint32_t address, cpu_options *opts, uint16_t flags, uint32_t *size_sum) 56 memmap_chunk const *find_map_chunk(uint32_t address, cpu_options *opts, uint16_t flags, uint32_t *size_sum)
57 { 57 {
58 if (size_sum) { 58 if (size_sum) {
59 *size_sum = 0; 59 *size_sum = 0;
60 } 60 }
61 #ifndef NEW_CORE
61 uint32_t minsize; 62 uint32_t minsize;
62 if (flags == MMAP_CODE) { 63 if (flags == MMAP_CODE) {
63 minsize = 1 << (opts->ram_flags_shift + 3); 64 minsize = 1 << (opts->ram_flags_shift + 3);
64 } else { 65 } else {
65 minsize = 0; 66 minsize = 0;
66 } 67 }
68 #endif
67 address &= opts->address_mask; 69 address &= opts->address_mask;
68 for (memmap_chunk const *cur = opts->memmap, *end = opts->memmap + opts->memmap_chunks; cur != end; cur++) 70 for (memmap_chunk const *cur = opts->memmap, *end = opts->memmap + opts->memmap_chunks; cur != end; cur++)
69 { 71 {
70 if (address >= cur->start && address < cur->end) { 72 if (address >= cur->start && address < cur->end) {
71 return cur; 73 return cur;
72 } else if (size_sum && (cur->flags & flags) == flags) { 74 } else if (size_sum && (cur->flags & flags) == flags) {
73 uint32_t size = chunk_size(opts, cur); 75 uint32_t size = chunk_size(opts, cur);
76 #ifndef NEW_CORE
74 if (size < minsize) { 77 if (size < minsize) {
75 size = minsize; 78 size = minsize;
76 } 79 }
80 #endif
77 *size_sum += size; 81 *size_sum += size;
78 } 82 }
79 } 83 }
80 return NULL; 84 return NULL;
81 } 85 }
279 } 283 }
280 284
281 uint32_t ram_size(cpu_options *opts) 285 uint32_t ram_size(cpu_options *opts)
282 { 286 {
283 uint32_t size = 0; 287 uint32_t size = 0;
288 #ifndef NEW_CORE
284 uint32_t minsize = 1 << (opts->ram_flags_shift + 3); 289 uint32_t minsize = 1 << (opts->ram_flags_shift + 3);
290 #endif
285 for (int i = 0; i < opts->memmap_chunks; i++) 291 for (int i = 0; i < opts->memmap_chunks; i++)
286 { 292 {
287 if (opts->memmap[i].flags & MMAP_CODE) { 293 if (opts->memmap[i].flags & MMAP_CODE) {
288 uint32_t cursize = chunk_size(opts, opts->memmap + i); 294 uint32_t cursize = chunk_size(opts, opts->memmap + i);
295 #ifndef NEW_CORE
289 if (cursize < minsize) { 296 if (cursize < minsize) {
290 size += minsize; 297 size += minsize;
291 } else { 298 } else {
299 #endif
292 size += cursize; 300 size += cursize;
293 } 301 #ifndef NEW_CORE
302 }
303 #endif
294 } 304 }
295 } 305 }
296 return size; 306 return size;
297 } 307 }