reindent all files.

1 files changed, 131 insertions, 131 deletions

diff --git a/src/cpuaddr.h b/src/cpuaddr.h
index 1fc5640..7d47431 100644
--- a/src/cpuaddr.h
+++ b/src/cpuaddr.h
@@ -4,7 +4,7 @@
  * (c) Copyright 1996 - 2001 Gary Henderson (gary.henderson@ntlworld.com) and

  *                           Jerremy Koot (jkoot@snes9x.com)

  *

- * Super FX C emulator code 

+ * Super FX C emulator code

  * (c) Copyright 1997 - 1999 Ivar (ivar@snes9x.com) and

  *                           Gary Henderson.

  * Super FX assembler emulator code (c) Copyright 1998 zsKnight and _Demo_.

@@ -40,286 +40,286 @@
  */

 

 #ifdef CPUASM

-#define	_CPUADDR_H_

-#endif 

+#define  _CPUADDR_H_

+#endif

 

 #ifndef _CPUADDR_H_

 #define _CPUADDR_H_

 

 EXTERN_C long OpAddress;

 

-STATIC inline void Immediate8 ()

+STATIC inline void Immediate8()

 {

-    OpAddress = ICPU.ShiftedPB + CPU.PC - CPU.PCBase;

-    CPU.PC++;

+   OpAddress = ICPU.ShiftedPB + CPU.PC - CPU.PCBase;

+   CPU.PC++;

 }

 

-STATIC inline void Immediate16 ()

+STATIC inline void Immediate16()

 {

-    OpAddress = ICPU.ShiftedPB + CPU.PC - CPU.PCBase;

-    CPU.PC += 2;

+   OpAddress = ICPU.ShiftedPB + CPU.PC - CPU.PCBase;

+   CPU.PC += 2;

 }

 

-STATIC inline void Relative ()

+STATIC inline void Relative()

 {

-    signed char s9xInt8 = *CPU.PC++;

+   signed char s9xInt8 = *CPU.PC++;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

-#endif    

-    OpAddress = ((int) (CPU.PC - CPU.PCBase) + s9xInt8) & 0xffff;

+   CPU.Cycles += CPU.MemSpeed;

+#endif

+   OpAddress = ((int)(CPU.PC - CPU.PCBase) + s9xInt8) & 0xffff;

 }

 

-STATIC inline void RelativeLong ()

+STATIC inline void RelativeLong()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = *(uint16 *) CPU.PC;

+   OpAddress = *(uint16*) CPU.PC;

 #else

-    OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

+   OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

 #endif

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2 + ONE_CYCLE;

+   CPU.Cycles += CPU.MemSpeedx2 + ONE_CYCLE;

 #endif

-    CPU.PC += 2;

-    OpAddress += (CPU.PC - CPU.PCBase);

-    OpAddress &= 0xffff;

+   CPU.PC += 2;

+   OpAddress += (CPU.PC - CPU.PCBase);

+   OpAddress &= 0xffff;

 }

 

-STATIC inline void AbsoluteIndexedIndirect ()

+STATIC inline void AbsoluteIndexedIndirect()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = (Registers.X.W + *(uint16 *) CPU.PC) & 0xffff;

+   OpAddress = (Registers.X.W + * (uint16*) CPU.PC) & 0xffff;

 #else

-    OpAddress = (Registers.X.W + *CPU.PC + (*(CPU.PC + 1) << 8)) & 0xffff;

+   OpAddress = (Registers.X.W + *CPU.PC + (*(CPU.PC + 1) << 8)) & 0xffff;

 #endif

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

-    CPU.PC += 2;

-    OpAddress = S9xGetWord (ICPU.ShiftedPB + OpAddress);

+   CPU.PC += 2;

+   OpAddress = S9xGetWord(ICPU.ShiftedPB + OpAddress);

 }

 

-STATIC inline void AbsoluteIndirectLong ()

+STATIC inline void AbsoluteIndirectLong()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = *(uint16 *) CPU.PC;

+   OpAddress = *(uint16*) CPU.PC;

 #else

-    OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

+   OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

 #endif

 

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

-    CPU.PC += 2;

-    OpAddress = S9xGetWord (OpAddress) | (S9xGetByte (OpAddress + 2) << 16);

+   CPU.PC += 2;

+   OpAddress = S9xGetWord(OpAddress) | (S9xGetByte(OpAddress + 2) << 16);

 }

 

-STATIC inline void AbsoluteIndirect ()

+STATIC inline void AbsoluteIndirect()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = *(uint16 *) CPU.PC;

+   OpAddress = *(uint16*) CPU.PC;

 #else

-    OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

