vba-clojure: src/gb/GB.cpp comparison

comparison src/gb/GB.cpp @ 92:1ff2c546f5ad

added tick(), which allows one to step through each opcode of gameboy

author	Robert McIntyre <rlm@mit.edu>
date	Sun, 11 Mar 2012 19:07:31 -0500
parents	d7c38ce83421
children	4c60ebca1a9d

comparison

equal deleted inserted replaced

-:613353b7e012
+:1ff2c546f5ad
 #include "gbSound.h"
 #include "../common/unzip.h"
 #include "../common/Util.h"
 #include "../common/System.h"
 #include "../common/movie.h"
-#include "../common/vbalua.h"
+// #include "../common/vbalua.h"
 #ifdef __GNUC__
 #define _stricmp strcasecmp
 #endif
 }
 void gbWriteMemory(register u16 address, register u8 value)
 {
 gbWriteMemoryWrapped(address, value);
-CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_WRITE);
+//CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_WRITE);
 }
 u8 gbReadMemory(register u16 address)
 {
 if (gbCheatMap[address])
 gbReset();
 return true;
 }
-void gbEmulate(int ticksToStop)
+int gbEmulate(int ticksToStop)
 {
+int rlm_count = 0;
 //printf("RLM: Inside the GB!\n");
 gbRegister tempRegister;
 u8		   tempValue;
 s8		   offset;
 //printf("RLM: after Lua functions\n");
 newFrame = false;
 }
-for (;; )
+//for (;; )
-{
+// {
 #ifndef FINAL_VERSION
 if (systemDebug)
 	{
 	  if (!(IFF & 0x80))
 	    {
 	    clockTicks = soundTicks;
 	}
 else
 	{
 	  opcode = gbReadOpcode(PC.W);
-	  CallRegisteredLuaMemHook(PC.W, 1, opcode, LUAMEMHOOK_EXEC);
+	  //printf("RLM: calling mem Hook ; %07d\n", rlm_count++);
+	  //CallRegisteredLuaMemHook(PC.W, 1, opcode, LUAMEMHOOK_EXEC);
 	  PC.W++;
 	  if (IFF & 0x100)
 	    {
 	      IFF &= 0xff;
 #include "gbCodes.h"
 	    }
 	}
 if (!emulating)
-	return;
+	return 1;
 if (gbDmaTicks)
 	{
 	  clockTicks += gbDmaTicks;
 	  gbDmaTicks	= 0;
 	      if (IFF & 0x01)
 		{
 		  if ((gbInterrupt & 1) && (register_IE & 1))
 		    {
 		      gbVblank_interrupt();
-		      continue;
+		      return newFrame;
 		    }
 		  if ((gbInterrupt & 2) && (register_IE & 2))
 		    {
 		      gbLcd_interrupt();
-		      continue;
+		      return newFrame;
 		    }
 		  if ((gbInterrupt & 4) && (register_IE & 4))
 		    {
 		      gbTimer_interrupt();
-		      continue;
+		      return newFrame;
 		    }
 		  if ((gbInterrupt & 8) && (register_IE & 8))
 		    {
 		      gbSerial_interrupt();
-		      continue;
+		      return newFrame;
 		    }
 		  if ((gbInterrupt & 16) && (register_IE & 16))
 		    {
 		      gbJoypad_interrupt();
-		      continue;
+		      return newFrame;
 		    }
 		}
 	    }
 	  else
 	    {
 if (useOldFrameTiming)
 	{
 	  // old timing code
 	  if (ticksToStop > 0)
-	    continue;
+	    return newFrame;
 	}
 else
 	{
 	  if (!newFrame && (register_LCDC & 0x80) != 0)
-	    continue;
+	    return newFrame;
 	}
 if (!(register_LCDC & 0x80))
 	{
 	  if (!useOldFrameTiming)
 #endif
 	    }
 	}
 // makes sure frames are really divided across input sampling boundaries which occur at a constant rate
-if (newFrame || useOldFrameTiming)
+//if (newFrame || useOldFrameTiming)
-	{
+//	{
 	  ///			extern void VBAOnEnteringFrameBoundary();
 	  ///			VBAOnEnteringFrameBoundary();
-	  break;
+//  break;
-	}
+//	}
-}
+// RLM removing for loop }
+return newFrame;
 }
 //RLM:
 gbReadSaveState,
 // emuWriteState
 gbWriteSaveState,
 // emuReadStateFromStream
 gbReadSaveStateFromStream,
-// emuWriteStateToStream
+// emuwritestatetostream
 gbWriteSaveStateToStream,
 // emuReadMemState
 gbReadMemSaveState,
 // emuWriteMemState
 gbWriteMemSaveState,

Mercurial > vba-clojure

comparison src/gb/GB.cpp @ 92:1ff2c546f5ad