minor code trimming and reformatting

[drnoksnes] / sa1cpu.cpp

diff --git a/sa1cpu.cpp b/sa1cpu.cpp
index cfd1b01..3c9dcc3 100644 (file)
--- a/sa1cpu.cpp
+++ b/sa1cpu.cpp
@@ -53,7 +53,7 @@
 #define CPU SA1
 #define ICPU SA1
 
-#undef Registers\r
+#undef Registers
 
 #define Registers SA1Registers
 #define S9xGetByte S9xSA1GetByte
@@ -69,7 +69,7 @@
 #define S9xOpcode_NMI S9xSA1Opcode_NMI
 #define S9xUnpackStatus S9xSA1UnpackStatus
 #define S9xPackStatus S9xSA1PackStatus
-#define S9xFixCycles S9xSA1FixCycles\r
+#define S9xFixCycles S9xSA1FixCycles
 
 #if 0
 #define Immediate8 SA1Immediate8
@@ -93,7 +93,7 @@
 #define DirectIndirect SA1DirectIndirect
 #define DirectIndirectLong SA1DirectIndirectLong
 #define StackRelative SA1StackRelative
-#define StackRelativeIndirectIndexed SA1StackRelativeIndirectIndexed\r
+#define StackRelativeIndirectIndexed SA1StackRelativeIndirectIndexed
 #endif
 
 //#undef CPU_SHUTDOWN
@@ -144,16 +144,16 @@ void S9xSA1MainLoop ()
 #endif
                    (*SA1.S9xOpcodes [*SA1.PC++].S9xOpcode)();
                }
+               return;
     }
-    else
 #endif
-           for (i = 0; i < 3 && SA1.Executing; i++)
-               {
+       for (i = 0; i < 3 && SA1.Executing; i++)
+       {
 #ifdef CPU_SHUTDOWN
-                       SA1.PCAtOpcodeStart = SA1.PC;
+               SA1.PCAtOpcodeStart = SA1.PC;
 #endif
-                       (*SA1.S9xOpcodes [*SA1.PC++].S9xOpcode)();
-               }
+               (*SA1.S9xOpcodes [*SA1.PC++].S9xOpcode)();
+       }
 }
 
 #endif