# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1330904130 21600
# Node ID 8870086b716c9575c0c0eed8c53551a8ad563dc1
# Parent  e0545ef33bb9ab8f73f3ca58f7915bc813242827
remote.cpp must include config.h

diff -r e0545ef33bb9 -r 8870086b716c commands.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commands.sh	Sun Mar 04 17:35:30 2012 -0600
@@ -0,0 +1,9 @@
+# This buffer is for notes you don't want to save, and for Lisp evaluation.
+# If you want to create a file, visit that file with C-x C-f,
+# then enter the text in that file's own buffer.
+
+
+./VisualBoyAdvance ../../../pokemon-escape/roms/Pokemon\ Yellow\ \(U\)\ \[C\]\[\!\].gbc                                     
+
+
+./VisualBoyAdvance --recordmovie=./rlm.vbm ../../../pokemon-escape/roms/Pokemon\ Yellow\ \(U\)\ \[C\]\[\!\].gbc                                     
diff -r e0545ef33bb9 -r 8870086b716c correct.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/correct.sh	Sun Mar 04 17:35:30 2012 -0600
@@ -0,0 +1,9 @@
+cd ./src/gba
+
+g++ -DHAVE_ARPA_INET_H=1  \
+    -DHAVE_NETINET_IN_H=1 \
+    -fno-exceptions \
+    -I. -I../../../src/gba -I../..  -I../../../src \
+    -g -O2 \
+    -MT remote.o -MD -MP -MF .deps/remote.Tpo -c \
+    -o remote.o ../../../src/gba/remote.cpp
diff -r e0545ef33bb9 -r 8870086b716c src/gba/remote.cpp
--- a/src/gba/remote.cpp	Sun Mar 04 16:56:20 2012 -0600
+++ b/src/gba/remote.cpp	Sun Mar 04 17:35:30 2012 -0600
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+#include <config.h>
 
 #ifndef WIN32
 # include <unistd.h>
