@@ -209,8 +209,7 @@ static inline bool addCyclesInDMA(uint8_t dma_channel)

 bool S9xDoDMA(uint8_t Channel)

 {

-	CPU.InDMA = true;

-	CPU.InDMAorHDMA = true;

+	CPU.InDMA = CPU.InDMAorHDMA = true;

 	CPU.CurrentDMAorHDMAChannel = Channel;

 	SDMA *d = &DMA[Channel];

@@ -325,9 +324,7 @@ bool S9xDoDMA(uint8_t Channel)

 			p += inc;

 			if (!addCyclesInDMA(Channel))

 			{

-				CPU.InDMA = false;

-				CPU.InDMAorHDMA = false;

-				CPU.InWRAMDMAorHDMA = false;

+				CPU.InDMA = CPU.InDMAorHDMA = CPU.InWRAMDMAorHDMA = false;

 				CPU.CurrentDMAorHDMAChannel = -1;

 				return false;

 			}

@@ -836,9 +833,7 @@ bool S9xDoDMA(uint8_t Channel)

 			d->AAddress += inc;

 			if (!addCyclesInDMA(Channel))

 			{

-				CPU.InDMA = false;

-				CPU.InDMAorHDMA = false;

-				CPU.InWRAMDMAorHDMA = false;

+				CPU.InDMA = CPU.InDMAorHDMA = CPU.InWRAMDMAorHDMA = false;

 				CPU.CurrentDMAorHDMAChannel = -1;

 				return false;

 			}

@@ -1148,8 +1143,7 @@ void S9xStartHDMA()

 	PPU.HDMAEnded = 0;

-	CPU.InHDMA = true;

-	CPU.InDMAorHDMA = true;

+	CPU.InHDMA = CPU.InDMAorHDMA = true;

 	int32_t tmpch = CPU.CurrentDMAorHDMAChannel;

 	// XXX: Not quite right...

@@ -1186,8 +1180,7 @@ uint8_t S9xDoHDMA(uint8_t byte)

 	int d = 0;

-	CPU.InHDMA = true;

-	CPU.InDMAorHDMA = true;

+	CPU.InHDMA = CPU.InDMAorHDMA = true;

 	CPU.HDMARanInDMA = CPU.InDMA ? byte : 0;

 	bool temp = CPU.InWRAMDMAorHDMA;

 	int32_t tmpch = CPU.CurrentDMAorHDMAChannel;

@@ -179,26 +179,15 @@

 #include "memmap.h"

 #include "dma.h"

 #include "apu/apu.h"

-//#include "sdd1emu.h"

-//#include "spc7110emu.h"

-#ifdef DEBUGGER

-#include "missing.h"

-#endif

-//#define ADD_CYCLES(n)	{ CPU.PrevCycles = CPU.Cycles; CPU.Cycles += (n); S9xCheckInterrupts(); }

 static inline void ADD_CYCLES(int32_t n) { CPU.PrevCycles = CPU.Cycles; CPU.Cycles += n; S9xCheckInterrupts(); }

-extern uint8_t	*HDMAMemPointers[8];

-extern int		HDMA_ModeByteCounts[8];

-//extern SPC7110	s7emu;

+extern uint8_t *HDMAMemPointers[8];

+extern int HDMA_ModeByteCounts[8];

-static uint8_t	sdd1_decode_buffer[0x10000];

+static uint8_t sdd1_decode_buffer[0x10000];

-//static inline bool addCyclesInDMA (uint8_t);

-//static inline bool HDMAReadLineCount (int);

-

-

-static inline bool addCyclesInDMA (uint8_t dma_channel)

+static inline bool addCyclesInDMA(uint8_t dma_channel)

 {

 	// Add 8 cycles per byte, sync APU, and do HC related events.

 	// If HDMA was done in S9xDoHEventProcessing(), check if it used the same channel as DMA.

@@ -209,9 +198,6 @@ static inline bool addCyclesInDMA (uint8_t dma_channel)

 	if (CPU.HDMARanInDMA & (1 << dma_channel))

 	{

 		CPU.HDMARanInDMA = 0;

-	#ifdef DEBUGGER

-		printf("HDMA and DMA use the same channel %d!\n", dma_channel);

-	#endif

 		// If HDMA triggers in the middle of DMA transfer and it uses the same channel,

 		// it kills the DMA transfer immediately. $43x2 and $43x5 stop updating.

 		return false;

@@ -221,13 +207,13 @@ static inline bool addCyclesInDMA (uint8_t dma_channel)

 	return true;

 }

-bool S9xDoDMA (uint8_t Channel)

+bool S9xDoDMA(uint8_t Channel)

 {

 	CPU.InDMA = true;

-    CPU.InDMAorHDMA = true;

+	CPU.InDMAorHDMA = true;

 	CPU.CurrentDMAorHDMAChannel = Channel;

-    SDMA	*d = &DMA[Channel];

+	SDMA *d = &DMA[Channel];

 	// Check invalid DMA first

 	if ((d->ABank == 0x7E || d->ABank == 0x7F) && d->BAddress == 0x80 && !d->ReverseTransfer)

@@ -242,9 +228,9 @@ bool S9xDoDMA (uint8_t Channel)

 		// not being able to read and write itself at the same time

 		// And no, PPU.WRAM should not be updated.

-		int32_t	c = d->TransferBytes;

+		int32_t c = d->DMACount_Or_HDMAIndirectAddress;

 		// Writing $0000 to $43x5 actually results in a transfer of $10000 bytes, not 0.

-		if (c == 0)

+		if (!c)

 			c = 0x10000;

 		// 8 cycles per channel

@@ -252,9 +238,9 @@ bool S9xDoDMA (uint8_t Channel)

 		// 8 cycles per byte

 		while (c)

 		{

-			d->TransferBytes--;

-			d->AAddress++;

-			c--;

+			--d->DMACount_Or_HDMAIndirectAddress;

+			++d->AAddress;

+			--c;

 			if (!addCyclesInDMA(Channel))

 			{

 				CPU.InDMA = false;

@@ -264,14 +250,6 @@ bool S9xDoDMA (uint8_t Channel)

 			}

 		}

-	#ifdef DEBUGGER

-		if (Settings.TraceDMA)

-		{

-			sprintf(String, "DMA[%d]: WRAM Bank:%02X->$2180", Channel, d->ABank);

-			S9xMessage(S9X_TRACE, S9X_DMA_TRACE, String);

-		}

-	#endif

-

 		CPU.InDMA = false;

 		CPU.InDMAorHDMA = false;

 		CPU.CurrentDMAorHDMAChannel = -1;

@@ -279,26 +257,18 @@ bool S9xDoDMA (uint8_t Channel)

 	}

 	// Prepare for accessing $2118-2119

-	/*switch (d->BAddress)

-	{

-		case 0x18:

-		case 0x19:

-			if (IPPU.RenderThisFrame)

-				FLUSH_REDRAW();

-			break;

-	}*/

-

-	int32_t	inc = d->AAddressFixed ? 0 : (!d->AAddressDecrement ? 1 : -1);

-	int32_t	count = d->TransferBytes;

+

+	int32_t inc = d->AAddressFixed ? 0 : (!d->AAddressDecrement ? 1 : -1);

+	int32_t count = d->DMACount_Or_HDMAIndirectAddress;

 	// Writing $0000 to $43x5 actually results in a transfer of $10000 bytes, not 0.

-	if (count == 0)

+	if (!count)

 		count = 0x10000;

 	// Prepare for custom chip DMA

 	// S-DD1

-	uint8_t	*in_sdd1_dma = NULL;

+	uint8_t *in_sdd1_dma = nullptr;

 	if (Settings.SDD1)

 	{

@@ -309,19 +279,9 @@ bool S9xDoDMA (uint8_t Channel)

 			// Hacky support for pre-decompressed S-DD1 data

 			inc = !d->AAddressDecrement ? 1 : -1;

-			uint8_t	*in_ptr = S9xGetBasePointer(((d->ABank << 16) | d->AAddress));

+			uint8_t *in_ptr = S9xGetBasePointer((d->ABank << 16) | d->AAddress);

 			if (in_ptr)

-			{

 				in_ptr += d->AAddress;

-				//SDD1_decompress(sdd1_decode_buffer, in_ptr, d->TransferBytes);

-			}

-		#ifdef DEBUGGER

-			else

-			{

-				sprintf(String, "S-DD1: DMA from non-block address $%02X:%04X", d->ABank, d->AAddress);

-				S9xMessage(S9X_WARNING, S9X_DMA_TRACE, String);

-			}

-		#endif

 			in_sdd1_dma = sdd1_decode_buffer;

 		}

@@ -329,242 +289,50 @@ bool S9xDoDMA (uint8_t Channel)

 		Memory.FillRAM[0x4801] = 0;

 	}

-	// SPC7110

-

-	//uint8_t	*spc7110_dma = NULL;

-

-	/*if (Settings.SPC7110)

-	{

-		if (d->AAddress == 0x4800 || d->ABank == 0x50)

-		{

-			spc7110_dma = new uint8_t[d->TransferBytes];

-			for (int i = 0; i < d->TransferBytes; i++)

-				spc7110_dma[i] = s7emu.decomp.read();

-

-			int32_t	icount = s7emu.r4809 | (s7emu.r480a << 8);

-			icount -= d->TransferBytes;

-			s7emu.r4809 =  icount & 0x00ff;

-			s7emu.r480a = (icount & 0xff00) >> 8;

-

-			inc = 1;

-			d->AAddress -= count;

-		}

-	}*/

-

-	// SA-1

-

-	//bool	in_sa1_dma = false;

-

-	/*if (Settings.SA1)

-	{

-		if (SA1.in_char_dma && d->BAddress == 0x18 && (d->ABank & 0xf0) == 0x40)

-		{

-			// Perform packed bitmap to PPU character format conversion on the data

-			// before transmitting it to V-RAM via-DMA.

-			int32_t	num_chars = 1 << ((Memory.FillRAM[0x2231] >> 2) & 7);

-			int32_t	depth = (Memory.FillRAM[0x2231] & 3) == 0 ? 8 : (Memory.FillRAM[0x2231] & 3) == 1 ? 4 : 2;

-			int32_t	bytes_per_char = 8 * depth;

-			int32_t	bytes_per_line = depth * num_chars;

-			int32_t	char_line_bytes = bytes_per_char * num_chars;

-			uint32_t	addr = (d->AAddress / char_line_bytes) * char_line_bytes;

-

-			uint8_t	*base = S9xGetBasePointer((d->ABank << 16) + addr);

-			if (!base)

-			{

-				sprintf(String, "SA-1: DMA from non-block address $%02X:%04X", d->ABank, addr);

-				S9xMessage(S9X_WARNING, S9X_DMA_TRACE, String);

-				base = Memory.ROM;

-			}

-

-			base += addr;

-

-			uint8_t	*buffer = &Memory.ROM[CMemory::MAX_ROM_SIZE - 0x10000];

-			uint8_t	*p = buffer;

-			uint32_t	inc_sa1 = char_line_bytes - (d->AAddress % char_line_bytes);

-			uint32_t	char_count = inc_sa1 / bytes_per_char;

-

-			in_sa1_dma = true;

-

-		#if 0

-			printf("SA-1 DMA: %08x,", base);

-			printf("depth = %d, count = %d, bytes_per_char = %d, bytes_per_line = %d, num_chars = %d, char_line_bytes = %d\n",

-				depth, count, bytes_per_char, bytes_per_line, num_chars, char_line_bytes);

-		#endif

-

-			switch (depth)

-			{

-				case 2:

-					for (int32_t i = 0; i < count; i += inc_sa1, base += char_line_bytes, inc_sa1 = char_line_bytes, char_count = num_chars)

-					{

-						uint8_t	*line = base + (num_chars - char_count) * 2;

-						for (uint32_t j = 0; j < char_count && p - buffer < count; j++, line += 2)

-						{

-							uint8_t	*q = line;

-							for (int32_t l = 0; l < 8; l++, q += bytes_per_line)

-							{

-								for (int32_t b = 0; b < 2; b++)

-								{

-									uint8_t	r = *(q + b);

-									*(p + 0) = (*(p + 0) << 1) | ((r >> 0) & 1);

-									*(p + 1) = (*(p + 1) << 1) | ((r >> 1) & 1);

-									*(p + 0) = (*(p + 0) << 1) | ((r >> 2) & 1);

-									*(p + 1) = (*(p + 1) << 1) | ((r >> 3) & 1);

-									*(p + 0) = (*(p + 0) << 1) | ((r >> 4) & 1);

-									*(p + 1) = (*(p + 1) << 1) | ((r >> 5) & 1);

-									*(p + 0) = (*(p + 0) << 1) | ((r >> 6) & 1);

-									*(p + 1) = (*(p + 1) << 1) | ((r >> 7) & 1);

-								}

-

-								p += 2;

-							}

-						}

-					}

-

-					break;

-

-				case 4:

-					for (int32_t i = 0; i < count; i += inc_sa1, base += char_line_bytes, inc_sa1 = char_line_bytes, char_count = num_chars)

-					{

-						uint8_t	*line = base + (num_chars - char_count) * 4;

-						for (uint32_t j = 0; j < char_count && p - buffer < count; j++, line += 4)

-						{

-							uint8_t	*q = line;

-							for (int32_t l = 0; l < 8; l++, q += bytes_per_line)

-							{

-								for (int32_t b = 0; b < 4; b++)

-								{

-									uint8_t	r = *(q + b);

-									*(p +  0) = (*(p +  0) << 1) | ((r >> 0) & 1);

-									*(p +  1) = (*(p +  1) << 1) | ((r >> 1) & 1);

-									*(p + 16) = (*(p + 16) << 1) | ((r >> 2) & 1);

-									*(p + 17) = (*(p + 17) << 1) | ((r >> 3) & 1);

-									*(p +  0) = (*(p +  0) << 1) | ((r >> 4) & 1);

-									*(p +  1) = (*(p +  1) << 1) | ((r >> 5) & 1);

-									*(p + 16) = (*(p + 16) << 1) | ((r >> 6) & 1);

-									*(p + 17) = (*(p + 17) << 1) | ((r >> 7) & 1);

-								}

-

-								p += 2;

-							}

-

-							p += 32 - 16;

-						}

-					}

-

-					break;

-

-				case 8:

-					for (int32_t i = 0; i < count; i += inc_sa1, base += char_line_bytes, inc_sa1 = char_line_bytes, char_count = num_chars)

-					{

-						uint8_t	*line = base + (num_chars - char_count) * 8;

-						for (uint32_t j = 0; j < char_count && p - buffer < count; j++, line += 8)

-						{

-							uint8_t	*q = line;

-							for (int32_t l = 0; l < 8; l++, q += bytes_per_line)

-							{

-								for (int32_t b = 0; b < 8; b++)

-								{

-									uint8_t	r = *(q + b);

-									*(p +  0) = (*(p +  0) << 1) | ((r >> 0) & 1);

-									*(p +  1) = (*(p +  1) << 1) | ((r >> 1) & 1);

-									*(p + 16) = (*(p + 16) << 1) | ((r >> 2) & 1);

-									*(p + 17) = (*(p + 17) << 1) | ((r >> 3) & 1);

-									*(p + 32) = (*(p + 32) << 1) | ((r >> 4) & 1);

-									*(p + 33) = (*(p + 33) << 1) | ((r >> 5) & 1);

-									*(p + 48) = (*(p + 48) << 1) | ((r >> 6) & 1);

-									*(p + 49) = (*(p + 49) << 1) | ((r >> 7) & 1);

-								}

-

-								p += 2;

-							}

-

-							p += 64 - 16;

-						}

-					}

-

-					break;

-			}

-		}

-	}*/

-

-#ifdef DEBUGGER

-	if (Settings.TraceDMA)

-	{

-		sprintf(String, "DMA[%d]: %s Mode:%d 0x%02X%04X->0x21%02X Bytes:%d (%s) V:%03d",

-			Channel, d->ReverseTransfer ? "PPU->CPU" : "CPU->PPU", d->TransferMode, d->ABank, d->AAddress, d->BAddress,

-			d->TransferBytes, d->AAddressFixed ? "fixed" : (d->AAddressDecrement ? "dec" : "inc"), CPU.V_Counter);

-

-		if (d->BAddress == 0x18 || d->BAddress == 0x19 || d->BAddress == 0x39 || d->BAddress == 0x3a)

-			sprintf(String, "%s VRAM: %04X (%d,%d) %s", String,

-				PPU.VMA.Address, PPU.VMA.Increment, PPU.VMA.FullGraphicCount, PPU.VMA.High ? "word" : "byte");

-		else

-		if (d->BAddress == 0x22 || d->BAddress == 0x3b)

-			sprintf(String, "%s CGRAM: %02X (%x)", String, PPU.CGADD, PPU.CGFLIP);

-		else

-		if (d->BAddress == 0x04 || d->BAddress == 0x38)

-			sprintf(String, "%s OBJADDR: %04X", String, PPU.OAMAddr);

-

-		S9xMessage(S9X_TRACE, S9X_DMA_TRACE, String);

-	}

-#endif

-

 	// Do Transfer

-	uint8_t	Work;

+	uint8_t Work;

 	// 8 cycles per channel

 	ADD_CYCLES(SLOW_ONE_CYCLE);

 	if (!d->ReverseTransfer)

-    {

+	{

 		// CPU -> PPU

-		int32_t	b = 0;

-		uint16_t	p = d->AAddress;

-		uint8_t	*base = S9xGetBasePointer((d->ABank << 16) + d->AAddress);

-		bool	inWRAM_DMA;

+		int32_t b = 0;

+		uint16_t p = d->AAddress;

+		uint8_t *base = S9xGetBasePointer((d->ABank << 16) + d->AAddress);

-		int32_t	rem = count;

+		int32_t rem = count;

 		// Transfer per block if d->AAdressFixed is false

 		count = d->AAddressFixed ? rem : (d->AAddressDecrement ? ((p & MEMMAP_MASK) + 1) : (MEMMAP_BLOCK_SIZE - (p & MEMMAP_MASK)));

 		// Settings for custom chip DMA

-		/*if (in_sa1_dma)

-		{

-			base = &Memory.ROM[CMemory::MAX_ROM_SIZE - 0x10000];

-			p = 0;

-			count = rem;

-		}

-		else*/

 		if (in_sdd1_dma)

 		{

 			base = in_sdd1_dma;

 			p = 0;

 			count = rem;

 		}

-		/*else

-		if (spc7110_dma)

-		{

-			base = spc7110_dma;

-			p = 0;

-			count = rem;

-		}*/

-		inWRAM_DMA = ((/*!in_sa1_dma && */!in_sdd1_dma/* && !spc7110_dma*/) &&

-			(d->ABank == 0x7e || d->ABank == 0x7f || (!(d->ABank & 0x40) && d->AAddress < 0x2000)));

+		bool inWRAM_DMA = !in_sdd1_dma && (d->ABank == 0x7e || d->ABank == 0x7f || (!(d->ABank & 0x40) && d->AAddress < 0x2000));

 		// 8 cycles per byte

-		#define	UPDATE_COUNTERS \

-			d->TransferBytes--; \

-			d->AAddress += inc; \

-			p += inc; \

-			if (!addCyclesInDMA(Channel)) \

-			{ \

-				CPU.InDMA = false; \

-				CPU.InDMAorHDMA = false; \

-				CPU.InWRAMDMAorHDMA = false; \

-				CPU.CurrentDMAorHDMAChannel = -1; \

-				return false; \

+		auto UPDATE_COUNTERS = [&]() -> bool

+		{

+			--d->DMACount_Or_HDMAIndirectAddress;

+			d->AAddress += inc;

+			p += inc;

+			if (!addCyclesInDMA(Channel))

+			{

+				CPU.InDMA = false;

+				CPU.InDMAorHDMA = false;

+				CPU.InWRAMDMAorHDMA = false;

+				CPU.CurrentDMAorHDMAChannel = -1;

+				return false;

 			}

+			return true;

+		};

 		while (1)

 		{

@@ -577,17 +345,17 @@ bool S9xDoDMA (uint8_t Channel)

 			if (!base)

 			{

 				// DMA SLOW PATH

-				if (d->TransferMode == 0 || d->TransferMode == 2 || d->TransferMode == 6)

+				if (!d->TransferMode || d->TransferMode == 2 || d->TransferMode == 6)

 				{

 					do

 					{

 						Work = S9xGetByte((d->ABank << 16) + p);

 						S9xSetPPU(Work, 0x2100 + d->BAddress);

-						UPDATE_COUNTERS;

+						if (!UPDATE_COUNTERS())

+							return false;

 					} while (--count > 0);

 				}

-				else

-				if (d->TransferMode == 1 || d->TransferMode == 5)

+				else if (d->TransferMode == 1 || d->TransferMode == 5)

 				{

 					// This is a variation on Duff's Device. It is legal C/C++.

 					switch (b)

@@ -597,14 +365,16 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

-							count--;

+							if (!UPDATE_COUNTERS())

+								return false;

+							--count;

 						case 1:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

-							count--;

+							if (!UPDATE_COUNTERS())

+								return false;

+							--count;

 						}

 					}

@@ -612,14 +382,14 @@ bool S9xDoDMA (uint8_t Channel)

 					{

 						Work = S9xGetByte((d->ABank << 16) + p);

 						S9xSetPPU(Work, 0x2100 + d->BAddress);

-						UPDATE_COUNTERS;

+						if (!UPDATE_COUNTERS())

+							return false;

 						b = 1;

 					}

 					else

 						b = 0;

 				}

-				else

-				if (d->TransferMode == 3 || d->TransferMode == 7)

+				else if (d->TransferMode == 3 || d->TransferMode == 7)

 				{

 					switch (b)

 					{

@@ -628,7 +398,8 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 1;

@@ -638,7 +409,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 1:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 2;

@@ -648,7 +420,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 2:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 3;

@@ -658,7 +431,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 3:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 0;

@@ -667,8 +441,7 @@ bool S9xDoDMA (uint8_t Channel)

 						} while (1);

 					}

 				}

-				else

-				if (d->TransferMode == 4)

+				else if (d->TransferMode == 4)

 				{

 					switch (b)

 					{

@@ -677,7 +450,8 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 1;

@@ -687,7 +461,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 1:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 2;

@@ -697,7 +472,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 2:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2102 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 3;

@@ -707,7 +483,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 3:

 							Work = S9xGetByte((d->ABank << 16) + p);

 							S9xSetPPU(Work, 0x2103 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 0;

@@ -716,18 +493,11 @@ bool S9xDoDMA (uint8_t Channel)

 						} while (1);

 					}

 				}

-			#ifdef DEBUGGER

-				else

-				{

-					sprintf(String, "Unknown DMA transfer mode: %d on channel %d\n", d->TransferMode, Channel);

-					S9xMessage(S9X_TRACE, S9X_DMA_TRACE, String);

-				}

-			#endif

 			}

 			else

 			{

 				// DMA FAST PATH

-				if (d->TransferMode == 0 || d->TransferMode == 2 || d->TransferMode == 6)

+				if (!d->TransferMode || d->TransferMode == 2 || d->TransferMode == 6)

 				{

 					switch (d->BAddress)

 					{

@@ -736,7 +506,8 @@ bool S9xDoDMA (uint8_t Channel)

 							{

 								Work = *(base + p);

 								REGISTER_2104(Work);

-								UPDATE_COUNTERS;

+								if (!UPDATE_COUNTERS())

+									return false;

 							} while (--count > 0);

 							break;

@@ -748,7 +519,8 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2118_linear(Work);

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

 							else

@@ -757,7 +529,8 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2118_tile(Work);

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

@@ -770,7 +543,8 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2119_linear(Work);

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

 							else

@@ -779,7 +553,8 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2119_tile(Work);

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

@@ -789,8 +564,8 @@ bool S9xDoDMA (uint8_t Channel)

 							do

 							{

 								Work = *(base + p);

-								//REGISTER_2122(Work);

-								UPDATE_COUNTERS;

+								if (!UPDATE_COUNTERS())

+									return false;

 							} while (--count > 0);

 							break;

@@ -802,14 +577,16 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2180(Work);

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

 							else

 							{

 								do

 								{

-									UPDATE_COUNTERS;

+									if (!UPDATE_COUNTERS())

+										return false;

 								} while (--count > 0);

 							}

@@ -820,14 +597,14 @@ bool S9xDoDMA (uint8_t Channel)

 							{

 								Work = *(base + p);

 								S9xSetPPU(Work, 0x2100 + d->BAddress);

-								UPDATE_COUNTERS;

+								if (!UPDATE_COUNTERS())

+									return false;

 							} while (--count > 0);

 							break;

 					}

 				}

-				else

-				if (d->TransferMode == 1 || d->TransferMode == 5)

+				else if (d->TransferMode == 1 || d->TransferMode == 5)

 				{

 					if (d->BAddress == 0x18)

 					{

@@ -841,14 +618,16 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2118_linear(Work);

-									UPDATE_COUNTERS;

-									count--;

+									if (!UPDATE_COUNTERS())

+										return false;

+									--count;

 								case 1:

 									Work = *(base + p);

 									REGISTER_2119_linear(Work);

-									UPDATE_COUNTERS;

-									count--;

+									if (!UPDATE_COUNTERS())

+										return false;

+									--count;

 								}

 							}

@@ -856,7 +635,8 @@ bool S9xDoDMA (uint8_t Channel)

 							{

 								Work = *(base + p);

 								REGISTER_2118_linear(Work);

-								UPDATE_COUNTERS;

+								if (!UPDATE_COUNTERS())

+									return false;

 								b = 1;

 							}

 							else

@@ -871,14 +651,16 @@ bool S9xDoDMA (uint8_t Channel)

 								{

 									Work = *(base + p);

 									REGISTER_2118_tile(Work);

-									UPDATE_COUNTERS;

-									count--;

+									if (!UPDATE_COUNTERS())

+										return false;

+									--count;

 								case 1:

 									Work = *(base + p);

 									REGISTER_2119_tile(Work);

-									UPDATE_COUNTERS;

-									count--;

+									if (!UPDATE_COUNTERS())

+										return false;

+									--count;

 								}

 							}

@@ -886,7 +668,8 @@ bool S9xDoDMA (uint8_t Channel)

 							{

 								Work = *(base + p);

 								REGISTER_2118_tile(Work);

-								UPDATE_COUNTERS;

+								if (!UPDATE_COUNTERS())

+									return false;

 								b = 1;

 							}

 							else

@@ -903,14 +686,16 @@ bool S9xDoDMA (uint8_t Channel)

 							{

 								Work = *(base + p);

 								S9xSetPPU(Work, 0x2100 + d->BAddress);

-								UPDATE_COUNTERS;

-								count--;

+								if (!UPDATE_COUNTERS())

+									return false;

+								--count;

 							case 1:

 								Work = *(base + p);

 								S9xSetPPU(Work, 0x2101 + d->BAddress);

-								UPDATE_COUNTERS;

-								count--;

+								if (!UPDATE_COUNTERS())

+									return false;

+								--count;

 							}

 						}

@@ -918,15 +703,15 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							b = 1;

 						}

 						else

 							b = 0;

 					}

 				}

-				else

-				if (d->TransferMode == 3 || d->TransferMode == 7)

+				else if (d->TransferMode == 3 || d->TransferMode == 7)

 				{

 					switch (b)

 					{

@@ -935,7 +720,8 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 1;

@@ -945,7 +731,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 1:

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 2;

@@ -955,7 +742,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 2:

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 3;

@@ -965,7 +753,8 @@ bool S9xDoDMA (uint8_t Channel)

 						case 3:

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2101 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 0;

@@ -974,8 +763,7 @@ bool S9xDoDMA (uint8_t Channel)

 						} while (1);

 					}

 				}

-				else

-				if (d->TransferMode == 4)

+				else if (d->TransferMode == 4)

 				{

 					switch (b)

 					{

@@ -984,7 +772,8 @@ bool S9xDoDMA (uint8_t Channel)

 						{

 							Work = *(base + p);

 							S9xSetPPU(Work, 0x2100 + d->BAddress);

-							UPDATE_COUNTERS;

+							if (!UPDATE_COUNTERS())

+								return false;

 							if (--count <= 0)

 							{

 								b = 1;

@@ -994,7 +783,8 @@ bool S9xDoDMA (uint8_t Channel)