@@ -6,7 +6,7 @@

 #include "Globals.h"

 #include "XSFCommon.h"

-int32_t sineTable[] =

+static int32_t sineTable[] =

 {

 	0x0000, 0x0192, 0x0323, 0x04B5, 0x0645, 0x07D5, 0x0964, 0x0AF1,

 	0x0C7C, 0x0E05, 0x0F8C, 0x1111, 0x1294, 0x1413, 0x158F, 0x1708,

@@ -4,6 +4,7 @@

 #include "bios.h"

 #include "GBAinline.h"

 #include "Globals.h"

+#include "XSFCommon.h"

 int32_t sineTable[] =

 {

@@ -64,7 +65,7 @@ void BIOS_ArcTan2()

 		res = (x >> 16) & 0x8000;

 	else if (!x)

 		res = ((y >> 16) & 0x8000) + 0x4000;

-	else if (std::abs(x) > std::abs(y) || (std::abs(x) == std::abs(y) && !(x < 0 && y < 0)))

+	else if (std::abs(x) > std::abs(y) || (fEqual(std::abs(x), std::abs(y)) && !(x < 0 && y < 0)))

 	{

 		reg[1].I = x;

 		reg[0].I = y << 14;

@@ -62,31 +62,25 @@ void BIOS_ArcTan2()

 	uint32_t res = 0;

 	if (!y)

 		res = (x >> 16) & 0x8000;

-	else

+	else if (!x)

+		res = ((y >> 16) & 0x8000) + 0x4000;

+	else if (std::abs(x) > std::abs(y) || (std::abs(x) == std::abs(y) && !(x < 0 && y < 0)))

 	{

-		if (!x)

-			res = ((y >> 16) & 0x8000) + 0x4000;

+		reg[1].I = x;

+		reg[0].I = y << 14;

+		BIOS_Div();

+		BIOS_ArcTan();

+		if (x < 0)

+			res = 0x8000 + reg[0].I;

 		else

-		{

-			if (std::abs(x) > std::abs(y) || (std::abs(x) == std::abs(y) && !(x < 0 && y < 0)))

-			{

-				reg[1].I = x;

-				reg[0].I = y << 14;

-				BIOS_Div();

-				BIOS_ArcTan();

-				if (x < 0)

-					res = 0x8000 + reg[0].I;

-				else

-					res = (((y >> 16) & 0x8000) << 1) + reg[0].I;

-			}

-			else

-			{

-				reg[0].I = x << 14;

-				BIOS_Div();

-				BIOS_ArcTan();

-				res = (0x4000 + ((y >> 16) & 0x8000)) - reg[0].I;

-			}

-		}

+			res = (((y >> 16) & 0x8000) << 1) + reg[0].I;

+	}

+	else

+	{

+		reg[0].I = x << 14;

+		BIOS_Div();

+		BIOS_ArcTan();

+		res = (0x4000 + ((y >> 16) & 0x8000)) - reg[0].I;

 	}

 	reg[0].I = res;

 }

@@ -118,8 +112,7 @@ void BIOS_BitUnPack()

 		if (len < 0)

 			break;

 		int mask = 0xff >> revbits;

-		uint8_t b = CPUReadByte(source);

-		++source;

+		uint8_t b = CPUReadByte(source++);

 		int bitcount = 0;

 		while (1)

 		{

@@ -629,6 +622,7 @@ void BIOS_LZ77UnCompVram()

 					writeValue |= CPUReadByte(source++) << byteShift;

 					byteShift += 8;

 					++byteCount;

+

 					if (byteCount == 2)

 					{

 						CPUWriteHalfWord(dest, writeValue);

@@ -990,7 +984,7 @@ void BIOS_Sqrt()

 void BIOS_MidiKey2Freq()

 {

 	int freq = CPUReadMemory(reg[0].I + 4);

-	double tmp = (180 - reg[1].I) - (reg[2].I / 256.0);

+	double tmp = (180.0 - reg[1].I) - (reg[2].I / 256.0);

 	tmp = std::pow(2.0, tmp / 12.0);

 	reg[0].I = static_cast<int>(freq / tmp);

 }

@@ -104,7 +104,7 @@ void BIOS_BitUnPack()

 	int bits = CPUReadByte(header + 2);

 	int revbits = 8 - bits;

-	// u32 value = 0;

+	//uint32_t value = 0;

 	uint32_t base = CPUReadMemory(header + 4);

 	bool addBase = !!(base & 0x80000000);

 	base &= 0x7fffffff;

@@ -346,7 +346,7 @@ void BIOS_Diff8bitUnFilterVram()

 	uint32_t header = CPUReadMemory(source);

 	source += 4;

-	if (!(source & 0xe000000) | !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))

+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))

 		return;

 	int len = header >> 8;

@@ -416,7 +416,7 @@ void BIOS_Div()

 		reg[1].I = number % denom;

 		int32_t temp = static_cast<int32_t>(reg[0].I);

 		reg[3].I = static_cast<uint32_t>(temp < 0 ? -temp : temp);

-  }