@@ -51,150 +52,147 @@
 #if (defined WIN32 && !defined SDL)
 void remoteSetSockets(SOCKET l, SOCKET r)
 {
-  remoteSocket       = r;
-  remoteListenSocket = l;
+	remoteSocket       = r;
+	remoteListenSocket = l;
 }
 
 #endif
 
 int remoteTcpSend(char *data, int len)
 {
-  return send(remoteSocket, data, len, 0);
+	return send(remoteSocket, data, len, 0);
 }
 
 int remoteTcpRecv(char *data, int len)
 {
-  return recv(remoteSocket, data, len, 0);
+	return recv(remoteSocket, data, len, 0);
 }
 
 bool remoteTcpInit()
 {
-  if (remoteSocket == -1)
-    {
+	if (remoteSocket == -1)
+	{
 #ifdef WIN32
-      WSADATA wsaData;
-      int     error = WSAStartup(MAKEWORD(1, 1), &wsaData);
+		WSADATA wsaData;
+		int     error = WSAStartup(MAKEWORD(1, 1), &wsaData);
 #endif // WIN32
-      int s = socket(PF_INET, SOCK_STREAM, 0);
+		int s = socket(PF_INET, SOCK_STREAM, 0);
 
-      remoteListenSocket = s;
+		remoteListenSocket = s;
 
-      if (s < 0)
-	{
-	  fprintf(stderr, "Error opening socket\n");
-	  exit(-1);
-	}
-      int tmp = 1;
-      setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof(tmp));
+		if (s < 0)
+		{
+			fprintf(stderr, "Error opening socket\n");
+			exit(-1);
+		}
+		int tmp = 1;
+		setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof(tmp));
 
-      //    char hostname[256];
-      //    gethostname(hostname, 256);
+		//    char hostname[256];
+		//    gethostname(hostname, 256);
 
-      //    hostent *ent = gethostbyname(hostname);
-      //    unsigned long a = *((unsigned long *)ent->h_addr);
+		//    hostent *ent = gethostbyname(hostname);
+		//    unsigned long a = *((unsigned long *)ent->h_addr);
 
-      sockaddr_in addr;
-      addr.sin_family      = AF_INET;
-      addr.sin_port        = htons(remotePort);
-      addr.sin_addr.s_addr = htonl(0);
-      int count = 0;
-      while (count < 3)
-	{
-	  if (bind(s, (sockaddr *)&addr, sizeof(addr)))
-	    {
-	      addr.sin_port = htons(ntohs(addr.sin_port)+1);
-	    }
-	  else
-	    break;
-	}
-      if (count == 3)
-	{
-	  fprintf(stderr, "Error binding \n");
-	  exit(-1);
-	}
+		sockaddr_in addr;
+		addr.sin_family      = AF_INET;
+		addr.sin_port        = htons(remotePort);
+		addr.sin_addr.s_addr = htonl(0);
+		int count = 0;
+		while (count < 3)
+		{
+			if (bind(s, (sockaddr *)&addr, sizeof(addr)))
+			{
+				addr.sin_port = htons(ntohs(addr.sin_port)+1);
+			}
+			else
+				break;
+		}
+		if (count == 3)
+		{
+			fprintf(stderr, "Error binding \n");
+			exit(-1);
+		}
 
-      fprintf(stderr, "Listening for a connection at port %d\n",
-	      ntohs(addr.sin_port));
+		fprintf(stderr, "Listening for a connection at port %d\n",
+		        ntohs(addr.sin_port));
 
-      if (listen(s, 1))
-	{
-	  fprintf(stderr, "Error listening\n");
-	  exit(-1);
-	}
-
+		if (listen(s, 1))
+		{
+			fprintf(stderr, "Error listening\n");
+			exit(-1);
+		}
+		socklen_t len = sizeof(addr);
 
 #ifdef WIN32
-      int flag = 0;
-      ioctlsocket(s, FIONBIO, (unsigned long *)&flag);
+		int flag = 0;
+		ioctlsocket(s, FIONBIO, (unsigned long *)&flag);
 #endif // WIN32
-
-      socklen_t len = sizeof(addr);
-
-      int s2 = accept(s, (sockaddr *)&addr, &len);
-      if (s2 > 0)
-	{
-	  fprintf(stderr, "Got a connection from %s %d\n",
-		  inet_ntoa((in_addr)addr.sin_addr),
-		  ntohs(addr.sin_port));
+		int s2 = accept(s, (sockaddr *)&addr, &len);
+		if (s2 > 0)
+		{
+			fprintf(stderr, "Got a connection from %s %d\n",
+			        inet_ntoa((in_addr)addr.sin_addr),
+			        ntohs(addr.sin_port));
+		}
+		else
+		{
+#ifdef WIN32
+			int error = WSAGetLastError();
+#endif // WIN32
+		}
+		char dummy;
+		recv(s2, &dummy, 1, 0);
+		if (dummy != '+')
+		{
+			fprintf(stderr, "ACK not received\n");
+			exit(-1);
+		}
+		remoteSocket = s2;
+		//    close(s);
 	}
-      else
-	{
-#ifdef WIN32
-	  int error = WSAGetLastError();
-#endif // WIN32
-	}
-      char dummy;
-      recv(s2, &dummy, 1, 0);
-      if (dummy != '+')
-	{
-	  fprintf(stderr, "ACK not received\n");
-	  exit(-1);
-	}
-      remoteSocket = s2;
-      //    close(s);
-    }
-  return true;
+	return true;
 }
 
 void remoteTcpCleanUp()
 {
-  if (remoteSocket > 0)
-    {
-      fprintf(stderr, "Closing remote socket\n");
-      close(remoteSocket);
-      remoteSocket = -1;
-    }
-  if (remoteListenSocket > 0)
-    {
-      fprintf(stderr, "Closing listen socket\n");
-      close(remoteListenSocket);
-      remoteListenSocket = -1;
-    }
+	if (remoteSocket > 0)
+	{
+		fprintf(stderr, "Closing remote socket\n");
+		close(remoteSocket);
+		remoteSocket = -1;
+	}
+	if (remoteListenSocket > 0)
+	{
+		fprintf(stderr, "Closing listen socket\n");
+		close(remoteListenSocket);
+		remoteListenSocket = -1;
+	}
 }
 
 int remotePipeSend(char *data, int len)
 {
-  int res = write(1, data, len);
-  return res;
+	int res = write(1, data, len);
+	return res;
 }
 
 int remotePipeRecv(char *data, int len)
 {
-  int res = read(0, data, len);
-  return res;
+	int res = read(0, data, len);
+	return res;
 }
 
 bool remotePipeInit()
 {
-  char dummy;
-  read(0, &dummy, 1);
-  if (dummy != '+')
-    {
-      fprintf(stderr, "ACK not received\n");
-      exit(-1);
-    }
+	char dummy;
+	read(0, &dummy, 1);
+	if (dummy != '+')
+	{
+		fprintf(stderr, "ACK not received\n");
+		exit(-1);
+	}
 
-  return true;
+	return true;
 }
 
 void remotePipeCleanUp()
