Merge pull request #23 from jamsilva/master

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

1 files changed, 1 insertions, 99 deletions

diff --git a/source/getset.h b/source/getset.h
index 78e4cfe..8939e76 100644
--- a/source/getset.h
+++ b/source/getset.h
@@ -1,93 +1,4 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
-
-  (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.
-*******************************************************************************/
+#include "../copyright"
 
 #ifndef _GETSET_H_
 #define _GETSET_H_
@@ -139,7 +50,6 @@ INLINE uint8_t S9xGetByte(uint32_t Address)
       //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:
@@ -242,9 +152,6 @@ INLINE uint16_t S9xGetWord(uint32_t Address)
          ((*(Memory.SRAM + (((((Address + 1) & 0xFF0000) >> 1) | ((
                                 Address + 1) & 0x7FFF)) &Memory.SRAMMask))) << 8);
 
-   //return (*(uint16_t*)(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
@@ -350,7 +257,6 @@ INLINE void S9xSetByte(uint8_t Byte, uint32_t Address)
       {
          *(Memory.SRAM + ((((Address & 0xFF0000) >> 1) | (Address & 0x7FFF))&
                           Memory.SRAMMask)) = Byte;
-         //       *(Memory.SRAM + (Address & Memory.SRAMMask)) = Byte;
          CPU.SRAMModified = true;
       }
       return;
@@ -484,8 +390,6 @@ INLINE void S9xSetWord(uint16_t Word, uint32_t Address)
          *(Memory.SRAM + (((((Address + 1) & 0xFF0000) >> 1) | ((
                               Address + 1) & 0x7FFF))& Memory.SRAMMask)) = Word >> 8;
 
-         //       *(Memory.SRAM + (Address & Memory.SRAMMask)) = (uint8_t) Word;
-         //       *(Memory.SRAM + ((Address + 1) & Memory.SRAMMask)) = Word >> 8;
          CPU.SRAMModified = true;
       }
       return;
@@ -577,11 +481,9 @@ INLINE uint8_t* GetBasePointer(uint32_t 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: