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

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

 #pragma once

@@ -183,9 +12,7 @@ inline void addCyclesInMemoryAccess(int32_t speed)

 {

 	if (!CPU.InDMAorHDMA)

 	{

-		CPU.PrevCycles = CPU.Cycles;

 		CPU.Cycles += speed;

-		S9xCheckInterrupts();

 		while (CPU.Cycles >= CPU.NextEvent)

 			S9xDoHEventProcessing();

 	}

@@ -195,9 +22,7 @@ inline void addCyclesInMemoryAccess_x2(int32_t speed)

 {

 	if (!CPU.InDMAorHDMA)

 	{

-		CPU.PrevCycles = CPU.Cycles;

 		CPU.Cycles += speed << 1;

-		S9xCheckInterrupts();

 		while (CPU.Cycles >= CPU.NextEvent)

 			S9xDoHEventProcessing();

 	}

@@ -278,34 +103,35 @@ inline uint8_t S9xGetByte(uint32_t Address)

 inline uint16_t S9xGetWord(uint32_t Address, s9xwrap_t w = WRAP_NONE)

 {

+	uint16_t word;

+

 	uint32_t mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));

 	if ((Address & mask) == mask)

 	{

 		PC_t a;

-		OpenBus = S9xGetByte(Address);

+		word = OpenBus = S9xGetByte(Address);

 		switch (w)

 		{

 			case WRAP_PAGE:

 				a.xPBPC = Address;

 				++a.B.xPCl;

-				return OpenBus | (S9xGetByte(a.xPBPC) << 8);

+				return word | (S9xGetByte(a.xPBPC) << 8);

 			case WRAP_BANK:

 				a.xPBPC = Address;

 				++a.W.xPC;

-				return OpenBus | (S9xGetByte(a.xPBPC) << 8);

+				return word | (S9xGetByte(a.xPBPC) << 8);

 			default:

-				return OpenBus | (S9xGetByte(Address + 1) << 8);

+				return word | (S9xGetByte(Address + 1) << 8);

 		}

 	}

 	int block = (Address & 0xffffff) >> MEMMAP_SHIFT;

 	uint8_t *GetAddress = Memory.Map[block];

 	int32_t speed = memory_speed(Address);

-	uint16_t word;

 	if (GetAddress >= reinterpret_cast<uint8_t *>(CMemory::MAP_LAST))

 	{

@@ -326,8 +152,8 @@ inline uint16_t S9xGetWord(uint32_t Address, s9xwrap_t w = WRAP_NONE)

 		case CMemory::MAP_PPU:

 			if (CPU.InDMAorHDMA)

 			{

-				OpenBus = S9xGetByte(Address);

-				return OpenBus | (S9xGetByte(Address + 1) << 8);

+				word = OpenBus = S9xGetByte(Address);

+				return word | (S9xGetByte(Address + 1) << 8);

 			}

 			word  = S9xGetPPU(Address & 0xffff);

@@ -550,8 +376,7 @@ inline void S9xSetPCBase(uint32_t Address)

 	Registers.PC.xPBPC = Address & 0xffffff;

 	ICPU.ShiftedPB = Address & 0xff0000;

-	int block;

-	uint8_t *GetAddress = Memory.Map[block = ((Address & 0xffffff) >> MEMMAP_SHIFT)];

+	uint8_t *GetAddress = Memory.Map[static_cast<int>((Address & 0xffffff) >> MEMMAP_SHIFT)];

 	CPU.MemSpeed = memory_speed(Address);

 	CPU.MemSpeedx2 = CPU.MemSpeed << 1;

@@ -363,7 +363,7 @@ inline uint16_t S9xGetWord(uint32_t Address, s9xwrap_t w = WRAP_NONE)

 	}

 }

-inline void S9xSetByte(uint8_t Byte, uint32_t Address)