+	}

 }

 void BIOS_HuffUnComp()

@@ -1,1147 +1,1005 @@

-#include <math.h>

-#include <memory.h>

-#include <stdlib.h>

-

+#include <cmath>

+#include <cstring>

 #include "GBA.h"

 #include "bios.h"

 #include "GBAinline.h"

 #include "Globals.h"

-int16_t sineTable[256] = {

-  (int16_t)0x0000, (int16_t)0x0192, (int16_t)0x0323, (int16_t)0x04B5, (int16_t)0x0645, (int16_t)0x07D5, (int16_t)0x0964, (int16_t)0x0AF1,

-  (int16_t)0x0C7C, (int16_t)0x0E05, (int16_t)0x0F8C, (int16_t)0x1111, (int16_t)0x1294, (int16_t)0x1413, (int16_t)0x158F, (int16_t)0x1708,

-  (int16_t)0x187D, (int16_t)0x19EF, (int16_t)0x1B5D, (int16_t)0x1CC6, (int16_t)0x1E2B, (int16_t)0x1F8B, (int16_t)0x20E7, (int16_t)0x223D,

-  (int16_t)0x238E, (int16_t)0x24DA, (int16_t)0x261F, (int16_t)0x275F, (int16_t)0x2899, (int16_t)0x29CD, (int16_t)0x2AFA, (int16_t)0x2C21,

-  (int16_t)0x2D41, (int16_t)0x2E5A, (int16_t)0x2F6B, (int16_t)0x3076, (int16_t)0x3179, (int16_t)0x3274, (int16_t)0x3367, (int16_t)0x3453,

-  (int16_t)0x3536, (int16_t)0x3612, (int16_t)0x36E5, (int16_t)0x37AF, (int16_t)0x3871, (int16_t)0x392A, (int16_t)0x39DA, (int16_t)0x3A82,

-  (int16_t)0x3B20, (int16_t)0x3BB6, (int16_t)0x3C42, (int16_t)0x3CC5, (int16_t)0x3D3E, (int16_t)0x3DAE, (int16_t)0x3E14, (int16_t)0x3E71,

-  (int16_t)0x3EC5, (int16_t)0x3F0E, (int16_t)0x3F4E, (int16_t)0x3F84, (int16_t)0x3FB1, (int16_t)0x3FD3, (int16_t)0x3FEC, (int16_t)0x3FFB,

-  (int16_t)0x4000, (int16_t)0x3FFB, (int16_t)0x3FEC, (int16_t)0x3FD3, (int16_t)0x3FB1, (int16_t)0x3F84, (int16_t)0x3F4E, (int16_t)0x3F0E,

-  (int16_t)0x3EC5, (int16_t)0x3E71, (int16_t)0x3E14, (int16_t)0x3DAE, (int16_t)0x3D3E, (int16_t)0x3CC5, (int16_t)0x3C42, (int16_t)0x3BB6,

-  (int16_t)0x3B20, (int16_t)0x3A82, (int16_t)0x39DA, (int16_t)0x392A, (int16_t)0x3871, (int16_t)0x37AF, (int16_t)0x36E5, (int16_t)0x3612,

-  (int16_t)0x3536, (int16_t)0x3453, (int16_t)0x3367, (int16_t)0x3274, (int16_t)0x3179, (int16_t)0x3076, (int16_t)0x2F6B, (int16_t)0x2E5A,

-  (int16_t)0x2D41, (int16_t)0x2C21, (int16_t)0x2AFA, (int16_t)0x29CD, (int16_t)0x2899, (int16_t)0x275F, (int16_t)0x261F, (int16_t)0x24DA,

-  (int16_t)0x238E, (int16_t)0x223D, (int16_t)0x20E7, (int16_t)0x1F8B, (int16_t)0x1E2B, (int16_t)0x1CC6, (int16_t)0x1B5D, (int16_t)0x19EF,

-  (int16_t)0x187D, (int16_t)0x1708, (int16_t)0x158F, (int16_t)0x1413, (int16_t)0x1294, (int16_t)0x1111, (int16_t)0x0F8C, (int16_t)0x0E05,

-  (int16_t)0x0C7C, (int16_t)0x0AF1, (int16_t)0x0964, (int16_t)0x07D5, (int16_t)0x0645, (int16_t)0x04B5, (int16_t)0x0323, (int16_t)0x0192,

-  (int16_t)0x0000, (int16_t)0xFE6E, (int16_t)0xFCDD, (int16_t)0xFB4B, (int16_t)0xF9BB, (int16_t)0xF82B, (int16_t)0xF69C, (int16_t)0xF50F,

-  (int16_t)0xF384, (int16_t)0xF1FB, (int16_t)0xF074, (int16_t)0xEEEF, (int16_t)0xED6C, (int16_t)0xEBED, (int16_t)0xEA71, (int16_t)0xE8F8,

-  (int16_t)0xE783, (int16_t)0xE611, (int16_t)0xE4A3, (int16_t)0xE33A, (int16_t)0xE1D5, (int16_t)0xE075, (int16_t)0xDF19, (int16_t)0xDDC3,

-  (int16_t)0xDC72, (int16_t)0xDB26, (int16_t)0xD9E1, (int16_t)0xD8A1, (int16_t)0xD767, (int16_t)0xD633, (int16_t)0xD506, (int16_t)0xD3DF,

-  (int16_t)0xD2BF, (int16_t)0xD1A6, (int16_t)0xD095, (int16_t)0xCF8A, (int16_t)0xCE87, (int16_t)0xCD8C, (int16_t)0xCC99, (int16_t)0xCBAD,

-  (int16_t)0xCACA, (int16_t)0xC9EE, (int16_t)0xC91B, (int16_t)0xC851, (int16_t)0xC78F, (int16_t)0xC6D6, (int16_t)0xC626, (int16_t)0xC57E,

-  (int16_t)0xC4E0, (int16_t)0xC44A, (int16_t)0xC3BE, (int16_t)0xC33B, (int16_t)0xC2C2, (int16_t)0xC252, (int16_t)0xC1EC, (int16_t)0xC18F,

-  (int16_t)0xC13B, (int16_t)0xC0F2, (int16_t)0xC0B2, (int16_t)0xC07C, (int16_t)0xC04F, (int16_t)0xC02D, (int16_t)0xC014, (int16_t)0xC005,

-  (int16_t)0xC000, (int16_t)0xC005, (int16_t)0xC014, (int16_t)0xC02D, (int16_t)0xC04F, (int16_t)0xC07C, (int16_t)0xC0B2, (int16_t)0xC0F2,

-  (int16_t)0xC13B, (int16_t)0xC18F, (int16_t)0xC1EC, (int16_t)0xC252, (int16_t)0xC2C2, (int16_t)0xC33B, (int16_t)0xC3BE, (int16_t)0xC44A,

-  (int16_t)0xC4E0, (int16_t)0xC57E, (int16_t)0xC626, (int16_t)0xC6D6, (int16_t)0xC78F, (int16_t)0xC851, (int16_t)0xC91B, (int16_t)0xC9EE,

-  (int16_t)0xCACA, (int16_t)0xCBAD, (int16_t)0xCC99, (int16_t)0xCD8C, (int16_t)0xCE87, (int16_t)0xCF8A, (int16_t)0xD095, (int16_t)0xD1A6,

-  (int16_t)0xD2BF, (int16_t)0xD3DF, (int16_t)0xD506, (int16_t)0xD633, (int16_t)0xD767, (int16_t)0xD8A1, (int16_t)0xD9E1, (int16_t)0xDB26,

-  (int16_t)0xDC72, (int16_t)0xDDC3, (int16_t)0xDF19, (int16_t)0xE075, (int16_t)0xE1D5, (int16_t)0xE33A, (int16_t)0xE4A3, (int16_t)0xE611,

-  (int16_t)0xE783, (int16_t)0xE8F8, (int16_t)0xEA71, (int16_t)0xEBED, (int16_t)0xED6C, (int16_t)0xEEEF, (int16_t)0xF074, (int16_t)0xF1FB,

-  (int16_t)0xF384, (int16_t)0xF50F, (int16_t)0xF69C, (int16_t)0xF82B, (int16_t)0xF9BB, (int16_t)0xFB4B, (int16_t)0xFCDD, (int16_t)0xFE6E

+int32_t sineTable[] =

+{

+	0x0000, 0x0192, 0x0323, 0x04B5, 0x0645, 0x07D5, 0x0964, 0x0AF1,

+	0x0C7C, 0x0E05, 0x0F8C, 0x1111, 0x1294, 0x1413, 0x158F, 0x1708,

+	0x187D, 0x19EF, 0x1B5D, 0x1CC6, 0x1E2B, 0x1F8B, 0x20E7, 0x223D,

+	0x238E, 0x24DA, 0x261F, 0x275F, 0x2899, 0x29CD, 0x2AFA, 0x2C21,

+	0x2D41, 0x2E5A, 0x2F6B, 0x3076, 0x3179, 0x3274, 0x3367, 0x3453,

+	0x3536, 0x3612, 0x36E5, 0x37AF, 0x3871, 0x392A, 0x39DA, 0x3A82,

+	0x3B20, 0x3BB6, 0x3C42, 0x3CC5, 0x3D3E, 0x3DAE, 0x3E14, 0x3E71,

+	0x3EC5, 0x3F0E, 0x3F4E, 0x3F84, 0x3FB1, 0x3FD3, 0x3FEC, 0x3FFB,

+	0x4000, 0x3FFB, 0x3FEC, 0x3FD3, 0x3FB1, 0x3F84, 0x3F4E, 0x3F0E,

+	0x3EC5, 0x3E71, 0x3E14, 0x3DAE, 0x3D3E, 0x3CC5, 0x3C42, 0x3BB6,

+	0x3B20, 0x3A82, 0x39DA, 0x392A, 0x3871, 0x37AF, 0x36E5, 0x3612,

+	0x3536, 0x3453, 0x3367, 0x3274, 0x3179, 0x3076, 0x2F6B, 0x2E5A,

+	0x2D41, 0x2C21, 0x2AFA, 0x29CD, 0x2899, 0x275F, 0x261F, 0x24DA,

+	0x238E, 0x223D, 0x20E7, 0x1F8B, 0x1E2B, 0x1CC6, 0x1B5D, 0x19EF,

+	0x187D, 0x1708, 0x158F, 0x1413, 0x1294, 0x1111, 0x0F8C, 0x0E05,

+	0x0C7C, 0x0AF1, 0x0964, 0x07D5, 0x0645, 0x04B5, 0x0323, 0x0192,

+	0x0000, 0xFE6E, 0xFCDD, 0xFB4B, 0xF9BB, 0xF82B, 0xF69C, 0xF50F,

+	0xF384, 0xF1FB, 0xF074, 0xEEEF, 0xED6C, 0xEBED, 0xEA71, 0xE8F8,

+	0xE783, 0xE611, 0xE4A3, 0xE33A, 0xE1D5, 0xE075, 0xDF19, 0xDDC3,

+	0xDC72, 0xDB26, 0xD9E1, 0xD8A1, 0xD767, 0xD633, 0xD506, 0xD3DF,

+	0xD2BF, 0xD1A6, 0xD095, 0xCF8A, 0xCE87, 0xCD8C, 0xCC99, 0xCBAD,

+	0xCACA, 0xC9EE, 0xC91B, 0xC851, 0xC78F, 0xC6D6, 0xC626, 0xC57E,

+	0xC4E0, 0xC44A, 0xC3BE, 0xC33B, 0xC2C2, 0xC252, 0xC1EC, 0xC18F,

+	0xC13B, 0xC0F2, 0xC0B2, 0xC07C, 0xC04F, 0xC02D, 0xC014, 0xC005,

+	0xC000, 0xC005, 0xC014, 0xC02D, 0xC04F, 0xC07C, 0xC0B2, 0xC0F2,

+	0xC13B, 0xC18F, 0xC1EC, 0xC252, 0xC2C2, 0xC33B, 0xC3BE, 0xC44A,

+	0xC4E0, 0xC57E, 0xC626, 0xC6D6, 0xC78F, 0xC851, 0xC91B, 0xC9EE,

+	0xCACA, 0xCBAD, 0xCC99, 0xCD8C, 0xCE87, 0xCF8A, 0xD095, 0xD1A6,

+	0xD2BF, 0xD3DF, 0xD506, 0xD633, 0xD767, 0xD8A1, 0xD9E1, 0xDB26,

+	0xDC72, 0xDDC3, 0xDF19, 0xE075, 0xE1D5, 0xE33A, 0xE4A3, 0xE611,

+	0xE783, 0xE8F8, 0xEA71, 0xEBED, 0xED6C, 0xEEEF, 0xF074, 0xF1FB,

+	0xF384, 0xF50F, 0xF69C, 0xF82B, 0xF9BB, 0xFB4B, 0xFCDD, 0xFE6E

 };

 void BIOS_ArcTan()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("ArcTan: %08x (VCOUNT=%2d)\n",

-        reg[0].I,

-        VCOUNT);

-  }

