Added SA-1 NMI and fixed its override mode. (zones)

This commit is contained in:
dborth 2010-11-02 19:14:13 +00:00
parent 63e1f9c391
commit df7be8626c
4 changed files with 6064 additions and 6052 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,299 +1,303 @@
/*********************************************************************************** /***********************************************************************************
Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
(c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com),
Jerremy Koot (jkoot@snes9x.com) Jerremy Koot (jkoot@snes9x.com)
(c) Copyright 2002 - 2004 Matthew Kendora (c) Copyright 2002 - 2004 Matthew Kendora
(c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org) (c) Copyright 2002 - 2005 Peter Bortas (peter@bortas.org)
(c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/) (c) Copyright 2004 - 2005 Joel Yliluoma (http://iki.fi/bisqwit/)
(c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net)
(c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca),
Kris Bleakley (codeviolation@hotmail.com) Kris Bleakley (codeviolation@hotmail.com)
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
Nach (n-a-c-h@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net),
zones (kasumitokoduck@yahoo.com) zones (kasumitokoduck@yahoo.com)
(c) Copyright 2006 - 2007 nitsuja (c) Copyright 2006 - 2007 nitsuja
(c) Copyright 2009 - 2010 BearOso, (c) Copyright 2009 - 2010 BearOso,
OV2 OV2
BS-X C emulator code BS-X C emulator code
(c) Copyright 2005 - 2006 Dreamer Nom, (c) Copyright 2005 - 2006 Dreamer Nom,
zones zones
C4 x86 assembler and some C emulation code C4 x86 assembler and some C emulation code
(c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com),
Nach, Nach,
zsKnight (zsknight@zsnes.com) zsKnight (zsknight@zsnes.com)
C4 C++ code C4 C++ code
(c) Copyright 2003 - 2006 Brad Jorsch, (c) Copyright 2003 - 2006 Brad Jorsch,
Nach Nach
DSP-1 emulator code DSP-1 emulator code
(c) Copyright 1998 - 2006 _Demo_, (c) Copyright 1998 - 2006 _Demo_,
Andreas Naive (andreasnaive@gmail.com), Andreas Naive (andreasnaive@gmail.com),
Gary Henderson, Gary Henderson,
Ivar (ivar@snes9x.com), Ivar (ivar@snes9x.com),
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Matthew Kendora, Matthew Kendora,
Nach, Nach,
neviksti (neviksti@hotmail.com) neviksti (neviksti@hotmail.com)
DSP-2 emulator code DSP-2 emulator code
(c) Copyright 2003 John Weidman, (c) Copyright 2003 John Weidman,
Kris Bleakley, Kris Bleakley,
Lord Nightmare (lord_nightmare@users.sourceforge.net), Lord Nightmare (lord_nightmare@users.sourceforge.net),
Matthew Kendora, Matthew Kendora,
neviksti neviksti
DSP-3 emulator code DSP-3 emulator code
(c) Copyright 2003 - 2006 John Weidman, (c) Copyright 2003 - 2006 John Weidman,
Kris Bleakley, Kris Bleakley,
Lancer, Lancer,
z80 gaiden z80 gaiden
DSP-4 emulator code DSP-4 emulator code
(c) Copyright 2004 - 2006 Dreamer Nom, (c) Copyright 2004 - 2006 Dreamer Nom,
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Nach, Nach,
z80 gaiden z80 gaiden
OBC1 emulator code OBC1 emulator code
(c) Copyright 2001 - 2004 zsKnight, (c) Copyright 2001 - 2004 zsKnight,
pagefault (pagefault@zsnes.com), pagefault (pagefault@zsnes.com),
Kris Bleakley Kris Bleakley
Ported from x86 assembler to C by sanmaiwashi Ported from x86 assembler to C by sanmaiwashi
SPC7110 and RTC C++ emulator code used in 1.39-1.51 SPC7110 and RTC C++ emulator code used in 1.39-1.51
(c) Copyright 2002 Matthew Kendora with research by (c) Copyright 2002 Matthew Kendora with research by
zsKnight, zsKnight,
John Weidman, John Weidman,
Dark Force Dark Force
SPC7110 and RTC C++ emulator code used in 1.52+ SPC7110 and RTC C++ emulator code used in 1.52+
(c) Copyright 2009 byuu, (c) Copyright 2009 byuu,
neviksti neviksti
S-DD1 C emulator code S-DD1 C emulator code
(c) Copyright 2003 Brad Jorsch with research by (c) Copyright 2003 Brad Jorsch with research by
Andreas Naive, Andreas Naive,
John Weidman John Weidman
S-RTC C emulator code S-RTC C emulator code
(c) Copyright 2001 - 2006 byuu, (c) Copyright 2001 - 2006 byuu,
John Weidman John Weidman
ST010 C++ emulator code ST010 C++ emulator code
(c) Copyright 2003 Feather, (c) Copyright 2003 Feather,
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Matthew Kendora Matthew Kendora
Super FX x86 assembler emulator code Super FX x86 assembler emulator code
(c) Copyright 1998 - 2003 _Demo_, (c) Copyright 1998 - 2003 _Demo_,
pagefault, pagefault,
zsKnight zsKnight
Super FX C emulator code Super FX C emulator code
(c) Copyright 1997 - 1999 Ivar, (c) Copyright 1997 - 1999 Ivar,
Gary Henderson, Gary Henderson,
John Weidman John Weidman
Sound emulator code used in 1.5-1.51 Sound emulator code used in 1.5-1.51
(c) Copyright 1998 - 2003 Brad Martin (c) Copyright 1998 - 2003 Brad Martin
(c) Copyright 1998 - 2006 Charles Bilyue' (c) Copyright 1998 - 2006 Charles Bilyue'
Sound emulator code used in 1.52+ Sound emulator code used in 1.52+
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com) (c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
SH assembler code partly based on x86 assembler code 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)
2xSaI filter 2xSaI filter
(c) Copyright 1999 - 2001 Derek Liauw Kie Fa (c) Copyright 1999 - 2001 Derek Liauw Kie Fa
HQ2x, HQ3x, HQ4x filters HQ2x, HQ3x, HQ4x filters
(c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com)
NTSC filter NTSC filter
(c) Copyright 2006 - 2007 Shay Green (c) Copyright 2006 - 2007 Shay Green
GTK+ GUI code GTK+ GUI code
(c) Copyright 2004 - 2010 BearOso (c) Copyright 2004 - 2010 BearOso
Win32 GUI code Win32 GUI code
(c) Copyright 2003 - 2006 blip, (c) Copyright 2003 - 2006 blip,
funkyass, funkyass,
Matthew Kendora, Matthew Kendora,
Nach, Nach,
nitsuja nitsuja
(c) Copyright 2009 - 2010 OV2 (c) Copyright 2009 - 2010 OV2
Mac OS GUI code Mac OS GUI code
(c) Copyright 1998 - 2001 John Stiles (c) Copyright 1998 - 2001 John Stiles
(c) Copyright 2001 - 2010 zones (c) Copyright 2001 - 2010 zones
Specific ports contains the works of other authors. See headers in Specific ports contains the works of other authors. See headers in
individual files. individual files.
Snes9x homepage: http://www.snes9x.com/ Snes9x homepage: http://www.snes9x.com/
Permission to use, copy, modify and/or distribute Snes9x in both binary Permission to use, copy, modify and/or distribute Snes9x in both binary
and source form, for non-commercial purposes, is hereby granted without and source form, for non-commercial purposes, is hereby granted without
fee, providing that this license information and copyright notice appear fee, providing that this license information and copyright notice appear
with all copies and any derived work. with all copies and any derived work.
This software is provided 'as-is', without any express or implied This software is provided 'as-is', without any express or implied
warranty. In no event shall the authors be held liable for any damages warranty. In no event shall the authors be held liable for any damages
arising from the use of this software or it's derivatives. arising from the use of this software or it's derivatives.
Snes9x is freeware for PERSONAL USE only. Commercial users should Snes9x is freeware for PERSONAL USE only. Commercial users should
seek permission of the copyright holders first. Commercial use includes, seek permission of the copyright holders first. Commercial use includes,
but is not limited to, charging money for Snes9x or software derived from but is not limited to, charging money for Snes9x or software derived from
Snes9x, including Snes9x or derivatives in commercial game bundles, and/or Snes9x, including Snes9x or derivatives in commercial game bundles, and/or
using Snes9x as a promotion for your commercial product. using Snes9x as a promotion for your commercial product.
The copyright holders request that bug fixes and improvements to the code The copyright holders request that bug fixes and improvements to the code
should be forwarded to them so everyone can benefit from the modifications should be forwarded to them so everyone can benefit from the modifications
in future versions. in future versions.
Super NES and Super Nintendo Entertainment System are trademarks of Super NES and Super Nintendo Entertainment System are trademarks of
Nintendo Co., Limited and its subsidiary companies. Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/ ***********************************************************************************/
#include "snes9x.h" #include "snes9x.h"
#include "memmap.h" #include "memmap.h"
#define CPU SA1 #define CPU SA1
#define ICPU SA1 #define ICPU SA1
#define Registers SA1Registers #define Registers SA1Registers
#define OpenBus SA1OpenBus #define OpenBus SA1OpenBus
#define S9xGetByte S9xSA1GetByte #define S9xGetByte S9xSA1GetByte
#define S9xGetWord S9xSA1GetWord #define S9xGetWord S9xSA1GetWord
#define S9xSetByte S9xSA1SetByte #define S9xSetByte S9xSA1SetByte
#define S9xSetWord S9xSA1SetWord #define S9xSetWord S9xSA1SetWord
#define S9xSetPCBase S9xSA1SetPCBase #define S9xSetPCBase S9xSA1SetPCBase
#define S9xOpcodesM1X1 S9xSA1OpcodesM1X1 #define S9xOpcodesM1X1 S9xSA1OpcodesM1X1
#define S9xOpcodesM1X0 S9xSA1OpcodesM1X0 #define S9xOpcodesM1X0 S9xSA1OpcodesM1X0
#define S9xOpcodesM0X1 S9xSA1OpcodesM0X1 #define S9xOpcodesM0X1 S9xSA1OpcodesM0X1
#define S9xOpcodesM0X0 S9xSA1OpcodesM0X0 #define S9xOpcodesM0X0 S9xSA1OpcodesM0X0
#define S9xOpcodesE1 S9xSA1OpcodesE1 #define S9xOpcodesE1 S9xSA1OpcodesE1
#define S9xOpcodesSlow S9xSA1OpcodesSlow #define S9xOpcodesSlow S9xSA1OpcodesSlow
#define S9xOpcode_IRQ S9xSA1Opcode_IRQ #define S9xOpcode_IRQ S9xSA1Opcode_IRQ
#define S9xOpcode_NMI S9xSA1Opcode_NMI #define S9xOpcode_NMI S9xSA1Opcode_NMI
#define S9xUnpackStatus S9xSA1UnpackStatus #define S9xUnpackStatus S9xSA1UnpackStatus
#define S9xPackStatus S9xSA1PackStatus #define S9xPackStatus S9xSA1PackStatus
#define S9xFixCycles S9xSA1FixCycles #define S9xFixCycles S9xSA1FixCycles
#define Immediate8 SA1Immediate8 #define Immediate8 SA1Immediate8
#define Immediate16 SA1Immediate16 #define Immediate16 SA1Immediate16
#define Relative SA1Relative #define Relative SA1Relative
#define RelativeLong SA1RelativeLong #define RelativeLong SA1RelativeLong
#define Absolute SA1Absolute #define Absolute SA1Absolute
#define AbsoluteLong SA1AbsoluteLong #define AbsoluteLong SA1AbsoluteLong
#define AbsoluteIndirect SA1AbsoluteIndirect #define AbsoluteIndirect SA1AbsoluteIndirect
#define AbsoluteIndirectLong SA1AbsoluteIndirectLong #define AbsoluteIndirectLong SA1AbsoluteIndirectLong
#define AbsoluteIndexedIndirect SA1AbsoluteIndexedIndirect #define AbsoluteIndexedIndirect SA1AbsoluteIndexedIndirect
#define Direct SA1Direct #define Direct SA1Direct
#define DirectIndirectIndexed SA1DirectIndirectIndexed #define DirectIndirectIndexed SA1DirectIndirectIndexed
#define DirectIndirectIndexedLong SA1DirectIndirectIndexedLong #define DirectIndirectIndexedLong SA1DirectIndirectIndexedLong
#define DirectIndexedIndirect SA1DirectIndexedIndirect #define DirectIndexedIndirect SA1DirectIndexedIndirect
#define DirectIndexedX SA1DirectIndexedX #define DirectIndexedX SA1DirectIndexedX
#define DirectIndexedY SA1DirectIndexedY #define DirectIndexedY SA1DirectIndexedY
#define AbsoluteIndexedX SA1AbsoluteIndexedX #define AbsoluteIndexedX SA1AbsoluteIndexedX
#define AbsoluteIndexedY SA1AbsoluteIndexedY #define AbsoluteIndexedY SA1AbsoluteIndexedY
#define AbsoluteLongIndexedX SA1AbsoluteLongIndexedX #define AbsoluteLongIndexedX SA1AbsoluteLongIndexedX
#define DirectIndirect SA1DirectIndirect #define DirectIndirect SA1DirectIndirect
#define DirectIndirectLong SA1DirectIndirectLong #define DirectIndirectLong SA1DirectIndirectLong
#define StackRelative SA1StackRelative #define StackRelative SA1StackRelative
#define StackRelativeIndirectIndexed SA1StackRelativeIndirectIndexed #define StackRelativeIndirectIndexed SA1StackRelativeIndirectIndexed
//#undef CPU_SHUTDOWN //#undef CPU_SHUTDOWN
#define SA1_OPCODES #define SA1_OPCODES
#include "cpuops.cpp" #include "cpuops.cpp"
void S9xSA1MainLoop (void) void S9xSA1MainLoop (void)
{ {
#if 0 if (SA1.Flags & NMI_FLAG)
if (SA1.Flags & NMI_FLAG) {
{ if (Memory.FillRAM[0x2200] & 0x10)
SA1.Flags &= ~NMI_FLAG; {
if (SA1.WaitingForInterrupt) SA1.Flags &= ~NMI_FLAG;
{ Memory.FillRAM[0x2301] |= 0x10;
SA1.WaitingForInterrupt = FALSE;
SA1Registers.PCw++; if (SA1.WaitingForInterrupt)
} {
SA1.WaitingForInterrupt = FALSE;
S9xSA1Opcode_NMI(); SA1Registers.PCw++;
} }
#endif
S9xSA1Opcode_NMI();
if (SA1.Flags & IRQ_FLAG) }
{ }
if (SA1.IRQActive)
{ if (SA1.Flags & IRQ_FLAG)
if (SA1.WaitingForInterrupt) {
{ if (SA1.IRQActive)
SA1.WaitingForInterrupt = FALSE; {
SA1Registers.PCw++; if (SA1.WaitingForInterrupt)
} {
SA1.WaitingForInterrupt = FALSE;
if (!SA1CheckFlag(IRQ)) SA1Registers.PCw++;
S9xSA1Opcode_IRQ(); }
}
else if (!SA1CheckFlag(IRQ))
SA1.Flags &= ~IRQ_FLAG; S9xSA1Opcode_IRQ();
} }
else
for (int i = 0; i < 3 && SA1.Executing; i++) SA1.Flags &= ~IRQ_FLAG;
{ }
#ifdef DEBUGGER
if (SA1.Flags & TRACE_FLAG) for (int i = 0; i < 3 && SA1.Executing; i++)
S9xSA1Trace(); {
#endif #ifdef DEBUGGER
if (SA1.Flags & TRACE_FLAG)
#ifdef CPU_SHUTDOWN S9xSA1Trace();
SA1.PBPCAtOpcodeStart = SA1Registers.PBPC; #endif
#endif
#ifdef CPU_SHUTDOWN
register uint8 Op; SA1.PBPCAtOpcodeStart = SA1Registers.PBPC;
register struct SOpcodes *Opcodes; #endif
if (SA1.PCBase) register uint8 Op;
{ register struct SOpcodes *Opcodes;
SA1OpenBus = Op = SA1.PCBase[Registers.PCw];
Opcodes = SA1.S9xOpcodes; if (SA1.PCBase)
} {
else SA1OpenBus = Op = SA1.PCBase[Registers.PCw];
{ Opcodes = SA1.S9xOpcodes;
Op = S9xSA1GetByte(Registers.PBPC); }
Opcodes = S9xOpcodesSlow; else
} {
Op = S9xSA1GetByte(Registers.PBPC);
if ((SA1Registers.PCw & MEMMAP_MASK) + SA1.S9xOpLengths[Op] >= MEMMAP_BLOCK_SIZE) Opcodes = S9xOpcodesSlow;
{ }
uint32 oldPC = SA1Registers.PBPC;
S9xSA1SetPCBase(SA1Registers.PBPC); if ((SA1Registers.PCw & MEMMAP_MASK) + SA1.S9xOpLengths[Op] >= MEMMAP_BLOCK_SIZE)
SA1Registers.PBPC = oldPC; {
Opcodes = S9xSA1OpcodesSlow; uint32 oldPC = SA1Registers.PBPC;
} S9xSA1SetPCBase(SA1Registers.PBPC);
SA1Registers.PBPC = oldPC;
Registers.PCw++; Opcodes = S9xSA1OpcodesSlow;
(*Opcodes[Op].S9xOpcode)(); }
}
} Registers.PCw++;
(*Opcodes[Op].S9xOpcode)();
}
}