+inline void S9xSetByte(uint8_t Byt, uint32_t Address)

 {

 	int block = (Address & 0xffffff) >> MEMMAP_SHIFT;

 	uint8_t *SetAddress = Memory.WriteMap[block];

@@ -371,7 +371,7 @@ inline void S9xSetByte(uint8_t Byte, uint32_t Address)

 	if (SetAddress >= reinterpret_cast<uint8_t *>(CMemory::MAP_LAST))

 	{

-		SetAddress[Address & 0xffff] = Byte;

+		SetAddress[Address & 0xffff] = Byt;

 		addCyclesInMemoryAccess(speed);

 		return;

 	}

@@ -379,7 +379,7 @@ inline void S9xSetByte(uint8_t Byte, uint32_t Address)

 	switch (reinterpret_cast<intptr_t>(SetAddress))

 	{

 		case CMemory::MAP_CPU:

-			S9xSetCPU(Byte, Address & 0xffff);

+			S9xSetCPU(Byt, Address & 0xffff);

 			addCyclesInMemoryAccess(speed);

 			break;

@@ -387,26 +387,26 @@ inline void S9xSetByte(uint8_t Byte, uint32_t Address)

 			if (CPU.InDMAorHDMA && (Address & 0xff00) == 0x2100)

 				return;

-			S9xSetPPU(Byte, Address & 0xffff);

+			S9xSetPPU(Byt, Address & 0xffff);

 			addCyclesInMemoryAccess(speed);

 			break;

 		case CMemory::MAP_LOROM_SRAM:

 			if (Memory.SRAMMask)

-				Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask] = Byte;

+				Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask] = Byt;

 			addCyclesInMemoryAccess(speed);

 			break;

 		case CMemory::MAP_HIROM_SRAM:

 			if (Memory.SRAMMask)

-				Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask] = Byte;

+				Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask] = Byt;

 			addCyclesInMemoryAccess(speed);

 			break;

 		case CMemory::MAP_SA1RAM:

-			Memory.SRAM[Address & 0xffff] = Byte;

+			Memory.SRAM[Address & 0xffff] = Byt;

 			addCyclesInMemoryAccess(speed);

 			break;

@@ -175,8 +175,7 @@

   Nintendo Co., Limited and its subsidiary companies.

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

-#ifndef _GETSET_H_

-#define _GETSET_H_

+#pragma once

 #include "cpuexec.h"

@@ -641,5 +640,3 @@ inline uint8_t *S9xGetMemPointer(uint32_t Address)

 			return nullptr;

 	}

 }

-

-#endif

@@ -175,42 +175,38 @@

   Nintendo Co., Limited and its subsidiary companies.

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

-

 #ifndef _GETSET_H_

 #define _GETSET_H_

 #include "cpuexec.h"

-//#include "dsp.h"

-//#include "sa1.h"

-//#include "spc7110.h"

-//#include "c4.h"

-//#include "obc1.h"

-//#include "seta.h"

-//#include "bsx.h"

-

-#define addCyclesInMemoryAccess \

-	if (!CPU.InDMAorHDMA) \