-#endif

-

-  int32_t a =  -(((int32_t)(reg[0].I*reg[0].I)) >> 14);

-  int32_t b = ((0xA9 * a) >> 14) + 0x390;

-  b = ((b * a) >> 14) + 0x91C;

-  b = ((b * a) >> 14) + 0xFB6;

-  b = ((b * a) >> 14) + 0x16AA;

-  b = ((b * a) >> 14) + 0x2081;

-  b = ((b * a) >> 14) + 0x3651;

-  b = ((b * a) >> 14) + 0xA2F9;

-  a = ((int32_t)reg[0].I * b) >> 16;

-  reg[0].I = a;

-

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("ArcTan: return=%08x\n",

-        reg[0].I);

-  }

-#endif

+	int32_t a =  -(static_cast<int32_t>(reg[0].I * reg[0].I) >> 14);

+	int32_t b = ((0xA9 * a) >> 14) + 0x390;

+	b = ((b * a) >> 14) + 0x91C;

+	b = ((b * a) >> 14) + 0xFB6;

+	b = ((b * a) >> 14) + 0x16AA;

+	b = ((b * a) >> 14) + 0x2081;

+	b = ((b * a) >> 14) + 0x3651;

+	b = ((b * a) >> 14) + 0xA2F9;

+	a = (static_cast<int32_t>(reg[0].I) * b) >> 16;