@@ -202,514 +200,514 @@
 
 void remoteSetPort(int port)
 {
-  remotePort = port;
+	remotePort = port;
 }
 
 void remoteSetProtocol(int p)
 {
-  if (p == 0)
-    {
-      remoteSendFnc    = remoteTcpSend;
-      remoteRecvFnc    = remoteTcpRecv;
-      remoteInitFnc    = remoteTcpInit;
-      remoteCleanUpFnc = remoteTcpCleanUp;
-    }
-  else
-    {
-      remoteSendFnc    = remotePipeSend;
-      remoteRecvFnc    = remotePipeRecv;
-      remoteInitFnc    = remotePipeInit;
-      remoteCleanUpFnc = remotePipeCleanUp;
-    }
+	if (p == 0)
+	{
+		remoteSendFnc    = remoteTcpSend;
+		remoteRecvFnc    = remoteTcpRecv;
+		remoteInitFnc    = remoteTcpInit;
+		remoteCleanUpFnc = remoteTcpCleanUp;
+	}
+	else
+	{
+		remoteSendFnc    = remotePipeSend;
+		remoteRecvFnc    = remotePipeRecv;
+		remoteInitFnc    = remotePipeInit;
+		remoteCleanUpFnc = remotePipeCleanUp;
+	}
 }
 
 void remoteInit()
 {
-  if (remoteInitFnc)
-    remoteInitFnc();
+	if (remoteInitFnc)
+		remoteInitFnc();
 }
 
 void remotePutPacket(char *packet)
 {
-  char *hex = "0123456789abcdef";
-  char  buffer[1024];
+	char *hex = "0123456789abcdef";
+	char  buffer[1024];
 
-  int count = strlen(packet);
+	int count = strlen(packet);
 
-  unsigned char csum = 0;
+	unsigned char csum = 0;
 
-  char *p = buffer;
-  *p++ = '$';
+	char *p = buffer;
+	*p++ = '$';
 
-  for (int i = 0; i < count; i++)
-    {
-      csum += packet[i];
-      *p++  = packet[i];
-    }
-  *p++ = '#';
-  *p++ = hex[csum>>4];
-  *p++ = hex[csum & 15];
-  *p++ = 0;
-  //  printf("Sending %s\n", buffer);
-  remoteSendFnc(buffer, count + 4);
+	for (int i = 0; i < count; i++)
+	{
+		csum += packet[i];
+		*p++  = packet[i];
+	}
+	*p++ = '#';
+	*p++ = hex[csum>>4];
+	*p++ = hex[csum & 15];
+	*p++ = 0;
+	//  printf("Sending %s\n", buffer);
+	remoteSendFnc(buffer, count + 4);
 
-  char c = 0;
-  remoteRecvFnc(&c, 1);
-  /*
-    if(c == '+')
-    printf("ACK\n");
-    else if(c=='-')
-    printf("NACK\n");
-  */
+	char c = 0;
+	remoteRecvFnc(&c, 1);
+	/*
+	   if(c == '+')
+	   printf("ACK\n");
+	   else if(c=='-')
+	   printf("NACK\n");
+	 */
 }
 
 void remoteOutput(char *s, u32 addr)
 {
-  char buffer[16384];
+	char buffer[16384];
 
-  char *d = buffer;
-  *d++ = 'O';
+	char *d = buffer;
+	*d++ = 'O';
 
-  if (s)
-    {
-      char c = *s++;
-      while (c)
+	if (s)
 	{
-	  sprintf(d, "%02x", c);
-	  d += 2;
-	  c  = *s++;
+		char c = *s++;
+		while (c)
+		{
+			sprintf(d, "%02x", c);
+			d += 2;
+			c  = *s++;
+		}
 	}
-    }
-  else
-    {
-      char c = debuggerReadByte(addr);
-      addr++;
-      while (c)
+	else
 	{
-	  sprintf(d, "%02x", c);
-	  d += 2;
-	  c  = debuggerReadByte(addr);
-	  addr++;
+		char c = debuggerReadByte(addr);
+		addr++;
+		while (c)
+		{
+			sprintf(d, "%02x", c);
+			d += 2;
+			c  = debuggerReadByte(addr);
+			addr++;
+		}
 	}
-    }
-  remotePutPacket(buffer);
-  //  fprintf(stderr, "Output sent %s\n", buffer);
+	remotePutPacket(buffer);
+	//  fprintf(stderr, "Output sent %s\n", buffer);
 }
 
 void remoteSendSignal()
 {
-  char buffer[1024];
-  sprintf(buffer, "S%02x", remoteSignal);
-  remotePutPacket(buffer);
+	char buffer[1024];
+	sprintf(buffer, "S%02x", remoteSignal);
+	remotePutPacket(buffer);
 }
 
 void remoteSendStatus()
 {
-  char buffer[1024];
-  sprintf(buffer, "T%02x", remoteSignal);
-  char *s = buffer;
-  s += 3;
-  for (int i = 0; i < 15; i++)
-    {
-      u32 v = reg[i].I;
-      sprintf(s, "%02x:%02x%02x%02x%02x;", i,
-	      (v & 255),
-	      (v >> 8) & 255,
-	      (v >> 16) & 255,
-	      (v >> 24) & 255);
-      s += 12;
-    }
-  u32 v = armNextPC;
-  sprintf(s, "0f:%02x%02x%02x%02x;", (v & 255),
-	  (v >> 8) & 255,
-	  (v >> 16) & 255,
-	  (v >> 24) & 255);
-  s += 12;
-  CPUUpdateCPSR();
-  v = reg[16].I;
-  sprintf(s, "19:%02x%02x%02x%02x;", (v & 255),
-	  (v >> 8) & 255,
-	  (v >> 16) & 255,
-	  (v >> 24) & 255);
-  s += 12;
-  *s = 0;
-  //  printf("Sending %s\n", buffer);
-  remotePutPacket(buffer);
+	char buffer[1024];
+	sprintf(buffer, "T%02x", remoteSignal);
+	char *s = buffer;
+	s += 3;
+	for (int i = 0; i < 15; i++)
+	{
+		u32 v = reg[i].I;
+		sprintf(s, "%02x:%02x%02x%02x%02x;", i,
+		        (v & 255),
+		        (v >> 8) & 255,
+		        (v >> 16) & 255,
+		        (v >> 24) & 255);
+		s += 12;
+	}
+	u32 v = armNextPC;
+	sprintf(s, "0f:%02x%02x%02x%02x;", (v & 255),
+	        (v >> 8) & 255,
+	        (v >> 16) & 255,
+	        (v >> 24) & 255);
+	s += 12;
+	CPUUpdateCPSR();
+	v = reg[16].I;
+	sprintf(s, "19:%02x%02x%02x%02x;", (v & 255),
+	        (v >> 8) & 255,
+	        (v >> 16) & 255,
+	        (v >> 24) & 255);
+	s += 12;
+	*s = 0;
+	//  printf("Sending %s\n", buffer);
+	remotePutPacket(buffer);
 }
 
 void remoteBinaryWrite(char *p)
 {
-  u32 address;
-  int count;
-  sscanf(p, "%x,%x:", &address, &count);
-  //  printf("Binary write for %08x %d\n", address, count);
+	u32 address;
+	int count;
+	sscanf(p, "%x,%x:", &address, &count);
+	//  printf("Binary write for %08x %d\n", address, count);
 
-  p = strchr(p, ':');
-  p++;
-  for (int i = 0; i < count; i++)
-    {
-      u8 b = *p++;
-      switch (b)
+	p = strchr(p, ':');
+	p++;
+	for (int i = 0; i < count; i++)
 	{
-	case 0x7d:
-	  b = *p++;
-	  debuggerWriteByte(address, (b^0x20));
-	  address++;
-	  break;
-	default:
-	  debuggerWriteByte(address, b);
-	  address++;
-	  break;
+		u8 b = *p++;
+		switch (b)
+		{
+		case 0x7d:
+			b = *p++;
+			debuggerWriteByte(address, (b^0x20));
+			address++;
+			break;
+		default:
+			debuggerWriteByte(address, b);
+			address++;
+			break;
+		}
 	}
-    }
-  //  printf("ROM is %08x\n", debuggerReadMemory(0x8000254));
-  remotePutPacket("OK");
+	//  printf("ROM is %08x\n", debuggerReadMemory(0x8000254));
+	remotePutPacket("OK");
 }
 
 void remoteMemoryWrite(char *p)
 {
-  u32 address;
-  int count;
-  sscanf(p, "%x,%x:", &address, &count);
-  //  printf("Memory write for %08x %d\n", address, count);
+	u32 address;
+	int count;
+	sscanf(p, "%x,%x:", &address, &count);
+	//  printf("Memory write for %08x %d\n", address, count);
 
-  p = strchr(p, ':');
-  p++;
-  for (int i = 0; i < count; i++)
-    {
-      u8   v = 0;
-      char c = *p++;
-      if (c <= '9')
-	v = (c - '0') << 4;
-      else
-	v = (c + 10 - 'a') << 4;
-      c = *p++;
-      if (c <= '9')
-	v += (c - '0');
-      else
-	v += (c + 10 - 'a');
-      debuggerWriteByte(address, v);
-      address++;
-    }
-  //  printf("ROM is %08x\n", debuggerReadMemory(0x8000254));
-  remotePutPacket("OK");
+	p = strchr(p, ':');
+	p++;
+	for (int i = 0; i < count; i++)
+	{
+		u8   v = 0;
+		char c = *p++;
+		if (c <= '9')
+			v = (c - '0') << 4;
+		else
+			v = (c + 10 - 'a') << 4;
+		c = *p++;
+		if (c <= '9')
+			v += (c - '0');
+		else
+			v += (c + 10 - 'a');
+		debuggerWriteByte(address, v);
+		address++;
+	}
+	//  printf("ROM is %08x\n", debuggerReadMemory(0x8000254));
+	remotePutPacket("OK");
 }
 
 void remoteMemoryRead(char *p)
 {
-  u32 address;
-  int count;
-  sscanf(p, "%x,%x:", &address, &count);
-  //  printf("Memory read for %08x %d\n", address, count);
+	u32 address;
+	int count;
+	sscanf(p, "%x,%x:", &address, &count);
+	//  printf("Memory read for %08x %d\n", address, count);
 
-  char buffer[1024];
+	char buffer[1024];
 
-  char *s = buffer;
-  for (int i = 0; i < count; i++)
-    {
-      u8 b = debuggerReadByte(address);
-      sprintf(s, "%02x", b);
-      address++;
-      s += 2;
-    }
-  *s = 0;
-  remotePutPacket(buffer);
+	char *s = buffer;
+	for (int i = 0; i < count; i++)
+	{
+		u8 b = debuggerReadByte(address);
+		sprintf(s, "%02x", b);
+		address++;
+		s += 2;
+	}
+	*s = 0;
+	remotePutPacket(buffer);
 }
 
 void remoteStepOverRange(char *p)
 {
-  u32 address;
-  u32 final;
-  sscanf(p, "%x,%x", &address, &final);
+	u32 address;
+	u32 final;
+	sscanf(p, "%x,%x", &address, &final);
 
-  remotePutPacket("OK");
+	remotePutPacket("OK");
 
-  remoteResumed = true;
-  do
-    {
-      CPULoop(1);
-      if (debugger)
-	break;
-    }
-  while (armNextPC >= address && armNextPC < final);
+	remoteResumed = true;
+	do
+	{
+		CPULoop(1);
+		if (debugger)
+			break;
+	}
+	while (armNextPC >= address && armNextPC < final);
 
-  remoteResumed = false;
+	remoteResumed = false;
 
-  remoteSendStatus();
+	remoteSendStatus();
 }
 
 void remoteWriteWatch(char *p, bool active)
 {
-  u32 address;
-  int count;
-  sscanf(p, ",%x,%x#", &address, &count);
+	u32 address;
+	int count;
+	sscanf(p, ",%x,%x#", &address, &count);
 
-  fprintf(stderr, "Write watch for %08x %d\n", address, count);
+	fprintf(stderr, "Write watch for %08x %d\n", address, count);
 
-  if (address < 0x2000000 || address > 0x3007fff)
-    {
-      remotePutPacket("E01");
-      return;
-    }
+	if (address < 0x2000000 || address > 0x3007fff)
+	{
+		remotePutPacket("E01");
+		return;
+	}
 
-  if (address > 0x203ffff && address < 0x3000000)
-    {
-      remotePutPacket("E01");
-      return;
-    }
+	if (address > 0x203ffff && address < 0x3000000)
+	{
+		remotePutPacket("E01");
+		return;
+	}
 
-  u32 final = address + count;
+	u32 final = address + count;
 
-  if (address < 0x2040000 && final > 0x2040000)
-    {
-      remotePutPacket("E01");
-      return;
-    }
-  else if (address < 0x3008000 && final > 0x3008000)
-    {
-      remotePutPacket("E01");
-      return;
-    }
+	if (address < 0x2040000 && final > 0x2040000)
+	{
+		remotePutPacket("E01");
+		return;
+	}
+	else if (address < 0x3008000 && final > 0x3008000)
+	{
+		remotePutPacket("E01");
+		return;
+	}
 
-  for (int i = 0; i < count; i++)
-    {
-      if ((address >> 24) == 2)
-	freezeWorkRAM[address & 0x3ffff] = active;
-      else
-	freezeInternalRAM[address & 0x7fff] = active;
-      address++;
-    }
+	for (int i = 0; i < count; i++)
+	{
+		if ((address >> 24) == 2)
+			freezeWorkRAM[address & 0x3ffff] = active;
+		else
+			freezeInternalRAM[address & 0x7fff] = active;
+		address++;
+	}
 
-  remotePutPacket("OK");
+	remotePutPacket("OK");
 }
 
 void remoteReadRegisters(char *p)
 {
-  char buffer[1024];
+	char buffer[1024];
 
-  char *s = buffer;
-  int   i;
-  // regular registers
-  for (i = 0; i < 15; i++)
-    {
-      u32 v = reg[i].I;
-      sprintf(s, "%02x%02x%02x%02x",  v & 255, (v >> 8) & 255,
-	      (v >> 16) & 255, (v >> 24) & 255);
-      s += 8;
-    }
-  // PC
-  u32 pc = armNextPC;
-  sprintf(s, "%02x%02x%02x%02x", pc & 255, (pc >> 8) & 255,
-	  (pc >> 16) & 255, (pc >> 24) & 255);
-  s += 8;
+	char *s = buffer;
+	int   i;
+	// regular registers
+	for (i = 0; i < 15; i++)
+	{
+		u32 v = reg[i].I;
+		sprintf(s, "%02x%02x%02x%02x",  v & 255, (v >> 8) & 255,
+		        (v >> 16) & 255, (v >> 24) & 255);
+		s += 8;
+	}
+	// PC
+	u32 pc = armNextPC;
+	sprintf(s, "%02x%02x%02x%02x", pc & 255, (pc >> 8) & 255,
+	        (pc >> 16) & 255, (pc >> 24) & 255);
+	s += 8;
 
-  // floating point registers (24-bit)
-  for (i = 0; i < 8; i++)
-    {
-      sprintf(s, "000000000000000000000000");
-      s += 24;
-    }
+	// floating point registers (24-bit)
+	for (i = 0; i < 8; i++)
+	{
+		sprintf(s, "000000000000000000000000");
+		s += 24;
+	}
 
-  // FP status register
-  sprintf(s, "00000000");
-  s += 8;
-  // CPSR
-  CPUUpdateCPSR();
-  u32 v = reg[16].I;
-  sprintf(s, "%02x%02x%02x%02x",  v & 255, (v >> 8) & 255,
-	  (v >> 16) & 255, (v >> 24) & 255);
-  s += 8;
-  *s = 0;
-  remotePutPacket(buffer);
+	// FP status register
+	sprintf(s, "00000000");
+	s += 8;
+	// CPSR
+	CPUUpdateCPSR();
+	u32 v = reg[16].I;
+	sprintf(s, "%02x%02x%02x%02x",  v & 255, (v >> 8) & 255,
+	        (v >> 16) & 255, (v >> 24) & 255);
+	s += 8;
+	*s = 0;
+	remotePutPacket(buffer);
 }
 
 void remoteWriteRegister(char *p)
 {
-  int r;
+	int r;
 
-  sscanf(p, "%x=", &r);
+	sscanf(p, "%x=", &r);
 
-  p = strchr(p, '=');
-  p++;
+	p = strchr(p, '=');
+	p++;
 
-  char c = *p++;
+	char c = *p++;
 
-  u32 v = 0;
+	u32 v = 0;
 
-  u8 data[4] = {0, 0, 0, 0};
+	u8 data[4] = {0, 0, 0, 0};
 
-  int i = 0;
+	int i = 0;
 
-  while (c != '#')
-    {
-      u8 b = 0;
-      if (c <= '9')
-	b = (c - '0') << 4;
-      else
-	b = (c + 10 - 'a') << 4;
-      c = *p++;
-      if (c <= '9')
-	b += (c - '0');
-      else
-	b += (c + 10 - 'a');
-      data[i++] = b;
-      c         = *p++;
-    }
+	while (c != '#')
+	{
+		u8 b = 0;
+		if (c <= '9')
+			b = (c - '0') << 4;
+		else
+			b = (c + 10 - 'a') << 4;
+		c = *p++;
+		if (c <= '9')
+			b += (c - '0');
+		else
+			b += (c + 10 - 'a');
+		data[i++] = b;
+		c         = *p++;
+	}
 
-  v = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+	v = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
 
-  //  printf("Write register %d=%08x\n", r, v);
-  reg[r].I = v;
-  if (r == 15)
-    {
-      armNextPC = v;
-      if (armState)
-	reg[15].I = v + 4;
-      else
-	reg[15].I = v + 2;
-    }
-  remotePutPacket("OK");
+	//  printf("Write register %d=%08x\n", r, v);
+	reg[r].I = v;
+	if (r == 15)
+	{
+		armNextPC = v;
+		if (armState)
+			reg[15].I = v + 4;
+		else
+			reg[15].I = v + 2;
+	}
+	remotePutPacket("OK");
 }
 
 void remoteStubMain()
 {
-  if (!debugger)
-    return;
+	if (!debugger)
+		return;
 
-  if (remoteResumed)
-    {
-      remoteSendStatus();
-      remoteResumed = false;
-    }
-
-  while (true)
-    {
-      char buffer[1024];
-      int  res = remoteRecvFnc(buffer, 1024);
-
-      if (res == -1)
+	if (remoteResumed)
 	{
-	  fprintf(stderr, "GDB connection lost\n");
-#ifdef SDL
-	  dbgMain   = debuggerMain;
-	  dbgSignal = debuggerSignal;
-#endif
-	  debugger = false;
-	  break;
+		remoteSendStatus();
+		remoteResumed = false;
 	}
 
-      //    fprintf(stderr, "Received %s\n", buffer);
-      char *p  = buffer;
-      char  c  = *p++;
-      char  pp = '+';
-      remoteSendFnc(&pp, 1);
+	while (true)
+	{
+		char buffer[1024];
+		int  res = remoteRecvFnc(buffer, 1024);
 
-      if (c != '$')
-	continue;
-      c = *p++;
-      switch (c)
-	{
-	case '?':
-	  remoteSendSignal();
-	  break;
-	case 'D':
-	  remotePutPacket("OK");
+		if (res == -1)
+		{
+			fprintf(stderr, "GDB connection lost\n");
 #ifdef SDL
-	  dbgMain   = debuggerMain;
-	  dbgSignal = debuggerSignal;
+			dbgMain   = debuggerMain;
+			dbgSignal = debuggerSignal;
 #endif
-	  remoteResumed = true;
-	  debugger      = false;
-	  return;
-	case 'e':
-	  remoteStepOverRange(p);
-	  break;
-	case 'k':
-	  remotePutPacket("OK");
+			debugger = false;
+			break;
+		}
+
+		//    fprintf(stderr, "Received %s\n", buffer);
+		char *p  = buffer;
+		char  c  = *p++;
+		char  pp = '+';
+		remoteSendFnc(&pp, 1);
+
+		if (c != '$')
+			continue;
+		c = *p++;
+		switch (c)
+		{
+		case '?':
+			remoteSendSignal();
+			break;
+		case 'D':
+			remotePutPacket("OK");
 #ifdef SDL
-	  dbgMain   = debuggerMain;
-	  dbgSignal = debuggerSignal;
+			dbgMain   = debuggerMain;
+			dbgSignal = debuggerSignal;
 #endif
-	  debugger  = false;
-	  emulating = false;
-	  return;
-	case 'C':
-	  remoteResumed = true;
-	  debugger      = false;
-	  return;
-	case 'c':
-	  remoteResumed = true;
-	  debugger      = false;
-	  return;
-	case 's':
-	  remoteResumed = true;
-	  remoteSignal  = 5;
-	  CPULoop(1);
-	  if (remoteResumed)
-	    {
-	      remoteResumed = false;
-	      remoteSendStatus();
-	    }
-	  break;
-	case 'g':
-	  remoteReadRegisters(p);
-	  break;
-	case 'P':
-	  remoteWriteRegister(p);
-	  break;
-	case 'M':
-	  remoteMemoryWrite(p);
-	  break;
-	case 'm':
-	  remoteMemoryRead(p);
-	  break;
-	case 'X':
-	  remoteBinaryWrite(p);
-	  break;
-	case 'H':
-	  remotePutPacket("OK");
-	  break;
-	case 'q':
-	  remotePutPacket("");
-	  break;
-	case 'Z':
-	  if (*p++ == '2')
-	    {
-	      remoteWriteWatch(p, true);
-	    }
-	  else
-	    remotePutPacket("");
-	  break;
-	case 'z':
-	  if (*p++ == '2')
-	    {
-	      remoteWriteWatch(p, false);
-	    }
-	  else
-	    remotePutPacket("");
-	  break;
-	default:
-	  {
-	    *(strchr(p, '#') + 3) = 0;
-	    fprintf(stderr, "Unknown packet %s\n", --p);
-	    remotePutPacket("");
-	    break;
-	  }
+			remoteResumed = true;
+			debugger      = false;
+			return;
+		case 'e':
+			remoteStepOverRange(p);
+			break;
+		case 'k':
+			remotePutPacket("OK");
+#ifdef SDL
+			dbgMain   = debuggerMain;
+			dbgSignal = debuggerSignal;
+#endif
+			debugger  = false;
+			emulating = false;
+			return;
+		case 'C':
+			remoteResumed = true;
+			debugger      = false;
+			return;
+		case 'c':
+			remoteResumed = true;
+			debugger      = false;
+			return;
+		case 's':
+			remoteResumed = true;
+			remoteSignal  = 5;
+			CPULoop(1);
+			if (remoteResumed)
+			{
+				remoteResumed = false;
+				remoteSendStatus();
+			}
+			break;
+		case 'g':
+			remoteReadRegisters(p);
+			break;
+		case 'P':
+			remoteWriteRegister(p);
+			break;
+		case 'M':
+			remoteMemoryWrite(p);
+			break;
+		case 'm':
+			remoteMemoryRead(p);
+			break;
+		case 'X':
+			remoteBinaryWrite(p);
+			break;
+		case 'H':
+			remotePutPacket("OK");
+			break;
+		case 'q':
+			remotePutPacket("");
+			break;
+		case 'Z':
+			if (*p++ == '2')
+			{
+				remoteWriteWatch(p, true);
+			}
+			else
+				remotePutPacket("");
+			break;
+		case 'z':
+			if (*p++ == '2')
+			{
+				remoteWriteWatch(p, false);
+			}
+			else
+				remotePutPacket("");
+			break;
+		default:
+		{
+			*(strchr(p, '#') + 3) = 0;
+			fprintf(stderr, "Unknown packet %s\n", --p);
+			remotePutPacket("");
+			break;
+		}
+		}
 	}
-    }
 }
 
 void remoteStubSignal(int sig, int number)
 {
-  remoteSignal  = sig;
-  remoteResumed = false;
-  remoteSendStatus();
-  debugger = true;
+	remoteSignal  = sig;
+	remoteResumed = false;
+	remoteSendStatus();
+	debugger = true;
 }
 
 void remoteCleanUp()
 {
-  if (remoteCleanUpFnc)
-    remoteCleanUpFnc();
+	if (remoteCleanUpFnc)
+		remoteCleanUpFnc();
 }
 
diff -r e0545ef33bb9 -r 8870086b716c wrong.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wrong.sh	Sun Mar 04 17:35:30 2012 -0600
@@ -0,0 +1,8 @@
+cd ./src/gba
+
+g++ -DHAVE_CONFIG_H \
+    -I. -I../../../src/gba -I../..  -I../../../src \
+    -DSDL -DSYSCONFDIR=\"/usr/local/etc\"  \
+    -fno-exceptions  -g -O2 \
+    -MT remote.o -MD -MP -MF .deps/remote.Tpo -c \
+    -o remote.o ../../../src/gba/remote.cpp