From 804169dd621a3ad3eec1a32ce30350de667fee80 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 30 Oct 2014 00:23:30 +0100 Subject: apply a facelift --- source/cpu.c | 240 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 120 insertions(+), 120 deletions(-) (limited to 'source/cpu.c') diff --git a/source/cpu.c b/source/cpu.c index 51adb61..977ac77 100644 --- a/source/cpu.c +++ b/source/cpu.c @@ -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. *******************************************************************************/ @@ -107,131 +107,131 @@ extern struct FxInit_s SuperFX; -void S9xResetSuperFX () +void S9xResetSuperFX() { - SuperFX.vFlags = 0; //FX_FLAG_ROM_BUFFER;// | FX_FLAG_ADDRESS_CHECKING; - FxReset (&SuperFX); + SuperFX.vFlags = 0; //FX_FLAG_ROM_BUFFER;// | FX_FLAG_ADDRESS_CHECKING; + FxReset(&SuperFX); } #endif -void S9xResetCPU () +void S9xResetCPU() { - ICPU.Registers.PB = 0; - ICPU.Registers.PC = S9xGetWord (0xFFFC); - ICPU.Registers.D.W = 0; - ICPU.Registers.DB = 0; - ICPU.Registers.SH = 1; - ICPU.Registers.SL = 0xFF; - ICPU.Registers.XH = 0; - ICPU.Registers.YH = 0; - ICPU.Registers.P.W = 0; - - ICPU.ShiftedPB = 0; - ICPU.ShiftedDB = 0; - SetFlags (MemoryFlag | IndexFlag | IRQ | Emulation); - ClearFlags (Decimal); - - CPU.Flags = CPU.Flags & (DEBUG_MODE_FLAG | TRACE_FLAG); - CPU.BranchSkip = FALSE; - CPU.NMIActive = FALSE; - CPU.IRQActive = FALSE; - CPU.WaitingForInterrupt = FALSE; - CPU.InDMA = FALSE; - CPU.WhichEvent = HBLANK_START_EVENT; - CPU.PC = NULL; - CPU.PCBase = NULL; - CPU.PCAtOpcodeStart = NULL; - CPU.WaitAddress = NULL; - CPU.WaitCounter = 0; - CPU.Cycles = 0; - CPU.NextEvent = Settings.HBlankStart; - CPU.V_Counter = 0; - CPU.MemSpeed = SLOW_ONE_CYCLE; - CPU.MemSpeedx2 = SLOW_ONE_CYCLE * 2; - CPU.FastROMSpeed = SLOW_ONE_CYCLE; - CPU.AutoSaveTimer = 0; - CPU.SRAMModified = FALSE; - // CPU.NMITriggerPoint = 4; // Set when ROM image loaded - CPU.BRKTriggered = FALSE; - //CPU.TriedInterleavedMode2 = FALSE; // Reset when ROM image loaded - CPU.NMICycleCount = 0; - CPU.IRQCycleCount = 0; - S9xSetPCBase (ICPU.Registers.PC); - - ICPU.S9xOpcodes = S9xOpcodesE1; - ICPU.CPUExecuting = TRUE; - - S9xUnpackStatus(); + ICPU.Registers.PB = 0; + ICPU.Registers.PC = S9xGetWord(0xFFFC); + ICPU.Registers.D.W = 0; + ICPU.Registers.DB = 0; + ICPU.Registers.SH = 1; + ICPU.Registers.SL = 0xFF; + ICPU.Registers.XH = 0; + ICPU.Registers.YH = 0; + ICPU.Registers.P.W = 0; + + ICPU.ShiftedPB = 0; + ICPU.ShiftedDB = 0; + SetFlags(MemoryFlag | IndexFlag | IRQ | Emulation); + ClearFlags(Decimal); + + CPU.Flags = CPU.Flags & (DEBUG_MODE_FLAG | TRACE_FLAG); + CPU.BranchSkip = FALSE; + CPU.NMIActive = FALSE; + CPU.IRQActive = FALSE; + CPU.WaitingForInterrupt = FALSE; + CPU.InDMA = FALSE; + CPU.WhichEvent = HBLANK_START_EVENT; + CPU.PC = NULL; + CPU.PCBase = NULL; + CPU.PCAtOpcodeStart = NULL; + CPU.WaitAddress = NULL; + CPU.WaitCounter = 0; + CPU.Cycles = 0; + CPU.NextEvent = Settings.HBlankStart; + CPU.V_Counter = 0; + CPU.MemSpeed = SLOW_ONE_CYCLE; + CPU.MemSpeedx2 = SLOW_ONE_CYCLE * 2; + CPU.FastROMSpeed = SLOW_ONE_CYCLE; + CPU.AutoSaveTimer = 0; + CPU.SRAMModified = FALSE; + // CPU.NMITriggerPoint = 4; // Set when ROM image loaded + CPU.BRKTriggered = FALSE; + //CPU.TriedInterleavedMode2 = FALSE; // Reset when ROM image loaded + CPU.NMICycleCount = 0; + CPU.IRQCycleCount = 0; + S9xSetPCBase(ICPU.Registers.PC); + + ICPU.S9xOpcodes = S9xOpcodesE1; + ICPU.CPUExecuting = TRUE; + + S9xUnpackStatus(); } #ifdef ZSNES_FX -void S9xResetSuperFX (); +void S9xResetSuperFX(); bool8 WinterGold = 0; -extern uint8 *C4Ram; +extern uint8* C4Ram; #endif -void S9xReset (void) +void S9xReset(void) { - if (Settings.SuperFX) - S9xResetSuperFX (); + if (Settings.SuperFX) + S9xResetSuperFX(); #ifdef ZSNES_FX - WinterGold = Settings.WinterGold; + WinterGold = Settings.WinterGold; #endif - ZeroMemory (Memory.FillRAM, 0x8000); - memset (Memory.VRAM, 0x00, 0x10000); - memset (Memory.RAM, 0x55, 0x20000); - - if(Settings.SPC7110) - S9xSpc7110Reset(); - S9xResetCPU (); - S9xResetPPU (); - S9xResetSRTC (); - if (Settings.SDD1) - S9xResetSDD1 (); - - S9xResetDMA (); - S9xResetAPU (); - S9xResetDSP1 (); - S9xSA1Init (); - if (Settings.C4) - S9xInitC4 (); - S9xInitCheatData (); - if(Settings.OBC1) - ResetOBC1(); - -// Settings.Paused = FALSE; + ZeroMemory(Memory.FillRAM, 0x8000); + memset(Memory.VRAM, 0x00, 0x10000); + memset(Memory.RAM, 0x55, 0x20000); + + if (Settings.SPC7110) + S9xSpc7110Reset(); + S9xResetCPU(); + S9xResetPPU(); + S9xResetSRTC(); + if (Settings.SDD1) + S9xResetSDD1(); + + S9xResetDMA(); + S9xResetAPU(); + S9xResetDSP1(); + S9xSA1Init(); + if (Settings.C4) + S9xInitC4(); + S9xInitCheatData(); + if (Settings.OBC1) + ResetOBC1(); + + // Settings.Paused = FALSE; } -void S9xSoftReset (void) +void S9xSoftReset(void) { - if (Settings.SuperFX) - S9xResetSuperFX (); + if (Settings.SuperFX) + S9xResetSuperFX(); #ifdef ZSNES_FX - WinterGold = Settings.WinterGold; + WinterGold = Settings.WinterGold; #endif - ZeroMemory (Memory.FillRAM, 0x8000); - memset (Memory.VRAM, 0x00, 0x10000); - // memset (Memory.RAM, 0x55, 0x20000); - - if(Settings.SPC7110) - S9xSpc7110Reset(); - S9xResetCPU (); - S9xSoftResetPPU (); - S9xResetSRTC (); - if (Settings.SDD1) - S9xResetSDD1 (); - - S9xResetDMA (); - S9xResetAPU (); - S9xResetDSP1 (); - if(Settings.OBC1) - ResetOBC1(); - S9xSA1Init (); - if (Settings.C4) - S9xInitC4 (); - S9xInitCheatData (); - -// Settings.Paused = FALSE; + ZeroMemory(Memory.FillRAM, 0x8000); + memset(Memory.VRAM, 0x00, 0x10000); + // memset (Memory.RAM, 0x55, 0x20000); + + if (Settings.SPC7110) + S9xSpc7110Reset(); + S9xResetCPU(); + S9xSoftResetPPU(); + S9xResetSRTC(); + if (Settings.SDD1) + S9xResetSDD1(); + + S9xResetDMA(); + S9xResetAPU(); + S9xResetDSP1(); + if (Settings.OBC1) + ResetOBC1(); + S9xSA1Init(); + if (Settings.C4) + S9xInitC4(); + S9xInitCheatData(); + + // Settings.Paused = FALSE; } -- cgit v1.2.3