[Vba-commit] VisualBoyAdvance/src SDL.cpp,1.50,1.51 TestEmu.cpp,1.8,1.9

[<for...@pr...>]

Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4196/src

Modified Files:
	SDL.cpp TestEmu.cpp 
Log Message:
Cleanup + TestEmu fix

Index: SDL.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/SDL.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** SDL.cpp	28 Jan 2004 17:59:29 -0000	1.50
--- SDL.cpp	31 Jan 2004 01:14:36 -0000	1.51
***************
*** 39,45 ****
  #include "gb/GB.h"
  #include "gb/gbGlobals.h"
- #ifdef GP_EMULATION
- #include "gp/GP.h"
- #endif
  
  #ifdef __GNUC__
--- 39,42 ----
***************
*** 113,120 ****
  
  extern void CPUUpdateRenderBuffers(bool);
- extern void CPUUpdateCPSR();
- #ifdef GP_EMULATION
- extern void GPUpdateCPSR();
- #endif
  
  struct EmulatedSystem emulator = {
--- 110,113 ----

Index: TestEmu.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/TestEmu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestEmu.cpp	21 Nov 2003 21:53:41 -0000	1.8
--- TestEmu.cpp	31 Jan 2004 01:14:36 -0000	1.9
***************
*** 33,39 ****
  #include "gb/GB.h"
  #include "gb/gbGlobals.h"
- #ifdef GP_EMULATION
- #include "gp/GP.h"
- #endif
  
  #ifdef __GNUC__
--- 33,36 ----
***************
*** 61,81 ****
  extern void debuggerOutput(char *, u32);
  
! extern void CPUUpdateCPSR();
! #ifdef GP_EMULATION
! extern void GPUpdateCPSR();
! #endif
! 
! bool (*emuWriteState)(const char *) = NULL;
! bool (*emuReadState)(const char *) = NULL;
! bool (*emuWriteBattery)(const char *) = NULL;
! bool (*emuReadBattery)(const char *) = NULL;
! void (*emuReset)() = NULL;
! void (*emuCleanUp)() = NULL;
! bool (*emuWritePNG)(const char *) = NULL;
! bool (*emuWriteBMP)(const char *) = NULL;
! void (*emuMain)(int) = NULL;
! void (*emuUpdateCPSR)() = NULL;
! int emuCount = 0;
! bool emuHasDebugger = false;
  
  static u8 COPYRIGHT[] = {
--- 58,62 ----
  extern void debuggerOutput(char *, u32);
  
! struct EmulatedSystem emulator;
  
  static u8 COPYRIGHT[] = {
***************
*** 257,310 ****
        failed = !gbLoadRom(szFile);
        cartridgeType = 1;
!       emuWriteState = gbWriteSaveState;
!       emuReadState = gbReadSaveState;
!       emuWriteBattery = gbWriteBatteryFile;
!       emuReadBattery = gbReadBatteryFile;
!       emuReset = gbReset;
!       emuCleanUp = gbCleanUp;
!       emuWritePNG = gbWritePNGFile;
!       emuWriteBMP = gbWriteBMPFile;
!       emuMain = gbEmulate;
!       emuUpdateCPSR = NULL;
!       emuHasDebugger = false;
!       emuCount = 70000/4;
      } else if(utilIsGBAImage(szFile) || cartridgeType == 0) {
        failed = !CPULoadRom(szFile);
        cartridgeType = 0;
!       emuWriteState = CPUWriteState;
!       emuReadState = CPUReadState;
!       emuWriteBattery = CPUWriteBatteryFile;
!       emuReadBattery = CPUReadBatteryFile;
!       emuReset = CPUReset;
!       emuCleanUp = CPUCleanUp;
!       emuWritePNG = CPUWritePNGFile;
!       emuWriteBMP = CPUWriteBMPFile;
!       emuMain = CPULoop;
!       emuUpdateCPSR = CPUUpdateCPSR;
!       emuHasDebugger = true;
!       emuCount = 50000;
  
        CPUInit(biosFileName, useBios);
        CPUReset();
- #ifdef GP_EMULATION
-     } else if(GPIsGPImage(szFile) || cartridgeType == 2) {
-       failed = !GPLoadRom(szFile);
-       cartridgeType = 2;
-       emuWriteState = GPWriteState;
-       emuReadState = GPReadState;
-       emuWriteBattery = GPWriteBatteryFile;
-       emuReadBattery = GPReadBatteryFile;
-       emuReset = GPReset;
-       emuCleanUp = GPCleanUp;
-       emuWritePNG = GPWritePNGFile;
-       emuWriteBMP = GPWriteBMPFile;
-       emuMain = GPLoop;
-       emuUpdateCPSR = GPUpdateCPSR;
-       emuHasDebugger = true;
-       emuCount = 50000;
- 
-       GPInit();
-       GPReset();
- #endif
      } else {
        systemMessage(0, "Unknown file type %s", szFile);
--- 238,249 ----
        failed = !gbLoadRom(szFile);
        cartridgeType = 1;
!       emulator = GBSystem;
      } else if(utilIsGBAImage(szFile) || cartridgeType == 0) {
        failed = !CPULoadRom(szFile);
        cartridgeType = 0;
!       emulator = GBASystem;
  
        CPUInit(biosFileName, useBios);
        CPUReset();
      } else {
        systemMessage(0, "Unknown file type %s", szFile);
***************
*** 334,349 ****
      ioMem = (u8 *)calloc(1, 0x400);
  
!     emuWriteState = CPUWriteState;
!     emuReadState = CPUReadState;
!     emuWriteBattery = CPUWriteBatteryFile;
!     emuReadBattery = CPUReadBatteryFile;
!     emuReset = CPUReset;
!     emuCleanUp = CPUCleanUp;
!     emuWritePNG = CPUWritePNGFile;
!     emuWriteBMP = CPUWriteBMPFile;
!     emuMain = CPULoop;
!     emuUpdateCPSR = CPUUpdateCPSR;
!     emuHasDebugger = true;
!     emuCount = 50000;    
      
      CPUInit(biosFileName, useBios);
--- 273,277 ----
      ioMem = (u8 *)calloc(1, 0x400);
  
!     emulator = GBASystem;
      
      CPUInit(biosFileName, useBios);
***************
*** 379,386 ****
    while(emulating) {
      if(!paused) {
!       if(debugger && emuHasDebugger)
          dbgMain();
        else
!         emuMain(emuCount);
      }
    }
--- 307,314 ----
    while(emulating) {
      if(!paused) {
!       if(debugger && emulator.emuHasDebugger)
          dbgMain();
        else
!         emulator.emuMain(emulator.emuCount);
      }
    }
***************
*** 391,395 ****
  
    if(gbRom != NULL || rom != NULL) {
!     emuCleanUp();
    }
  
--- 319,323 ----
  
    if(gbRom != NULL || rom != NULL) {
!     emulator.emuCleanUp();
    }
  
***************
*** 449,453 ****
        sprintf(buffer, "%s%02d.bmp", filename, a);
  
!     emuWriteBMP(buffer);
    } else {
      if(captureDir[0])
--- 377,381 ----
        sprintf(buffer, "%s%02d.bmp", filename, a);
  
!     emulator.emuWriteBMP(buffer);
    } else {
      if(captureDir[0])
***************
*** 455,459 ****
      else
        sprintf(buffer, "%s%02d.png", filename, a);
!     emuWritePNG(buffer);
    }
  
--- 383,387 ----
      else
        sprintf(buffer, "%s%02d.png", filename, a);
!     emulator.emuWritePNG(buffer);
    }