+   OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8);

 #endif

 

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

-    CPU.PC += 2;

-    OpAddress = S9xGetWord (OpAddress) + ICPU.ShiftedPB;

+   CPU.PC += 2;

+   OpAddress = S9xGetWord(OpAddress) + ICPU.ShiftedPB;

 }

 

-STATIC inline void Absolute ()

+STATIC inline void Absolute()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = *(uint16 *) CPU.PC + ICPU.ShiftedDB;

+   OpAddress = *(uint16*) CPU.PC + ICPU.ShiftedDB;

 #else

-    OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8) + ICPU.ShiftedDB;

+   OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8) + ICPU.ShiftedDB;

 #endif

-    CPU.PC += 2;

+   CPU.PC += 2;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

 }

 

-STATIC inline void AbsoluteLong ()

+STATIC inline void AbsoluteLong()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = (*(uint32 *) CPU.PC) & 0xffffff;

+   OpAddress = (*(uint32*) CPU.PC) & 0xffffff;

 #else

-    OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8) + (*(CPU.PC + 2) << 16);

+   OpAddress = *CPU.PC + (*(CPU.PC + 1) << 8) + (*(CPU.PC + 2) << 16);

 #endif

-    CPU.PC += 3;

+   CPU.PC += 3;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2 + CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeedx2 + CPU.MemSpeed;

 #endif

 }

 

-STATIC inline void Direct( void)

+STATIC inline void Direct(void)

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

-//    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

+   //    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

 }

 

-STATIC inline void DirectIndirectIndexed ()

+STATIC inline void DirectIndirectIndexed()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

 

-    OpAddress = ICPU.ShiftedDB + S9xGetWord (OpAddress) + Registers.Y.W;

+   OpAddress = ICPU.ShiftedDB + S9xGetWord(OpAddress) + Registers.Y.W;

 

-//    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

-    // XXX: always add one if STA

-    // XXX: else Add one cycle if crosses page boundary

+   //    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

+   // XXX: always add one if STA

+   // XXX: else Add one cycle if crosses page boundary

 }

 

-STATIC inline void DirectIndirectIndexedLong ()

+STATIC inline void DirectIndirectIndexedLong()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

 

-    OpAddress = S9xGetWord (OpAddress) + (S9xGetByte (OpAddress + 2) << 16) +

-		Registers.Y.W;

-//    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

+   OpAddress = S9xGetWord(OpAddress) + (S9xGetByte(OpAddress + 2) << 16) +

+               Registers.Y.W;

+   //    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

 }

 

-STATIC inline void DirectIndexedIndirect( void)

+STATIC inline void DirectIndexedIndirect(void)

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W + Registers.X.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W + Registers.X.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

 

-    OpAddress = S9xGetWord (OpAddress) + ICPU.ShiftedDB;

+   OpAddress = S9xGetWord(OpAddress) + ICPU.ShiftedDB;

 

 #ifdef VAR_CYCLES

-//    if (Registers.DL != 0)

-//	CPU.Cycles += TWO_CYCLES;

-//    else

-	CPU.Cycles += ONE_CYCLE;

+   //    if (Registers.DL != 0)

+   // CPU.Cycles += TWO_CYCLES;

+   //    else

+   CPU.Cycles += ONE_CYCLE;

 #endif

 }

 

-STATIC inline void DirectIndexedX ()

+STATIC inline void DirectIndexedX()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W + Registers.X.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W + Registers.X.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

 

 #ifdef VAR_CYCLES

-//    if (Registers.DL != 0)

-//	CPU.Cycles += TWO_CYCLES;

-//    else

-	CPU.Cycles += ONE_CYCLE;

+   //    if (Registers.DL != 0)

+   // CPU.Cycles += TWO_CYCLES;

+   //    else

+   CPU.Cycles += ONE_CYCLE;

 #endif

 }

 

-STATIC inline void DirectIndexedY ()

+STATIC inline void DirectIndexedY()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W + Registers.Y.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W + Registers.Y.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

 

 #ifdef VAR_CYCLES

-//    if (Registers.DL != 0)

-//	CPU.Cycles += TWO_CYCLES;

-//    else

-	CPU.Cycles += ONE_CYCLE;

+   //    if (Registers.DL != 0)

+   // CPU.Cycles += TWO_CYCLES;

+   //    else

+   CPU.Cycles += ONE_CYCLE;

 #endif

 }

 

-STATIC inline void AbsoluteIndexedX ()

+STATIC inline void AbsoluteIndexedX()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = ICPU.ShiftedDB + *(uint16 *) CPU.PC + Registers.X.W;

+   OpAddress = ICPU.ShiftedDB + *(uint16*) CPU.PC + Registers.X.W;

 #else

