diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2007-12-31 07:38:42 +0000 |
---|---|---|
committer | R. Belmont <rb6502@users.noreply.github.com> | 2007-12-31 07:38:42 +0000 |
commit | 67eec8cf268f0f4774d01a884ace323d54f4bf5a (patch) | |
tree | 9b408049451e52fd3512f2edd34952c40d516622 /src/emu | |
parent | da6a8c1fe03d7f9c66d77a8ff2d5dc08d2393295 (diff) |
Fixed various 64-bit GCC warnings.
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/memory.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/emu/memory.c b/src/emu/memory.c index 5f844cfb61e..56c4a8cf1df 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1484,7 +1484,11 @@ static void install_mem_handler(addrspace_data *space, int iswrite, int databits if (state_save_registration_allowed()) state_save_register_item("memory", HANDLER_TO_BANK(handler), bdata->curentry); + #ifdef PTR64 + VPRINTF(("Allocated new bank %lld\n", HANDLER_TO_BANK(handler))); + #else VPRINTF(("Allocated new bank %d\n", HANDLER_TO_BANK(handler))); + #endif } } @@ -2118,7 +2122,7 @@ static void *allocate_memory_block(int cpunum, int spacenum, offs_t start, offs_ int allocatemem = (memory == NULL); int region; - VPRINTF(("allocate_memory_block(%d,%d,%08X,%08X,%08X)\n", cpunum, spacenum, start, end, (UINT32)memory)); + VPRINTF(("allocate_memory_block(%d,%d,%08X,%08X,%08X)\n", cpunum, spacenum, start, end, (UINT32)(FPTR)memory)); /* if we weren't passed a memory block, allocate one and clear it to zero */ if (allocatemem) @@ -2188,7 +2192,7 @@ static address_map *assign_intersecting_blocks(addrspace_data *space, offs_t sta if (map->share && shared_ptr[map->share]) { map->memory = shared_ptr[map->share]; - VPRINTF(("memory range %08X-%08X -> shared_ptr[%d] [%08X]\n", map->start, map->end, map->share, (UINT32)map->memory)); + VPRINTF(("memory range %08X-%08X -> shared_ptr[%d] [%08X]\n", map->start, map->end, map->share, (UINT32)(FPTR)map->memory)); } /* otherwise, look for a match in this block */ @@ -2199,7 +2203,7 @@ static address_map *assign_intersecting_blocks(addrspace_data *space, offs_t sta if (map->start >= start && map->end <= end) { map->memory = base + (map->start - start); - VPRINTF(("memory range %08X-%08X -> found in block from %08X-%08X [%08X]\n", map->start, map->end, start, end, (UINT32)map->memory)); + VPRINTF(("memory range %08X-%08X -> found in block from %08X-%08X [%08X]\n", map->start, map->end, start, end, (UINT32)(FPTR)map->memory)); } } else @@ -2207,7 +2211,7 @@ static address_map *assign_intersecting_blocks(addrspace_data *space, offs_t sta if (map->start >= start && map->start + map->mask <= end) { map->memory = base + (map->start - start); - VPRINTF(("memory range %08X-%08X -> found in block from %08X-%08X [%08X]\n", map->start, map->end, start, end, (UINT32)map->memory)); + VPRINTF(("memory range %08X-%08X -> found in block from %08X-%08X [%08X]\n", map->start, map->end, start, end, (UINT32)(FPTR)map->memory)); } } } @@ -2290,7 +2294,7 @@ static void find_memory(void) if (!IS_AMENTRY_EXTENDED(map) && map->start == bankdata[banknum].base) { bank_ptr[banknum] = map->memory; - VPRINTF(("assigned bank %d pointer to memory from range %08X-%08X [%08X]\n", banknum, map->start, map->end, (UINT32)map->memory)); + VPRINTF(("assigned bank %d pointer to memory from range %08X-%08X [%08X]\n", banknum, map->start, map->end, (UINT32)(FPTR)map->memory)); break; } @@ -2328,7 +2332,7 @@ static void *memory_find_base(int cpunum, int spacenum, int readwrite, offs_t of { if (maskoffs >= map->start && maskoffs <= map->end) { - VPRINTF(("found in entry %08X-%08X [%08X]\n", map->start, map->end, (UINT32)map->memory + (maskoffs - map->start))); + VPRINTF(("found in entry %08X-%08X [%08X]\n", map->start, map->end, (UINT32)(FPTR)map->memory + (maskoffs - map->start))); return (UINT8 *)map->memory + (maskoffs - map->start); } } @@ -2336,7 +2340,7 @@ static void *memory_find_base(int cpunum, int spacenum, int readwrite, offs_t of { if ((maskoffs & map->end) == map->start) { - VPRINTF(("found in entry %08X-%08X [%08X]\n", map->start, map->end, (UINT32)map->memory + (maskoffs - map->start))); + VPRINTF(("found in entry %08X-%08X [%08X]\n", map->start, map->end, (UINT32)(FPTR)map->memory + (maskoffs - map->start))); return (UINT8 *)map->memory + (maskoffs - map->start); } } @@ -2346,7 +2350,7 @@ static void *memory_find_base(int cpunum, int spacenum, int readwrite, offs_t of for (blocknum = 0, block = memory_block_list; blocknum < memory_block_count; blocknum++, block++) if (block->cpunum == cpunum && block->spacenum == spacenum && block->start <= offset && block->end > offset) { - VPRINTF(("found in allocated memory block %08X-%08X [%08X]\n", block->start, block->end, (UINT32)block->data + (offset - block->start))); + VPRINTF(("found in allocated memory block %08X-%08X [%08X]\n", block->start, block->end, (UINT32)(FPTR)block->data + (offset - block->start))); return block->data + offset - block->start; } |