summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/mips/psx.c2
-rw-r--r--src/emu/cpu/nec/necdasm.c2
-rw-r--r--src/emu/inptport.c46
-rw-r--r--src/emu/memory.c88
-rw-r--r--src/emu/state.c4
-rw-r--r--src/emu/tilemap.h2
-rw-r--r--src/emu/video.c6
7 files changed, 75 insertions, 75 deletions
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index fef2f900c97..67d93186ff1 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -2449,7 +2449,7 @@ static int mips_execute( int cycles )
{
mips_breakpoint_exception();
}
- else
+ else
{
UINT32 data = mipscpu.readword( address );
diff --git a/src/emu/cpu/nec/necdasm.c b/src/emu/cpu/nec/necdasm.c
index 47a9aab931d..cd797a33deb 100644
--- a/src/emu/cpu/nec/necdasm.c
+++ b/src/emu/cpu/nec/necdasm.c
@@ -1536,7 +1536,7 @@ int necv_dasm_one(char *buffer, UINT32 eip, const UINT8 *oprom, const nec_config
op = FETCH();
- if (Iconfig->v25v35_decryptiontable) op = Iconfig->v25v35_decryptiontable[op];
+ if (Iconfig->v25v35_decryptiontable) op = Iconfig->v25v35_decryptiontable[op];
decode_opcode( buffer, &necv_opcode_table1[op], op );
return (pc-eip) | dasm_flags | DASMFLAG_SUPPORTED;
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 3fbc21a4f7c..90985d5ff9d 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -2762,7 +2762,7 @@ static void input_port_frame_update(running_machine *machine)
int ui_visible = ui_is_menu_active() || ui_is_slider_active();
attotime curtime = timer_get_time();
int portnum, bitnum;
-
+
profiler_mark(PROFILER_INPUT);
/* record/playback information about the current frame */
@@ -3292,7 +3292,7 @@ UINT32 input_port_read_indexed(running_machine *machine, int portnum)
input_port_info *portinfo = &port_info[portnum];
custom_port_info *custom;
UINT32 result;
-
+
/* start with the digital */
result = portinfo->defvalue ^ portinfo->digital;
@@ -3452,7 +3452,7 @@ static UINT8 playback_read_uint8(running_machine *machine)
playback_end(machine, "End of file");
return 0;
}
-
+
/* return the appropriate value */
return result;
}
@@ -3496,7 +3496,7 @@ static UINT32 playback_read_uint32(running_machine *machine)
playback_end(machine, "End of file");
return 0;
}
-
+
/* return the appropriate value */
return LITTLE_ENDIANIZE_INT32(result);
}
@@ -3540,7 +3540,7 @@ static UINT64 playback_read_uint64(running_machine *machine)
playback_end(machine, "End of file");
return 0;
}
-
+
/* return the appropriate value */
return LITTLE_ENDIANIZE_INT64(result);
}
@@ -3575,7 +3575,7 @@ static time_t playback_init(running_machine *machine)
UINT8 header[INP_HEADER_SIZE];
file_error filerr;
time_t basetime;
-
+
/* if no file, nothing to do */
if (filename[0] == 0)
return 0;
@@ -3599,11 +3599,11 @@ static time_t playback_init(running_machine *machine)
((UINT64)header[0x0c] << 32) | ((UINT64)header[0x0d] << 40) | ((UINT64)header[0x0e] << 48) | ((UINT64)header[0x0f] << 56);
mame_printf_info("Created %s", ctime(&basetime));
mame_printf_info("Recorded using %s\n", header + 0x20);
-
+
/* verify the header against the current game */
if (memcmp(machine->gamedrv->name, header + 0x14, strlen(machine->gamedrv->name) + 1) != 0)
fatalerror("Input file is for " GAMENOUN " '%s', not for current " GAMENOUN " '%s'\n", header + 0x14, machine->gamedrv->name);
-
+
return basetime;
}
@@ -3645,7 +3645,7 @@ static void record_init(running_machine *machine)
header[0x11] = INP_HEADER_MINVERSION;
strcpy((char *)header + 0x14, machine->gamedrv->name);
sprintf((char *)header + 0x20, APPNAME " %s", build_version);
-
+
/* write it */
mame_fwrite(machine->record_file, header, sizeof(header));
}
@@ -3663,11 +3663,11 @@ static void playback_end(running_machine *machine, const char *message)
/* close the file */
mame_fclose(machine->playback_file);
machine->playback_file = NULL;
-
+
/* pop a message */
if (message != NULL)
popmessage("Playback Ended\nReason: %s", message);
-
+
/* display speed stats */
playback_accumulated_speed /= playback_accumulated_frames;
mame_printf_info("Total playback frames: %d\n", (UINT32)playback_accumulated_frames);
@@ -3688,7 +3688,7 @@ static void record_end(running_machine *machine, const char *message)
/* close the file */
mame_fclose(machine->record_file);
machine->record_file = NULL;
-
+
/* pop a message */
if (message != NULL)
popmessage("Recording Ended\nReason: %s", message);
@@ -3697,7 +3697,7 @@ static void record_end(running_machine *machine, const char *message)
/*-------------------------------------------------
- playback_frame - start of frame callback for
+ playback_frame - start of frame callback for
playback
-------------------------------------------------*/
@@ -3707,22 +3707,22 @@ static void playback_frame(running_machine *machine, attotime curtime)
if (machine->playback_file != NULL)
{
attotime readtime;
-
+
/* first the absolute time */
readtime.seconds = playback_read_uint32(machine);
readtime.attoseconds = playback_read_uint64(machine);
if (attotime_compare(readtime, curtime) != 0)
playback_end(machine, "Out of sync");
-
+
/* then the speed */
playback_accumulated_speed += playback_read_uint32(machine);
playback_accumulated_frames++;
}
}
-
+
/*-------------------------------------------------
- record_frame - start of frame callback for
+ record_frame - start of frame callback for
recording
-------------------------------------------------*/
@@ -3734,12 +3734,12 @@ static void record_frame(running_machine *machine, attotime curtime)
/* first the absolute time */
record_write_uint32(machine, curtime.seconds);
record_write_uint64(machine, curtime.attoseconds);
-
+
/* then the current speed */
record_write_uint32(machine, video_get_speed_percent(machine) * (double)(1 << 20));
}
}
-
+
/*-------------------------------------------------
playback_port - per-port callback for playback
@@ -3754,14 +3754,14 @@ static void playback_port(running_machine *machine, input_port_info *portinfo)
/* read the digital value */
portinfo->digital = playback_read_uint32(machine);
-
+
/* loop over analog ports and save their data */
for (analog = portinfo->analoginfo; analog != NULL; analog = analog->next)
{
/* read current and previous values */
analog->accum = playback_read_uint32(machine);
analog->previous = playback_read_uint32(machine);
-
+
/* read configuration information */
analog->portentry->analog.sensitivity = playback_read_uint32(machine);
analog->portentry->analog.reverse = playback_read_uint8(machine);
@@ -3783,14 +3783,14 @@ static void record_port(running_machine *machine, input_port_info *portinfo)
/* store the digital value */
record_write_uint32(machine, portinfo->digital);
-
+
/* loop over analog ports and save their data */
for (analog = portinfo->analoginfo; analog != NULL; analog = analog->next)
{
/* store current and previous values */
record_write_uint32(machine, analog->accum);
record_write_uint32(machine, analog->previous);
-
+
/* store configuration information */
record_write_uint32(machine, analog->portentry->analog.sensitivity);
record_write_uint8(machine, analog->portentry->analog.reverse);
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 98df79026de..dab459e5e0a 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -2979,7 +2979,7 @@ INLINE UINT32 lookup_write_entry(const address_space *space, offs_t address)
***************************************************************************/
/*-------------------------------------------------
- read_byte_generic - read a byte from an
+ read_byte_generic - read a byte from an
arbitrary address space
-------------------------------------------------*/
@@ -2990,23 +2990,23 @@ INLINE UINT8 read_byte_generic(UINT8 spacenum, offs_t address)
offs_t offset;
UINT32 entry;
UINT8 result;
-
+
profiler_mark(PROFILER_MEMREAD);
address &= space->bytemask;
entry = lookup_read_entry(space, address);
handler = &space->readhandlers[entry];
-
+
DEBUG_HOOK_READ(spacenum, address, 0xff);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
result = bank_ptr[entry][offset];
else
result = (*handler->handler.read.mhandler8)(handler->object, offset);
-
+
profiler_mark(PROFILER_END);
-
+
return result;
}
@@ -3170,7 +3170,7 @@ UINT64 io_read_qword_8be(offs_t address)
***************************************************************************/
/*-------------------------------------------------
- write_byte_generic - write a byte to an
+ write_byte_generic - write a byte to an
arbitrary address space
-------------------------------------------------*/
@@ -3180,21 +3180,21 @@ INLINE void write_byte_generic(UINT8 spacenum, offs_t address, UINT8 data)
const handler_data *handler;
offs_t offset;
UINT32 entry;
-
+
profiler_mark(PROFILER_MEMWRITE);
address &= space->bytemask;
entry = lookup_write_entry(space, address);
handler = &space->writehandlers[entry];
-
+
DEBUG_HOOK_WRITE(spacenum, address, data, 0xff);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
bank_ptr[entry][offset] = data;
else
(*handler->handler.write.mhandler8)(handler->object, offset, data);
-
+
profiler_mark(PROFILER_END);
}
@@ -3358,7 +3358,7 @@ void io_write_qword_8be(offs_t address, UINT64 data)
***************************************************************************/
/*-------------------------------------------------
- read_word_masked_generic - read a word from
+ read_word_masked_generic - read a word from
an arbitrary address space
-------------------------------------------------*/
@@ -3369,23 +3369,23 @@ INLINE UINT16 read_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 me
offs_t offset;
UINT32 entry;
UINT16 result;
-
+
profiler_mark(PROFILER_MEMREAD);
address &= space->bytemask;
entry = lookup_read_entry(space, address);
handler = &space->readhandlers[entry];
-
+
DEBUG_HOOK_READ(spacenum, address & ~1, (UINT16)~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
result = *(UINT16 *)&bank_ptr[entry][offset & ~1];
else
result = (*handler->handler.read.mhandler16)(handler->object, offset >> 1, mem_mask);
-
+
profiler_mark(PROFILER_END);
-
+
return result;
}
@@ -3549,7 +3549,7 @@ UINT64 io_read_qword_16be(offs_t address)
***************************************************************************/
/*-------------------------------------------------
- write_word_masked_generic - write a masked
+ write_word_masked_generic - write a masked
word to an arbitrary address space
-------------------------------------------------*/
@@ -3559,15 +3559,15 @@ INLINE void write_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 dat
const handler_data *handler;
offs_t offset;
UINT32 entry;
-
+
profiler_mark(PROFILER_MEMWRITE);
address &= space->bytemask;
entry = lookup_write_entry(space, address);
handler = &space->writehandlers[entry];
-
+
DEBUG_HOOK_WRITE(spacenum, address & ~1, data, (UINT16)~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
{
@@ -3576,7 +3576,7 @@ INLINE void write_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 dat
}
else
(*handler->handler.write.mhandler16)(handler->object, offset >> 1, data, mem_mask);
-
+
profiler_mark(PROFILER_END);
}
@@ -3740,7 +3740,7 @@ void io_write_qword_16be(offs_t address, UINT64 data)
***************************************************************************/
/*-------------------------------------------------
- read_dword_masked_generic - read a dword from
+ read_dword_masked_generic - read a dword from
an arbitrary address space
-------------------------------------------------*/
@@ -3751,23 +3751,23 @@ INLINE UINT32 read_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 m
offs_t offset;
UINT32 entry;
UINT32 result;
-
+
profiler_mark(PROFILER_MEMREAD);
address &= space->bytemask;
entry = lookup_read_entry(space, address);
handler = &space->readhandlers[entry];
-
+
DEBUG_HOOK_READ(spacenum, address & ~3, (UINT32)~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
result = *(UINT32 *)&bank_ptr[entry][offset & ~3];
else
result = (*handler->handler.read.mhandler32)(handler->object, offset >> 2, mem_mask);
-
+
profiler_mark(PROFILER_END);
-
+
return result;
}
@@ -3961,7 +3961,7 @@ UINT64 io_read_qword_32be(offs_t address)
***************************************************************************/
/*-------------------------------------------------
- write_dword_masked_generic - write a masked
+ write_dword_masked_generic - write a masked
dword to an arbitrary address space
-------------------------------------------------*/
@@ -3971,15 +3971,15 @@ INLINE void write_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 da
const handler_data *handler;
offs_t offset;
UINT32 entry;
-
+
profiler_mark(PROFILER_MEMWRITE);
address &= space->bytemask;
entry = lookup_write_entry(space, address);
handler = &space->writehandlers[entry];
-
+
DEBUG_HOOK_WRITE(spacenum, address & ~3, data, (UINT32)~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
{
@@ -3988,7 +3988,7 @@ INLINE void write_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 da
}
else
(*handler->handler.write.mhandler32)(handler->object, offset >> 2, data, mem_mask);
-
+
profiler_mark(PROFILER_END);
}
@@ -4182,7 +4182,7 @@ void io_write_qword_32be(offs_t address, UINT64 data)
***************************************************************************/
/*-------------------------------------------------
- read_qword_masked_generic - read a qword from
+ read_qword_masked_generic - read a qword from
an arbitrary address space
-------------------------------------------------*/
@@ -4193,23 +4193,23 @@ INLINE UINT64 read_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 m
offs_t offset;
UINT32 entry;
UINT64 result;
-
+
profiler_mark(PROFILER_MEMREAD);
address &= space->bytemask;
entry = lookup_read_entry(space, address);
handler = &space->readhandlers[entry];
-
+
DEBUG_HOOK_READ(spacenum, address & ~7, ~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
result = *(UINT64 *)&bank_ptr[entry][offset & ~7];
else
result = (*handler->handler.read.mhandler64)(handler->object, offset >> 3, mem_mask);
-
+
profiler_mark(PROFILER_END);
-
+
return result;
}
@@ -4403,7 +4403,7 @@ UINT64 io_read_qword_masked_64be(offs_t address, UINT64 mem_mask)
***************************************************************************/
/*-------------------------------------------------
- write_qword_masked_generic - write a masked
+ write_qword_masked_generic - write a masked
dword to an arbitrary address space
-------------------------------------------------*/
@@ -4413,15 +4413,15 @@ INLINE void write_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 da
const handler_data *handler;
offs_t offset;
UINT32 entry;
-
+
profiler_mark(PROFILER_MEMWRITE);
address &= space->bytemask;
entry = lookup_write_entry(space, address);
handler = &space->writehandlers[entry];
-
+
DEBUG_HOOK_WRITE(spacenum, address & ~7, data, ~mem_mask);
-
+
offset = (address - handler->bytestart) & handler->bytemask;
if (entry < STATIC_RAM)
{
@@ -4430,7 +4430,7 @@ INLINE void write_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 da
}
else
(*handler->handler.write.mhandler64)(handler->object, offset >> 3, data, mem_mask);
-
+
profiler_mark(PROFILER_END);
}
diff --git a/src/emu/state.c b/src/emu/state.c
index dea893d72f9..b25fa54daf8 100644
--- a/src/emu/state.c
+++ b/src/emu/state.c
@@ -292,7 +292,7 @@ void state_save_register_bitmap(const char *module, UINT32 instance, const char
***************************************************************************/
/*-------------------------------------------------
- state_save_register_presave -
+ state_save_register_presave -
register a pre-save function callback
-------------------------------------------------*/
@@ -322,7 +322,7 @@ void state_save_register_presave(running_machine *machine, state_presave_func fu
/*-------------------------------------------------
- state_save_register_postload -
+ state_save_register_postload -
register a post-load function callback
-------------------------------------------------*/
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index f552235c68b..eb2e0fb0502 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -433,7 +433,7 @@ tilemap *tilemap_create(tile_get_info_func tile_get_info, tilemap_mapper_func ma
void tilemap_set_user_data(tilemap *tmap, void *user_data);
/* specify an offset to be added to each pixel before looking up the palette
- * The offset only applies at final rendering time (e.g., tilemap_draw())
+ * The offset only applies at final rendering time (e.g., tilemap_draw())
* It does not apply to the cached pixmap, which is provided by tilemap_get_pixmap().
*/
void tilemap_set_palette_offset(tilemap *tmap, UINT32 offset);
diff --git a/src/emu/video.c b/src/emu/video.c
index e88998d0e5c..8befead6ad9 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -1608,7 +1608,7 @@ const char *video_get_speed_text(running_machine *machine)
/*-------------------------------------------------
- video_get_speed_percent - return the current
+ video_get_speed_percent - return the current
effective speed percentage
-------------------------------------------------*/
@@ -1988,7 +1988,7 @@ static void update_refresh_speed(running_machine *machine)
UINT32 original_speed = original_speed_setting();
const device_config *screen;
UINT32 target_speed;
-
+
/* find the screen with the shortest frame period (max refresh rate) */
for (screen = video_screen_first(machine->config); screen != NULL; screen = video_screen_next(screen))
{
@@ -1999,7 +1999,7 @@ static void update_refresh_speed(running_machine *machine)
/* compute a target speed as an integral percentage */
target_speed = floor(minrefresh * 100.0 / ATTOSECONDS_TO_HZ(min_frame_period));
target_speed = MIN(target_speed, original_speed);
-
+
/* if we changed, log that verbosely */
if (target_speed != global.speed)
{