@@ -1,179 +1,8 @@

-/***********************************************************************************

+/*****************************************************************************\

   Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.

-

-  (c) Copyright 1996 - 2002  Gary Henderson (gary.henderson@ntlworld.com),

-                             Jerremy Koot (jkoot@snes9x.com)

-

-  (c) Copyright 2002 - 2004  Matthew Kendora

-

-  (c) Copyright 2002 - 2005  Peter Bortas (peter@bortas.org)

-

-  (c) Copyright 2004 - 2005  Joel Yliluoma (http://iki.fi/bisqwit/)

-

-  (c) Copyright 2001 - 2006  John Weidman (jweidman@slip.net)

-

-  (c) Copyright 2002 - 2006  funkyass (funkyass@spam.shaw.ca),

-                             Kris Bleakley (codeviolation@hotmail.com)

-

-  (c) Copyright 2002 - 2010  Brad Jorsch (anomie@users.sourceforge.net),

-                             Nach (n-a-c-h@users.sourceforge.net),

-

-  (c) Copyright 2002 - 2011  zones (kasumitokoduck@yahoo.com)

-

-  (c) Copyright 2006 - 2007  nitsuja

-

-  (c) Copyright 2009 - 2011  BearOso,

-                             OV2

-

-

-  BS-X C emulator code

-  (c) Copyright 2005 - 2006  Dreamer Nom,

-                             zones

-

-  C4 x86 assembler and some C emulation code

-  (c) Copyright 2000 - 2003  _Demo_ (_demo_@zsnes.com),

-                             Nach,

-                             zsKnight (zsknight@zsnes.com)

-

-  C4 C++ code

-  (c) Copyright 2003 - 2006  Brad Jorsch,

-                             Nach

-

-  DSP-1 emulator code

-  (c) Copyright 1998 - 2006  _Demo_,

-                             Andreas Naive (andreasnaive@gmail.com),

-                             Gary Henderson,

-                             Ivar (ivar@snes9x.com),

-                             John Weidman,

-                             Kris Bleakley,

-                             Matthew Kendora,

-                             Nach,

-                             neviksti (neviksti@hotmail.com)

-

-  DSP-2 emulator code

-  (c) Copyright 2003         John Weidman,

-                             Kris Bleakley,

-                             Lord Nightmare (lord_nightmare@users.sourceforge.net),

-                             Matthew Kendora,

-                             neviksti

-

-  DSP-3 emulator code

-  (c) Copyright 2003 - 2006  John Weidman,

-                             Kris Bleakley,

-                             Lancer,

-                             z80 gaiden

-

-  DSP-4 emulator code

-  (c) Copyright 2004 - 2006  Dreamer Nom,

-                             John Weidman,

-                             Kris Bleakley,

-                             Nach,

-                             z80 gaiden

-

-  OBC1 emulator code

-  (c) Copyright 2001 - 2004  zsKnight,

-                             pagefault (pagefault@zsnes.com),

-                             Kris Bleakley

-                             Ported from x86 assembler to C by sanmaiwashi

-

-  SPC7110 and RTC C++ emulator code used in 1.39-1.51

-  (c) Copyright 2002         Matthew Kendora with research by

-                             zsKnight,

-                             John Weidman,

-                             Dark Force

-

-  SPC7110 and RTC C++ emulator code used in 1.52+

-  (c) Copyright 2009         byuu,

-                             neviksti

-

-  S-DD1 C emulator code

-  (c) Copyright 2003         Brad Jorsch with research by

-                             Andreas Naive,

-                             John Weidman

-

-  S-RTC C emulator code

-  (c) Copyright 2001 - 2006  byuu,

-                             John Weidman

-

-  ST010 C++ emulator code

-  (c) Copyright 2003         Feather,

-                             John Weidman,

-                             Kris Bleakley,

-                             Matthew Kendora

-

-  Super FX x86 assembler emulator code

-  (c) Copyright 1998 - 2003  _Demo_,

-                             pagefault,

-                             zsKnight

-

-  Super FX C emulator code

-  (c) Copyright 1997 - 1999  Ivar,

-                             Gary Henderson,

-                             John Weidman

-

-  Sound emulator code used in 1.5-1.51

-  (c) Copyright 1998 - 2003  Brad Martin

-  (c) Copyright 1998 - 2006  Charles Bilyue'

-

-  Sound emulator code used in 1.52+

-  (c) Copyright 2004 - 2007  Shay Green (gblargg@gmail.com)

-

-  SH assembler code partly based on x86 assembler code

-  (c) Copyright 2002 - 2004  Marcus Comstedt (marcus@mc.pp.se)

-

-  2xSaI filter

-  (c) Copyright 1999 - 2001  Derek Liauw Kie Fa

-

-  HQ2x, HQ3x, HQ4x filters

-  (c) Copyright 2003         Maxim Stepin (maxim@hiend3d.com)

-

-  NTSC filter

-  (c) Copyright 2006 - 2007  Shay Green

-

-  GTK+ GUI code

-  (c) Copyright 2004 - 2011  BearOso

-

-  Win32 GUI code

-  (c) Copyright 2003 - 2006  blip,

-                             funkyass,

-                             Matthew Kendora,

-                             Nach,

-                             nitsuja

-  (c) Copyright 2009 - 2011  OV2

-

-  Mac OS GUI code

-  (c) Copyright 1998 - 2001  John Stiles

-  (c) Copyright 2001 - 2011  zones

-

-

-  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/or 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 or it's derivatives.

-

-  Snes9x is freeware for PERSONAL USE only. Commercial users should

-  seek permission of the copyright holders first. Commercial use includes,

-  but is not limited to, charging money for Snes9x or software derived from

-  Snes9x, including Snes9x or derivatives in commercial game bundles, and/or

-  using Snes9x as a promotion for your commercial product.

-

-  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.

- ***********************************************************************************/

