Merge pull request #23 from jamsilva/master

Cleanups, fixes (including one for "Retroarch/RetroPie Super Mario Allstars")

1 files changed, 1 insertions, 122 deletions

diff --git a/source/fxinst.c b/source/fxinst.c
index ee16a54..05ebba2 100644
--- a/source/fxinst.c
+++ b/source/fxinst.c
@@ -1,93 +1,5 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+#include "../copyright"
 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  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 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 2014 - 2016 Daniel De Matteis. (UNDER NO CIRCUMSTANCE 
-  WILL COMMERCIAL RIGHTS EVER BE APPROPRIATED TO ANY PARTY)
-
-  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.
-*******************************************************************************/
 #define FX_DO_ROMBUFFER
 
 #include "fxemu.h"
@@ -148,23 +60,6 @@ static void fx_cache()
       fx_flushCache();
       GSU.vCacheBaseReg = c;
       GSU.bCacheActive = true;
-#if 0
-      if (c < (0x10000 - 512))
-      {
-         uint8_t const* t = &ROM(c);
-         memcpy(GSU.pvCache, t, 512);
-      }
-      else
-      {
-         uint8_t const* t1;
-         uint8_t const* t2;
-         uint32_t i = 0x10000 - c;
-         t1 = &ROM(c);
-         t2 = &ROM(0);
-         memcpy(GSU.pvCache, t1, i);
-         memcpy(&GSU.pvCache[i], t2, 512 - i);
-      }
-#endif
    }
    R15++;
    CLRFLAGS;
@@ -3349,11 +3244,6 @@ static uint32_t fx_run(uint32_t nInstructions)
    READR14;
    while (TF(G) && (GSU.vCounter-- > 0))
       FX_STEP;
-   /*
-   #ifndef FX_ADDRESS_CHECK
-      GSU.vPipeAdr = USEX16(R15-1) | (USEX8(GSU.vPrgBankReg)<<16);
-   #endif
-   */
    return (nInstructions - GSU.vInstCount);
 }
 
@@ -3370,11 +3260,6 @@ static uint32_t fx_run_to_breakpoint(uint32_t nInstructions)
          break;
       }
    }
-   /*
-   #ifndef FX_ADDRESS_CHECK
-   GSU.vPipeAdr = USEX16(R15-1) | (USEX8(GSU.vPrgBankReg)<<16);
-   #endif
-   */
    return vCounter;
 }
 
@@ -3393,11 +3278,6 @@ static uint32_t fx_step_over(uint32_t nInstructions)
       if (USEX16(R15) == GSU.vStepPoint)
          break;
    }
-   /*
-   #ifndef FX_ADDRESS_CHECK
-   GSU.vPipeAdr = USEX16(R15-1) | (USEX8(GSU.vPrgBankReg)<<16);
-   #endif
-   */
    return vCounter;
 }
 
@@ -3643,4 +3523,3 @@ void (*fx_apfOpcodeTable[])() =
    &fx_lm_r0,   &fx_lm_r1,   &fx_lm_r2,    &fx_lm_r3,    &fx_lm_r4,    &fx_lm_r5,    &fx_lm_r6,    &fx_lm_r7,
    &fx_lm_r8,   &fx_lm_r9,   &fx_lm_r10,   &fx_lm_r11,   &fx_lm_r12,   &fx_lm_r13,   &fx_lm_r14,   &fx_lm_r15,
 };
-