-	{ \

-		CPU.PrevCycles = CPU.Cycles; \

-		CPU.Cycles += speed; \

-		S9xCheckInterrupts(); \

-		while (CPU.Cycles >= CPU.NextEvent) \

-			S9xDoHEventProcessing(); \

+

+inline void addCyclesInMemoryAccess(int32_t speed)

+{

+	if (!CPU.InDMAorHDMA)

+	{

+		CPU.PrevCycles = CPU.Cycles;

+		CPU.Cycles += speed;

+		S9xCheckInterrupts();

+		while (CPU.Cycles >= CPU.NextEvent)

+			S9xDoHEventProcessing();

 	}

+}

-#define addCyclesInMemoryAccess_x2 \

-	if (!CPU.InDMAorHDMA) \

-	{ \

-		CPU.PrevCycles = CPU.Cycles; \

-		CPU.Cycles += speed << 1; \

-		S9xCheckInterrupts(); \

-		while (CPU.Cycles >= CPU.NextEvent) \

-			S9xDoHEventProcessing(); \

+inline void addCyclesInMemoryAccess_x2(int32_t speed)

+{

+	if (!CPU.InDMAorHDMA)

+	{

+		CPU.PrevCycles = CPU.Cycles;

+		CPU.Cycles += speed << 1;

+		S9xCheckInterrupts();

+		while (CPU.Cycles >= CPU.NextEvent)

+			S9xDoHEventProcessing();

 	}

+}

-extern uint8_t	OpenBus;

+extern uint8_t OpenBus;

-static inline int32_t memory_speed (uint32_t address)

+inline int32_t memory_speed(uint32_t address)

 {

 	if (address & 0x408000)

 	{

@@ -229,25 +225,25 @@ static inline int32_t memory_speed (uint32_t address)

 	return TWO_CYCLES;

 }

-inline uint8_t S9xGetByte (uint32_t Address)

+inline uint8_t S9xGetByte(uint32_t Address)

 {

-	int		block = (Address & 0xffffff) >> MEMMAP_SHIFT;

-	uint8_t	*GetAddress = Memory.Map[block];

-	int32_t	speed = memory_speed(Address);

-	uint8_t	byte;

+	int block = (Address & 0xffffff) >> MEMMAP_SHIFT;

+	uint8_t *GetAddress = Memory.Map[block];

+	int32_t speed = memory_speed(Address);

+	uint8_t byte;

-	if (GetAddress >= (uint8_t *) CMemory::MAP_LAST)

+	if (GetAddress >= reinterpret_cast<uint8_t *>(CMemory::MAP_LAST))

 	{

-		byte = *(GetAddress + (Address & 0xffff));

-		addCyclesInMemoryAccess;

+		byte = GetAddress[Address & 0xffff];

+		addCyclesInMemoryAccess(speed);

 		return byte;

 	}

-	switch ((intptr_t) GetAddress)

+	switch (reinterpret_cast<intptr_t>(GetAddress))

 	{

 		case CMemory::MAP_CPU:

 			byte = S9xGetCPU(Address & 0xffff);

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			return byte;

 		case CMemory::MAP_PPU:

@@ -255,7 +251,7 @@ inline uint8_t S9xGetByte (uint32_t Address)

 				return OpenBus;

 			byte = S9xGetPPU(Address & 0xffff);

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			return byte;

 		case CMemory::MAP_LOROM_SRAM:

@@ -264,80 +260,29 @@ inline uint8_t S9xGetByte (uint32_t Address)

 			// Address & 0xff0000 : bank

 			// bank >> 1 | offset : SRAM address, unbound

 			// unbound & SRAMMask : SRAM offset

-			byte = *(Memory.SRAM + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask));

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_LOROM_SRAM_B:

-			byte = *(Multi.sramB + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Multi.sramMaskB));

-			addCyclesInMemoryAccess;

+			byte = Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask];

+			addCyclesInMemoryAccess(speed);

 			return byte;

 		case CMemory::MAP_HIROM_SRAM:

 		case CMemory::MAP_RONLY_SRAM:

-			byte = *(Memory.SRAM + (((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask));

-			addCyclesInMemoryAccess;

+			byte = Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask];

+			addCyclesInMemoryAccess(speed);

 			return byte;

-		case CMemory::MAP_BWRAM:

-			byte = *(Memory.BWRAM + ((Address & 0x7fff) - 0x6000));

-			addCyclesInMemoryAccess;

-			return byte;

-

-		/*case CMemory::MAP_DSP:

-			byte = S9xGetDSP(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_SPC7110_ROM:

-			byte = S9xGetSPC7110Byte(Address);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_SPC7110_DRAM:

-			byte = S9xGetSPC7110(0x4800);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_C4:

-			byte = S9xGetC4(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_OBC_RAM:

-			byte = S9xGetOBC1(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_SETA_DSP:

-			byte = S9xGetSetaDSP(Address);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_SETA_RISC:

-			byte = S9xGetST018(Address);

-			addCyclesInMemoryAccess;

-			return byte;

-

-		case CMemory::MAP_BSX:

-			byte = S9xGetBSX(Address);

-			addCyclesInMemoryAccess;

-			return byte;*/

-

-		case CMemory::MAP_NONE:

 		default:

 			byte = OpenBus;

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			return byte;

 	}

 }

-inline uint16_t S9xGetWord (uint32_t Address, enum s9xwrap_t w = WRAP_NONE)

+inline uint16_t S9xGetWord(uint32_t Address, s9xwrap_t w = WRAP_NONE)

 {

-	uint32_t	mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));