+	reg[0].I = a;

 }

 void BIOS_ArcTan2()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("ArcTan2: %08x,%08x (VCOUNT=%2d)\n",

-        reg[0].I,

-        reg[1].I,

-        VCOUNT);

-  }

-#endif

-

-  int32_t x = reg[0].I;

-  int32_t y = reg[1].I;

-  uint32_t res = 0;

-  if (y == 0) {

-    res = ((x>>16) & 0x8000);

-  } else {

-    if (x == 0) {

-      res = ((y>>16) & 0x8000) + 0x4000;

-    } else {

-		if ((abs(x) > abs(y)) || ((abs(x) == abs(y)) && (!((x<0) && (y<0))))) {

-        reg[1].I = x;

-        reg[0].I = y << 14;

-        BIOS_Div();

-        BIOS_ArcTan();

-        if (x < 0)

-          res = 0x8000 + reg[0].I;

-        else

-          res = (((y>>16) & 0x8000)<<1) + reg[0].I;

-      } else {

-        reg[0].I = x << 14;

-        BIOS_Div();

-        BIOS_ArcTan();

-        res = (0x4000 + ((y>>16) & 0x8000)) - reg[0].I;

-      }

-    }

-  }

-  reg[0].I = res;

-

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("ArcTan2: return=%08x\n",

-        reg[0].I);

