Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-07 14:54:35 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixes so we can compile as C++ again.

Browse Source
This commit is contained in:
Aaron Giles 2009-12-28 07:34:17 +00:00
parent 4e9be151f7
commit f20a2e6b17
19 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/dsp56k/dsp56ops.c
View File

@ -1882,7 +1882,7 @@ static size_t dsp56k_op_abs(dsp56k_core* cpustate, const UINT16 op_byte, typed_p
opD &= U64(0x000000ffffffffff);
/* Take the absolute value and clean up */
opD = abs(opD);
opD = (opD < 0) ? -opD : opD;
opD &= U64(0x000000ffffffffff);
/* Reassign */

12
src/emu/cpu/z180/z180.c
View File

@ -2516,12 +2516,12 @@ static CPU_SET_INFO( z180 )
case CPUINFO_INT_INPUT_STATE + Z180_INT0: set_irq_line(cpustate, Z180_INT0, info->i); break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: cpustate->cc[Z180_TABLE_op] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: cpustate->cc[Z180_TABLE_cb] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: cpustate->cc[Z180_TABLE_ed] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xy: cpustate->cc[Z180_TABLE_xy] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xycb: cpustate->cc[Z180_TABLE_xycb] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ex: cpustate->cc[Z180_TABLE_ex] = info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: cpustate->cc[Z180_TABLE_op] = (UINT8 *)info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: cpustate->cc[Z180_TABLE_cb] = (UINT8 *)info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: cpustate->cc[Z180_TABLE_ed] = (UINT8 *)info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xy: cpustate->cc[Z180_TABLE_xy] = (UINT8 *)info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xycb: cpustate->cc[Z180_TABLE_xycb] = (UINT8 *)info->p; break;
case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ex: cpustate->cc[Z180_TABLE_ex] = (UINT8 *)info->p; break;
}
}

2
src/emu/devintrf.c
View File