+	uint32_t mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));

 	if ((Address & mask) == mask)

 	{

-		PC_t	a;

+		PC_t a;

 		OpenBus = S9xGetByte(Address);

@@ -345,39 +290,38 @@ inline uint16_t S9xGetWord (uint32_t Address, enum s9xwrap_t w = WRAP_NONE)

 		{

 			case WRAP_PAGE:

 				a.xPBPC = Address;

-				a.B.xPCl++;

+				++a.B.xPCl;

 				return OpenBus | (S9xGetByte(a.xPBPC) << 8);

 			case WRAP_BANK:

 				a.xPBPC = Address;

-				a.W.xPC++;

+				++a.W.xPC;

 				return OpenBus | (S9xGetByte(a.xPBPC) << 8);

-			case WRAP_NONE:

 			default:

 				return OpenBus | (S9xGetByte(Address + 1) << 8);

 		}

 	}

-	int		block = (Address & 0xffffff) >> MEMMAP_SHIFT;

-	uint8_t	*GetAddress = Memory.Map[block];

-	int32_t	speed = memory_speed(Address);

-	uint16_t	word;

+	int block = (Address & 0xffffff) >> MEMMAP_SHIFT;

+	uint8_t *GetAddress = Memory.Map[block];

+	int32_t speed = memory_speed(Address);

+	uint16_t word;

-	if (GetAddress >= (uint8_t *) CMemory::MAP_LAST)

+	if (GetAddress >= reinterpret_cast<uint8_t *>(CMemory::MAP_LAST))

 	{

-		word = READ_WORD(GetAddress + (Address & 0xffff));

-		addCyclesInMemoryAccess_x2;

+		word = READ_WORD(&GetAddress[Address & 0xffff]);

+		addCyclesInMemoryAccess_x2(speed);

 		return word;

 	}

-	switch ((intptr_t) GetAddress)

+	switch (reinterpret_cast<intptr_t>(GetAddress))

 	{

 		case CMemory::MAP_CPU:

 			word  = S9xGetCPU(Address & 0xffff);

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			word |= S9xGetCPU((Address + 1) & 0xffff) << 8;

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			return word;

 		case CMemory::MAP_PPU:

@@ -388,644 +332,313 @@ inline uint16_t S9xGetWord (uint32_t Address, enum s9xwrap_t w = WRAP_NONE)

 			}

 			word  = S9xGetPPU(Address & 0xffff);

-			addCyclesInMemoryAccess;

+			addCyclesInMemoryAccess(speed);

 			word |= S9xGetPPU((Address + 1) & 0xffff) << 8;

-			addCyclesInMemoryAccess;

-			return (word);

+			addCyclesInMemoryAccess(speed);

+			return word;

 		case CMemory::MAP_LOROM_SRAM:

 		case CMemory::MAP_SA1RAM:

 			if (Memory.SRAMMask >= MEMMAP_MASK)

-				word = READ_WORD(Memory.SRAM + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask));

+				word = READ_WORD(&Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask]);

 			else

-				word = (*(Memory.SRAM + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask))) |

-					  ((*(Memory.SRAM + (((((Address + 1) & 0xff0000) >> 1) | ((Address + 1) & 0x7fff)) & Memory.SRAMMask))) << 8);

-			addCyclesInMemoryAccess_x2;

-			return word;

-

-		case CMemory::MAP_LOROM_SRAM_B:

-			if (Multi.sramMaskB >= MEMMAP_MASK)

-				word = READ_WORD(Multi.sramB + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Multi.sramMaskB));

-			else

-				word = (*(Multi.sramB + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Multi.sramMaskB))) |

-					  ((*(Multi.sramB + (((((Address + 1) & 0xff0000) >> 1) | ((Address + 1) & 0x7fff)) & Multi.sramMaskB))) << 8);

-			addCyclesInMemoryAccess_x2;

+				word = Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask] |

+					(Memory.SRAM[((((Address + 1) & 0xff0000) >> 1) | ((Address + 1) & 0x7fff)) & Memory.SRAMMask] << 8);

+			addCyclesInMemoryAccess_x2(speed);

 			return word;

 		case CMemory::MAP_HIROM_SRAM:

 		case CMemory::MAP_RONLY_SRAM:

 			if (Memory.SRAMMask >= MEMMAP_MASK)