-  }

-#endif

+	int32_t x = reg[0].I;

+	int32_t y = reg[1].I;

+	uint32_t res = 0;

+	if (!y)

+		res = (x >> 16) & 0x8000;

+	else

+	{

+		if (!x)

+			res = ((y >> 16) & 0x8000) + 0x4000;

+		else

+		{

+			if (std::abs(x) > std::abs(y) || (std::abs(x) == std::abs(y) && !(x < 0 && y < 0)))

+			{

+				reg[1].I = x;

+				reg[0].I = y << 14;

+				BIOS_Div();

+				BIOS_ArcTan();

+				if (x < 0)

+					res = 0x8000 + reg[0].I;

+				else

+					res = (((y >> 16) & 0x8000) << 1) + reg[0].I;

+			}

+			else

+			{

+				reg[0].I = x << 14;

+				BIOS_Div();

+				BIOS_ArcTan();

+				res = (0x4000 + ((y >> 16) & 0x8000)) - reg[0].I;

+			}

+		}

+	}

+	reg[0].I = res;

 }

 void BIOS_BitUnPack()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("BitUnPack: %08x,%08x,%08x (VCOUNT=%2d)\n",

-        reg[0].I,

-        reg[1].I,

-        reg[2].I,

-        VCOUNT);

-  }

-#endif

-

-  uint32_t source = reg[0].I;

-  uint32_t dest = reg[1].I;

-  uint32_t header = reg[2].I;

-

-  int len = CPUReadHalfWord(header);

-    // check address

-  if(((source & 0xe000000) == 0) ||

-     ((source + len) & 0xe000000) == 0)

-    return;

-

-  int bits = CPUReadByte(header+2);

-  int revbits = 8 - bits;

-  // u32 value = 0;

-  uint32_t base = CPUReadMemory(header+4);

-  bool addBase = (base & 0x80000000) ? true : false;

-  base &= 0x7fffffff;

-  int dataSize = CPUReadByte(header+3);

-

-  int data = 0;

-  int bitwritecount = 0;

-  while(1) {

-    len -= 1;

-    if(len < 0)

-      break;

-    int mask = 0xff >> revbits;

-    uint8_t b = CPUReadByte(source);

-    source++;

-    int bitcount = 0;

-    while(1) {

-      if(bitcount >= 8)

-        break;

-      uint32_t d = b & mask;

-      uint32_t temp = d >> bitcount;

-      if(d || addBase) {

-        temp += base;

-      }

-      data |= temp << bitwritecount;

-      bitwritecount += dataSize;

-      if(bitwritecount >= 32) {

-        CPUWriteMemory(dest, data);

-        dest += 4;

-        data = 0;

-        bitwritecount = 0;

-      }

-      mask <<= bits;

-      bitcount += bits;

-    }

-  }

