summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/audit.c2
-rw-r--r--src/emu/cpu/arm7/arm7ops.h2
-rw-r--r--src/emu/cpu/i386/i386.c4
-rw-r--r--src/emu/cpu/i386/i386op16.c4
-rw-r--r--src/emu/cpu/i386/i386op32.c4
-rw-r--r--src/emu/cpu/i386/i386priv.h2
-rw-r--r--src/emu/cpu/i386/i486ops.c4
-rw-r--r--src/emu/cpu/i386/x87ops.c136
-rw-r--r--src/emu/device.c18
-rw-r--r--src/emu/device.h34
-rw-r--r--src/emu/diimage.h2
-rw-r--r--src/emu/emutempl.h2
-rw-r--r--src/emu/imagedev/floppy.c10
-rw-r--r--src/emu/machine.c10
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/emu/machine/6522via.c14
-rw-r--r--src/emu/machine/generic.c2
-rw-r--r--src/emu/machine/im6402.c34
-rw-r--r--src/emu/machine/im6402.h30
-rw-r--r--src/emu/machine/scsihd.c10
-rw-r--r--src/emu/mconfig.c8
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/render.h2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/screen.c6
-rw-r--r--src/emu/softlist.h8
-rw-r--r--src/emu/sound/samples.c8
-rw-r--r--src/emu/tilemap.c34
-rw-r--r--src/emu/tilemap.h16
-rw-r--r--src/emu/validity.c56
-rw-r--r--src/emu/validity.h16
-rw-r--r--src/emu/video/pc_vga.c26
32 files changed, 255 insertions, 255 deletions
diff --git a/src/emu/audit.c b/src/emu/audit.c
index bfc4466d977..97837a44487 100644
--- a/src/emu/audit.c
+++ b/src/emu/audit.c
@@ -234,7 +234,7 @@ media_auditor::summary media_auditor::audit_samples()
int found = 0;
// iterate over sample entries
- samples_device_iterator iter(m_enumerator.config().root_device());
+ samples_device_iterator iter(m_enumerator.config().root_device());
for (samples_device *device = iter.first(); device != NULL; device = iter.next())
{
const samples_interface *intf = reinterpret_cast<const samples_interface *>(device->static_config());
diff --git a/src/emu/cpu/arm7/arm7ops.h b/src/emu/cpu/arm7/arm7ops.h
index e797ae89056..56778963982 100644
--- a/src/emu/cpu/arm7/arm7ops.h
+++ b/src/emu/cpu/arm7/arm7ops.h
@@ -5,4 +5,4 @@ const void arm7ops_89(arm_state *cpustate, UINT32 insn);
const void arm7ops_ab(arm_state *cpustate, UINT32 insn);
const void arm7ops_cd(arm_state *cpustate, UINT32 insn);
const void arm7ops_e(arm_state *cpustate, UINT32 insn);
-const void arm7ops_f(arm_state *cpustate, UINT32 insn);
+const void arm7ops_f(arm_state *cpustate, UINT32 insn);
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 2c4a6631cf4..0c9dcb9917c 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -1062,7 +1062,7 @@ static void i286_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested
CHANGE_PC(cpustate,cpustate->eip);
cpustate->CPL = cpustate->sreg[CS].selector & 0x03;
-// printf("286 Task Switch from selector %04x to %04x\n",old_task,selector);
+// printf("286 Task Switch from selector %04x to %04x\n",old_task,selector);
}
static void i386_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested)
@@ -1177,7 +1177,7 @@ static void i386_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested
CHANGE_PC(cpustate,cpustate->eip);
cpustate->CPL = cpustate->sreg[CS].selector & 0x03;
-// printf("386 Task Switch from selector %04x to %04x\n",old_task,selector);
+// printf("386 Task Switch from selector %04x to %04x\n",old_task,selector);
}
static void i386_check_irq_line(i386_state *cpustate)
diff --git a/src/emu/cpu/i386/i386op16.c b/src/emu/cpu/i386/i386op16.c
index 20aa740a017..3e647024cdc 100644
--- a/src/emu/cpu/i386/i386op16.c
+++ b/src/emu/cpu/i386/i386op16.c
@@ -3277,7 +3277,7 @@ static void I386OP(group0F01_16)(i386_state *cpustate) // Opcode 0x0f 01
case 2: /* LGDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM16(modrm);
ea = i386_translate(cpustate, CS, address, 0 );
@@ -3292,7 +3292,7 @@ static void I386OP(group0F01_16)(i386_state *cpustate) // Opcode 0x0f 01
case 3: /* LIDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM16(modrm);
ea = i386_translate(cpustate, CS, address, 0 );
diff --git a/src/emu/cpu/i386/i386op32.c b/src/emu/cpu/i386/i386op32.c
index a165f6f22a1..aa53fcfb1e0 100644
--- a/src/emu/cpu/i386/i386op32.c
+++ b/src/emu/cpu/i386/i386op32.c
@@ -3123,7 +3123,7 @@ static void I386OP(group0F01_32)(i386_state *cpustate) // Opcode 0x0f 01
case 2: /* LGDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM32(modrm);
ea = i386_translate(cpustate, CS, address, 0 );
@@ -3138,7 +3138,7 @@ static void I386OP(group0F01_32)(i386_state *cpustate) // Opcode 0x0f 01
case 3: /* LIDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM32(modrm);
ea = i386_translate(cpustate, CS, address, 0 );
diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h
index 92467b7504c..35b29faba9e 100644
--- a/src/emu/cpu/i386/i386priv.h
+++ b/src/emu/cpu/i386/i386priv.h
@@ -458,7 +458,7 @@ INLINE int translate_address(i386_state *cpustate, int rwn, UINT32 *address, UIN
if(!(page_dir & 0x40) && (rwn == 1))
cpustate->program->write_dword(pdbr + directory * 4, page_dir | 0x60);
else if(!(page_dir & 0x20) && (rwn != -1))
- cpustate->program->write_dword(pdbr + directory * 4, page_dir | 0x20);
+ cpustate->program->write_dword(pdbr + directory * 4, page_dir | 0x20);
*address = (page_dir & 0xffc00000) | (a & 0x003fffff);
}
}
diff --git a/src/emu/cpu/i386/i486ops.c b/src/emu/cpu/i386/i486ops.c
index b573fd09da0..8a5e86dfa14 100644
--- a/src/emu/cpu/i386/i486ops.c
+++ b/src/emu/cpu/i386/i486ops.c
@@ -241,7 +241,7 @@ static void I486OP(group0F01_16)(i386_state *cpustate) // Opcode 0x0f 01
case 2: /* LGDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM16(modrm);
ea = i386_translate( cpustate, CS, address, 0 );
@@ -256,7 +256,7 @@ static void I486OP(group0F01_16)(i386_state *cpustate) // Opcode 0x0f 01
case 3: /* LIDT */
{
if(PROTECTED_MODE && cpustate->CPL)
- FAULT(FAULT_GP,0)
+ FAULT(FAULT_GP,0)
if( modrm >= 0xc0 ) {
address = LOAD_RM16(modrm);
ea = i386_translate( cpustate, CS, address, 0 );
diff --git a/src/emu/cpu/i386/x87ops.c b/src/emu/cpu/i386/x87ops.c
index 21e05057628..c6b9dc4bb85 100644
--- a/src/emu/cpu/i386/x87ops.c
+++ b/src/emu/cpu/i386/x87ops.c
@@ -2,17 +2,17 @@
x87 FPU emulation
- TODO:
- - 80-bit precision for F2XM1, FYL2X, FPATAN
- - Figure out why SoftFloat trig extensions produce bad values
- - Cycle counts for all processors (currently using 486 counts)
- - Precision-dependent cycle counts for divide instructions
- - Last instruction, operand pointers etc.
- - Fix FLDENV, FSTENV, FSAVE, FRSTOR and FPREM
- - Status word C2 updates to reflect round up/down
- - Handling of invalid and denormal numbers
- - Remove redundant operand checks
- - Exceptions
+ TODO:
+ - 80-bit precision for F2XM1, FYL2X, FPATAN
+ - Figure out why SoftFloat trig extensions produce bad values
+ - Cycle counts for all processors (currently using 486 counts)
+ - Precision-dependent cycle counts for divide instructions
+ - Last instruction, operand pointers etc.
+ - Fix FLDENV, FSTENV, FSAVE, FRSTOR and FPREM
+ - Status word C2 updates to reflect round up/down
+ - Handling of invalid and denormal numbers
+ - Remove redundant operand checks
+ - Exceptions
***************************************************************************/
@@ -2167,7 +2167,7 @@ void x87_fptan(i386_state *cpustate, UINT8 modrm)
double x = fx80_to_double(result1);
x = tan(x);
result1 = double_to_fx80(x);
-
+
cpustate->x87_sw &= ~X87_SW_C2;
#endif
}
@@ -2229,7 +2229,7 @@ void x87_fsin(i386_state *cpustate, UINT8 modrm)
double x = fx80_to_double(result);
x = sin(x);
result = double_to_fx80(x);
-
+
cpustate->x87_sw &= ~X87_SW_C2;
#endif
}
@@ -2262,7 +2262,7 @@ void x87_fcos(i386_state *cpustate, UINT8 modrm)
double x = fx80_to_double(result);
x = cos(x);
result = double_to_fx80(x);
-
+
cpustate->x87_sw &= ~X87_SW_C2;
#endif
}
@@ -2300,13 +2300,13 @@ void x87_fsincos(i386_state *cpustate, UINT8 modrm)
cpustate->x87_sw |= X87_SW_C2;
#else
double s = fx80_to_double(s_result);
- double c = fx80_to_double(c_result);
+ double c = fx80_to_double(c_result);
s = sin(s);
c = cos(c);
-
+
s_result = double_to_fx80(s);
c_result = double_to_fx80(c);
-
+
cpustate->x87_sw &= ~X87_SW_C2;
#endif
}
@@ -4023,38 +4023,38 @@ void x87_fstenv(i386_state *cpustate, UINT8 modrm)
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 2, cpustate->x87_sw);
WRITE16(cpustate, ea + 4, cpustate->x87_tw);
-// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
break;
case 1: // 16-bit protected mode
WRITE16(cpustate,ea + 0, cpustate->x87_cw);
WRITE16(cpustate,ea + 2, cpustate->x87_sw);
WRITE16(cpustate,ea + 4, cpustate->x87_tw);
-// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
break;
case 2: // 32-bit real mode
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 4, cpustate->x87_sw);
WRITE16(cpustate, ea + 8, cpustate->x87_tw);
-// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
+// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
break;
case 3: // 32-bit protected mode
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 4, cpustate->x87_sw);
WRITE16(cpustate, ea + 8, cpustate->x87_tw);
-// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
-// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
-// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
-// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
+// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
+// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
break;
}
@@ -4072,41 +4072,41 @@ void x87_fsave(i386_state *cpustate, UINT8 modrm)
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 2, cpustate->x87_sw);
WRITE16(cpustate, ea + 4, cpustate->x87_tw);
-// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
ea += 14;
break;
case 1: // 16-bit protected mode
WRITE16(cpustate,ea + 0, cpustate->x87_cw);
WRITE16(cpustate,ea + 2, cpustate->x87_sw);
WRITE16(cpustate,ea + 4, cpustate->x87_tw);
-// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
ea += 14;
break;
case 2: // 32-bit real mode
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 4, cpustate->x87_sw);
WRITE16(cpustate, ea + 8, cpustate->x87_tw);
-// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
+// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
ea += 28;
break;
case 3: // 32-bit protected mode
WRITE16(cpustate, ea + 0, cpustate->x87_cw);
WRITE16(cpustate, ea + 4, cpustate->x87_sw);
WRITE16(cpustate, ea + 8, cpustate->x87_tw);
-// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
-// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
-// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
-// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
+// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
+// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
ea += 28;
break;
}
@@ -4128,41 +4128,41 @@ void x87_frstor(i386_state *cpustate, UINT8 modrm)
x87_write_cw(cpustate, READ16(cpustate, ea));
cpustate->x87_sw = READ16(cpustate, ea + 2);
cpustate->x87_tw = READ16(cpustate, ea + 4);
-// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate, ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
ea += 14;
break;
case 1: // 16-bit protected mode
x87_write_cw(cpustate, READ16(cpustate, ea));
cpustate->x87_sw = READ16(cpustate, ea + 2);
cpustate->x87_tw = READ16(cpustate, ea + 4);
-// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
+// WRITE16(cpustate,ea + 6, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate,ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate,ea + 10, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate,ea + 12, (cpustate->fpu_inst_ptr & 0x0f0000) >> 4);
ea += 14;
break;
case 2: // 32-bit real mode
x87_write_cw(cpustate, READ16(cpustate, ea));
cpustate->x87_sw = READ16(cpustate, ea + 4);
cpustate->x87_tw = READ16(cpustate, ea + 8);
-// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
-// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
-// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
-// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
+// WRITE16(cpustate, ea + 12, cpustate->fpu_inst_ptr & 0xffff);
+// WRITE16(cpustate, ea + 8, (cpustate->fpu_opcode & 0x07ff) | ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE16(cpustate, ea + 20, cpustate->fpu_data_ptr & 0xffff);
+// WRITE16(cpustate, ea + 12, ((cpustate->fpu_inst_ptr & 0x0f0000) >> 4));
+// WRITE32(cpustate, ea + 24, (cpustate->fpu_data_ptr >> 16) << 12);
ea += 28;
break;
case 3: // 32-bit protected mode
x87_write_cw(cpustate, READ16(cpustate, ea));
cpustate->x87_sw = READ16(cpustate, ea + 4);
cpustate->x87_tw = READ16(cpustate, ea + 8);
-// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
-// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
-// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
-// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 12, cpustate->fpu_inst_ptr);
+// WRITE32(cpustate, ea + 16, cpustate->fpu_opcode);
+// WRITE32(cpustate, ea + 20, cpustate->fpu_data_ptr);
+// WRITE32(cpustate, ea + 24, cpustate->fpu_inst_ptr);
ea += 28;
break;
}
diff --git a/src/emu/device.c b/src/emu/device.c
index c9c83b12cbd..abe467f1122 100644
--- a/src/emu/device.c
+++ b/src/emu/device.c
@@ -110,7 +110,7 @@ device_t::device_t(const machine_config &mconfig, device_type type, const char *
m_clock(clock),
m_clock_scale(1.0),
m_attoseconds_per_clock((clock == 0) ? 0 : HZ_TO_ATTOSECONDS(clock)),
-
+
m_debug(NULL),
m_region(NULL),
m_machine_config(mconfig),
@@ -148,7 +148,7 @@ device_t::device_t(const machine_config &mconfig, device_type type, const char *
m_clock(clock),
m_clock_scale(1.0),
m_attoseconds_per_clock((clock == 0) ? 0 : HZ_TO_ATTOSECONDS(clock)),
-
+
m_debug(NULL),
m_region(NULL),
m_machine_config(mconfig),
@@ -262,11 +262,11 @@ void device_t::reset()
// reset the device
device_reset();
-
+
// reset all child devices
for (device_t *child = m_subdevice_list.first(); child != NULL; child = child->next())
child->reset();
-
+
// now allow for some post-child reset action
device_reset_after_children();
@@ -695,7 +695,7 @@ device_t *device_t::subdevice_slow(const char *tag) const
if (part == curdevice->m_basetag)
break;
}
-
+
// if we got a match, add to the fast map
if (curdevice != NULL)
{
@@ -719,7 +719,7 @@ astring &device_t::subtag(astring &result, const char *tag) const
tag++;
result.cpy(":");
}
-
+
// otherwise, start with our path
else
{
@@ -735,12 +735,12 @@ astring &device_t::subtag(astring &result, const char *tag) const
// copy everything up to there
result.cat(tag, caret - tag);
tag = caret + 1;
-
+
// strip trailing colons
int len = result.len();
while (result[--len] == ':')
result.substr(0, len);
-
+
// remove the last path part, leaving the last colon
if (result != ":")
{
@@ -792,7 +792,7 @@ device_t *device_t::replace_subdevice(device_t &old, device_type type, const cha
for (device_t *scan = iter.first(); scan != NULL; scan = iter.next())
scan->m_device_map.remove(&old);
- // create a new device, and substitute it for the old one
+ // create a new device, and substitute it for the old one
device_t *device = (*type)(mconfig(), tag, this, clock);
m_subdevice_list.replace_and_remove(*device, old);
diff --git a/src/emu/device.h b/src/emu/device.h
index b4fbd163cb3..f2c6950b45c 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -470,7 +470,7 @@ public:
m_current(NULL),
m_curdepth(0),
m_maxdepth(maxdepth) { }
-
+
// getters
device_t *current() const { return m_current; }
@@ -480,7 +480,7 @@ public:
// reset and return first item
device_t *first()
{
- m_current = m_root;
+ m_current = m_root;
return m_current;
}
@@ -502,7 +502,7 @@ public:
return m_current;
}
}
-
+
// search next for neighbors up the ownership chain
while (m_curdepth > 0)
{
@@ -511,24 +511,24 @@ public:
if (m_current != NULL)
return m_current;
- // no? try our parent
+ // no? try our parent
start = start->owner();
m_curdepth--;
}
-
+
// returned to the top; we're done
return m_current = NULL;
}
-
+
// return the number of items available
int count()
{
- int result = 0;
+ int result = 0;
for (device_t *item = first(); item != NULL; item = next())
result++;
return result;
}
-
+
// return the index of a given item in the virtual list
int indexof(device_t &device)
{
@@ -591,16 +591,16 @@ public:
return downcast<_DeviceClass *>(device);
return NULL;
}
-
+
// return the number of items available
int count()
{
- int result = 0;
+ int result = 0;
for (_DeviceClass *item = first(); item != NULL; item = next())
result++;
return result;
}
-
+
// return the index of a given item in the virtual list
int indexof(_DeviceClass &device)
{
@@ -641,7 +641,7 @@ public:
// getters
_InterfaceClass *current() const { return m_current; }
-
+
// setters
void set_current(_InterfaceClass &current) { m_current = &current; m_iterator.set_current(current.device()); }
@@ -662,16 +662,16 @@ public:
return m_current;
return NULL;
}
-
+
// return the number of items available
int count()
{
- int result = 0;
+ int result = 0;
for (_InterfaceClass *item = first(); item != NULL; item = next())
result++;
return result;
}
-
+
// return the index of a given item in the virtual list
int indexof(_InterfaceClass &intrf)
{
@@ -755,7 +755,7 @@ inline device_t *device_t::subdevice(const char *tag) const
//-------------------------------------------------
-// siblingdevice - given a tag, find the device
+// siblingdevice - given a tag, find the device
// by name relative to this device's parent
//-------------------------------------------------
@@ -768,7 +768,7 @@ inline device_t *device_t::siblingdevice(const char *tag) const
// empty string or NULL means this device
if (tag == NULL || *tag == 0)
return const_cast<device_t *>(this);
-
+
// leading caret implies the owner, just skip it
if (tag[0] == '^') tag++;
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 84fafc69952..299a3010006 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -333,7 +333,7 @@ public:
virtual ~ui_menu_control_device_image();
virtual void populate();
virtual void handle();
-
+
protected:
enum {
START_FILE, START_OTHER_PART, START_SOFTLIST, SELECT_PARTLIST, SELECT_ONE_PART, SELECT_OTHER_PART, SELECT_FILE, CREATE_FILE, CREATE_CONFIRM, DO_CREATE, SELECT_SOFTLIST,
diff --git a/src/emu/emutempl.h b/src/emu/emutempl.h
index 413e2cacbbb..70a709b1c0d 100644
--- a/src/emu/emutempl.h
+++ b/src/emu/emutempl.h
@@ -59,7 +59,7 @@ class simple_list
public:
// construction/destruction
- simple_list(resource_pool &pool = global_resource_pool())
+ simple_list(resource_pool &pool = global_resource_pool())
: m_head(NULL),
m_tail(NULL),
m_pool(pool),
diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c
index 2e4d9593a62..41f57584cab 100644
--- a/src/emu/imagedev/floppy.c
+++ b/src/emu/imagedev/floppy.c
@@ -203,7 +203,7 @@ floppy_image_format_t *floppy_image_device::identify(astring filename) const
fd = fopen(filename.cstr(), "r");
if(!fd)
return 0;
-
+
io_generic io;
io.file = fd;
io.procs = &stdio_ioprocs_noclose;
@@ -610,12 +610,12 @@ ui_menu *floppy_image_device::get_selection_menu(running_machine &machine, rende
ui_menu_control_floppy_image::ui_menu_control_floppy_image(running_machine &machine, render_container *container, device_image_interface *_image) : ui_menu_control_device_image(machine, container, _image)
{
- floppy_image_device *fd = static_cast<floppy_image_device *>(image);
+ floppy_image_device *fd = static_cast<floppy_image_device *>(image);
const floppy_image_format_t *fif_list = fd->get_formats();
int fcnt = 0;
for(const floppy_image_format_t *i = fif_list; i; i = i->next)
fcnt++;
-
+
format_array = global_alloc_array(floppy_image_format_t *, fcnt);
input_format = output_format = 0;
input_filename = output_filename = "";
@@ -628,7 +628,7 @@ ui_menu_control_floppy_image::~ui_menu_control_floppy_image()
void ui_menu_control_floppy_image::do_load_create()
{
- floppy_image_device *fd = static_cast<floppy_image_device *>(image);
+ floppy_image_device *fd = static_cast<floppy_image_device *>(image);
if(input_filename == "") {
int err = fd->create(output_filename, 0, NULL);
if (err != 0) {
@@ -678,7 +678,7 @@ void ui_menu_control_floppy_image::hook_load(astring filename, bool softlist)
void ui_menu_control_floppy_image::handle()
{
- floppy_image_device *fd = static_cast<floppy_image_device *>(image);
+ floppy_image_device *fd = static_cast<floppy_image_device *>(image);
switch(state) {
case DO_CREATE: {
floppy_image_format_t *fif_list = fd->get_formats();
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 2206628b4e4..88ad95b27d9 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -915,7 +915,7 @@ void running_machine::start_all_devices()
failed_starts++;
}
}
-
+
// each iteration should reduce the number of failed starts; error if
// this doesn't happen
if (failed_starts == last_failed_starts)
@@ -954,12 +954,12 @@ void running_machine::stop_all_devices()
device->stop();
// then nuke the device tree
-// global_free(m_root_device);
+// global_free(m_root_device);
}
//-------------------------------------------------
-// presave_all_devices - tell all the devices we
+// presave_all_devices - tell all the devices we
// are about to save
//-------------------------------------------------
@@ -972,7 +972,7 @@ void running_machine::presave_all_devices()
//-------------------------------------------------
-// postload_all_devices - tell all the devices we
+// postload_all_devices - tell all the devices we
// just completed a load
//-------------------------------------------------
@@ -1266,7 +1266,7 @@ void driver_device::device_start()
//-------------------------------------------------
-// device_reset_after_children - device override
+// device_reset_after_children - device override
// which calls the various helpers; must happen
// after all child devices are reset
//-------------------------------------------------
diff --git a/src/emu/machine.h b/src/emu/machine.h
index ba99c76534b..f4878516ff8 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -444,7 +444,7 @@ private:
void fill_systime(system_time &systime, time_t t);
void handle_saveload();
void soft_reset(void *ptr = NULL, INT32 param = 0);
-
+
// internal callbacks
static void logfile_callback(running_machine &machine, const char *buffer);
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index 4bb2eae5bad..970e61cba89 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -27,14 +27,14 @@
#include "devhelpr.h"
/***************************************************************************
- PARAMETERS
+ PARAMETERS
***************************************************************************/
#define TRACE_VIA 0
/***************************************************************************
- MACROS
+ MACROS
***************************************************************************/
/* Macros for PCR */
@@ -106,7 +106,7 @@
/***************************************************************************
- INLINE FUNCTIONS
+ INLINE FUNCTIONS
***************************************************************************/
inline void via6522_device::set_irq_line(int state)
@@ -578,7 +578,7 @@ READ8_MEMBER( via6522_device::read )
CLR_PA_INT();
/* If CA2 is configured as output and in pulse or handshake mode,
- CA2 is set now */
+ CA2 is set now */
if (CA2_PULSE_OUTPUT(m_pcr))
{
/* call the CA2 output function */
@@ -742,7 +742,7 @@ WRITE8_MEMBER( via6522_device::write )
CLR_PB_INT();
/* If CB2 is configured as output and in pulse or handshake mode,
- CB2 is set now */
+ CB2 is set now */
if (CB2_AUTO_HS(m_pcr))
{
if (m_out_cb2)
@@ -1015,7 +1015,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 )
set_int(INT_CA1);
/* CA2 is configured as output and in pulse or handshake mode,
- CA2 is cleared now */
+ CA2 is cleared now */
if (CA2_AUTO_HS(m_pcr))
{
if (!m_out_ca2)
@@ -1089,7 +1089,7 @@ WRITE_LINE_MEMBER( via6522_device::write_cb1 )
set_int(INT_CB1);
/* CB2 is configured as output and in pulse or handshake mode,
- CB2 is cleared now */
+ CB2 is cleared now */
if (CB2_AUTO_HS(m_pcr))
{
if (!m_out_cb2)
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index a62e175b808..3d90dcad6fd 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -320,7 +320,7 @@ static astring &nvram_filename(astring &result, device_t &device)
{
running_machine &machine = device.machine();
- // start with either basename or basename_biosnum
+ // start with either basename or basename_biosnum
result.cpy(machine.basename());
if (rom_system_bios(machine) != 0 && rom_default_bios(machine) != rom_system_bios(machine))
result.catprintf("_%d", rom_system_bios(machine) - 1);
diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c
index 6ceb337803a..9e03a188fd8 100644
--- a/src/emu/machine/im6402.c
+++ b/src/emu/machine/im6402.c
@@ -38,7 +38,7 @@ const device_type IM6402 = &device_creator<im6402_device>;
inline void im6402_device::set_dr(int state)
{
m_dr = state;
-
+
m_out_dr_func(state);
}
@@ -50,7 +50,7 @@ inline void im6402_device::set_dr(int state)
inline void im6402_device::set_tbre(int state)
{
m_tbre = state;
-
+
m_out_tbre_func(state);
}
@@ -62,7 +62,7 @@ inline void im6402_device::set_tbre(int state)
inline void im6402_device::set_tre(int state)
{
m_tre = state;
-
+
m_out_tre_func(state);
}
@@ -86,12 +86,12 @@ inline void im6402_device::receive()
{
receive_register_extract();
m_rbr = get_received_char();
-
+
if (m_dr)
{
m_oe = 1;
}
-
+
set_dr(ASSERT_LINE);
}
}
@@ -106,18 +106,18 @@ inline void im6402_device::transmit()
if (is_transmit_register_empty() && !m_tbre)
{
transmit_register_setup(m_tbr);
-
+
set_tbre(ASSERT_LINE);
set_tre(CLEAR_LINE);
}
-
+
if (!is_transmit_register_empty())
{
int bit = transmit_register_get_data_bit();
-
+
m_out_tro_func(bit);
serial_connection_out();
-
+
if (is_transmit_register_empty())
{
set_tre(ASSERT_LINE);
@@ -226,7 +226,7 @@ void im6402_device::device_reset()
m_pe = 0;
m_fe = 0;
m_oe = 0;
-
+
set_dr(CLEAR_LINE);
set_tbre(ASSERT_LINE);
set_tre(ASSERT_LINE);
@@ -292,7 +292,7 @@ WRITE_LINE_MEMBER( im6402_device::rrc_w )
if (state)
{
m_rrc_count++;
-
+
if (m_rrc_count == 16)
{
receive();
@@ -311,13 +311,13 @@ WRITE_LINE_MEMBER( im6402_device::trc_w )
if (state)
{
m_trc_count++;
-
+
if (m_trc_count == 16)
{
transmit();
m_trc_count = 0;
}
- }
+ }
}
@@ -436,11 +436,11 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
int word_length = 5 + ((m_cls2 << 1) | m_cls1);
int stop_bits = 1 + m_sbs ? ((word_length == 5) ? 0.5 : 1) : 0;
int parity_code;
-
- if (m_pi) parity_code = SERIAL_PARITY_NONE;
- else if (m_epe) parity_code = SERIAL_PARITY_EVEN;
+
+ if (m_pi) parity_code = SERIAL_PARITY_NONE;
+ else if (m_epe) parity_code = SERIAL_PARITY_EVEN;
else parity_code = SERIAL_PARITY_ODD;
-
+
set_data_frame(word_length, stop_bits, parity_code);
}
}
diff --git a/src/emu/machine/im6402.h b/src/emu/machine/im6402.h
index a9575b225d1..254fa8027ce 100644
--- a/src/emu/machine/im6402.h
+++ b/src/emu/machine/im6402.h
@@ -29,12 +29,12 @@
RRI 20 |_____________| 21 MR
- NOTE: PIN IM6402 IM6403
- ---------------------------
- 2 N/C CONTROL
- 17 RRC OSC IN
- 40 TRC OSC OUT
-
+ NOTE: PIN IM6402 IM6403
+ ---------------------------
+ 2 N/C CONTROL
+ 17 RRC OSC IN
+ 40 TRC OSC OUT
+
***************************************************************************/
#pragma once
@@ -70,7 +70,7 @@ struct im6402_interface
{
int m_rrc;
int m_trc;
-
+
devcb_read_line m_in_rri_cb;
devcb_write_line m_out_tro_cb;
devcb_write_line m_out_dr_cb;
@@ -81,7 +81,7 @@ struct im6402_interface
// ======================> im6402_device
-class im6402_device : public device_t,
+class im6402_device : public device_t,
public device_serial_interface,
public im6402_interface
{
@@ -91,7 +91,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
-
+
DECLARE_READ_LINE_MEMBER( dr_r );
DECLARE_READ_LINE_MEMBER( tbre_r );
DECLARE_READ_LINE_MEMBER( tre_r );
@@ -118,7 +118,7 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
// device_serial_interface overrides
virtual void input_callback(UINT8 state);
@@ -128,7 +128,7 @@ private:
inline void set_tre(int state);
inline void receive();
inline void transmit();
-
+
static const device_timer_id TIMER_RX = 0;
static const device_timer_id TIMER_TX = 1;
@@ -145,7 +145,7 @@ private:
int m_pe;
int m_fe;
int m_oe;
-
+
// control
int m_cls1;
int m_cls2;
@@ -153,15 +153,15 @@ private:
int m_sfd;
int m_epe;
int m_pi;
-
+
// receiver
UINT8 m_rbr;
int m_rrc_count;
-
+
// transmitter
UINT8 m_tbr;
int m_trc_count;
-
+
// timers
emu_timer *m_rx_timer;
emu_timer *m_tx_timer;
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index 05f372aa6e9..b7b51667007 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -257,17 +257,17 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
// Attempt to register save state entry after state registration is closed!
state_save_register_item( machine, "scsihd", diskregion, 0, our_this->lba );
state_save_register_item( machine, "scsihd", diskregion, 0, our_this->blocks );
-
+
// try to locate the CHD from a DISK_REGION
our_this->handle = get_disk_handle(machine, diskregion);
our_this->disk = hard_disk_open(our_this->handle);
our_this->is_image_device = false;
-
+
if (our_this->disk == NULL)
{
// try to locate the CHD from an image device
harddisk_image_device *image_device = machine.device<harddisk_image_device>(diskregion);
-
+
if (image_device != NULL)
{
our_this->handle = image_device->get_chd_file();
@@ -275,7 +275,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
our_this->is_image_device = true;
}
}
-
+
if (our_this->disk == NULL)
{
// try to locate the CHD from an image subdevice
@@ -290,7 +290,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
}
}
}
-
+
if (our_this->disk != NULL)
{
// get hard disk sector size from CHD metadata
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index 95ef6ec936c..313754e4f16 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -80,10 +80,10 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
if (!options.exists(owner.tag()+1))
selval = slot->get_default_card(*this, options);
- if (selval != NULL && strlen(selval) != 0)
+ if (selval != NULL && strlen(selval) != 0)
{
bool found = false;
- for (int i = 0; intf[i].name != NULL; i++)
+ for (int i = 0; intf[i].name != NULL; i++)
{
if (strcmp(selval, intf[i].name) == 0)
{
@@ -143,7 +143,7 @@ device_t *machine_config::device_add(device_t *owner, const char *tag, device_ty
// if there's an owner, let the owner do the work
if (owner != NULL)
return owner->add_subdevice(type, tag, clock);
-
+
// otherwise, allocate the device directly
assert(m_root_device == NULL);
m_root_device = (*type)(*this, tag, owner, clock);
@@ -171,7 +171,7 @@ device_t *machine_config::device_replace(device_t *owner, const char *tag, devic
mame_printf_warning("Warning: attempting to replace non-existent device '%s'\n", tag);
return device_add(owner, tag, type, clock);
}
-
+
// let the device's owner do the work
return device->owner()->replace_subdevice(*device, type, tag, clock);
}
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 521eb09d871..292f6b71149 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -2233,7 +2233,7 @@ void address_space::prepare_map()
// determine full tag
astring fulltag;
device().siblingtag(fulltag, entry->m_region);
-
+
// set the memory address
entry->m_memory = machine().region(fulltag.cstr())->base() + entry->m_rgnoffs;
}
diff --git a/src/emu/render.h b/src/emu/render.h
index 980816300fe..8171d4b6145 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -190,7 +190,7 @@ struct render_bounds
float y0; // topmost Y coordinate
float x1; // rightmost X coordinate
float y1; // bottommost Y coordinate
-
+
float width() const { return x1 - x0; }
float height() const { return y1 - y0; }
};
diff --git a/src/emu/romload.c b/src/emu/romload.c
index efb2858ca0a..d8379bbcda9 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -154,7 +154,7 @@ file_error common_process_file(emu_options &options, const char *location, bool
chd_file *get_disk_handle(running_machine &machine, const char *region)
{
- for (open_chd *curdisk = machine.romload_data->chd_list.first(); curdisk != NULL; curdisk = curdisk->next())
+ for (open_chd *curdisk = machine.romload_data->chd_list.first(); curdisk != NULL; curdisk = curdisk->next())
if (strcmp(curdisk->region(), region) == 0)
return curdisk->chd();
return NULL;
diff --git a/src/emu/screen.c b/src/emu/screen.c
index 241532fab90..65d904e84b3 100644
--- a/src/emu/screen.c
+++ b/src/emu/screen.c
@@ -430,8 +430,8 @@ void screen_device::configure(int width, int height, const rectangle &visarea, a
assert(height > 0);
assert(visarea.min_x >= 0);
assert(visarea.min_y >= 0);
-// assert(visarea.max_x < width);
-// assert(visarea.max_y < height);
+// assert(visarea.max_x < width);
+// assert(visarea.max_y < height);
assert(m_type == SCREEN_TYPE_VECTOR || visarea.min_x < width);
assert(m_type == SCREEN_TYPE_VECTOR || visarea.min_y < height);
assert(frame_period > 0);
@@ -509,7 +509,7 @@ void screen_device::realloc_screen_bitmaps()
// doesn't apply for vector games
if (m_type == SCREEN_TYPE_VECTOR)
return;
-
+
// determine effective size to allocate
INT32 effwidth = MAX(m_width, m_visarea.max_x + 1);
INT32 effheight = MAX(m_height, m_visarea.max_y + 1);
diff --git a/src/emu/softlist.h b/src/emu/softlist.h
index 6c8b5af041e..d4391e812c8 100644
--- a/src/emu/softlist.h
+++ b/src/emu/softlist.h
@@ -60,12 +60,12 @@ public:
// inline configuration helpers
static void static_set_config(device_t &device, const char *list, softlist_type list_type);
static void static_set_filter(device_t &device, const char *filter);
-
+
// getters
const char *list_name() const { return m_list_name; }
softlist_type list_type() const { return m_list_type; }
const char *filter() const { return m_filter; }
-
+
// validation helpers
static void reset_checked_lists() { s_checked_lists.reset(); }
@@ -76,9 +76,9 @@ protected:
// configuration state
const char * m_list_name;
- softlist_type m_list_type;
+ softlist_type m_list_type;
const char * m_filter;
-
+
// static state
static tagmap_t<UINT8> s_checked_lists;
};
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 35847f654b8..55641d1c7a6 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -124,7 +124,7 @@ FLAC__StreamDecoderReadStatus my_read_callback(const FLAC__StreamDecoder *decode
}
-FLAC__StreamDecoderWriteStatus my_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
+FLAC__StreamDecoderWriteStatus my_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
{
//printf("my_write_callback\n");
//printf("array size %d\n",frame->header.blocksize);
@@ -140,7 +140,7 @@ FLAC__StreamDecoderWriteStatus my_write_callback(const FLAC__StreamDecoder *deco
}
flacrd->write_position += frame->header.blocksize;
-
+
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
@@ -328,7 +328,7 @@ static int read_wav_sample(running_machine &machine, emu_file &file, loaded_samp
return 0;
int size = flacread.total_samples * (flacread.bits_per_sample/8);
-
+
sample->data = auto_alloc_array(machine, INT16, size);
flacread.write_position = 0;
flacread.write_data = sample->data;
@@ -342,7 +342,7 @@ static int read_wav_sample(running_machine &machine, emu_file &file, loaded_samp
FLAC__stream_decoder_delete(decoder);
/* fill in the sample data */
-
+
sample->frequency = flacread.sample_rate;
sample->length = size;
diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c
index 31e12cc6b48..ab0ee1f5e96 100644
--- a/src/emu/tilemap.c
+++ b/src/emu/tilemap.c
@@ -446,7 +446,7 @@ tilemap_t::~tilemap_t()
//-------------------------------------------------
-// mark_tile_dirty - mark a single tile dirty
+// mark_tile_dirty - mark a single tile dirty
// based on its memory index
//-------------------------------------------------
@@ -467,8 +467,8 @@ void tilemap_t::mark_tile_dirty(tilemap_memory_index memindex)
//-------------------------------------------------
-// map_pens_to_layer - specify the mapping of one
-// or more pens (where (<pen> & mask) == pen) to
+// map_pens_to_layer - specify the mapping of one
+// or more pens (where (<pen> & mask) == pen) to
// a layer
//-------------------------------------------------
@@ -503,8 +503,8 @@ void tilemap_t::map_pens_to_layer(int group, pen_t pen, pen_t mask, UINT8 layerm
//-------------------------------------------------
-// set_transparent_pen - set a single transparent
-// pen into the tilemap, mapping all other pens
+// set_transparent_pen - set a single transparent
+// pen into the tilemap, mapping all other pens
// to layer 0
//-------------------------------------------------
@@ -519,8 +519,8 @@ void tilemap_t::set_transparent_pen(pen_t pen)
//-------------------------------------------------
-// set_transmask - set up the first 32 pens using
-// a foreground mask (mapping to layer 0) and a
+// set_transmask - set up the first 32 pens using
+// a foreground mask (mapping to layer 0) and a
// background mask (mapping to layer 1)
//-------------------------------------------------
@@ -601,7 +601,7 @@ TILEMAP_MAPPER( tilemap_scan_cols_flip_xy )
//-------------------------------------------------
-// postload - after loading a save state
+// postload - after loading a save state
// invalidate everything
//-------------------------------------------------
@@ -918,7 +918,7 @@ void tilemap_t::configure_blit_parameters(blit_parameters &blit, const rectangle
//-------------------------------------------------
-// draw_common - draw a tilemap to the
+// draw_common - draw a tilemap to the
// destination with clipping; pixels apply
// priority/priority_mask to the priority bitmap
//-------------------------------------------------
@@ -1037,9 +1037,9 @@ void tilemap_t::draw(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 flags
//-------------------------------------------------
-// draw_roz - draw a tilemap to the destination
-// with clipping and arbitrary rotate/zoom; pixels
-// apply priority/priority_mask to the priority
+// draw_roz - draw a tilemap to the destination
+// with clipping and arbitrary rotate/zoom; pixels
+// apply priority/priority_mask to the priority
// bitmap
//-------------------------------------------------
@@ -1090,8 +1090,8 @@ void tilemap_t::draw_roz(bitmap_rgb32 &dest, const rectangle &cliprect,
//-------------------------------------------------
-// draw_instance - draw a single instance of the
-// tilemap to the internal pixmap at the given
+// draw_instance - draw a single instance of the
+// tilemap to the internal pixmap at the given
// xpos,ypos
//-------------------------------------------------
@@ -1481,7 +1481,7 @@ tilemap_manager::tilemap_manager(running_machine &machine)
//-------------------------------------------------
-// set_flip_all - set a global flip for all the
+// set_flip_all - set a global flip for all the
// tilemaps
//-------------------------------------------------
@@ -1497,7 +1497,7 @@ tilemap_t &tilemap_manager::create(tile_get_info_func tile_get_info, tilemap_map
//-------------------------------------------------
-// set_flip_all - set a global flip for all the
+// set_flip_all - set a global flip for all the
// tilemaps
//-------------------------------------------------
@@ -1509,7 +1509,7 @@ void tilemap_manager::set_flip_all(UINT32 attributes)
//-------------------------------------------------
-// mark_all_dirty - mark all the tiles in all the
+// mark_all_dirty - mark all the tiles in all the
// tilemaps dirty
//-------------------------------------------------
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index 956a3fc95f5..192f2879eda 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -419,7 +419,7 @@ typedef tilemap_memory_index (*tilemap_mapper_func)(running_machine &machine, UI
class tilemap_t
{
DISABLE_COPYING(tilemap_t);
-
+
friend class tilemap_manager;
friend class simple_list<tilemap_t>;
friend resource_pool_object<tilemap_t>::~resource_pool_object();
@@ -455,7 +455,7 @@ public:
bitmap_ind8 &flagsmap() { pixmap_update(); return m_flagsmap; }
UINT8 *tile_flags() { pixmap_update(); return m_tileflags; }
tilemap_memory_index memory_index(UINT32 col, UINT32 row) { return m_mapper(col, row, m_cols, m_rows); }
-
+
// setters
void enable(bool enable = true) { m_enable = enable; }
void set_user_data(void *user_data) { m_user_data = user_data; }
@@ -505,12 +505,12 @@ private:
UINT8 value;
UINT8 alpha;
};
-
+
// inline helpers
INT32 effective_rowscroll(int index, UINT32 screen_width);
INT32 effective_colscroll(int index, UINT32 screen_height);
bool gfx_elements_changed();
-
+
// inline scanline rasterizers
void scanline_draw_opaque_null(int count, UINT8 *pri, UINT32 pcode);
void scanline_draw_masked_null(const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode);
@@ -600,10 +600,10 @@ class tilemap_manager
public:
// construction/destuction
tilemap_manager(running_machine &machine);
-
+
// getters
running_machine &machine() const { return m_machine; }
-
+
// tilemap creation
tilemap_t &create(tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows);
tilemap_t &create(tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows);
@@ -622,7 +622,7 @@ private:
// internal state
running_machine & m_machine;
- simple_list<tilemap_t> m_tilemap_list;
+ simple_list<tilemap_t> m_tilemap_list;
int m_instance;
};
@@ -643,7 +643,7 @@ private:
// function definition for a logical-to-memory mapper
#define TILEMAP_MAPPER(_name) tilemap_memory_index _name(running_machine &machine, UINT32 col, UINT32 row, UINT32 num_cols, UINT32 num_rows)
-// useful macro inside of a TILE_GET_INFO callback to set tile information
+// useful macro inside of a TILE_GET_INFO callback to set tile information
#define SET_TILE_INFO(GFX,CODE,COLOR,FLAGS) tileinfo.set(machine, GFX, CODE, COLOR, FLAGS)
#define SET_TILE_INFO_DEVICE(GFX,CODE,COLOR,FLAGS) tileinfo.set(device->machine(), GFX, CODE, COLOR, FLAGS)
diff --git a/src/emu/validity.c b/src/emu/validity.c
index d33c033b1b4..0ee812df39f 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -72,7 +72,7 @@ extern int m_device_count;
//**************************************************************************
//-------------------------------------------------
-// ioport_string_from_index - return an indexed
+// ioport_string_from_index - return an indexed
// string from the I/O port system
//-------------------------------------------------
@@ -200,13 +200,13 @@ void validity_checker::check_shared_source(const game_driver &driver)
{
// initialize
validate_begin();
-
+
// then iterate over all drivers and check the ones that share the same source file
m_drivlist.reset();
while (m_drivlist.next())
if (strcmp(driver.source_file, m_drivlist.driver().source_file) == 0)
validate_one(m_drivlist.driver());
-
+
// cleanup
validate_end();
}
@@ -222,20 +222,20 @@ void validity_checker::check_all()
validate_begin();
validate_core();
validate_inlines();
-
+
// then iterate over all drivers and check them
m_drivlist.reset();
while (m_drivlist.next())
validate_one(m_drivlist.driver());
-
+
// cleanup
validate_end();
}
//-------------------------------------------------
-// validate_begin - prepare for validation by
-// taking over the output callbacks and resetting
+// validate_begin - prepare for validation by
+// taking over the output callbacks and resetting
// our internal state
//-------------------------------------------------
@@ -244,25 +244,25 @@ void validity_checker::validate_begin()
// take over error and warning outputs
m_saved_error_output = mame_set_output_channel(OUTPUT_CHANNEL_ERROR, output_delegate(FUNC(validity_checker::error_output), this));
m_saved_warning_output = mame_set_output_channel(OUTPUT_CHANNEL_WARNING, output_delegate(FUNC(validity_checker::warning_output), this));
-
+
// reset all our maps
m_names_map.reset();
m_descriptions_map.reset();
m_roms_map.reset();
m_defstr_map.reset();
m_region_map.reset();
-
+
// reset internal state
m_errors = 0;
m_warnings = 0;
-
+
// reset some special case state
software_list_device::reset_checked_lists();
}
//-------------------------------------------------
-// validate_end - restore output callbacks and
+// validate_end - restore output callbacks and
// clean up
//-------------------------------------------------
@@ -286,7 +286,7 @@ void validity_checker::validate_one(const game_driver &driver)
m_current_device = NULL;
m_current_ioport = NULL;
m_region_map.reset();
-
+
// reset error/warning state
int start_errors = m_errors;
int start_warnings = m_warnings;
@@ -314,7 +314,7 @@ void validity_checker::validate_one(const game_driver &driver)
mame_printf_error("Fatal error %s", err.string());
}
m_current_config = NULL;
-
+
// if we had warnings or errors, output
if (m_errors > start_errors || m_warnings > start_warnings)
{
@@ -625,7 +625,7 @@ void validity_checker::validate_roms()
{
// for non-root devices, track the current device
m_current_device = (source == &m_current_config->root_device()) ? NULL : source;
-
+
// scan the ROM entries for this device
const char *last_region_name = "???";
const char *last_name = "???";
@@ -660,7 +660,7 @@ void validity_checker::validate_roms()
// generate the full tag
astring fulltag;
rom_region_name(fulltag, m_current_driver, source, romp);
-
+
// attempt to add it to the map, reporting duplicates as errors
current_length = ROMREGION_GETLENGTH(romp);
if (m_region_map.add(fulltag, current_length, false) == TMERR_DUPLICATE)
@@ -807,7 +807,7 @@ void validity_checker::validate_gfx()
int xscale = (m_current_config->m_gfxdecodeinfo[gfxnum].xscale == 0) ? 1 : m_current_config->m_gfxdecodeinfo[gfxnum].xscale;
int yscale = (m_current_config->m_gfxdecodeinfo[gfxnum].yscale == 0) ? 1 : m_current_config->m_gfxdecodeinfo[gfxnum].yscale;
-
+
// verify raw decode, which can only be full-region and have no scaling
if (layout.planeoffset[0] == GFX_RAW)
{
@@ -816,7 +816,7 @@ void validity_checker::validate_gfx()
if (xscale != 1 || yscale != 1)
mame_printf_error("gfx[%d] with unsupported xscale/yscale\n", gfxnum);
}
-
+
// verify traditional decode doesn't have too many planes or is not too large
else
{
@@ -989,7 +989,7 @@ void validity_checker::validate_condition(input_condition &condition, device_t &
// resolve the tag
astring porttag;
device.subtag(porttag, condition.tag);
-
+
// then find a matching port
if (port_map.find(porttag) == 0)
mame_printf_error("Condition referencing non-existent ioport tag '%s'\n", condition.tag);
@@ -1019,7 +1019,7 @@ void validity_checker::validate_inputs()
ioport_list portlist;
astring errorbuf;
input_port_list_init(*device, portlist, errorbuf);
-
+
// report any errors during construction
if (errorbuf)
mame_printf_error("I/O port error during construction:\n%s\n", errorbuf.cstr());
@@ -1084,7 +1084,7 @@ void validity_checker::validate_inputs()
if (setting->condition.tag != NULL)
validate_condition(setting->condition, *device, port_map);
}
-
+
// done with this port
m_current_ioport = NULL;
}
@@ -1149,7 +1149,7 @@ void validity_checker::validate_slots()
// instantiate the device
device_t *dev = (*intf[j].devtype)(*m_current_config, "dummy", &m_current_config->root_device(), 0);
dev->config_complete();
-
+
// if a ROM region is present
if (dev->rom_region() != NULL)
{
@@ -1161,7 +1161,7 @@ void validity_checker::validate_slots()
break;
}
- if (has_romfiles)
+ if (has_romfiles)
{
// scan the list of devices for this device type
bool found = false;
@@ -1184,7 +1184,7 @@ void validity_checker::validate_slots()
//-------------------------------------------------
-// build_output_prefix - create a prefix
+// build_output_prefix - create a prefix
// indicating the current source file, driver,
// and device
//-------------------------------------------------
@@ -1193,11 +1193,11 @@ void validity_checker::build_output_prefix(astring &string)
{
// start empty
string.reset();
-
+
// if we have a current device, indicate that
if (m_current_device != NULL)
string.cat(m_current_device->name()).cat(" device '").cat(m_current_device->tag()).cat("': ");
-
+
// if we have a current port, indicate that as well
if (m_current_ioport != NULL)
string.cat("ioport '").cat(m_current_ioport).cat("': ");
@@ -1212,7 +1212,7 @@ void validity_checker::error_output(const char *format, va_list argptr)
{
// count the error
m_errors++;
-
+
// output the source(driver) device 'tag'
astring output;
build_output_prefix(output);
@@ -1224,7 +1224,7 @@ void validity_checker::error_output(const char *format, va_list argptr)
//-------------------------------------------------
-// warning_output - warning message output
+// warning_output - warning message output
// override
//-------------------------------------------------
@@ -1232,7 +1232,7 @@ void validity_checker::warning_output(const char *format, va_list argptr)
{
// count the error
m_warnings++;
-
+
// output the source(driver) device 'tag'
astring output;
build_output_prefix(output);
diff --git a/src/emu/validity.h b/src/emu/validity.h
index d362e155a1e..63854910bd7 100644
--- a/src/emu/validity.h
+++ b/src/emu/validity.h
@@ -63,18 +63,18 @@ class validity_checker
public:
validity_checker(emu_options &options);
- // getters
+ // getters
int errors() const { return m_errors; }
int warnings() const { return m_warnings; }
- // operations
+ // operations
void check_driver(const game_driver &driver);
void check_shared_source(const game_driver &driver);
void check_all();
// helpers for devices
void validate_tag(const char *tag);
-
+
private:
// internal helpers
const char *ioport_string_from_index(UINT32 index);
@@ -84,7 +84,7 @@ private:
void validate_begin();
void validate_end();
void validate_one(const game_driver &driver);
-
+
// internal sub-checks
void validate_core();
void validate_inlines();
@@ -106,8 +106,8 @@ private:
void output_via_delegate(output_delegate &delegate, const char *format, ...);
// internal driver list
- driver_enumerator m_drivlist;
-
+ driver_enumerator m_drivlist;
+
// error tracking
int m_errors;
int m_warnings;
@@ -128,8 +128,8 @@ private:
int_map m_region_map;
// callbacks
- output_delegate m_saved_error_output;
- output_delegate m_saved_warning_output;
+ output_delegate m_saved_error_output;
+ output_delegate m_saved_warning_output;
};
#endif
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 281dfea3aba..a79f669360a 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -20,15 +20,15 @@
- modernize
- add emulated mc6845 hook-up
- fix video update.
- - rewrite video drawing functions (they are horrible)
- - add VESA etc.
- - "System Information" UI currently crashes the emulation
+ - rewrite video drawing functions (they are horrible)
+ - add VESA etc.
+ - "System Information" UI currently crashes the emulation
- (and many more ...)
- per-game issues:
- - The Incredible Machine: fix partial updates
- - MAME 0.01: fix 92 Hz refresh rate bug (uses VESA register?).
- - Bio Menace: jerky H scrolling (uses EGA mode)
+ per-game issues:
+ - The Incredible Machine: fix partial updates
+ - MAME 0.01: fix 92 Hz refresh rate bug (uses VESA register?).
+ - Bio Menace: jerky H scrolling (uses EGA mode)
- Virtual Pool: ET4k unrecognized;
- California Chase (calchase): init bug causes messed up chars at POST
(gfxs works if you soft reset).
@@ -728,19 +728,19 @@ static void recompute_params(running_machine &machine)
/* TODO: 10b and 11b settings aren't known */
pixel_clock = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz;
- pixel_clock /= (((vga.sequencer.data[1]&8) >> 3) + 1);
+ pixel_clock /= (((vga.sequencer.data[1]&8) >> 3) + 1);
refresh = HZ_TO_ATTOSECONDS(pixel_clock) * (hblank_period) * vblank_period;
machine.primary_screen->configure((hblank_period), (vblank_period), visarea, refresh );
-// popmessage("%d %d\n",vga.crtc.horz_total * 8,vga.crtc.vert_total);
+// popmessage("%d %d\n",vga.crtc.horz_total * 8,vga.crtc.vert_total);
}
static void crtc_reg_write(running_machine &machine, UINT8 index, UINT8 data)
{
/* Doom does this */
-// if(vga.crtc.protect_enable && index <= 0x07)
-// printf("write to protected address %02x\n",index);
+// if(vga.crtc.protect_enable && index <= 0x07)
+// printf("write to protected address %02x\n",index);
switch(index)
{
@@ -878,7 +878,7 @@ static void seq_reg_write(running_machine &machine, UINT8 index, UINT8 data)
break;
case 0x03:
/* --2- 84-- character select A
- ---2 --84 character select B */
+ ---2 --84 character select B */
vga.sequencer.char_sel.A = (((data & 0xc) >> 2)<<1) | ((data & 0x20) >> 5);
vga.sequencer.char_sel.B = (((data & 0x3) >> 0)<<1) | ((data & 0x10) >> 4);
if(data)
@@ -1321,7 +1321,7 @@ READ8_HANDLER(vga_mem_r)
WRITE8_HANDLER(vga_mem_w)
{
- //Inside each case must prevent writes to non-mapped VGA memory regions, not only mask the offset.
+ //Inside each case must prevent writes to non-mapped VGA memory regions, not only mask the offset.
switch((vga.gc.data[6] >> 2) & 0x03)
{
case 0: break;