+                This file is licensed under the Snes9x License.

+   For further information, consult the LICENSE file in the root directory.

+\*****************************************************************************/

 #include <vector>

 #include <algorithm>

@@ -358,13 +187,20 @@ int CMemory::ScoreLoROM(bool skip_header, int32_t romoff)

 	return score;

 }

-bool CMemory::LoadROMSNSF(const uint8_t *lrombuf, int32_t lromsize, const uint8_t *srambuf, int32_t sramsize)

+int CMemory::First512BytesCountZeroes() const

 {

-	int retry_count = 0;

+	const uint8_t *buf = ROM;

+	int zeroCount = 0;

+	for (int i = 0; i < 512; ++i)

+		if (buf[i] == 0)

+			++zeroCount;

+	return zeroCount;

+}

+bool CMemory::LoadROMSNSF(const uint8_t *lrombuf, int32_t lromsize, const uint8_t *srambuf, int32_t sramsize)

+{

 	std::fill_n(&this->ROM[0], static_cast<int>(MAX_ROM_SIZE), 0);

-again:

 	this->CalculatedSize = 0;

 	this->ExtendedFormat = NOPE;

@@ -378,8 +214,22 @@ again:

 	int hi_score = this->ScoreHiROM(false);

 	int lo_score = this->ScoreLoROM(false);

+	int score_nonheadered = std::max(hi_score, lo_score);

+	int score_headered = std::max(this->ScoreHiROM(TRUE), this->ScoreLoROM(TRUE));

+

+	bool size_is_likely_headered = !((totalFileSize - 512) & 0xFFFF);

+	if (size_is_likely_headered)

+		score_headered += 2;

+	else

+		score_headered -= 2;

+	if (this->First512BytesCountZeroes() >= 0x1E0)

+		score_headered += 2;

+	else

+		score_headered -= 2;

+

+	bool headered_score_highest = score_headered > score_nonheadered;

-	if (((hi_score > lo_score && this->ScoreHiROM(true) > hi_score) || (hi_score <= lo_score && this->ScoreLoROM(true) > lo_score)))

+	if (headered_score_highest)

 	{

 		std::copy_n(&this->ROM[512], totalFileSize - 512, &this->ROM[0]);

 		totalFileSize -= 512;

@@ -388,9 +238,11 @@ again:

 		lo_score = this->ScoreLoROM(false);

 	}

-	this->CalculatedSize = (totalFileSize / 0x2000) * 0x2000;

+	this->CalculatedSize = ((totalFileSize + 0x1fff) / 0x2000) * 0x2000;

 	if (this->CalculatedSize > 0x400000 &&

+		this->ROM[0x7fd5] + (this->ROM[0x7fd6] << 8) != 0x3423 && // exclude SA-1

+		this->ROM[0x7fd5] + (this->ROM[0x7fd6] << 8) != 0x3523 &&

 		this->ROM[0x7fd5] + (this->ROM[0x7fd6] << 8) != 0x4332 && // exclude S-DD1

 		this->ROM[0x7fd5] + (this->ROM[0x7fd6] << 8) != 0x4532 &&

 		this->ROM[0xffd5] + (this->ROM[0xffd6] << 8) != 0xF93a && // exclude SPC7110

@@ -496,11 +348,10 @@ again:

 		hi_score = this->ScoreHiROM(false);

 		lo_score = this->ScoreLoROM(false);

-		if (((this->HiROM && (lo_score >= hi_score || hi_score < 0)) || (this->LoROM && (hi_score > lo_score || lo_score < 0))) && !retry_count)

+		if ((this->HiROM && (lo_score >= hi_score || hi_score < 0)) || (this->LoROM && (hi_score > lo_score || lo_score < 0)))

 		{

 			Settings.ForceNotInterleaved = true;

-			++retry_count;

-			goto again;

+			return false;

 		}

 	}

@@ -661,7 +512,6 @@ void CMemory::InitROM()

 	   and the NMI handler, time enough for an instruction or two. */

 	// Wild Guns, Mighty Morphin Power Rangers - The Fighting Edition

 	Timings.NMIDMADelay = 24;

-	Timings.IRQPendCount = 0;

 	//// Hack games

@@ -765,7 +615,7 @@ void CMemory::map_index(uint32_t bank_s, uint32_t bank_e, uint32_t addr_s, uint3

 		for (uint32_t i = addr_s; i <= addr_e; i += 0x1000)

 		{

 			uint32_t p = (c << 4) | (i >> 12);

-			this->Map[p] = reinterpret_cast<uint8_t *>(index);

+			this->Map[p] = reinterpret_cast<uint8_t *>(static_cast<intptr_t>(index));

 			this->BlockIsROM[p] = false;

 			this->BlockIsRAM[p] = isRAM;

 		}

@@ -791,8 +641,13 @@ void CMemory::map_WRAM()

 void CMemory::map_LoROMSRAM()

 {

-	this->map_index(0x70, 0x7f, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM);

-	this->map_index(0xf0, 0xff, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM);

+	if (!this->SRAMSize)

+		return;

+

+	uint32_t hi = this->SRAMSize > 5 ? 0x7fff : 0xffff;

+

+	this->map_index(0x70, 0x7d, 0x0000, hi, MAP_LOROM_SRAM, MAP_TYPE_RAM);

+	this->map_index(0xf0, 0xff, 0x0000, hi, MAP_LOROM_SRAM, MAP_TYPE_RAM);

 }

 void CMemory::map_HiROMSRAM()

@@ -857,7 +712,7 @@ void CMemory::Map_JumboLoROMMap()

 	this->map_System();

 	this->map_lorom_offset(0x00, 0x3f, 0x8000, 0xffff, this->CalculatedSize - 0x400000, 0x400000);

-	this->map_lorom_offset(0x40, 0x7f, 0x0000, 0xffff, this->CalculatedSize - 0x400000, 0x400000);

+	this->map_lorom_offset(0x40, 0x7f, 0x0000, 0xffff, this->CalculatedSize - 0x600000, 0x600000);

 	this->map_lorom_offset(0x80, 0xbf, 0x8000, 0xffff, 0x400000, 0);

 	this->map_lorom_offset(0xc0, 0xff, 0x0000, 0xffff, 0x400000, 0x200000);

@@ -909,10 +764,11 @@ void CMemory::Map_SDD1LoROMMap()

 	this->map_lorom(0x00, 0x3f, 0x8000, 0xffff, this->CalculatedSize);

 	this->map_lorom(0x80, 0xbf, 0x8000, 0xffff, this->CalculatedSize);

-	this->map_hirom_offset(0x40, 0x7f, 0x0000, 0xffff, this->CalculatedSize, 0);

+	this->map_hirom_offset(0x60, 0x7f, 0x0000, 0xffff, this->CalculatedSize, 0);

 	this->map_hirom_offset(0xc0, 0xff, 0x0000, 0xffff, this->CalculatedSize, 0); // will be overwritten dynamically

 	this->map_index(0x70, 0x7f, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM);

+	this->map_index(0xa0, 0xbf, 0x6000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM);

 	this->map_WRAM();

@@ -973,66 +829,22 @@ void CMemory::ApplyROMFixes()

 	//// APU timing hacks :(

 	Timings.APUSpeedup = 0;

-	Timings.APUAllowTimeOverflow = false;

 	if (!Settings.DisableGameSpecificHacks)

 	{

-		if (this->match_id("AVCJ")) // Rendering Ranger R2

-			Timings.APUSpeedup = 4;

-

-		if (this->match_na("GAIA GENSOUKI 1 JPN") || // Gaia Gensouki

-			this->match_id("JG  ") || // Illusion of Gaia

-			this->match_id("CQ  ") || // Stunt Race FX

-			this->match_na("SOULBLADER - 1") || // Soul Blader

-			this->match_na("SOULBLAZER - 1 USA") || // Soul Blazer

-			this->match_na("SLAP STICK 1 JPN") || // Slap Stick

-			this->match_id("E9 ") || // Robotrek

-			this->match_nn("ACTRAISER") || // Actraiser

-			this->match_nn("ActRaiser-2") || // Actraiser 2

-			this->match_id("AQT") || // Tenchi Souzou, Terranigma

-			this->match_id("ATV") || // Tales of Phantasia

-			this->match_id("ARF") || // Star Ocean

-			this->match_id("APR") || // Zen-Nippon Pro Wrestling 2 - 3-4 Budoukan

-			this->match_id("A4B") || // Super Bomberman 4

-			this->match_id("Y7 ") || // U.F.O. Kamen Yakisoban - Present Ban

-			this->match_id("Y9 ") || // U.F.O. Kamen Yakisoban - Shihan Ban

-			this->match_id("APB") || // Super Bomberman - Panic Bomber W

-			this->match_na("DARK KINGDOM") || // Dark Kingdom

-			this->match_na("ZAN3 SFC") || // Zan III Spirits

-			this->match_na("HIOUDEN") || // Hiouden - Mamono-tachi Tono Chikai

-			this->match_na("\xC3\xDD\xBC\xC9\xB3\xC0") || // Tenshi no Uta

-			this->match_na("FORTUNE QUEST") || // Fortune Quest - Dice wo Korogase

-			this->match_na("FISHING TO BASSING") || // Shimono Masaki no Fishing To Bassing

-			this->match_na("OHMONO BLACKBASS") || // Oomono Black Bass Fishing - Jinzouko Hen

-			this->match_na("MASTERS") || // Harukanaru Augusta 2 - Masters

-			this->match_na("SFC \xB6\xD2\xDD\xD7\xB2\xC0\xDE\xB0") || // Kamen Rider

-			this->match_na("ZENKI TENCHIMEIDOU") || // Kishin Douji Zenki - Tenchi Meidou

-			this->match_nn("TokyoDome '95Battle 7") || // Shin Nippon Pro Wrestling Kounin '95 - Tokyo Dome Battle 7

-			this->match_nn("SWORD WORLD SFC") || // Sword World SFC/2

-			this->match_nn("LETs PACHINKO(") || // BS Lets Pachinko Nante Gindama 1/2/3/4

-			this->match_nn("THE FISHING MASTER") || // Mark Davis The Fishing Master

-			this->match_nn("Parlor") || // Parlor mini/2/3/4/5/6/7, Parlor Parlor!/2/3/4/5

-			this->match_na("HEIWA Parlor!Mini8") || // Parlor mini 8

-			this->match_nn("SANKYO Fever! \xCC\xA8\xB0\xCA\xDE\xB0!")) // SANKYO Fever! Fever!

-			Timings.APUSpeedup = 1;

-

-		if (this->match_na("EARTHWORM JIM 2") || // Earthworm Jim 2

-			this->match_na("NBA Hangtime") || // NBA Hang Time

-			this->match_na("MSPACMAN") || // Ms Pacman

-			this->match_na("THE MASK") || // The Mask

-			this->match_na("PRIMAL RAGE") || // Primal Rage

-			this->match_na("DOOM TROOPERS")) // Doom Troopers

-			Timings.APUAllowTimeOverflow = true;

+		//if (this->match_id("AVCJ")) // Rendering Ranger R2

+		//	Timings.APUSpeedup = 2;

+		if (this->match_na("CIRCUIT USA"))

+			Timings.APUSpeedup = 3;

 	}

 	S9xAPUTimingSetSpeedup(Timings.APUSpeedup);

-	S9xAPUAllowTimeOverflow(Timings.APUAllowTimeOverflow);

 	//// Other timing hacks :(

 	Timings.HDMAStart = SNES_HDMA_START_HC + Settings.HDMATimingHack - 100;

 	Timings.HBlankStart = SNES_HBLANK_START_HC + Timings.HDMAStart - SNES_HDMA_START_HC;

-	Timings.IRQTriggerCycles = 10;

+	Timings.IRQTriggerCycles = 14;

 	if (!Settings.DisableGameSpecificHacks)

 	{

@@ -1040,17 +852,10 @@ void CMemory::ApplyROMFixes()

 		// Some games need really severe delay timing...

 		if (this->match_na("BATTLE GRANDPRIX")) // Battle Grandprix

 			Timings.DMACPUSync = 20;

-

-		// An infinite loop reads $4212 and waits V-blank end, whereas VIRQ is set V=0.

-		// If Snes9x succeeds to escape from the loop before jumping into the IRQ handler, the game goes further.

-		// If Snes9x jumps into the IRQ handler before escaping from the loop,

-		// Snes9x cannot escape from the loop permanently because the RTI is in the next V-blank.

-		if (this->match_na("Aero the AcroBat 2"))

-			Timings.IRQPendCount = 2;

-

-		// XXX: What's happening?

-		if (this->match_na("X-MEN")) // Spider-Man and the X-Men

-			Settings.BlockInvalidVRAMAccess = false;

+		else if (match_na("KORYU NO MIMI ENG")) // Koryu no Mimi translation by rpgone)

+			// An infinite loop reads $4210 and checks NMI flag. This only works if LDA instruction executes before the NMI triggers,

+			// which doesn't work very well with s9x's default DMA timing.

+			Timings.DMACPUSync = 20;

 		//// SRAM initial value

@@ -185,53 +185,6 @@

 #include "apu/apu.h"

 #include "sdd1.h"

-static const uint32_t crc32Table[] =

-{

-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,

-	0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,

-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,

-	0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,

-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,

-	0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,

-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,

-	0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,

-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,

-	0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,

-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,

-	0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,

-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,

-	0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,

-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,

-	0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,

-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,

-	0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,

-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,

-	0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,

-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,

-	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,

-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,

-	0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,

-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,

-	0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,

-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,

-	0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,

-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,

-	0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,

-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,

-	0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,

-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,

-	0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,

-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,

-	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,

-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,

-	0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,

-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,

-	0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,

-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,

-	0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,

-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d

-};

-

 // deinterleave

 static void S9xDeinterleaveType1(int size, uint8_t *base)

@@ -270,10 +270,10 @@ bool CMemory::Init()

 		return false;

 	}

-	std::fill(&this->RAM[0], &this->RAM[0x20000], 0);

-	std::fill(&this->SRAM[0], &this->SRAM[0x20000], 0);

-	std::fill(&this->VRAM[0], &this->VRAM[0x10000], 0);

-	std::fill(&this->RealROM[0], &this->RealROM[MAX_ROM_SIZE + 0x200 + 0x8000], 0);

+	std::fill_n(&this->RAM[0], 0x20000, 0);

+	std::fill_n(&this->SRAM[0], 0x20000, 0);

+	std::fill_n(&this->VRAM[0], 0x10000, 0);

+	std::fill_n(&this->RealROM[0], MAX_ROM_SIZE + 0x200 + 0x8000, 0);

 	// FillRAM uses first 32K of ROM image area, otherwise space just

 	// wasted. Might be read by the SuperFX code.

@@ -409,7 +409,7 @@ bool CMemory::LoadROMSNSF(const uint8_t *lrombuf, int32_t lromsize, const uint8_

 {

 	int retry_count = 0;

-	std::fill(&this->ROM[0], &this->ROM[MAX_ROM_SIZE], 0);

+	std::fill_n(&this->ROM[0], static_cast<int>(MAX_ROM_SIZE), 0);

 again:

 	this->CalculatedSize = 0;

@@ -418,18 +418,17 @@ again:

 	int32_t totalFileSize = std::min<int32_t>(MAX_ROM_SIZE, lromsize);

 	if (!totalFileSize)

 		return false;

-	std::copy(&lrombuf[0], &lrombuf[totalFileSize], &this->ROM[0]);

-	SNESGameFixes.SRAMInitialValue = 0xff;

-	std::fill(&this->SRAM[0], &this->SRAM[0x20000], SNESGameFixes.SRAMInitialValue);

+	std::copy_n(&lrombuf[0], totalFileSize, &this->ROM[0]);

+	std::fill_n(&this->SRAM[0], 0x20000, 0xff);

 	if (srambuf && sramsize)

-		std::copy(&srambuf[0], &srambuf[sramsize], &this->SRAM[0]);

+		std::copy_n(&srambuf[0], sramsize, &this->SRAM[0]);

 	int hi_score = this->ScoreHiROM(false);

 	int lo_score = this->ScoreLoROM(false);

 	if (((hi_score > lo_score && this->ScoreHiROM(true) > hi_score) || (hi_score <= lo_score && this->ScoreLoROM(true) > lo_score)))

 	{

-		memmove(&this->ROM[0], &this->ROM[512], totalFileSize - 512);

+		std::copy_n(&this->ROM[512], totalFileSize - 512, &this->ROM[0]);

 		totalFileSize -= 512;

 		// modifying ROM, so we need to rescore

 		hi_score = this->ScoreHiROM(false);

@@ -486,7 +485,6 @@ again:

 		// ignore map type byte if not 0x2x or 0x3x

 		if ((RomHeader[0x7fd5] & 0xf0) == 0x20 || (RomHeader[0x7fd5] & 0xf0) == 0x30)

-		{

 			switch (RomHeader[0x7fd5] & 0xf)

 			{

 				case 1:

@@ -494,11 +492,8 @@ again:

 					break;

 				case 5:

-					interleaved = true;

-					tales = true;

-					break;

+					interleaved = tales = true;

 			}

-		}

 	}

 	else

 	{

@@ -506,24 +501,19 @@ again:

 		this->HiROM = true;

 		if ((RomHeader[0xffd5] & 0xf0) == 0x20 || (RomHeader[0xffd5] & 0xf0) == 0x30)

-		{

 			switch (RomHeader[0xffd5] & 0xf)

 			{

 				case 0:

 				case 3:

 					interleaved = true;

-					break;

 			}

-		}

 	}

 	// this two games fail to be detected

 	if (!strncmp(reinterpret_cast<char *>(&this->ROM[0x7fc0]), "YUYU NO QUIZ DE GO!GO!", 22) || !strncmp(reinterpret_cast<char *>(&this->ROM[0xffc0]), "BATMAN--REVENGE JOKER",  21))

 	{

 		this->LoROM = true;

-		this->HiROM = false;

-		interleaved = false;

-		tales = false;

+		this->HiROM = interleaved = tales = false;

 	}

 	if (!Settings.ForceNotInterleaved && interleaved)

@@ -567,13 +557,12 @@ again:

 	if (tales)

 	{

 		auto tmp = std::vector<uint8_t>(this->CalculatedSize - 0x400000);

-		memmove(&tmp[0], &this->ROM[0], this->CalculatedSize - 0x400000);

-		memmove(&this->ROM[0], &this->ROM[this->CalculatedSize - 0x400000], 0x400000);

-		memmove(&this->ROM[0x400000], &tmp[0], this->CalculatedSize - 0x400000);

+		std::copy_n(&this->ROM[0], this->CalculatedSize - 0x400000, &tmp[0]);

+		std::copy_n(&this->ROM[this->CalculatedSize - 0x400000], 0x400000, &this->ROM[0]);

+		std::copy_n(&tmp[0], this->CalculatedSize - 0x400000, &this->ROM[0x400000]);

 	}

 	memset(&SNESGameFixes, 0, sizeof(SNESGameFixes));

-	SNESGameFixes.SRAMInitialValue = 0x60;

 	this->InitROM();

@@ -626,14 +615,14 @@ void CMemory::ParseSNESHeader(uint8_t *RomHeader)

 	this->ROMType = RomHeader[0x26];

 	this->ROMRegion = RomHeader[0x29];

-	std::copy(&RomHeader[0x02], &RomHeader[0x06], &this->ROMId[0]);

+	std::copy_n(&RomHeader[0x02], 4, &this->ROMId[0]);

 }

 void CMemory::InitROM()

 {

 	//// Parse ROM header and read ROM informatoin

-	std::fill(&this->ROMId[0], &this->ROMId[5], 0);

+	std::fill_n(&this->ROMId[0], 5, 0);

 	uint8_t *RomHeader = &this->ROM[0x7FB0];

 	if (this->ExtendedFormat == BIGFIRST)

@@ -817,7 +806,6 @@ void CMemory::map_space(uint32_t bank_s, uint32_t bank_e, uint32_t addr_s, uint3

 void CMemory::map_index(uint32_t bank_s, uint32_t bank_e, uint32_t addr_s, uint32_t addr_e, int index, int type)

 {

-	bool isROM = !(type == MAP_TYPE_I_O || type == MAP_TYPE_RAM);

 	bool isRAM = type != MAP_TYPE_I_O;

 	for (uint32_t c = bank_s; c <= bank_e; ++c)

@@ -825,7 +813,7 @@ void CMemory::map_index(uint32_t bank_s, uint32_t bank_e, uint32_t addr_s, uint3

 		{

 			uint32_t p = (c << 4) | (i >> 12);

 			this->Map[p] = reinterpret_cast<uint8_t *>(index);

-			this->BlockIsROM[p] = isROM;

+			this->BlockIsROM[p] = false;

 			this->BlockIsRAM[p] = isRAM;

 		}

 }

@@ -862,7 +850,7 @@ void CMemory::map_HiROMSRAM()

 void CMemory::map_WriteProtectROM()

 {

-	std::copy(&this->Map[0], &this->Map[0x1000], &this->WriteMap[0]);

+	std::copy_n(&this->Map[0], 0x1000, &this->WriteMap[0]);

 	for (int c = 0; c < 0x1000; ++c)

 		if (this->BlockIsROM[c])

@@ -1119,17 +1107,6 @@ void CMemory::ApplyROMFixes()

 			SRAMMask = ((1 << (SRAMSize + 3)) * 128) - 1;

 		}

-		// SRAM value fixes

-		if (this->match_na("SUPER DRIFT OUT") || // Super Drift Out

-			this->match_na("SATAN IS OUR FATHER!") ||

-			this->match_na("goemon 4")) // Ganbare Goemon Kirakira Douchuu

-			SNESGameFixes.SRAMInitialValue = 0x00;

-

-		// Additional game fixes by sanmaiwashi ...

-		// XXX: unnecessary?

-		if (this->match_na("SFX \xC5\xB2\xC4\xB6\xDE\xDD\xC0\xDE\xD1\xD3\xC9\xB6\xDE\xC0\xD8 1")) // SD Gundam Gaiden - Knight Gundam Monogatari

-			SNESGameFixes.SRAMInitialValue = 0x6b;

-

 		// others: BS and ST-01x games are 0x00.

 		//// OAM hacks :(

@@ -175,718 +175,17 @@

   Nintendo Co., Limited and its subsidiary companies.

  ***********************************************************************************/

+#include <vector>

 #include <algorithm>

 #include <string>

 #include <numeric>

-#include <assert.h>

-

-#ifdef UNZIP_SUPPORT

-#include "unzip/unzip.h"

-#endif

-

-#ifdef JMA_SUPPORT

-#include "jma/s9x-jma.h"

-#endif

-

+#include <cassert>

 #include "snes9x.h"

 #include "memmap.h"

 #include "apu/apu.h"

-//#include "fxemu.h"

 #include "sdd1.h"

-//#include "srtc.h"

-//#include "controls.h"

-//#include "cheats.h"

-//#include "movie.h"

-//#include "reader.h"

-//#include "display.h"

-

-/*#ifndef SET_UI_COLOR

-#define SET_UI_COLOR(r, g, b) ;

-#endif*/

-

-/*#ifndef max

-#define max(a, b) (((a) > (b)) ? (a) : (b))

-#endif*/

-

-/*#ifndef min

-#define min(a, b) (((a) < (b)) ? (a) : (b))

-#endif*/

-

-//static bool	stopMovie = true;

-//static char		LastRomFilename[PATH_MAX + 1] = "";

-

-// from NSRT

-/*static const char	*nintendo_licensees[] =

-{

-	"Unlicensed",

-	"Nintendo",

-	"Rocket Games/Ajinomoto",

-	"Imagineer-Zoom",

-	"Gray Matter",

-	"Zamuse",

-	"Falcom",

-	NULL,

-	"Capcom",

-	"Hot B Co.",

-	"Jaleco",

-	"Coconuts Japan",

-	"Coconuts Japan/G.X.Media",

-	"Micronet",

-	"Technos",

-	"Mebio Software",

-	"Shouei System",

-	"Starfish",

-	NULL,

-	"Mitsui Fudosan/Dentsu",

-	NULL,

-	"Warashi Inc.",

-	NULL,

-	"Nowpro",

-	NULL,

-	"Game Village",

-	"IE Institute",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Banarex",

-	"Starfish",

-	"Infocom",

-	"Electronic Arts Japan",

-	NULL,

-	"Cobra Team",

-	"Human/Field",

-	"KOEI",

-	"Hudson Soft",

-	"S.C.P./Game Village",

-	"Yanoman",

-	NULL,

-	"Tecmo Products",

-	"Japan Glary Business",

-	"Forum/OpenSystem",

-	"Virgin Games (Japan)",

-	"SMDE",

-	"Yojigen",

-	NULL,

-	"Daikokudenki",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Creatures Inc.",

-	"TDK Deep Impresion",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Destination Software/KSS",

-	"Sunsoft/Tokai Engineering",

-	"POW (Planning Office Wada)/VR 1 Japan",

-	"Micro World",

-	NULL,

-	"San-X",

-	"Enix",

-	"Loriciel/Electro Brain",

-	"Kemco Japan",

-	"Seta Co.,Ltd.",

-	"Culture Brain",

-	"Irem Corp.",

-	"Palsoft",

-	"Visit Co., Ltd.",

-	"Intec",

-	"System Sacom",

-	"Poppo",

-	"Ubisoft Japan",

-	NULL,

-	"Media Works",

-	"NEC InterChannel",

-	"Tam",

-	"Gajin/Jordan",

-	"Smilesoft",

-	NULL,

-	NULL,

-	"Mediakite",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Viacom",

-	"Carrozzeria",

-	"Dynamic",

-	NULL,

-	"Magifact",

-	"Hect",

-	"Codemasters",

-	"Taito/GAGA Communications",

-	"Laguna",

-	"Telstar Fun & Games/Event/Taito",

-	NULL,

-	"Arcade Zone Ltd.",

-	"Entertainment International/Empire Software",

-	"Loriciel",

-	"Gremlin Graphics",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Seika Corp.",

-	"UBI SOFT Entertainment Software",

-	"Sunsoft US",

-	NULL,

-	"Life Fitness",

-	NULL,

-	"System 3",

-	"Spectrum Holobyte",

-	NULL,

-	"Irem",

-	NULL,

-	"Raya Systems",

-	"Renovation Products",

-	"Malibu Games",

-	NULL,

-	"Eidos/U.S. Gold",

-	"Playmates Interactive",

-	NULL,

-	NULL,

-	"Fox Interactive",

-	"Time Warner Interactive",

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	"Disney Interactive",

-	NULL,

-	"Black Pearl",

-	NULL,

-	"Advanced Productions",

-	NULL,

-	NULL,

-	"GT Interactive",

-	"RARE",

-	"Crave Entertainment",

-	"Absolute Entertainment",

-	"Acclaim",

-	"Activision",

-	"American Sammy",

-	"Take 2/GameTek",

-	"Hi Tech",

-	"LJN Ltd.",

-	NULL,

-	"Mattel",

-	NULL,

-	"Mindscape/Red Orb Entertainment",

-	"Romstar",

-	"Taxan",

-	"Midway/Tradewest",

-	NULL,

-	"American Softworks Corp.",

-	"Majesco Sales Inc.",

-	"3DO",

-	NULL,

-	NULL,