+	uint32_t source = reg[0].I;

+	uint32_t dest = reg[1].I;

+	uint32_t header = reg[2].I;

+

+	int len = CPUReadHalfWord(header);

+	// check address

+	if (!(source & 0xe000000) || !((source + len) & 0xe000000))

+		return;

+

+	int bits = CPUReadByte(header + 2);

+	int revbits = 8 - bits;

+	// u32 value = 0;

+	uint32_t base = CPUReadMemory(header + 4);

+	bool addBase = !!(base & 0x80000000);

+	base &= 0x7fffffff;

+	int dataSize = CPUReadByte(header + 3);

+

+	int data = 0;

+	int bitwritecount = 0;

+	while (1)

+	{

+		--len;

+		if (len < 0)

+			break;

+		int mask = 0xff >> revbits;

+		uint8_t b = CPUReadByte(source);

+		++source;

+		int bitcount = 0;

+		while (1)

+		{

+			if (bitcount >= 8)

+				break;

+			uint32_t d = b & mask;

+			uint32_t temp = d >> bitcount;

+			if (d || addBase)

+				temp += base;

+			data |= temp << bitwritecount;

+			bitwritecount += dataSize;

+			if (bitwritecount >= 32)

+			{

+				CPUWriteMemory(dest, data);

+				dest += 4;

+				data = 0;

+				bitwritecount = 0;

+			}

+			mask <<= bits;

+			bitcount += bits;

+		}

+	}

 }

 void BIOS_GetBiosChecksum()

 {

-  reg[0].I=0xBAAE187F;

+	reg[0].I = 0xBAAE187F;

 }

 void BIOS_BgAffineSet()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("BgAffineSet: %08x,%08x,%08x (VCOUNT=%2d)\n",

-        reg[0].I,

-        reg[1].I,

-        reg[2].I,

-        VCOUNT);

-  }

-#endif

-

-  uint32_t src = reg[0].I;

-  uint32_t dest = reg[1].I;

-  int num = reg[2].I;

-

-  for(int i = 0; i < num; i++) {

-    int32_t cx = CPUReadMemory(src);

-    src+=4;

-    int32_t cy = CPUReadMemory(src);

-    src+=4;

-    int16_t dispx = CPUReadHalfWord(src);

-    src+=2;

-    int16_t dispy = CPUReadHalfWord(src);

-    src+=2;

-    int16_t rx = CPUReadHalfWord(src);

-    src+=2;

-    int16_t ry = CPUReadHalfWord(src);

-    src+=2;

-    uint16_t theta = CPUReadHalfWord(src)>>8;

-    src+=4; // keep structure alignment

-    int32_t a = sineTable[(theta+0x40)&255];

-    int32_t b = sineTable[theta];

-

-    int16_t dx =  (rx * a)>>14;

-    int16_t dmx = (rx * b)>>14;

-    int16_t dy =  (ry * b)>>14;

-    int16_t dmy = (ry * a)>>14;

-

-    CPUWriteHalfWord(dest, dx);

-    dest += 2;

-    CPUWriteHalfWord(dest, -dmx);

-    dest += 2;

-    CPUWriteHalfWord(dest, dy);

-    dest += 2;

-    CPUWriteHalfWord(dest, dmy);

-    dest += 2;

-

-    int32_t startx = cx - dx * dispx + dmx * dispy;

-    int32_t starty = cy - dy * dispx - dmy * dispy;

-

-    CPUWriteMemory(dest, startx);

-    dest += 4;

-    CPUWriteMemory(dest, starty);

-    dest += 4;

-  }

+	uint32_t src = reg[0].I;

+	uint32_t dest = reg[1].I;

+	int num = reg[2].I;

+

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

+	{

+		int32_t cx = CPUReadMemory(src);

+		src += 4;

+		int32_t cy = CPUReadMemory(src);

+		src += 4;

+		int16_t dispx = CPUReadHalfWord(src);

+		src += 2;

+		int16_t dispy = CPUReadHalfWord(src);

+		src += 2;

+		int16_t rx = CPUReadHalfWord(src);

+		src += 2;

+		int16_t ry = CPUReadHalfWord(src);

+		src += 2;

+		uint16_t theta = CPUReadHalfWord(src) >> 8;

+		src += 4; // keep structure alignment

+		int32_t a = sineTable[(theta + 0x40) & 255];

+		int32_t b = sineTable[theta];

+

+		int16_t dx = (rx * a) >> 14;

+		int16_t dmx = (rx * b) >> 14;

+		int16_t dy = (ry * b) >> 14;

+		int16_t dmy = (ry * a) >> 14;

+

+		CPUWriteHalfWord(dest, dx);

+		dest += 2;

+		CPUWriteHalfWord(dest, -dmx);

+		dest += 2;

+		CPUWriteHalfWord(dest, dy);

+		dest += 2;

+		CPUWriteHalfWord(dest, dmy);

+		dest += 2;

+

+		int32_t startx = cx - dx * dispx + dmx * dispy;

+		int32_t starty = cy - dy * dispx - dmy * dispy;

+

+		CPUWriteMemory(dest, startx);

+		dest += 4;

+		CPUWriteMemory(dest, starty);

+		dest += 4;

+	}

 }

 void BIOS_CpuSet()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("CpuSet: 0x%08x,0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I, reg[1].I,

-        reg[2].I, VCOUNT);

