summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-07-22 05:24:06 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-07-22 05:24:06 +0000
commit7ae55db1ec9586f0072e4958c78f606b00a2d501 (patch)
treedd36e6c8bcde94e86b2010026dcb312fb6274762 /src/emu
parent9433e80b419b79f99faffa8d49fde4f5bc9c3fb7 (diff)
Cleanups and version bump.mame0138u4
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/rsp/rspdrc.c2
-rw-r--r--src/emu/cpu/sh2/sh2.c88
-rw-r--r--src/emu/devimage.c10
-rw-r--r--src/emu/diimage.c2
-rw-r--r--src/emu/mame.c8
-rw-r--r--src/emu/softlist.c2
6 files changed, 56 insertions, 56 deletions
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index 44265df787a..f7ab65e93b5 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -7666,7 +7666,7 @@ static void generate_sequence_instruction(rsp_state *rsp, drcuml_block *block, c
{
UML_MOV(block, MEM(&rsp->pc), IMM(desc->pc)); // mov [pc],desc->pc
save_fast_iregs(rsp, block);
- UML_EXIT(block, IMM(EXECUTE_UNMAPPED_CODE)); // exit EXECUTE_UNMAPPED_CODE
+ UML_EXIT(block, IMM(EXECUTE_UNMAPPED_CODE)); // exit EXECUTE_UNMAPPED_CODE
}
#endif
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index bfa1e840e59..747a49d8b3b 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -1839,7 +1839,7 @@ INLINE void op0000(sh2_state *sh2, UINT16 opcode)
case 0x07: MULL(sh2, Rm, Rn); break;
case 0x08: CLRT(sh2); break;
case 0x09: NOP(); break;
- case 0x0a: STSMACH(sh2, Rn); break;
+ case 0x0a: STSMACH(sh2, Rn); break;
case 0x0b: RTS(sh2); break;
case 0x0c: MOVBL0(sh2, Rm, Rn); break;
case 0x0d: MOVWL0(sh2, Rm, Rn); break;
@@ -1855,9 +1855,9 @@ INLINE void op0000(sh2_state *sh2, UINT16 opcode)
case 0x16: MOVLS0(sh2, Rm, Rn); break;
case 0x17: MULL(sh2, Rm, Rn); break;
case 0x18: SETT(sh2); break;
- case 0x19: DIV0U(sh2); break;
- case 0x1a: STSMACL(sh2, Rn); break;
- case 0x1b: SLEEP(sh2); break;
+ case 0x19: DIV0U(sh2); break;
+ case 0x1a: STSMACL(sh2, Rn); break;
+ case 0x1b: SLEEP(sh2); break;
case 0x1c: MOVBL0(sh2, Rm, Rn); break;
case 0x1d: MOVWL0(sh2, Rm, Rn); break;
case 0x1e: MOVLL0(sh2, Rm, Rn); break;
@@ -1911,20 +1911,20 @@ INLINE void op0010(sh2_state *sh2, UINT16 opcode)
{
switch (opcode & 15)
{
- case 0: MOVBS(sh2, Rm, Rn); break;
- case 1: MOVWS(sh2, Rm, Rn); break;
- case 2: MOVLS(sh2, Rm, Rn); break;
+ case 0: MOVBS(sh2, Rm, Rn); break;
+ case 1: MOVWS(sh2, Rm, Rn); break;
+ case 2: MOVLS(sh2, Rm, Rn); break;
case 3: NOP(); break;
- case 4: MOVBM(sh2, Rm, Rn); break;
- case 5: MOVWM(sh2, Rm, Rn); break;
- case 6: MOVLM(sh2, Rm, Rn); break;
- case 7: DIV0S(sh2, Rm, Rn); break;
+ case 4: MOVBM(sh2, Rm, Rn); break;
+ case 5: MOVWM(sh2, Rm, Rn); break;
+ case 6: MOVLM(sh2, Rm, Rn); break;
+ case 7: DIV0S(sh2, Rm, Rn); break;
case 8: TST(sh2, Rm, Rn); break;
case 9: AND(sh2, Rm, Rn); break;
case 10: XOR(sh2, Rm, Rn); break;
case 11: OR(sh2, Rm, Rn); break;
case 12: CMPSTR(sh2, Rm, Rn); break;
- case 13: XTRCT(sh2, Rm, Rn); break;
+ case 13: XTRCT(sh2, Rm, Rn); break;
case 14: MULU(sh2, Rm, Rn); break;
case 15: MULS(sh2, Rm, Rn); break;
}
@@ -1934,20 +1934,20 @@ INLINE void op0011(sh2_state *sh2, UINT16 opcode)
{
switch (opcode & 15)
{
- case 0: CMPEQ(sh2, Rm, Rn); break;
+ case 0: CMPEQ(sh2, Rm, Rn); break;
case 1: NOP(); break;
- case 2: CMPHS(sh2, Rm, Rn); break;
- case 3: CMPGE(sh2, Rm, Rn); break;
+ case 2: CMPHS(sh2, Rm, Rn); break;
+ case 3: CMPGE(sh2, Rm, Rn); break;
case 4: DIV1(sh2, Rm, Rn); break;
- case 5: DMULU(sh2, Rm, Rn); break;
- case 6: CMPHI(sh2, Rm, Rn); break;
- case 7: CMPGT(sh2, Rm, Rn); break;
+ case 5: DMULU(sh2, Rm, Rn); break;
+ case 6: CMPHI(sh2, Rm, Rn); break;
+ case 7: CMPGT(sh2, Rm, Rn); break;
case 8: SUB(sh2, Rm, Rn); break;
case 9: NOP(); break;
case 10: SUBC(sh2, Rm, Rn); break;
case 11: SUBV(sh2, Rm, Rn); break;
case 12: ADD(sh2, Rm, Rn); break;
- case 13: DMULS(sh2, Rm, Rn); break;
+ case 13: DMULS(sh2, Rm, Rn); break;
case 14: ADDC(sh2, Rm, Rn); break;
case 15: ADDV(sh2, Rm, Rn); break;
}
@@ -1967,8 +1967,8 @@ INLINE void op0100(sh2_state *sh2, UINT16 opcode)
case 0x07: LDCMSR(sh2, Rn); break;
case 0x08: SHLL2(sh2, Rn); break;
case 0x09: SHLR2(sh2, Rn); break;
- case 0x0a: LDSMACH(sh2, Rn); break;
- case 0x0b: JSR(sh2, Rn); break;
+ case 0x0a: LDSMACH(sh2, Rn); break;
+ case 0x0b: JSR(sh2, Rn); break;
case 0x0c: NOP(); break;
case 0x0d: NOP(); break;
case 0x0e: LDCSR(sh2, Rn); break;
@@ -1977,15 +1977,15 @@ INLINE void op0100(sh2_state *sh2, UINT16 opcode)
case 0x10: DT(sh2, Rn); break;
case 0x11: CMPPZ(sh2, Rn); break;
case 0x12: STSMMACL(sh2, Rn); break;
- case 0x13: STCMGBR(sh2, Rn); break;
+ case 0x13: STCMGBR(sh2, Rn); break;
case 0x14: NOP(); break;
case 0x15: CMPPL(sh2, Rn); break;
case 0x16: LDSMMACL(sh2, Rn); break;
- case 0x17: LDCMGBR(sh2, Rn); break;
+ case 0x17: LDCMGBR(sh2, Rn); break;
case 0x18: SHLL8(sh2, Rn); break;
case 0x19: SHLR8(sh2, Rn); break;
- case 0x1a: LDSMACL(sh2, Rn); break;
- case 0x1b: TAS(sh2, Rn); break;
+ case 0x1a: LDSMACL(sh2, Rn); break;
+ case 0x1b: TAS(sh2, Rn); break;
case 0x1c: NOP(); break;
case 0x1d: NOP(); break;
case 0x1e: LDCGBR(sh2, Rn); break;
@@ -1994,15 +1994,15 @@ INLINE void op0100(sh2_state *sh2, UINT16 opcode)
case 0x20: SHAL(sh2, Rn); break;
case 0x21: SHAR(sh2, Rn); break;
case 0x22: STSMPR(sh2, Rn); break;
- case 0x23: STCMVBR(sh2, Rn); break;
+ case 0x23: STCMVBR(sh2, Rn); break;
case 0x24: ROTCL(sh2, Rn); break;
case 0x25: ROTCR(sh2, Rn); break;
case 0x26: LDSMPR(sh2, Rn); break;
- case 0x27: LDCMVBR(sh2, Rn); break;
+ case 0x27: LDCMVBR(sh2, Rn); break;
case 0x28: SHLL16(sh2, Rn); break;
case 0x29: SHLR16(sh2, Rn); break;
case 0x2a: LDSPR(sh2, Rn); break;
- case 0x2b: JMP(sh2, Rn); break;
+ case 0x2b: JMP(sh2, Rn); break;
case 0x2c: NOP(); break;
case 0x2d: NOP(); break;
case 0x2e: LDCVBR(sh2, Rn); break;
@@ -2037,22 +2037,22 @@ INLINE void op0110(sh2_state *sh2, UINT16 opcode)
{
switch (opcode & 15)
{
- case 0: MOVBL(sh2, Rm, Rn); break;
- case 1: MOVWL(sh2, Rm, Rn); break;
- case 2: MOVLL(sh2, Rm, Rn); break;
+ case 0: MOVBL(sh2, Rm, Rn); break;
+ case 1: MOVWL(sh2, Rm, Rn); break;
+ case 2: MOVLL(sh2, Rm, Rn); break;
case 3: MOV(sh2, Rm, Rn); break;
- case 4: MOVBP(sh2, Rm, Rn); break;
- case 5: MOVWP(sh2, Rm, Rn); break;
- case 6: MOVLP(sh2, Rm, Rn); break;
+ case 4: MOVBP(sh2, Rm, Rn); break;
+ case 5: MOVWP(sh2, Rm, Rn); break;
+ case 6: MOVLP(sh2, Rm, Rn); break;
case 7: NOT(sh2, Rm, Rn); break;
- case 8: SWAPB(sh2, Rm, Rn); break;
- case 9: SWAPW(sh2, Rm, Rn); break;
+ case 8: SWAPB(sh2, Rm, Rn); break;
+ case 9: SWAPW(sh2, Rm, Rn); break;
case 10: NEGC(sh2, Rm, Rn); break;
case 11: NEG(sh2, Rm, Rn); break;
- case 12: EXTUB(sh2, Rm, Rn); break;
- case 13: EXTUW(sh2, Rm, Rn); break;
- case 14: EXTSB(sh2, Rm, Rn); break;
- case 15: EXTSW(sh2, Rm, Rn); break;
+ case 12: EXTUB(sh2, Rm, Rn); break;
+ case 13: EXTUW(sh2, Rm, Rn); break;
+ case 14: EXTSB(sh2, Rm, Rn); break;
+ case 15: EXTSW(sh2, Rm, Rn); break;
}
}
@@ -2069,14 +2069,14 @@ INLINE void op1000(sh2_state *sh2, UINT16 opcode)
case 1 << 8: MOVWS4(sh2, opcode & 0x0f, Rm); break;
case 2<< 8: NOP(); break;
case 3<< 8: NOP(); break;
- case 4<< 8: MOVBL4(sh2, Rm, opcode & 0x0f); break;
- case 5<< 8: MOVWL4(sh2, Rm, opcode & 0x0f); break;
+ case 4<< 8: MOVBL4(sh2, Rm, opcode & 0x0f); break;
+ case 5<< 8: MOVWL4(sh2, Rm, opcode & 0x0f); break;
case 6<< 8: NOP(); break;
case 7<< 8: NOP(); break;
case 8<< 8: CMPIM(sh2, opcode & 0xff); break;
- case 9<< 8: BT(sh2, opcode & 0xff); break;
+ case 9<< 8: BT(sh2, opcode & 0xff); break;
case 10<< 8: NOP(); break;
- case 11<< 8: BF(sh2, opcode & 0xff); break;
+ case 11<< 8: BF(sh2, opcode & 0xff); break;
case 12<< 8: NOP(); break;
case 13<< 8: BTS(sh2, opcode & 0xff); break;
case 14<< 8: NOP(); break;
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index 43a9dac1f7d..6c0fc43f84d 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -315,17 +315,17 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
UINT32 crc = 0;
UINT8 crcbytes[4];
file_error filerr;
-
+
bool has_crc = hash_data_extract_binary_checksum(ROM_GETHASHDATA(romp), HASH_CRC, crcbytes);
if (has_crc)
crc = (crcbytes[0] << 24) | (crcbytes[1] << 16) | (crcbytes[2] << 8) | crcbytes[3];
-
+
astring fname(swlist, PATH_SEPARATOR, swname, PATH_SEPARATOR, ROM_GETNAME(romp));
if (has_crc)
filerr = mame_fopen_crc(SEARCHPATH_ROM, fname, crc, OPEN_FLAG_READ, &m_mame_file);
else
filerr = mame_fopen(SEARCHPATH_ROM, fname, OPEN_FLAG_READ, &m_mame_file);
-
+
if (filerr == FILERR_NONE)
{
m_file = mame_core_file(m_mame_file);
@@ -380,7 +380,7 @@ bool legacy_image_device_base::load_internal(const char *path, bool is_create, i
goto done;
}
}
-
+
/* Copy some image information when we have been loaded through a software list */
if ( m_software_info_ptr )
{
@@ -606,4 +606,4 @@ void legacy_image_device_base::call_get_devices()
void *legacy_image_device_base::get_device_specific_call()
{
return (void*) m_config.get_legacy_config_fct(DEVINFO_FCT_DEVICE_SPECIFIC);
-} \ No newline at end of file
+}
diff --git a/src/emu/diimage.c b/src/emu/diimage.c
index 4a0bcac3417..98455570782 100644
--- a/src/emu/diimage.c
+++ b/src/emu/diimage.c
@@ -672,4 +672,4 @@ void device_image_interface::battery_save(const void *buffer, int length)
image_battery_save_by_name(astring_c(fname), buffer, length);
astring_free(fname);
}
-
+
diff --git a/src/emu/mame.c b/src/emu/mame.c
index c880ad2b4c5..14fde7a92dc 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -564,14 +564,14 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
filerr = mame_fopen_options(options, SEARCHPATH_INI, fname, OPEN_FLAG_READ, &file);
if (filerr != FILERR_NONE)
return FALSE;
-
+
/* update game name so depending callback options could be added */
- if (priority==OPTION_PRIORITY_DRIVER_INI) {
+ if (priority==OPTION_PRIORITY_DRIVER_INI) {
options_force_option_callback(options, OPTION_GAMENAME, name, priority);
}
-
+
/* parse the file and close it */
- mame_printf_verbose("Parsing %s.ini\n", name);
+ mame_printf_verbose("Parsing %s.ini\n", name);
options_parse_ini_file(options, mame_core_file(file), priority);
mame_fclose(file);
return TRUE;
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index fb1792964ca..67f324c1b13 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -1136,7 +1136,7 @@ bool load_software_part(device_image_interface *image, const char *path, softwar
/* Tell the world which part we actually loaded */
*full_sw_name = auto_alloc_array( image->device().machine, char, strlen(swlist_name) + strlen(software_info_ptr->shortname) + strlen(software_part_ptr->name) + 3 );
- sprintf( *full_sw_name, "%s:%s:%s", swlist_name, software_info_ptr->shortname, software_part_ptr->name );
+ sprintf( *full_sw_name, "%s:%s:%s", swlist_name, software_info_ptr->shortname, software_part_ptr->name );
}
/* Close the software list if it's still open */