-    OpAddress = ICPU.ShiftedDB + *CPU.PC + (*(CPU.PC + 1) << 8) +

-		Registers.X.W;

+   OpAddress = ICPU.ShiftedDB + *CPU.PC + (*(CPU.PC + 1) << 8) +

+               Registers.X.W;

 #endif

-    CPU.PC += 2;

+   CPU.PC += 2;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

-    // XXX: always add one cycle for ROL, LSR, etc

-    // XXX: else is cross page boundary add one cycle

+   // XXX: always add one cycle for ROL, LSR, etc

+   // XXX: else is cross page boundary add one cycle

 }

 

-STATIC inline void AbsoluteIndexedY ()

+STATIC inline void AbsoluteIndexedY()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = ICPU.ShiftedDB + *(uint16 *) CPU.PC + Registers.Y.W;

+   OpAddress = ICPU.ShiftedDB + *(uint16*) CPU.PC + Registers.Y.W;

 #else

-    OpAddress = ICPU.ShiftedDB + *CPU.PC + (*(CPU.PC + 1) << 8) +

-		Registers.Y.W;

-#endif    

-    CPU.PC += 2;

+   OpAddress = ICPU.ShiftedDB + *CPU.PC + (*(CPU.PC + 1) << 8) +

+               Registers.Y.W;

+#endif

+   CPU.PC += 2;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2;

+   CPU.Cycles += CPU.MemSpeedx2;

 #endif

-    // XXX: always add cycle for STA

-    // XXX: else is cross page boundary add one cycle

+   // XXX: always add cycle for STA

+   // XXX: else is cross page boundary add one cycle

 }

 

-STATIC inline void AbsoluteLongIndexedX ()

+STATIC inline void AbsoluteLongIndexedX()

 {

 #ifdef FAST_LSB_WORD_ACCESS

-    OpAddress = (*(uint32 *) CPU.PC + Registers.X.W) & 0xffffff;

+   OpAddress = (*(uint32*) CPU.PC + Registers.X.W) & 0xffffff;

 #else

-    OpAddress = (*CPU.PC + (*(CPU.PC + 1) << 8) + (*(CPU.PC + 2) << 16) + Registers.X.W) & 0xffffff;

+   OpAddress = (*CPU.PC + (*(CPU.PC + 1) << 8) + (*(CPU.PC + 2) << 16) + Registers.X.W) & 0xffffff;

 #endif

-    CPU.PC += 3;

+   CPU.PC += 3;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeedx2 + CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeedx2 + CPU.MemSpeed;

 #endif

 }

 

-STATIC inline void DirectIndirect ()

+STATIC inline void DirectIndirect()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

-    OpAddress = S9xGetWord (OpAddress) + ICPU.ShiftedDB;

+   OpAddress = S9xGetWord(OpAddress) + ICPU.ShiftedDB;

 

-//    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

+   //    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

 }

 

-STATIC inline void DirectIndirectLong ()

+STATIC inline void DirectIndirectLong()

 {

-    OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.D.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += CPU.MemSpeed;

 #endif

-    OpAddress = S9xGetWord (OpAddress) +

-		(S9xGetByte (OpAddress + 2) << 16);

-//    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

+   OpAddress = S9xGetWord(OpAddress) +

+               (S9xGetByte(OpAddress + 2) << 16);

+   //    if (Registers.DL != 0) CPU.Cycles += ONE_CYCLE;

 }

 

-STATIC inline void StackRelative ()

+STATIC inline void StackRelative()

 {

-    OpAddress = (*CPU.PC++ + Registers.S.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.S.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

-    CPU.Cycles += ONE_CYCLE;

+   CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += ONE_CYCLE;

 #endif

 }

 

-STATIC inline void StackRelativeIndirectIndexed ()

+STATIC inline void StackRelativeIndirectIndexed()

 {

-    OpAddress = (*CPU.PC++ + Registers.S.W) & 0xffff;

+   OpAddress = (*CPU.PC++ + Registers.S.W) & 0xffff;

 #ifdef VAR_CYCLES

-    CPU.Cycles += CPU.MemSpeed;

-    CPU.Cycles += TWO_CYCLES;

+   CPU.Cycles += CPU.MemSpeed;

+   CPU.Cycles += TWO_CYCLES;

 #endif

-    OpAddress = (S9xGetWord (OpAddress) + ICPU.ShiftedDB +

-		 Registers.Y.W) & 0xffffff;

+   OpAddress = (S9xGetWord(OpAddress) + ICPU.ShiftedDB +

+                Registers.Y.W) & 0xffffff;

 }

 #endif