-  }

-#endif

-

-  uint32_t source = reg[0].I;

-  uint32_t dest = reg[1].I;

-  uint32_t cnt = reg[2].I;

-

-  if(((source & 0xe000000) == 0) ||

-     ((source + (((cnt << 11)>>9) & 0x1fffff)) & 0xe000000) == 0)

-    return;

-

-  int count = cnt & 0x1FFFFF;

-

-  // 32-bit ?

-  if((cnt >> 26) & 1) {

-    // needed for 32-bit mode!

-    source &= 0xFFFFFFFC;

-    dest &= 0xFFFFFFFC;

-    // fill ?

-    if((cnt >> 24) & 1) {

-        uint32_t value = (source>0x0EFFFFFF ? 0x1CAD1CAD : CPUReadMemory(source));

-      while(count) {

-        CPUWriteMemory(dest, value);

-        dest += 4;

-        count--;

-      }

-    } else {

-      // copy

-      while(count) {

-        CPUWriteMemory(dest, (source>0x0EFFFFFF ? 0x1CAD1CAD : CPUReadMemory(source)));

-        source += 4;

-        dest += 4;

-        count--;

-      }

-    }

-  } else {

-    // 16-bit fill?

-    if((cnt >> 24) & 1) {

-      uint16_t value = (source>0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source));

-      while(count) {

-        CPUWriteHalfWord(dest, value);

-        dest += 2;

-        count--;

-      }

-    } else {

-      // copy

-      while(count) {

-        CPUWriteHalfWord(dest, (source>0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source)));

-        source += 2;

-        dest += 2;

-        count--;

-      }

-    }

-  }

+	uint32_t source = reg[0].I;

+	uint32_t dest = reg[1].I;

+	uint32_t cnt = reg[2].I;

+

+	if (!(source & 0xe000000) || !((source + (((cnt << 11) >> 9) & 0x1fffff)) & 0xe000000))

+		return;

+

+	int count = cnt & 0x1FFFFF;

+

+	// 32-bit ?

+	if ((cnt >> 26) & 1)

+	{

+		// needed for 32-bit mode!

+		source &= 0xFFFFFFFC;

+		dest &= 0xFFFFFFFC;

+		// fill ?

+		if ((cnt >> 24) & 1)

+		{

+			uint32_t value = source > 0x0EFFFFFF ? 0x1CAD1CAD : CPUReadMemory(source);

+			while (count)

+			{

+				CPUWriteMemory(dest, value);

+				dest += 4;

+				--count;

+			}

+		}

+		else

+		{

+			// copy

+			while (count)

+			{

+				CPUWriteMemory(dest, source > 0x0EFFFFFF ? 0x1CAD1CAD : CPUReadMemory(source));

+				source += 4;

+				dest += 4;

+				--count;

+			}

+		}

+	}

+	else

+	{

+		// 16-bit fill?

+		if ((cnt >> 24) & 1)

+		{

+			uint16_t value = source > 0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source);

+			while (count)

+			{

+				CPUWriteHalfWord(dest, value);

+				dest += 2;

+				--count;

+			}

+		}

+		else

+		{

+			// copy

+			while (count)

+			{

+				CPUWriteHalfWord(dest, source > 0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source));

+				source += 2;

+				dest += 2;

+				--count;

+			}

+		}

+	}

 }

 void BIOS_CpuFastSet()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("CpuFastSet: 0x%08x,0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I, reg[1].I,

-        reg[2].I, VCOUNT);

-  }

-#endif

-

-  uint32_t source = reg[0].I;

-  uint32_t dest = reg[1].I;

-  uint32_t cnt = reg[2].I;

-

-  if(((source & 0xe000000) == 0) ||

-     ((source + (((cnt << 11)>>9) & 0x1fffff)) & 0xe000000) == 0)

-    return;

-

-  // needed for 32-bit mode!

-  source &= 0xFFFFFFFC;

-  dest &= 0xFFFFFFFC;

-

-  int count = cnt & 0x1FFFFF;

-

-  // fill?