-				word = READ_WORD(Memory.SRAM + (((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask));

+				word = READ_WORD(&Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask]);

 			else

-				word = (*(Memory.SRAM + (((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) |

-					   (*(Memory.SRAM + ((((Address + 1) & 0x7fff) - 0x6000 + (((Address + 1) & 0xf0000) >> 3)) & Memory.SRAMMask)) << 8));

-			addCyclesInMemoryAccess_x2;

-			return word;

-

-		case CMemory::MAP_BWRAM:

-			word = READ_WORD(Memory.BWRAM + ((Address & 0x7fff) - 0x6000));

-			addCyclesInMemoryAccess_x2;

-			return word;

-

-		/*case CMemory::MAP_DSP:

-			word  = S9xGetDSP(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			word |= S9xGetDSP((Address + 1) & 0xffff) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_SPC7110_ROM:

-			word  = S9xGetSPC7110Byte(Address);

-			addCyclesInMemoryAccess;

-			word |= S9xGetSPC7110Byte(Address + 1) << 8;

-			addCyclesInMemoryAccess;

+				word = Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask] |

+					(Memory.SRAM[(((Address + 1) & 0x7fff) - 0x6000 + (((Address + 1) & 0xf0000) >> 3)) & Memory.SRAMMask] << 8);

+			addCyclesInMemoryAccess_x2(speed);

 			return word;

-		case CMemory::MAP_SPC7110_DRAM:

-			word  = S9xGetSPC7110(0x4800);

-			addCyclesInMemoryAccess;

-			word |= S9xGetSPC7110(0x4800) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_C4:

-			word  = S9xGetC4(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			word |= S9xGetC4((Address + 1) & 0xffff) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_OBC_RAM:

-			word  = S9xGetOBC1(Address & 0xffff);

-			addCyclesInMemoryAccess;

-			word |= S9xGetOBC1((Address + 1) & 0xffff) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_SETA_DSP:

-			word  = S9xGetSetaDSP(Address);

-			addCyclesInMemoryAccess;

-			word |= S9xGetSetaDSP(Address + 1) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_SETA_RISC:

-			word  = S9xGetST018(Address);

-			addCyclesInMemoryAccess;

-			word |= S9xGetST018(Address + 1) << 8;

-			addCyclesInMemoryAccess;

-			return word;

-

-		case CMemory::MAP_BSX:

-			word  = S9xGetBSX(Address);

-			addCyclesInMemoryAccess;

-			word |= S9xGetBSX(Address + 1) << 8;

-			addCyclesInMemoryAccess;

-			return word;*/

-

-		case CMemory::MAP_NONE:

 		default:

 			word = OpenBus | (OpenBus << 8);

-			addCyclesInMemoryAccess_x2;

+			addCyclesInMemoryAccess_x2(speed);

 			return word;

 	}

 }

-inline void S9xSetByte (uint8_t Byte, uint32_t Address)

+inline void S9xSetByte(uint8_t Byte, uint32_t Address)

 {

-	int		block = (Address & 0xffffff) >> MEMMAP_SHIFT;

-	uint8_t	*SetAddress = Memory.WriteMap[block];

-	int32_t	speed = memory_speed(Address);

+	int block = (Address & 0xffffff) >> MEMMAP_SHIFT;

+	uint8_t *SetAddress = Memory.WriteMap[block];

+	int32_t speed = memory_speed(Address);

-	if (SetAddress >= (uint8_t *) CMemory::MAP_LAST)

+	if (SetAddress >= reinterpret_cast<uint8_t *>(CMemory::MAP_LAST))

 	{

-		*(SetAddress + (Address & 0xffff)) = Byte;

-		addCyclesInMemoryAccess;

+		SetAddress[Address & 0xffff] = Byte;

+		addCyclesInMemoryAccess(speed);

 		return;

 	}

-	switch ((intptr_t) SetAddress)

+	switch (reinterpret_cast<intptr_t>(SetAddress))

 	{

 		case CMemory::MAP_CPU:

 			S9xSetCPU(Byte, Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return;

+			addCyclesInMemoryAccess(speed);

+			break;

 		case CMemory::MAP_PPU:

 			if (CPU.InDMAorHDMA && (Address & 0xff00) == 0x2100)

 				return;

 			S9xSetPPU(Byte, Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return;

+			addCyclesInMemoryAccess(speed);

+			break;

 		case CMemory::MAP_LOROM_SRAM:

 			if (Memory.SRAMMask)

-			{

-				*(Memory.SRAM + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask)) = Byte;

-				CPU.SRAMModified = true;

-			}

+				Memory.SRAM[(((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Memory.SRAMMask] = Byte;

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_LOROM_SRAM_B:

-			if (Multi.sramMaskB)

-			{

-				*(Multi.sramB + ((((Address & 0xff0000) >> 1) | (Address & 0x7fff)) & Multi.sramMaskB)) = Byte;

-				CPU.SRAMModified = true;

-			}

-

-			addCyclesInMemoryAccess;

-			return;

+			addCyclesInMemoryAccess(speed);

+			break;

 		case CMemory::MAP_HIROM_SRAM:

 			if (Memory.SRAMMask)

-			{

-				*(Memory.SRAM + (((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask)) = Byte;

-				CPU.SRAMModified = true;

-			}

-

-			addCyclesInMemoryAccess;

-			return;

+				Memory.SRAM[((Address & 0x7fff) - 0x6000 + ((Address & 0xf0000) >> 3)) & Memory.SRAMMask] = Byte;

-		case CMemory::MAP_BWRAM:

-			*(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)) = Byte;

-			CPU.SRAMModified = true;

-			addCyclesInMemoryAccess;

-			return;

+			addCyclesInMemoryAccess(speed);

+			break;

 		case CMemory::MAP_SA1RAM:

-			*(Memory.SRAM + (Address & 0xffff)) = Byte;

-			addCyclesInMemoryAccess;

-			return;

-

-		/*case CMemory::MAP_DSP:

-			S9xSetDSP(Byte, Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_C4:

-			S9xSetC4(Byte, Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_OBC_RAM:

-			S9xSetOBC1(Byte, Address & 0xffff);

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_SETA_DSP:

-			S9xSetSetaDSP(Byte, Address);

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_SETA_RISC:

-			S9xSetST018(Byte, Address);

-			addCyclesInMemoryAccess;

-			return;

-

-		case CMemory::MAP_BSX:

-			S9xSetBSX(Byte, Address);

-			addCyclesInMemoryAccess;

-			return;*/

-

-		case CMemory::MAP_NONE:

+			Memory.SRAM[Address & 0xffff] = Byte;

+			addCyclesInMemoryAccess(speed);

+			break;

+

 		default:

-			addCyclesInMemoryAccess;

-			return;

+			addCyclesInMemoryAccess(speed);

 	}

 }

-inline void S9xSetWord (uint16_t Word, uint32_t Address, enum s9xwrap_t w = WRAP_NONE, enum s9xwriteorder_t o = WRITE_01)

+inline void S9xSetWord(uint16_t Word, uint32_t Address, s9xwrap_t w = WRAP_NONE, s9xwriteorder_t o = WRITE_01)

 {

-	uint32_t	mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));

+	uint32_t mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));

 	if ((Address & mask) == mask)

 	{

-		PC_t	a;

+		PC_t a;

 		if (!o)

-			S9xSetByte((uint8_t) Word, Address);

+			S9xSetByte(static_cast<uint8_t>(Word), Address);

 		switch (w)

 		{

 			case WRAP_PAGE:

 				a.xPBPC = Address;

-				a.B.xPCl++;

+				++a.B.xPCl;

 				S9xSetByte(Word >> 8, a.xPBPC);

 				break;

 			case WRAP_BANK:

 				a.xPBPC = Address;

-				a.W.xPC++;

+				++a.W.xPC;

 				S9xSetByte(Word >> 8, a.xPBPC);

 				break;

-			case WRAP_NONE:

 			default:

 				S9xSetByte(Word >> 8, Address + 1);

-				break;

 		}

 		if (o)

-			S9xSetByte((uint8_t) Word, Address);

+			S9xSetByte(static_cast<uint8_t>(Word), Address);