@ -153,7 +153,7 @@ device_config *device_list_add(device_list *devlist, const device_config *owner,
tmerr = tagmap_add_unique_hash(devlist->map, tag, device, FALSE);
if (tmerr == TMERR_DUPLICATE)
{
device_config *match = tagmap_find_hash_only(devlist->map, tag);
device_config *match = (device_config *)tagmap_find_hash_only(devlist->map, tag);
assert(match != NULL);
if (strcmp(tag, match->tag) == 0)
fatalerror("Attempted to add duplicate device: type=%s tag=%s\n", device_get_name(*devptr), tag);

2
src/emu/devintrf.h
View File

@ -475,7 +475,7 @@ INLINE const device_config *device_list_find_by_tag(const device_list *devlist,
{
/* if we have a map, use it */
if (devlist->map != NULL)
return tagmap_find_hash_only(devlist->map, tag);
return (const device_config *)tagmap_find_hash_only(devlist->map, tag);
/* otherwise, go the slow route */
return device_list_find_by_tag_slow(devlist, tag);

2
src/emu/inptport.c
View File

@ -2476,7 +2476,7 @@ static void port_config_detokenize(input_port_list *portlist, const input_port_t
tagmap_error err = tagmap_add_unique_hash(portlist->map, curport->tag, curport, FALSE);
if (err == TMERR_DUPLICATE)
{
const input_port_config *match = tagmap_find_hash_only(portlist->map, curport->tag);
const input_port_config *match = (const input_port_config *)tagmap_find_hash_only(portlist->map, curport->tag);
error_buf_append(errorbuf, errorbuflen, "tag '%s' has same hash as tag '%s'; please change one of them", curport->tag, match->tag);
}
}

2
src/emu/inptport.h
View File

@ -1157,7 +1157,7 @@ INLINE const input_port_config *input_port_by_tag(const input_port_list *portlis
{
/* use the map if we have it */
if (portlist->map != NULL)
return tagmap_find_hash_only(portlist->map, tag);
return (const input_port_config *)tagmap_find_hash_only(portlist->map, tag);
/* otherwise, do it the slow way */
return input_port_by_tag_slow(portlist, tag);

2
src/emu/machine/ds2404.c
View File

@ -285,7 +285,7 @@ WRITE8_DEVICE_HANDLER( ds2404_clk_w )
static TIMER_CALLBACK( ds2404_tick )
{
ds2404_state *state = get_safe_token(ptr);
ds2404_state *state = get_safe_token((const device_config *)ptr);
int i;
for( i = 0; i < 5; i++ )
{

10
src/emu/mame.c
View File

@ -795,7 +795,7 @@ UINT8 *memory_region_alloc(running_machine *machine, const char *name, UINT32 le
tagerr = tagmap_add_unique_hash(mame->regionmap, name, info, FALSE);
if (tagerr == TMERR_DUPLICATE)
{
region_info *match = tagmap_find_hash_only(mame->regionmap, name);
region_info *match = (region_info *)tagmap_find_hash_only(mame->regionmap, name);
fatalerror("Memory region '%s' has same hash as tag '%s'; please change one of them", name, astring_c(match->name));
}
@ -848,7 +848,7 @@ UINT8 *memory_region(running_machine *machine, const char *name)
return NULL;
/* look up the region and return the base */
info = tagmap_find_hash_only(mame->regionmap, name);
info = (region_info *)tagmap_find_hash_only(mame->regionmap, name);
return (info != NULL) ? info->base : NULL;
}
@ -868,7 +868,7 @@ UINT32 memory_region_length(running_machine *machine, const char *name)
return 0;
/* look up the region and return the length */
info = tagmap_find_hash_only(mame->regionmap, name);
info = (region_info *)tagmap_find_hash_only(mame->regionmap, name);
return (info != NULL) ? info->length : 0;
}
@ -888,7 +888,7 @@ UINT32 memory_region_flags(running_machine *machine, const char *name)
return 0;
/* look up the region and return the flags */
info = tagmap_find_hash_only(mame->regionmap, name);
info = (region_info *)tagmap_find_hash_only(mame->regionmap, name);
return (info != NULL) ? info->flags : 0;
}
@ -912,7 +912,7 @@ const char *memory_region_next(running_machine *machine, const char *name)
return astring_c(mame->regionlist->name);
/* look up the region and return the next guy */
info = tagmap_find_hash_only(mame->regionmap, name);
info = (region_info *)tagmap_find_hash_only(mame->regionmap, name);
return (info != NULL && info->next != NULL) ? astring_c(info->next->name) : NULL;
}

49
src/emu/memory.c
View File

@ -406,7 +406,7 @@ static void *space_find_backing_memory(const address_space *space, offs_t addrst
static int space_needs_backing_store(const address_space *space, const address_map_entry *entry);
/* banking helpers */
static void *bank_find_or_allocate(const address_space *space, const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite);
static genf *bank_find_or_allocate(const address_space *space, const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite);
static STATE_POSTLOAD( bank_reattach );
/* table management */
@ -866,16 +866,16 @@ address_map *address_map_alloc(const device_config *device, const game_driver *d
/* append the internal device map (first so it takes priority) */
internal_map = (const addrmap_token *)device_get_info_ptr(device, DEVINFO_PTR_INTERNAL_MEMORY_MAP + spacenum);
if (internal_map != NULL)
map_detokenize(memdata, map, driver, device->tag, internal_map);
map_detokenize((memory_private *)memdata, map, driver, device->tag, internal_map);
/* construct the standard map */
if (device->address_map[spacenum] != NULL)
map_detokenize(memdata, map, driver, device->tag, device->address_map[spacenum]);
map_detokenize((memory_private *)memdata, map, driver, device->tag, device->address_map[spacenum]);
/* append the default device map (last so it can be overridden) */
default_map = (const addrmap_token *)device_get_info_ptr(device, DEVINFO_PTR_DEFAULT_MEMORY_MAP + spacenum);
if (default_map != NULL)
map_detokenize(memdata, map, driver, device->tag, default_map);
map_detokenize((memory_private *)memdata, map, driver, device->tag, default_map);
return map;
}
@ -1102,7 +1102,7 @@ void *memory_get_write_ptr(const address_space *space, offs_t byteaddress)
void memory_configure_bank(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride)
{
memory_private *memdata = machine->memory_data;
bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank_info *bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
int entrynum;
/* validation checks */
@ -1131,7 +1131,7 @@ void memory_configure_bank(running_machine *machine, const char *tag, int starte
void memory_configure_bank_decrypted(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride)
{
memory_private *memdata = machine->memory_data;
bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank_info *bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
int entrynum;
/* validation checks */
@ -1160,7 +1160,7 @@ void memory_configure_bank_decrypted(running_machine *machine, const char *tag,
void memory_set_bank(running_machine *machine, const char *tag, int entrynum)
{
memory_private *memdata = machine->memory_data;
bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank_info *bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
bank_reference *ref;
/* validation checks */
@ -1190,7 +1190,7 @@ void memory_set_bank(running_machine *machine, const char *tag, int entrynum)
int memory_get_bank(running_machine *machine, const char *tag)
{
memory_private *memdata = machine->memory_data;
bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank_info *bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
/* validation checks */
if (bank == NULL)
@ -1206,7 +1206,7 @@ int memory_get_bank(running_machine *machine, const char *tag)
void memory_set_bankptr(running_machine *machine, const char *tag, void *base)
{
memory_private *memdata = machine->memory_data;
bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank_info *bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
bank_reference *ref;
/* validation checks */
@ -1477,14 +1477,14 @@ void _memory_install_bank(const address_space *space, offs_t addrstart, offs_t a
/* map the read bank */
if (rtag != NULL)
{
void *handler = bank_find_or_allocate(space, rtag, addrstart, addrend, addrmask, addrmirror, ROW_READ);
genf *handler = bank_find_or_allocate(space, rtag, addrstart, addrend, addrmask, addrmirror, ROW_READ);
space_map_range(spacerw, ROW_READ, space->dbits, 0, addrstart, addrend, addrmask, addrmirror, handler, spacerw, rtag);
}
/* map the write bank */
if (wtag != NULL)
{
void *handler = bank_find_or_allocate(space, wtag, addrstart, addrend, addrmask, addrmirror, ROW_WRITE);
genf *handler = bank_find_or_allocate(space, wtag, addrstart, addrend, addrmask, addrmirror, ROW_WRITE);
space_map_range(spacerw, ROW_WRITE, space->dbits, 0, addrstart, addrend, addrmask, addrmirror, handler, spacerw, wtag);
}
@ -1503,7 +1503,7 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a
memory_private *memdata = space->machine->memory_data;
address_space *spacerw = (address_space *)space;
FPTR bankindex;
void *handler;
genf *handler;
/* map for read */
if (install_read)
@ -1514,7 +1514,7 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a
/* if we are provided a pointer, set it */
bankindex = (FPTR)handler;
if (baseptr != NULL)
memdata->bank_ptr[bankindex] = baseptr;
memdata->bank_ptr[bankindex] = (UINT8 *)baseptr;
/* if we don't have a bank pointer yet, try to find one */
if (memdata->bank_ptr[bankindex] == NULL)
@ -1525,7 +1525,7 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a
{
if (mame_get_phase(space->machine) >= MAME_PHASE_RESET)
fatalerror("Attempted to call memory_install_ram() after initialization time without a baseptr!");
memdata->bank_ptr[bankindex] = block_allocate(space, memory_address_to_byte(space, addrstart), memory_address_to_byte_end(space, addrend), NULL);
memdata->bank_ptr[bankindex] = (UINT8 *)block_allocate(space, memory_address_to_byte(space, addrstart), memory_address_to_byte_end(space, addrend), NULL);
}
}
@ -1538,7 +1538,7 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a
/* if we are provided a pointer, set it */
bankindex = (FPTR)handler;
if (baseptr != NULL)
memdata->bank_ptr[bankindex] = baseptr;
memdata->bank_ptr[bankindex] = (UINT8 *)baseptr;
/* if we don't have a bank pointer yet, try to find one */
if (memdata->bank_ptr[bankindex] == NULL)
@ -1549,7 +1549,7 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a
{
if (mame_get_phase(space->machine) >= MAME_PHASE_RESET)
fatalerror("Attempted to call memory_install_ram() after initialization time without a baseptr!");
memdata->bank_ptr[bankindex] = block_allocate(space, memory_address_to_byte(space, addrstart), memory_address_to_byte_end(space, addrend), NULL);
memdata->bank_ptr[bankindex] = (UINT8 *)block_allocate(space, memory_address_to_byte(space, addrstart), memory_address_to_byte_end(space, addrend), NULL);
}
}
@ -2298,6 +2298,7 @@ static void map_detokenize(memory_private *memdata, address_map *map, const game
address_map_entry *entry;
address_map tmap = {0};
UINT32 entrytype;
int maptype;
/* check the first token */
TOKEN_GET_UINT32_UNPACK3(tokens, entrytype, 8, tmap.spacenum, 8, tmap.databits, 8);
@ -2379,7 +2380,8 @@ static void map_detokenize(memory_private *memdata, address_map *map, const game
case ADDRMAP_TOKEN_READ:
check_entry_handler(read);
TOKEN_UNGET_UINT32(tokens);
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, entry->read.type, 8, entry->read.bits, 8, entry->read.mask, 8);
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, maptype, 8, entry->read.bits, 8, entry->read.mask, 8);
entry->read.type = (map_handler_type)maptype;
if (entry->read.type == AMH_HANDLER || entry->read.type == AMH_DEVICE_HANDLER)
{
entry->read.handler.read = TOKEN_GET_PTR(tokens, read);
@ -2396,7 +2398,8 @@ static void map_detokenize(memory_private *memdata, address_map *map, const game
case ADDRMAP_TOKEN_WRITE:
check_entry_handler(write);
TOKEN_UNGET_UINT32(tokens);
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, entry->write.type, 8, entry->write.bits, 8, entry->write.mask, 8);
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, maptype, 8, entry->write.bits, 8, entry->write.mask, 8);
entry->write.type = (map_handler_type)maptype;
if (entry->write.type == AMH_HANDLER || entry->write.type == AMH_DEVICE_HANDLER)
{
entry->write.handler.write = TOKEN_GET_PTR(tokens, write);
@ -2414,8 +2417,8 @@ static void map_detokenize(memory_private *memdata, address_map *map, const game
check_entry_handler(read);
check_entry_handler(write);
TOKEN_UNGET_UINT32(tokens);
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, entry->read.type, 8, entry->read.bits, 8, entry->read.mask, 8);
entry->write.type = entry->read.type;
TOKEN_GET_UINT32_UNPACK4(tokens, entrytype, 8, maptype, 8, entry->read.bits, 8, entry->read.mask, 8);
entry->write.type = entry->read.type = (map_handler_type)maptype;
entry->write.bits = entry->read.bits;
entry->write.mask = entry->read.mask;
if (entry->read.type == AMH_HANDLER || entry->read.type == AMH_DEVICE_HANDLER)
@ -2650,7 +2653,7 @@ static int space_needs_backing_store(const address_space *space, const address_m
read/write handler
-------------------------------------------------*/
static void *bank_find_or_allocate(const address_space *space, const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite)
static genf *bank_find_or_allocate(const address_space *space, const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite)
{
memory_private *memdata = space->machine->memory_data;
offs_t bytemirror = addrmirror;
@ -2666,7 +2669,7 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag,
/* if this bank is named, look it up */
if (tag != NULL)
bank = tagmap_find_hash_only(memdata->bankmap, tag);
bank = (bank_info *)tagmap_find_hash_only(memdata->bankmap, tag);
/* else try to find an exact match */
else
@ -2734,7 +2737,7 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag,
/* add a reference for this space */
add_bank_reference(bank, space);
return bank->handler;
return (genf *)bank->handler;
}

2
src/emu/tilemap.c
View File

@ -1324,7 +1324,7 @@ profiler_mark_start(PROFILER_TILEMAP_UPDATE);
/* call the get info callback for the associated memory index */
memindex = tmap->logical_to_memory[logindex];
(*tmap->tile_get_info)(tmap->tile_get_info_object, &tmap->tileinfo, memindex, tmap->user_data);
(*tmap->tile_get_info)((running_machine *)tmap->tile_get_info_object, &tmap->tileinfo, memindex, tmap->user_data);
/* apply the global tilemap flip to the returned flip flags */
flags = tmap->tileinfo.flags ^ (tmap->attributes & 0x03);

6
src/emu/validity.c
View File

@ -323,7 +323,7 @@ static int validate_driver(int drivnum, const machine_config *config, tagmap *na
/* check for duplicate names */
if (tagmap_add(names, driver->name, (void *)driver, FALSE) == TMERR_DUPLICATE)
{
const game_driver *match = tagmap_find(names, driver->name);
const game_driver *match = (const game_driver *)tagmap_find(names, driver->name);
mame_printf_error("%s: %s is a duplicate name (%s, %s)\n", driver->source_file, driver->name, match->source_file, match->name);
error = TRUE;
}
@ -331,7 +331,7 @@ static int validate_driver(int drivnum, const machine_config *config, tagmap *na
/* check for duplicate descriptions */
if (tagmap_add(descriptions, driver->description, (void *)driver, FALSE) == TMERR_DUPLICATE)
{
const game_driver *match = tagmap_find(descriptions, driver->description);
const game_driver *match = (const game_driver *)tagmap_find(descriptions, driver->description);
mame_printf_error("%s: %s is a duplicate description (%s, %s)\n", driver->source_file, driver->description, match->source_file, match->description);
error = TRUE;
}
@ -417,7 +417,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
sprintf(romaddr, "%p", driver->rom);
if (tagmap_add(roms, romaddr, (void *)driver, FALSE) == TMERR_DUPLICATE)
{
const game_driver *match = tagmap_find(roms, romaddr);
const game_driver *match = (const game_driver *)tagmap_find(roms, romaddr);
mame_printf_error("%s: %s uses the same ROM set as (%s, %s)\n", driver->source_file, driver->description, match->source_file, match->name);
error = TRUE;
}

4
src/lib/util/tagmap.c
View File

@ -58,7 +58,7 @@ static tagmap_error tagmap_add_common(tagmap *map, const char *tag, void *object
tagmap *tagmap_alloc(void)
{
tagmap *map = malloc(sizeof(*map));
tagmap *map = (tagmap *)malloc(sizeof(*map));
if (map != NULL)
memset(map, 0, sizeof(*map));
return map;
@ -174,7 +174,7 @@ static tagmap_error tagmap_add_common(tagmap *map, const char *tag, void *object
}
/* now allocate a new entry */
entry = malloc(sizeof(*entry) + strlen(tag));
entry = (tagmap_entry *)malloc(sizeof(*entry) + strlen(tag));
if (entry == NULL)
return TMERR_OUT_OF_MEMORY;

2
src/mame/drivers/bnstars.c
View File

@ -98,7 +98,7 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples)
#define ms32_spram bnstars_spram
#define ms32_tx_tilemap bnstars_tx_tilemap
#define ms32_bg_tilemap bnstars_bg_tilemap
#define ms32_roz_tilemap bnstars_tx_tilemap
#define ms32_roz_tilemap bnstars_roz_tilemap
static tilemap_t *ms32_tx_tilemap[2];
static tilemap_t *ms32_bg_tilemap[2];

2
src/mame/drivers/segae.c
View File

@ -396,7 +396,7 @@ static void init_systeme_map(running_machine *machine)
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, segasyse_videoram_w);
/* main ram area */
sms_mainram = memory_install_ram(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, NULL);
sms_mainram = (UINT8 *)memory_install_ram(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, NULL);
memset(sms_mainram,0x00,0x4000);
init_ports_systeme(machine);

4
src/mame/drivers/segamsys.c
View File

@ -1669,13 +1669,13 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha
memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
/* main ram area */
sms_mainram = memory_install_ram(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0x2000, NULL);
sms_mainram = (UINT8 *)memory_install_ram(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0x2000, NULL);
memset(sms_mainram,0x00,0x2000);
megatech_set_genz80_as_sms_standard_ports(machine, tag);
/* fixed rom bank area */
sms_rom = memory_install_rom(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, NULL);
sms_rom = (UINT8 *)memory_install_rom(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, NULL);
memcpy(sms_rom, memory_region(machine, "maincpu"), 0xc000);

2
src/mame/video/hng64.c
View File

@ -2497,7 +2497,7 @@ void hng64_command3d(running_machine* machine, const UINT16* packet)
/* A temporary place to put some polygons. This will optimize away if the compiler's any good. */
int numPolys = 0;
struct polygon* polys = malloc(sizeof(struct polygon) * (1024*5));
struct polygon* polys = (struct polygon*)malloc(sizeof(struct polygon) * (1024*5));
//printf("packet type : %04x\n", packet[0]);
switch (packet[0])

2
src/mame/video/n64.c
View File

@ -649,7 +649,7 @@ VIDEO_START(n64)
for (i = 0; i < 0x4000; i++)
{
gamma_dither_table[i] = sqrt(i);
gamma_dither_table[i] = sqrt((double)i);
gamma_dither_table[i] <<= 1;
}

1
src/osd/windows/eivcx86.h
View File

@ -46,6 +46,7 @@
#ifdef PTR64
#include <emmintrin.h>
#include <intrin.h>
#endif

2
src/osd/windows/windows.mak
View File

@ -244,8 +244,10 @@ endif
LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi
ifdef CPP_COMPILE
ifndef MSVC_BUILD
LIBS += -lsupc++
endif
endif
ifeq ($(DIRECTINPUT),8)
LIBS += -ldinput8