-  if((cnt >> 24) & 1) {

-    while(count > 0) {

-      // BIOS always transfers 32 bytes at a time

-      uint32_t value = (source>0x0EFFFFFF ? 0xBAFFFFFB : CPUReadMemory(source));

-      for(int i = 0; i < 8; i++) {

-        CPUWriteMemory(dest, value);

-        dest += 4;

-      }

-      count -= 8;

-    }

-  } else {

-    // copy

-    while(count > 0) {

-      // BIOS always transfers 32 bytes at a time

-      for(int i = 0; i < 8; i++) {

-        CPUWriteMemory(dest, (source>0x0EFFFFFF ? 0xBAFFFFFB :CPUReadMemory(source)));

-        source += 4;

-        dest += 4;

-      }

-      count -= 8;

-    }

-  }

+	uint32_t source = reg[0].I;

+	uint32_t dest = reg[1].I;

+	uint32_t cnt = reg[2].I;

+

+	if (!(source & 0xe000000) || !((source + (((cnt << 11) >> 9) & 0x1fffff)) & 0xe000000))

+		return;

+

+	// needed for 32-bit mode!

+	source &= 0xFFFFFFFC;

+	dest &= 0xFFFFFFFC;

+

+	int count = cnt & 0x1FFFFF;

+

+	// fill?

+	if ((cnt >> 24) & 1)

+	{

+		while (count > 0)

+		{

+			// BIOS always transfers 32 bytes at a time

+			uint32_t value = source > 0x0EFFFFFF ? 0xBAFFFFFB : CPUReadMemory(source);

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

+			{

+				CPUWriteMemory(dest, value);

+				dest += 4;

+			}

+			count -= 8;

+		}

+	}

+	else

+	{

+		// copy

+		while (count > 0)

+		{

+			// BIOS always transfers 32 bytes at a time

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

+			{

+				CPUWriteMemory(dest, source > 0x0EFFFFFF ? 0xBAFFFFFB :CPUReadMemory(source));

+				source += 4;

+				dest += 4;

+			}

+			count -= 8;

+		}

+	}

 }

 void BIOS_Diff8bitUnFilterWram()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("Diff8bitUnFilterWram: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I,

-        reg[1].I, VCOUNT);

-  }

-#endif

+	uint32_t source = reg[0].I;

+	uint32_t dest = reg[1].I;

-  uint32_t source = reg[0].I;

-  uint32_t dest = reg[1].I;

+	uint32_t header = CPUReadMemory(source);

+	source += 4;

-  uint32_t header = CPUReadMemory(source);

-  source += 4;

+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))

+		return;

-  if(((source & 0xe000000) == 0) ||

-     (((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0))

-    return;

+	int len = header >> 8;

-  int len = header >> 8;

+	uint8_t data = CPUReadByte(source++);

+	CPUWriteByte(dest++, data);

+	--len;

-  uint8_t data = CPUReadByte(source++);

-  CPUWriteByte(dest++, data);

-  len--;

-

-  while(len > 0) {

-    uint8_t diff = CPUReadByte(source++);

-    data += diff;

-    CPUWriteByte(dest++, data);

-    len--;

-  }

+	while (len > 0)

+	{

+		uint8_t diff = CPUReadByte(source++);

+		data += diff;

+		CPUWriteByte(dest++, data);

+		--len;

+	}

 }

 void BIOS_Diff8bitUnFilterVram()

 {

-#ifdef GBA_LOGGING

-  if(systemVerbose & VERBOSE_SWI) {

-    log("Diff8bitUnFilterVram: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I,

-        reg[1].I, VCOUNT);

-  }

-#endif

-

-  uint32_t source = reg[0].I;

-  uint32_t dest = reg[1].I;

-

-  uint32_t header = CPUReadMemory(source);

-  source += 4;

-

-  if(((source & 0xe000000) == 0) ||

-     ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)

-    return;

-

-  int len = header >> 8;

-

-  uint8_t data = CPUReadByte(source++);

-  uint16_t writeData = data;

-  int shift = 8;

-  int bytes = 1;

-

-  while(len >= 2) {

-    uint8_t diff = CPUReadByte(source++);

-    data += diff;

-    writeData |= (data << shift);

-    bytes++;

-    shift += 8;

-    if(bytes == 2) {

-      CPUWriteHalfWord(dest, writeData);

-      dest += 2;

-      len -= 2;

-      bytes = 0;

-      writeData = 0;

-      shift = 0;

-    }

-  }

+	uint32_t source = reg[0].I;

+	uint32_t dest = reg[1].I;

+

+	uint32_t header = CPUReadMemory(source);

+	source += 4;

+

+	if (!(source & 0xe000000) | !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))

+		return;

+

+	int len = header >> 8;

+

+	uint8_t data = CPUReadByte(source++);

+	uint16_t writeData = data;

+	int shift = 8;

+	int bytes = 1;

+

+	while (len >= 2)

+	{