vba-commit

[Spacy <sp...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/sdl
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6380/src/sdl

Modified Files:
	SDL.cpp TestEmu.cpp debugger.cpp 
Log Message:
vs2005 compatibility, minor changes/fixes

Index: TestEmu.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestEmu.cpp	20 Dec 2004 15:03:13 -0000	1.5
--- TestEmu.cpp	27 May 2006 14:47:33 -0000	1.6
***************
*** 24,36 ****
  #include <sys/stat.h>
  
! #include "AutoBuild.h"
  
! #include "GBA.h"
  #include "debugger.h"
! #include "Sound.h"
! #include "unzip.h"
! #include "Util.h"
! #include "gb/GB.h"
! #include "gb/gbGlobals.h"
  
  #ifndef WIN32
--- 24,37 ----
  #include <sys/stat.h>
  
! #include "../AutoBuild.h"
  
! #include "../GBA.h"
  #include "debugger.h"
! #include "../Sound.h"
! #include "../unzip.h"
! #include "../Util.h"
! #include "../gb/GB.h"
! #include "../gb/gbGlobals.h"
! #include "../getopt.h"
  
  #ifndef WIN32

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** debugger.cpp	13 May 2006 16:32:16 -0000	1.8
--- debugger.cpp	27 May 2006 14:47:33 -0000	1.9
***************
*** 1067,1071 ****
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(u32 i = address; i < final; i++)
            if(freezeWorkRAM[i] == 1)
              freezeWorkRAM[i] = 0;
--- 1067,1071 ----
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(int i = address; i < final; i++)
            if(freezeWorkRAM[i] == 1)
              freezeWorkRAM[i] = 0;
***************
*** 1078,1082 ****
          address &= 0x7fff;
          final &= 0x7fff;
!         for(u32 i = address; i < final; i++)
            if(freezeInternalRAM[i] == 1)
              freezeInternalRAM[i] = 0;
--- 1078,1082 ----
          address &= 0x7fff;
          final &= 0x7fff;
!         for(int i = address; i < final; i++)
            if(freezeInternalRAM[i] == 1)
              freezeInternalRAM[i] = 0;
***************
*** 1167,1171 ****
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(u32 i = address; i < final; i++)
            if(freezeWorkRAM[i] == 2)
              freezeWorkRAM[i] = 0;
--- 1167,1171 ----
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(int i = address; i < final; i++)
            if(freezeWorkRAM[i] == 2)
              freezeWorkRAM[i] = 0;
***************
*** 1178,1182 ****
          address &= 0x7fff;
          final &= 0x7fff;
!         for(u32 i = address; i < final; i++)
            if(freezeInternalRAM[i] == 2)
              freezeInternalRAM[i] = 0;
--- 1178,1182 ----
          address &= 0x7fff;
          final &= 0x7fff;
!         for(int i = address; i < final; i++)
            if(freezeInternalRAM[i] == 2)
              freezeInternalRAM[i] = 0;
***************
*** 1250,1254 ****
    char format[30];
    for(i = 0; i < count; i++) {
!     int l = strlen(elfGetAddressSymbol(pc+4*i));
      if(l > len)
        len = l;
--- 1250,1254 ----
    char format[30];
    for(i = 0; i < count; i++) {
!     size_t l = strlen(elfGetAddressSymbol(pc+4*i));
      if(l > len)
        len = l;
***************
*** 1269,1273 ****
    char format[30];
    for(i = 0; i < count; i++) {
!     int l = strlen(elfGetAddressSymbol(pc+2*i));
      if(l > len)
        len = l;
--- 1269,1273 ----
    char format[30];
    for(i = 0; i < count; i++) {
!     size_t l = strlen(elfGetAddressSymbol(pc+2*i));
      if(l > len)
        len = l;

Index: SDL.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SDL.cpp	13 May 2006 16:32:16 -0000	1.11
--- SDL.cpp	27 May 2006 14:47:33 -0000	1.12
***************
*** 110,113 ****
--- 110,114 ----
  
  extern void CPUUpdateRenderBuffers(bool);
+ extern int gbHardware;
  
  struct EmulatedSystem emulator = {
***************
*** 815,819 ****
    struct stat buf;
  
!   int len = strlen(dir);
  
    char *p = dir + len - 1;
--- 816,820 ----
    struct stat buf;
  
!   size_t len = strlen(dir);
  
    char *p = dir + len - 1;
***************
*** 838,842 ****
    static char filebuffer[2048];
  
!   int len = strlen(name);
    
    char *p = name + len - 1;
--- 839,843 ----
    static char filebuffer[2048];
  
!   size_t len = strlen(name);
    
    char *p = name + len - 1;
***************
*** 2217,2221 ****
        failed = !gbLoadRom(szFile);
        if(!failed) {
!         cartridgeType = 1;
          emulator = GBSystem;
          if(sdlAutoIPS) {
--- 2218,2238 ----
        failed = !gbLoadRom(szFile);
        if(!failed) {
!         gbGetHardwareType();
! 
! 		    // used for the handling of the gb Boot Rom
! 		    if (gbHardware & 5)
!         {
! 			    char tempName[0x800];
! 			    strcpy(tempName, arg0);
! 			    char *p = strrchr(tempName, '\\');
! 			    if(p) { *p = 0x00; }
! 			    strcat(tempName, "\\DMG_ROM.bin");
!           fprintf(stderr, "%s\n", tempName);
! 			    gbCPUInit(tempName, useBios);
!         }
!         else useBios = false;
!         
!         gbReset();
!         cartridgeType = IMAGE_GB;
          emulator = GBSystem;
          if(sdlAutoIPS) {
***************
*** 2267,2271 ****
      }
    } else {
!     cartridgeType = 0;
      strcpy(filename, "gnu_stub");
      rom = (u8 *)malloc(0x2000000);
--- 2284,2288 ----
      }
    } else {
!     cartridgeType = IMAGE_GBA;
      strcpy(filename, "gnu_stub");
      rom = (u8 *)malloc(0x2000000);