apply a facelift

1 files changed, 545 insertions, 536 deletions

diff --git a/source/getset.h b/source/getset.h
index 511634d..558ed98 100644
--- a/source/getset.h
+++ b/source/getset.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
   Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
+
   (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
                             Jerremy Koot (jkoot@snes9x.com)
 
@@ -43,46 +43,46 @@
   S-DD1 C emulator code
   (c) Copyright 2003 Brad Jorsch with research by
                      Andreas Naive and John Weidman
- 
+
   S-RTC C emulator code
   (c) Copyright 2001 John Weidman
-  
+
   ST010 C++ emulator code
   (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
 
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
+  Super FX x86 assembler emulator code
+  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault
 
-  Super FX C emulator code 
+  Super FX C emulator code
   (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
 
 
   SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
+  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
+
 
- 
   Specific ports contains the works of other authors. See headers in
   individual files.
- 
+
   Snes9x homepage: http://www.snes9x.com
- 
+
   Permission to use, copy, modify and distribute Snes9x in both binary and
   source form, for non-commercial purposes, is hereby granted without fee,
   providing that this license information and copyright notice appear with
   all copies and any derived work.
- 
+
   This software is provided 'as-is', without any express or implied
   warranty. In no event shall the authors be held liable for any damages
   arising from the use of this software.
- 
+
   Snes9x is freeware for PERSONAL USE only. Commercial users should
   seek permission of the copyright holders first. Commercial use includes
   charging money for Snes9x or software derived from Snes9x.
- 
+
   The copyright holders request that bug fixes and improvements to the code
   should be forwarded to them so everyone can benefit from the modifications
   in future versions.
- 
+
   Super NES and Super Nintendo Entertainment System are trademarks of
   Nintendo Co., Limited and its subsidiary companies.
 *******************************************************************************/
@@ -100,612 +100,621 @@
 
 extern uint8 OpenBus;
 
-uint8 S9xGetByte (uint32 Address)
+uint8 S9xGetByte(uint32 Address)
 {
-    int block;
-    uint8 *GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
+   int block;
+   uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) &
+                                           MEMMAP_MASK];
 
-	if(!CPU.InDMA)
-		CPU.Cycles += Memory.MemorySpeed [block];
+   if (!CPU.InDMA)
+      CPU.Cycles += Memory.MemorySpeed [block];
 
-    if (GetAddress >= (uint8 *) MAP_LAST)
-    {
+   if (GetAddress >= (uint8*) MAP_LAST)
+   {
 #ifdef CPU_SHUTDOWN
-		if (Memory.BlockIsRAM [block])
-			CPU.WaitAddress = CPU.PCAtOpcodeStart;
+      if (Memory.BlockIsRAM [block])
+         CPU.WaitAddress = CPU.PCAtOpcodeStart;
 #endif
-		return (*(GetAddress + (Address & 0xffff)));
-    }
-	
-    switch ((intptr_t) GetAddress)
-    {
-    case MAP_PPU:
-		return (S9xGetPPU (Address & 0xffff));
-    case MAP_CPU:
-		return (S9xGetCPU (Address & 0xffff));
-    case MAP_DSP:
+      return (*(GetAddress + (Address & 0xffff)));
+   }
+
+   switch ((intptr_t) GetAddress)
+   {
+   case MAP_PPU:
+      return (S9xGetPPU(Address & 0xffff));
+   case MAP_CPU:
+      return (S9xGetCPU(Address & 0xffff));
+   case MAP_DSP:
 #ifdef DSP_DUMMY_LOOPS
-		printf("Get DSP Byte @ %06X\n", Address);
+      printf("Get DSP Byte @ %06X\n", Address);
 #endif
-		return (S9xGetDSP (Address & 0xffff));
-    case MAP_SA1RAM:
-    case MAP_LOROM_SRAM:
-		//Address &0x7FFF -offset into bank
-		//Address&0xFF0000 -bank
-		//bank>>1 | offset = s-ram address, unbound
-		//unbound & SRAMMask = Sram offset
-		return (*(Memory.SRAM + ((((Address&0xFF0000)>>1) |(Address&0x7FFF)) &Memory.SRAMMask)));
-//		return (*(Memory.SRAM + ((Address & Memory.SRAMMask))));
-		
-	case MAP_RONLY_SRAM:
-    case MAP_HIROM_SRAM:
-		return (*(Memory.SRAM + (((Address & 0x7fff) - 0x6000 +
-			((Address & 0xf0000) >> 3)) & Memory.SRAMMask)));
-		
-    case MAP_BWRAM:
-		return (*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
-		
-    case MAP_C4:
-		return (S9xGetC4 (Address & 0xffff));
-		
-	case MAP_SPC7110_ROM:
-		return S9xGetSPC7110Byte(Address);
-
-	case MAP_SPC7110_DRAM:
-		return S9xGetSPC7110(0x4800);
-
-	case MAP_OBC_RAM:
-		return GetOBC1(Address & 0xffff);
-
-	case MAP_SETA_DSP:
-		return S9xGetSetaDSP(Address);
-	
-	case MAP_SETA_RISC:
-		return S9xGetST018(Address);
-
-
- 
+      return (S9xGetDSP(Address & 0xffff));
+   case MAP_SA1RAM:
+   case MAP_LOROM_SRAM:
+      //Address &0x7FFF -offset into bank
+      //Address&0xFF0000 -bank
+      //bank>>1 | offset = s-ram address, unbound
+      //unbound & SRAMMask = Sram offset
+      return (*(Memory.SRAM + ((((Address & 0xFF0000) >> 1) |
+                                (Address & 0x7FFF)) &Memory.SRAMMask)));
+   //    return (*(Memory.SRAM + ((Address & Memory.SRAMMask))));
+
+   case MAP_RONLY_SRAM:
+   case MAP_HIROM_SRAM:
+      return (*(Memory.SRAM + (((Address & 0x7fff) - 0x6000 +
+                                ((Address & 0xf0000) >> 3)) & Memory.SRAMMask)));
+
+   case MAP_BWRAM:
+      return (*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
+
+   case MAP_C4:
+      return (S9xGetC4(Address & 0xffff));
+
+   case MAP_SPC7110_ROM:
+      return S9xGetSPC7110Byte(Address);
+
+   case MAP_SPC7110_DRAM:
+      return S9xGetSPC7110(0x4800);
+
+   case MAP_OBC_RAM:
+      return GetOBC1(Address & 0xffff);
+
+   case MAP_SETA_DSP:
+      return S9xGetSetaDSP(Address);
+
+   case MAP_SETA_RISC:
+      return S9xGetST018(Address);
+
+
+
    case MAP_DEBUG:
-		return OpenBus;
+      return OpenBus;
 
 
-	default:
-    case MAP_NONE:
+   default:
+   case MAP_NONE:
 #ifdef MK_TRACE_BAD_READS
-		char address[20];
-		sprintf(address, TEXT("%06X"),Address);
-		MessageBox(GUI.hWnd, address, TEXT("GetByte"), MB_OK);
+      char address[20];
+      sprintf(address, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, address, TEXT("GetByte"), MB_OK);
 #endif
 
-		return OpenBus;
-    }
+      return OpenBus;
+   }
 }
 
-uint16 S9xGetWord (uint32 Address)
+uint16 S9xGetWord(uint32 Address)
 {
-    if ((Address & 0x0fff) == 0x0fff)
-    {
-		OpenBus = S9xGetByte (Address);
-		return (OpenBus | (S9xGetByte (Address + 1) << 8));
-    }
-    int block;
-    uint8 *GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
-
-	if(!CPU.InDMA)
-		CPU.Cycles += (Memory.MemorySpeed [block]<<1);
-
- 
-	if (GetAddress >= (uint8 *) MAP_LAST)
-    {
+   if ((Address & 0x0fff) == 0x0fff)
+   {
+      OpenBus = S9xGetByte(Address);
+      return (OpenBus | (S9xGetByte(Address + 1) << 8));
+   }
+   int block;
+   uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) &
+                                           MEMMAP_MASK];
+
+   if (!CPU.InDMA)
+      CPU.Cycles += (Memory.MemorySpeed [block] << 1);
+
+
+   if (GetAddress >= (uint8*) MAP_LAST)
+   {
 #ifdef CPU_SHUTDOWN
-		if (Memory.BlockIsRAM [block])
-			CPU.WaitAddress = CPU.PCAtOpcodeStart;
+      if (Memory.BlockIsRAM [block])
+         CPU.WaitAddress = CPU.PCAtOpcodeStart;
 #endif
 #ifdef FAST_LSB_WORD_ACCESS
-		return (*(uint16 *) (GetAddress + (Address & 0xffff)));
+      return (*(uint16*)(GetAddress + (Address & 0xffff)));
 #else
-		return (*(GetAddress + (Address & 0xffff)) |
-			(*(GetAddress + (Address & 0xffff) + 1) << 8));
-#endif	
-    }
-
-    switch ((intptr_t) GetAddress)
-    {
-    case MAP_PPU:
-		return (S9xGetPPU (Address & 0xffff) |
-			(S9xGetPPU ((Address + 1) & 0xffff) << 8));
-    case MAP_CPU:
-		return (S9xGetCPU (Address & 0xffff) |
-			(S9xGetCPU ((Address + 1) & 0xffff) << 8));
-    case MAP_DSP:
+      return (*(GetAddress + (Address & 0xffff)) |
+              (*(GetAddress + (Address & 0xffff) + 1) << 8));
+#endif
+   }
+
+   switch ((intptr_t) GetAddress)
+   {
+   case MAP_PPU:
+      return (S9xGetPPU(Address & 0xffff) |
+              (S9xGetPPU((Address + 1) & 0xffff) << 8));
+   case MAP_CPU:
+      return (S9xGetCPU(Address & 0xffff) |
+              (S9xGetCPU((Address + 1) & 0xffff) << 8));
+   case MAP_DSP:
 #ifdef DSP_DUMMY_LOOPS
-		printf("Get DSP Word @ %06X\n", Address);
+      printf("Get DSP Word @ %06X\n", Address);
 #endif
-		return (S9xGetDSP (Address & 0xffff) |
-			(S9xGetDSP ((Address + 1) & 0xffff) << 8));
-    case MAP_SA1RAM:
-    case MAP_LOROM_SRAM:
-		//Address &0x7FFF -offset into bank
-		//Address&0xFF0000 -bank
-		//bank>>1 | offset = s-ram address, unbound
-		//unbound & SRAMMask = Sram offset
-		/* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
-		 * then the high byte doesn't follow the low byte. */
-		return 
-			(*(Memory.SRAM + ((((Address&0xFF0000)>>1) |(Address&0x7FFF)) &Memory.SRAMMask)))|
-			((*(Memory.SRAM + (((((Address+1)&0xFF0000)>>1) |((Address+1)&0x7FFF)) &Memory.SRAMMask)))<<8);
-
-		//return (*(uint16*)(Memory.SRAM + ((((Address&0xFF0000)>>1)|(Address&0x7FFF)) & Memory.SRAMMask));// |
-	//		(*(Memory.SRAM + ((Address + 1) & Memory.SRAMMask)) << 8));
-		
-	case MAP_RONLY_SRAM:
-    case MAP_HIROM_SRAM:
-		/* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
-		 * then the high byte doesn't follow the low byte. */
-		return (*(Memory.SRAM +
-			(((Address & 0x7fff) - 0x6000 +
-			((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) |
-			(*(Memory.SRAM +
-			((((Address + 1) & 0x7fff) - 0x6000 +
-			(((Address + 1) & 0xf0000) >> 3)) & Memory.SRAMMask)) << 8));
-		
-    case MAP_BWRAM:
+      return (S9xGetDSP(Address & 0xffff) |
+              (S9xGetDSP((Address + 1) & 0xffff) << 8));
+   case MAP_SA1RAM:
+   case MAP_LOROM_SRAM:
+      //Address &0x7FFF -offset into bank
+      //Address&0xFF0000 -bank
+      //bank>>1 | offset = s-ram address, unbound
+      //unbound & SRAMMask = Sram offset
+      /* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
+       * then the high byte doesn't follow the low byte. */
+      return
+         (*(Memory.SRAM + ((((Address & 0xFF0000) >> 1) | (Address & 0x7FFF))
+                           &Memory.SRAMMask))) |
+         ((*(Memory.SRAM + (((((Address + 1) & 0xFF0000) >> 1) | ((
+                                Address + 1) & 0x7FFF)) &Memory.SRAMMask))) << 8);
+
+   //return (*(uint16*)(Memory.SRAM + ((((Address&0xFF0000)>>1)|(Address&0x7FFF)) & Memory.SRAMMask));// |
+   //    (*(Memory.SRAM + ((Address + 1) & Memory.SRAMMask)) << 8));
+
+   case MAP_RONLY_SRAM:
+   case MAP_HIROM_SRAM:
+      /* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
+       * then the high byte doesn't follow the low byte. */
+      return (*(Memory.SRAM +
+                (((Address & 0x7fff) - 0x6000 +
+                  ((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) |
+              (*(Memory.SRAM +
+                 ((((Address + 1) & 0x7fff) - 0x6000 +
+                   (((Address + 1) & 0xf0000) >> 3)) & Memory.SRAMMask)) << 8));
+
+   case MAP_BWRAM:
 #ifdef FAST_LSB_WORD_ACCESS
-		return (*(uint16 *) (Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
+      return (*(uint16*)(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
 #else
-		return (*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) |
-			(*(Memory.BWRAM + (((Address + 1) & 0x7fff) - 0x6000)) << 8));
+      return (*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) |
+              (*(Memory.BWRAM + (((Address + 1) & 0x7fff) - 0x6000)) << 8));
 #endif
-		
-    case MAP_C4:
-		return (S9xGetC4 (Address & 0xffff) |
-			(S9xGetC4 ((Address + 1) & 0xffff) << 8));
-	
-	case MAP_SPC7110_ROM:
-	return (S9xGetSPC7110Byte(Address)|
-			(S9xGetSPC7110Byte (Address+1))<<8);	
-	case MAP_SPC7110_DRAM:
-		return (S9xGetSPC7110(0x4800)|
-			(S9xGetSPC7110 (0x4800) << 8));
-	case MAP_OBC_RAM:
-		return GetOBC1(Address&0xFFFF)| (GetOBC1((Address+1)&0xFFFF)<<8);
-
-	case MAP_SETA_DSP:
-		return S9xGetSetaDSP(Address)| (S9xGetSetaDSP((Address+1))<<8);
-	
-	case MAP_SETA_RISC:
-		return S9xGetST018(Address)| (S9xGetST018((Address+1))<<8);
-
-     case MAP_DEBUG:
-		return (OpenBus | (OpenBus<<8));
-
-    default:
-    case MAP_NONE:
+
+   case MAP_C4:
+      return (S9xGetC4(Address & 0xffff) |
+              (S9xGetC4((Address + 1) & 0xffff) << 8));
+
+   case MAP_SPC7110_ROM:
+      return (S9xGetSPC7110Byte(Address) |
+              (S9xGetSPC7110Byte(Address + 1)) << 8);
+   case MAP_SPC7110_DRAM:
+      return (S9xGetSPC7110(0x4800) |
+              (S9xGetSPC7110(0x4800) << 8));
+   case MAP_OBC_RAM:
+      return GetOBC1(Address & 0xFFFF) | (GetOBC1((Address + 1) & 0xFFFF) << 8);
+
+   case MAP_SETA_DSP:
+      return S9xGetSetaDSP(Address) | (S9xGetSetaDSP((Address + 1)) << 8);
+
+   case MAP_SETA_RISC:
+      return S9xGetST018(Address) | (S9xGetST018((Address + 1)) << 8);
+
+   case MAP_DEBUG:
+      return (OpenBus | (OpenBus << 8));
+
+   default:
+   case MAP_NONE:
 #ifdef MK_TRACE_BAD_READS
-		char address[20];
-		sprintf(address, TEXT("%06X"),Address);
-		MessageBox(GUI.hWnd, address, TEXT("GetWord"), MB_OK);
+      char address[20];
+      sprintf(address, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, address, TEXT("GetWord"), MB_OK);
 #endif
 
-		return (OpenBus | (OpenBus<<8));
-    }
+      return (OpenBus | (OpenBus << 8));
+   }
 }
 
-void S9xSetByte (uint8 Byte, uint32 Address)
+void S9xSetByte(uint8 Byte, uint32 Address)
 {
 #if defined(CPU_SHUTDOWN)
-    CPU.WaitAddress = NULL;
+   CPU.WaitAddress = NULL;
 #endif
-    int block;
-    uint8 *SetAddress = Memory.WriteMap [block = ((Address >> MEMMAP_SHIFT) & MEMMAP_MASK)];
+   int block;
+   uint8* SetAddress = Memory.WriteMap [block = ((Address >> MEMMAP_SHIFT) &
+                                        MEMMAP_MASK)];
+
+   if (!CPU.InDMA)
+      CPU.Cycles += Memory.MemorySpeed [block];
 
-	if (!CPU.InDMA)
-		CPU.Cycles += Memory.MemorySpeed [block];
 
-	
-    if (SetAddress >= (uint8 *) MAP_LAST)
-    {
+   if (SetAddress >= (uint8*) MAP_LAST)
+   {
 #ifdef CPU_SHUTDOWN
-		SetAddress += Address & 0xffff;
-		if (SetAddress == SA1.WaitByteAddress1 ||
-			SetAddress == SA1.WaitByteAddress2)
-		{
-			SA1.Executing = SA1.S9xOpcodes != NULL;
-			SA1.WaitCounter = 0;
-		}
-		*SetAddress = Byte;
+      SetAddress += Address & 0xffff;
+      if (SetAddress == SA1.WaitByteAddress1 ||
+            SetAddress == SA1.WaitByteAddress2)
+      {
+         SA1.Executing = SA1.S9xOpcodes != NULL;
+         SA1.WaitCounter = 0;
+      }
+      *SetAddress = Byte;
 #else
-		*(SetAddress + (Address & 0xffff)) = Byte;
+      *(SetAddress + (Address & 0xffff)) = Byte;
 #endif
-		return;
-    }
-	
-    switch ((intptr_t) SetAddress)
-    {
-    case MAP_PPU:
-		S9xSetPPU (Byte, Address & 0xffff);
-		return;
-		
-    case MAP_CPU:
-		S9xSetCPU (Byte, Address & 0xffff);
-		return;
-		
-    case MAP_DSP:
+      return;
+   }
+
+   switch ((intptr_t) SetAddress)
+   {
+   case MAP_PPU:
+      S9xSetPPU(Byte, Address & 0xffff);
+      return;
+
+   case MAP_CPU:
+      S9xSetCPU(Byte, Address & 0xffff);
+      return;
+
+   case MAP_DSP:
 #ifdef DSP_DUMMY_LOOPS
-		printf("DSP Byte: %02X to %06X\n", Byte, Address);
+      printf("DSP Byte: %02X to %06X\n", Byte, Address);
 #endif
-		S9xSetDSP (Byte, Address & 0xffff);
-		return;
-		
-    case MAP_LOROM_SRAM:
-		if (Memory.SRAMMask)
-		{
-			*(Memory.SRAM + ((((Address&0xFF0000)>>1)|(Address&0x7FFF))& Memory.SRAMMask))=Byte;
-//			*(Memory.SRAM + (Address & Memory.SRAMMask)) = Byte;
-			CPU.SRAMModified = TRUE;
-		}
-		return;
-		
-    case MAP_HIROM_SRAM:
-		if (Memory.SRAMMask)
-		{
-			*(Memory.SRAM + (((Address & 0x7fff) - 0x6000 +
-				((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) = Byte;
-			CPU.SRAMModified = TRUE;
-		}
-		return;
-		
-    case MAP_BWRAM:
-		*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = Byte;
-		CPU.SRAMModified = TRUE;
-		return;
-		
-    case MAP_DEBUG:
-		
-    case MAP_SA1RAM:
-		*(Memory.SRAM + (Address & 0xffff)) = Byte;
-		SA1.Executing = !SA1.Waiting;
-		break;
-		
-    case MAP_C4:
-		S9xSetC4 (Byte, Address & 0xffff);
-		return;
-	
-	case MAP_SPC7110_DRAM:
-		s7r.bank50[(Address & 0xffff)]= (uint8) Byte;
-		break;
-	
-	case MAP_OBC_RAM:
-		SetOBC1(Byte, Address &0xFFFF);
-		return;
-	
-	case MAP_SETA_DSP:
-		S9xSetSetaDSP(Byte,Address);
-		return;
-	
-	case MAP_SETA_RISC:
-		S9xSetST018(Byte,Address);
-		return;
-    default:
-    case MAP_NONE:
+      S9xSetDSP(Byte, Address & 0xffff);
+      return;
+
+   case MAP_LOROM_SRAM:
+      if (Memory.SRAMMask)
+      {
+         *(Memory.SRAM + ((((Address & 0xFF0000) >> 1) | (Address & 0x7FFF))&
+                          Memory.SRAMMask)) = Byte;
+         //       *(Memory.SRAM + (Address & Memory.SRAMMask)) = Byte;
+         CPU.SRAMModified = TRUE;
+      }
+      return;
+
+   case MAP_HIROM_SRAM:
+      if (Memory.SRAMMask)
+      {
+         *(Memory.SRAM + (((Address & 0x7fff) - 0x6000 +
+                           ((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) = Byte;
+         CPU.SRAMModified = TRUE;
+      }
+      return;
+
+   case MAP_BWRAM:
+      *(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = Byte;
+      CPU.SRAMModified = TRUE;
+      return;
+
+   case MAP_DEBUG:
+
+   case MAP_SA1RAM:
+      *(Memory.SRAM + (Address & 0xffff)) = Byte;
+      SA1.Executing = !SA1.Waiting;
+      break;
+
+   case MAP_C4:
+      S9xSetC4(Byte, Address & 0xffff);
+      return;
+
+   case MAP_SPC7110_DRAM:
+      s7r.bank50[(Address & 0xffff)] = (uint8) Byte;
+      break;
+
+   case MAP_OBC_RAM:
+      SetOBC1(Byte, Address & 0xFFFF);
+      return;
+
+   case MAP_SETA_DSP:
+      S9xSetSetaDSP(Byte, Address);
+      return;
+
+   case MAP_SETA_RISC:
+      S9xSetST018(Byte, Address);
+      return;
+   default:
+   case MAP_NONE:
 #ifdef MK_TRACE_BAD_WRITES
-		char address[20];
-		sprintf(address, TEXT("%06X"),Address);
-		MessageBox(GUI.hWnd, address, TEXT("SetByte"), MB_OK);
+      char address[20];
+      sprintf(address, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, address, TEXT("SetByte"), MB_OK);
 #endif
 
-		return;
-    }
+      return;
+   }
 }
 
-void S9xSetWord (uint16 Word, uint32 Address)
+void S9xSetWord(uint16 Word, uint32 Address)
 {
-	if((Address & 0x0FFF)==0x0FFF)
-	{
-		S9xSetByte(Word&0x00FF, Address);
-		S9xSetByte(Word>>8, Address+1);
-		return;
-	}
+   if ((Address & 0x0FFF) == 0x0FFF)
+   {
+      S9xSetByte(Word & 0x00FF, Address);
+      S9xSetByte(Word >> 8, Address + 1);
+      return;
+   }
 
 #if defined(CPU_SHUTDOWN)
-    CPU.WaitAddress = NULL;
+   CPU.WaitAddress = NULL;
 #endif
-    int block;
-    uint8 *SetAddress = Memory.WriteMap [block = ((Address >> MEMMAP_SHIFT) & MEMMAP_MASK)];
+   int block;
+   uint8* SetAddress = Memory.WriteMap [block = ((Address >> MEMMAP_SHIFT) &
+                                        MEMMAP_MASK)];
 
-	if (!CPU.InDMA)
-		CPU.Cycles += Memory.MemorySpeed [block] << 1;
+   if (!CPU.InDMA)
+      CPU.Cycles += Memory.MemorySpeed [block] << 1;
 
 
-    if (SetAddress >= (uint8 *) MAP_LAST)
-    {
+   if (SetAddress >= (uint8*) MAP_LAST)
+   {
 #ifdef CPU_SHUTDOWN
-		SetAddress += Address & 0xffff;
-		if (SetAddress == SA1.WaitByteAddress1 ||
-			SetAddress == SA1.WaitByteAddress2)
-		{
-			SA1.Executing = SA1.S9xOpcodes != NULL;
-			SA1.WaitCounter = 0;
-		}
+      SetAddress += Address & 0xffff;
+      if (SetAddress == SA1.WaitByteAddress1 ||
+            SetAddress == SA1.WaitByteAddress2)
+      {
+         SA1.Executing = SA1.S9xOpcodes != NULL;
+         SA1.WaitCounter = 0;
+      }
 #ifdef FAST_LSB_WORD_ACCESS
-		*(uint16 *) SetAddress = Word;
+      *(uint16*) SetAddress = Word;
 #else
-		*SetAddress = (uint8) Word;
-		*(SetAddress + 1) = Word >> 8;
+      *SetAddress = (uint8) Word;
+      *(SetAddress + 1) = Word >> 8;
 #endif
 #else
 #ifdef FAST_LSB_WORD_ACCESS
-		*(uint16 *) (SetAddress + (Address & 0xffff)) = Word;
+      *(uint16*)(SetAddress + (Address & 0xffff)) = Word;
 #else
-		*(SetAddress + (Address & 0xffff)) = (uint8) Word;
-		*(SetAddress + ((Address + 1) & 0xffff)) = Word >> 8;
+      *(SetAddress + (Address & 0xffff)) = (uint8) Word;
+      *(SetAddress + ((Address + 1) & 0xffff)) = Word >> 8;
 #endif
 #endif
-		return;
-    }
-	
-    switch ((intptr_t) SetAddress)
-    {
-    case MAP_PPU:
-		S9xSetPPU ((uint8) Word, Address & 0xffff);
-		S9xSetPPU (Word >> 8, (Address & 0xffff) + 1);
-		return;
-		
-    case MAP_CPU:
-		S9xSetCPU ((uint8) Word, (Address & 0xffff));
-		S9xSetCPU (Word >> 8, (Address & 0xffff) + 1);
-		return;
-		
-    case MAP_DSP:
+      return;
+   }
+
+   switch ((intptr_t) SetAddress)
+   {
+   case MAP_PPU:
+      S9xSetPPU((uint8) Word, Address & 0xffff);
+      S9xSetPPU(Word >> 8, (Address & 0xffff) + 1);
+      return;
+
+   case MAP_CPU:
+      S9xSetCPU((uint8) Word, (Address & 0xffff));
+      S9xSetCPU(Word >> 8, (Address & 0xffff) + 1);
+      return;
+
+   case MAP_DSP:
 #ifdef DSP_DUMMY_LOOPS
-		printf("DSP Word: %04X to %06X\n", Word, Address);
+      printf("DSP Word: %04X to %06X\n", Word, Address);
 #endif
-		S9xSetDSP ((uint8) Word, (Address & 0xffff));
-		S9xSetDSP (Word >> 8, (Address & 0xffff) + 1);
-		return;
-		
-    case MAP_LOROM_SRAM:
-		if (Memory.SRAMMask)
-		{
-			/* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
-			 * then the high byte doesn't follow the low byte. */
-			*(Memory.SRAM + ((((Address&0xFF0000)>>1)|(Address&0x7FFF))& Memory.SRAMMask)) = (uint8) Word;
-			*(Memory.SRAM + (((((Address+1)&0xFF0000)>>1)|((Address+1)&0x7FFF))& Memory.SRAMMask)) = Word >> 8;
-
-//			*(Memory.SRAM + (Address & Memory.SRAMMask)) = (uint8) Word;
-//			*(Memory.SRAM + ((Address + 1) & Memory.SRAMMask)) = Word >> 8;
-			CPU.SRAMModified = TRUE;
-		}
-		return;
-		
-    case MAP_HIROM_SRAM:
-		if (Memory.SRAMMask)
-		{
-			/* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
-			 * then the high byte doesn't follow the low byte. */
-			*(Memory.SRAM + 
-				(((Address & 0x7fff) - 0x6000 +
-				((Address & 0xf0000) >> 3) & Memory.SRAMMask))) = (uint8) Word;
-			*(Memory.SRAM + 
-				((((Address + 1) & 0x7fff) - 0x6000 +
-				(((Address + 1) & 0xf0000) >> 3) & Memory.SRAMMask))) = (uint8) (Word >> 8);
-			CPU.SRAMModified = TRUE;
-		}
-		return;
-		
-    case MAP_BWRAM:
+      S9xSetDSP((uint8) Word, (Address & 0xffff));
+      S9xSetDSP(Word >> 8, (Address & 0xffff) + 1);
+      return;
+
+   case MAP_LOROM_SRAM:
+      if (Memory.SRAMMask)
+      {
+         /* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
+          * then the high byte doesn't follow the low byte. */
+         *(Memory.SRAM + ((((Address & 0xFF0000) >> 1) | (Address & 0x7FFF))&
+                          Memory.SRAMMask)) = (uint8) Word;
+         *(Memory.SRAM + (((((Address + 1) & 0xFF0000) >> 1) | ((
+                              Address + 1) & 0x7FFF))& Memory.SRAMMask)) = Word >> 8;
+
+         //       *(Memory.SRAM + (Address & Memory.SRAMMask)) = (uint8) Word;
+         //       *(Memory.SRAM + ((Address + 1) & Memory.SRAMMask)) = Word >> 8;
+         CPU.SRAMModified = TRUE;
+      }
+      return;
+
+   case MAP_HIROM_SRAM:
+      if (Memory.SRAMMask)
+      {
+         /* BJ: no FAST_LSB_WORD_ACCESS here, since if Memory.SRAMMask=0x7ff
+          * then the high byte doesn't follow the low byte. */
+         *(Memory.SRAM +
+           (((Address & 0x7fff) - 0x6000 +
+             ((Address & 0xf0000) >> 3) & Memory.SRAMMask))) = (uint8) Word;
+         *(Memory.SRAM +
+           ((((Address + 1) & 0x7fff) - 0x6000 +
+             (((Address + 1) & 0xf0000) >> 3) & Memory.SRAMMask))) = (uint8)(Word >> 8);
+         CPU.SRAMModified = TRUE;
+      }
+      return;
+
+   case MAP_BWRAM:
 #ifdef FAST_LSB_WORD_ACCESS
-		*(uint16 *) (Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = Word;
+      *(uint16*)(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = Word;
 #else
-		*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = (uint8) Word;
-		*(Memory.BWRAM + (((Address + 1) & 0x7fff) - 0x6000)) = (uint8) (Word >> 8);
+      *(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = (uint8) Word;
+      *(Memory.BWRAM + (((Address + 1) & 0x7fff) - 0x6000)) = (uint8)(Word >> 8);
 #endif
-		CPU.SRAMModified = TRUE;
-		return;
-		
-    case MAP_DEBUG:
-	
-	case MAP_SPC7110_DRAM:
-		s7r.bank50[(Address & 0xffff)]= (uint8) Word;
-		s7r.bank50[((Address + 1) & 0xffff)]= (uint8) Word;
-		break;
-    case MAP_SA1RAM:
-		*(Memory.SRAM + (Address & 0xffff)) = (uint8) Word;
-		*(Memory.SRAM + ((Address + 1) & 0xffff)) = (uint8) (Word >> 8);
-		SA1.Executing = !SA1.Waiting;
-		break;
-		
-    case MAP_C4:
-		S9xSetC4 (Word & 0xff, Address & 0xffff);
-		S9xSetC4 ((uint8) (Word >> 8), (Address + 1) & 0xffff);
-		return;
-
-	case MAP_OBC_RAM:
-		SetOBC1(Word & 0xff, Address &0xFFFF);
-		SetOBC1 ((uint8) (Word >> 8), (Address + 1) & 0xffff);
-		return;
-	
-	case MAP_SETA_DSP:
-		S9xSetSetaDSP (Word & 0xff, Address);
-		S9xSetSetaDSP ((uint8) (Word >> 8),(Address + 1));
-		return;
-	
-	case MAP_SETA_RISC:
-		S9xSetST018 (Word & 0xff, Address);
-		S9xSetST018 ((uint8) (Word >> 8),(Address + 1));
-		return;
-
-    default:
-    case MAP_NONE:
+      CPU.SRAMModified = TRUE;
+      return;
+
+   case MAP_DEBUG:
+
+   case MAP_SPC7110_DRAM:
+      s7r.bank50[(Address & 0xffff)] = (uint8) Word;
+      s7r.bank50[((Address + 1) & 0xffff)] = (uint8) Word;
+      break;
+   case MAP_SA1RAM:
+      *(Memory.SRAM + (Address & 0xffff)) = (uint8) Word;
+      *(Memory.SRAM + ((Address + 1) & 0xffff)) = (uint8)(Word >> 8);
+      SA1.Executing = !SA1.Waiting;
+      break;
+
+   case MAP_C4:
+      S9xSetC4(Word & 0xff, Address & 0xffff);
+      S9xSetC4((uint8)(Word >> 8), (Address + 1) & 0xffff);
+      return;
+
+   case MAP_OBC_RAM:
+      SetOBC1(Word & 0xff, Address & 0xFFFF);
+      SetOBC1((uint8)(Word >> 8), (Address + 1) & 0xffff);
+      return;
+
+   case MAP_SETA_DSP:
+      S9xSetSetaDSP(Word & 0xff, Address);
+      S9xSetSetaDSP((uint8)(Word >> 8), (Address + 1));
+      return;
+
+   case MAP_SETA_RISC:
+      S9xSetST018(Word & 0xff, Address);
+      S9xSetST018((uint8)(Word >> 8), (Address + 1));
+      return;
+
+   default:
+   case MAP_NONE:
 #ifdef MK_TRACE_BAD_WRITES
-		char address[20];
-		sprintf(address, TEXT("%06X"),Address);
-		MessageBox(GUI.hWnd, address, TEXT("SetWord"), MB_OK);
+      char address[20];
+      sprintf(address, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, address, TEXT("SetWord"), MB_OK);
 #endif
 
-		return;
-    }
+      return;
+   }
 }
 
-uint8 *GetBasePointer (uint32 Address)
+uint8* GetBasePointer(uint32 Address)
 {
-    uint8 *GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
-    if (GetAddress >= (uint8 *) MAP_LAST)
-		return (GetAddress);
-	if(Settings.SPC7110&&((Address&0x7FFFFF)==0x4800))
-	{
-		return s7r.bank50;
-	}
-    switch ((intptr_t) GetAddress)
-    {
-	case MAP_SPC7110_DRAM:
-		{
-			return s7r.bank50;
-		}
-	case MAP_SPC7110_ROM:
-		return Get7110BasePtr(Address);
-    case MAP_PPU:
-//just a guess, but it looks like this should match the CPU as a source.
-		return (Memory.FillRAM);
-//		return (Memory.FillRAM - 0x2000);
-    case MAP_CPU:
-//fixes Ogre Battle's green lines
-		return (Memory.FillRAM);
-//		return (Memory.FillRAM - 0x4000);
-    case MAP_DSP:
-		return (Memory.FillRAM - 0x6000);
-    case MAP_SA1RAM:
-    case MAP_LOROM_SRAM:
-		return (Memory.SRAM);
-    case MAP_BWRAM:
-		return (Memory.BWRAM - 0x6000);
-    case MAP_HIROM_SRAM:
-		return (Memory.SRAM - 0x6000);
-    case MAP_C4:
-		return (Memory.C4RAM - 0x6000);
-	case MAP_OBC_RAM:
-		return GetBasePointerOBC1(Address);
-	case MAP_SETA_DSP:
-		return Memory.SRAM;
-    case MAP_DEBUG:
-		
-    default:
-    case MAP_NONE:
+   uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
+   if (GetAddress >= (uint8*) MAP_LAST)
+      return (GetAddress);
+   if (Settings.SPC7110 && ((Address & 0x7FFFFF) == 0x4800))
+      return s7r.bank50;
+   switch ((intptr_t) GetAddress)
+   {
+   case MAP_SPC7110_DRAM:
+   {
+      return s7r.bank50;
+   }
+   case MAP_SPC7110_ROM:
+      return Get7110BasePtr(Address);
+   case MAP_PPU:
+      //just a guess, but it looks like this should match the CPU as a source.
+      return (Memory.FillRAM);
+   //    return (Memory.FillRAM - 0x2000);
+   case MAP_CPU:
+      //fixes Ogre Battle's green lines
+      return (Memory.FillRAM);
+   //    return (Memory.FillRAM - 0x4000);
+   case MAP_DSP:
+      return (Memory.FillRAM - 0x6000);
+   case MAP_SA1RAM:
+   case MAP_LOROM_SRAM:
+      return (Memory.SRAM);
+   case MAP_BWRAM:
+      return (Memory.BWRAM - 0x6000);
+   case MAP_HIROM_SRAM:
+      return (Memory.SRAM - 0x6000);
+   case MAP_C4:
+      return (Memory.C4RAM - 0x6000);
+   case MAP_OBC_RAM:
+      return GetBasePointerOBC1(Address);
+   case MAP_SETA_DSP:
+      return Memory.SRAM;
+   case MAP_DEBUG:
+
+   default:
+   case MAP_NONE:
 #if defined(MK_TRACE_BAD_READS) || defined(MK_TRACE_BAD_WRITES)
-		char fsd[12];
-		sprintf(fsd, TEXT("%06X"), Address);
-		MessageBox(GUI.hWnd, fsd, TEXT("Rogue DMA"), MB_OK);
+      char fsd[12];
+      sprintf(fsd, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, fsd, TEXT("Rogue DMA"), MB_OK);
 #endif
 
-		return (0);
-    }
+      return (0);
+   }
 }
 
-uint8 *S9xGetMemPointer (uint32 Address)
+uint8* S9xGetMemPointer(uint32 Address)
 {
-    uint8 *GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
-    if (GetAddress >= (uint8 *) MAP_LAST)
-		return (GetAddress + (Address & 0xffff));
-	
-	if(Settings.SPC7110&&((Address&0x7FFFFF)==0x4800))
-		return s7r.bank50;
-
-    switch ((intptr_t) GetAddress)
-    {
-	case MAP_SPC7110_DRAM:
-		return &s7r.bank50[Address&0x0000FFFF];
-    case MAP_PPU:
-		return (Memory.FillRAM + (Address & 0xffff));
-    case MAP_CPU:
-		return (Memory.FillRAM + (Address & 0xffff));
-    case MAP_DSP:
-		return (Memory.FillRAM - 0x6000 + (Address & 0xffff));
-    case MAP_SA1RAM:
-    case MAP_LOROM_SRAM:
-		return (Memory.SRAM + (Address & 0xffff));
-    case MAP_BWRAM:
-		return (Memory.BWRAM - 0x6000 + (Address & 0xffff));
-    case MAP_HIROM_SRAM:
-		return (Memory.SRAM - 0x6000 + (Address & 0xffff));
-    case MAP_C4:
-		return (Memory.C4RAM - 0x6000 + (Address & 0xffff));
-	case MAP_OBC_RAM:
-		return GetMemPointerOBC1(Address);
-	case MAP_SETA_DSP:
-		return Memory.SRAM+ ((Address & 0xffff) & Memory.SRAMMask);
-    case MAP_DEBUG:
-    default:
-    case MAP_NONE:
+   uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
+   if (GetAddress >= (uint8*) MAP_LAST)
+      return (GetAddress + (Address & 0xffff));
+
+   if (Settings.SPC7110 && ((Address & 0x7FFFFF) == 0x4800))
+      return s7r.bank50;
+
+   switch ((intptr_t) GetAddress)
+   {
+   case MAP_SPC7110_DRAM:
+      return &s7r.bank50[Address & 0x0000FFFF];
+   case MAP_PPU:
+      return (Memory.FillRAM + (Address & 0xffff));
+   case MAP_CPU:
+      return (Memory.FillRAM + (Address & 0xffff));
+   case MAP_DSP:
+      return (Memory.FillRAM - 0x6000 + (Address & 0xffff));
+   case MAP_SA1RAM:
+   case MAP_LOROM_SRAM:
+      return (Memory.SRAM + (Address & 0xffff));
+   case MAP_BWRAM:
+      return (Memory.BWRAM - 0x6000 + (Address & 0xffff));
+   case MAP_HIROM_SRAM:
+      return (Memory.SRAM - 0x6000 + (Address & 0xffff));
+   case MAP_C4:
+      return (Memory.C4RAM - 0x6000 + (Address & 0xffff));
+   case MAP_OBC_RAM:
+      return GetMemPointerOBC1(Address);
+   case MAP_SETA_DSP:
+      return Memory.SRAM + ((Address & 0xffff) & Memory.SRAMMask);
+   case MAP_DEBUG:
+   default:
+   case MAP_NONE:
 #if defined(MK_TRACE_BAD_READS) || defined(MK_TRACE_BAD_WRITES)
-		char fsd[12];
-		sprintf(fsd, TEXT("%06X"), Address);
-		MessageBox(GUI.hWnd, fsd, TEXT("Rogue DMA"), MB_OK);
+      char fsd[12];
+      sprintf(fsd, TEXT("%06X"), Address);
+      MessageBox(GUI.hWnd, fsd, TEXT("Rogue DMA"), MB_OK);
 #endif
 
-		return (0);
-    }
+      return (0);
+   }
 }
 
-void S9xSetPCBase (uint32 Address)
+void S9xSetPCBase(uint32 Address)
 {
-    int block;
-    uint8 *GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
-
-	CPU.MemSpeed = Memory.MemorySpeed [block];
-	CPU.MemSpeedx2 = CPU.MemSpeed << 1;
- 
-   if (GetAddress >= (uint8 *) MAP_LAST)
-    {
-		CPU.PCBase = GetAddress;
-		CPU.PC = GetAddress + (Address & 0xffff);
-		return;
-    }
-	
-    switch ((intptr_t) GetAddress)
-    {
-    case MAP_PPU:
-		CPU.PCBase = Memory.FillRAM;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_CPU:
-		CPU.PCBase = Memory.FillRAM;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_DSP:
-		CPU.PCBase = Memory.FillRAM - 0x6000;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_SA1RAM:
-    case MAP_LOROM_SRAM:
-		CPU.PCBase = Memory.SRAM;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_BWRAM:
-		CPU.PCBase = Memory.BWRAM - 0x6000;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-    case MAP_HIROM_SRAM:
-		CPU.PCBase = Memory.SRAM - 0x6000;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_C4:
-		CPU.PCBase = Memory.C4RAM - 0x6000;
-		CPU.PC = CPU.PCBase + (Address & 0xffff);
-		return;
-		
-    case MAP_DEBUG:
-		
-    default:
-    case MAP_NONE:
-		CPU.PCBase = Memory.SRAM;
-		CPU.PC = Memory.SRAM + (Address & 0xffff);
-		return;
-    }
+   int block;
+   uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) &
+                                           MEMMAP_MASK];
+
+   CPU.MemSpeed = Memory.MemorySpeed [block];
+   CPU.MemSpeedx2 = CPU.MemSpeed << 1;
+
+   if (GetAddress >= (uint8*) MAP_LAST)
+   {
+      CPU.PCBase = GetAddress;
+      CPU.PC = GetAddress + (Address & 0xffff);
+      return;
+   }
+
+   switch ((intptr_t) GetAddress)
+   {
+   case MAP_PPU:
+      CPU.PCBase = Memory.FillRAM;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_CPU:
+      CPU.PCBase = Memory.FillRAM;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_DSP:
+      CPU.PCBase = Memory.FillRAM - 0x6000;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_SA1RAM:
+   case MAP_LOROM_SRAM:
+      CPU.PCBase = Memory.SRAM;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_BWRAM:
+      CPU.PCBase = Memory.BWRAM - 0x6000;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+   case MAP_HIROM_SRAM:
+      CPU.PCBase = Memory.SRAM - 0x6000;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_C4:
+      CPU.PCBase = Memory.C4RAM - 0x6000;
+      CPU.PC = CPU.PCBase + (Address & 0xffff);
+      return;
+
+   case MAP_DEBUG:
+
+   default:
+   case MAP_NONE:
+      CPU.PCBase = Memory.SRAM;
+      CPU.PC = Memory.SRAM + (Address & 0xffff);
+      return;
+   }
 }
 #endif