[vba-commit] VisualBoyAdvance/src/sdl debugger.cpp,1.4,1.5 TestEmu.cpp,1.4,1.5

[Pokemonhacker <pok...@us...>]

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

Modified Files:
	debugger.cpp TestEmu.cpp 
Log Message:
- compilation fixes and version update 
- news updates 

Index: TestEmu.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestEmu.cpp	20 May 2004 21:01:30 -0000	1.4
--- TestEmu.cpp	20 Dec 2004 15:03:13 -0000	1.5
***************
*** 353,356 ****
--- 353,388 ----
  }
  
+ void sdlWriteState(int num)
+ {
+   char stateName[2048];
+ 
+   if(saveDir[0])
+     sprintf(stateName, "%s/%s%d.sgm", saveDir, sdlGetFilename(filename),
+             num+1);
+   else
+     sprintf(stateName,"%s%d.sgm", filename, num+1);
+   if(emulator.emuWriteState)
+     emulator.emuWriteState(stateName);
+   sprintf(stateName, "Wrote state %d", num+1);
+   systemScreenMessage(stateName);
+ }
+ 
+ void sdlReadState(int num)
+ {
+   char stateName[2048];
+ 
+   if(saveDir[0])
+     sprintf(stateName, "%s/%s%d.sgm", saveDir, sdlGetFilename(filename),
+             num+1);
+   else
+     sprintf(stateName,"%s%d.sgm", filename, num+1);
+ 
+   if(emulator.emuReadState)
+     emulator.emuReadState(stateName);
+ 
+   sprintf(stateName, "Loaded state %d", num+1);
+   systemScreenMessage(stateName);
+ }
+ 
  void systemScreenCapture(int a)
  {

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** debugger.cpp	18 Dec 2004 23:10:18 -0000	1.4
--- debugger.cpp	20 Dec 2004 15:03:13 -0000	1.5
***************
*** 22,25 ****
--- 22,26 ----
  #include <stdlib.h>
  #include <string.h>
+ #include <ctype.h>
  
  #include "GBA.h"
***************
*** 74,125 ****
  };
  
! void debuggerContinueAfterBreakpoint();
  
! void debuggerHelp(int,char **);
! void debuggerNext(int,char **);
! void debuggerContinue(int, char **);
! void debuggerRegisters(int, char **);
! void debuggerBreak(int, char **);
! void debuggerBreakDelete(int, char **);
! void debuggerBreakList(int, char **);
! void debuggerBreakArm(int, char **);
! void debuggerBreakThumb(int, char **);
! void debuggerBreakChange(int, char **);
! void debuggerBreakChangeClear(int, char **);
! void debuggerBreakWriteClear(int, char **);
! void debuggerBreakWrite(int, char **);
! void debuggerDebug(int, char **);
! void debuggerDisassemble(int, char **);
! void debuggerDisassembleArm(int, char **);
! void debuggerDisassembleThumb(int, char **);
! void debuggerEditByte(int, char **);
! void debuggerEditHalfWord(int, char **);
! void debuggerEditRegister(int, char **);
! void debuggerEdit(int, char **);
! void debuggerFileDisassemble(int, char **);
! void debuggerFileDisassembleArm(int, char **);
! void debuggerFileDisassembleThumb(int, char **);
! void debuggerIo(int, char **);
! void debuggerLocals(int, char **);
! void debuggerMemoryByte(int, char **);
! void debuggerMemoryHalfWord(int, char **);
! void debuggerMemory(int, char **);
! void debuggerPrint(int, char **);
! void debuggerQuit(int, char **);
! void debuggerSetRadix(int, char **);
! void debuggerSymbols(int, char **);
! void debuggerVerbose(int, char **);
! void debuggerWhere(int, char **);
  
! void debuggerReadState(int, char **);
! void debuggerWriteState(int, char **);
! void debuggerDumpLoad(int, char**);
! void debuggerDumpSave(int, char**);
! void debuggerCondValidate(int n, char **args, int start);
! bool debuggerCondEvaluate(int num);
! void debuggerCondBreakThumb(int, char **);
! void debuggerCondBreakArm(int, char **);
  
! DebuggerCommand debuggerCommands[] = {
    { "?", debuggerHelp,        "Show this help information. Type ? <command> for command help", "[<command>]" },
    { "ba", debuggerBreakArm,   "Add an ARM breakpoint", "<address>" },
--- 75,126 ----
  };
  
! static void debuggerContinueAfterBreakpoint();
  
! static void debuggerHelp(int,char **);
! static void debuggerNext(int,char **);
! static void debuggerContinue(int, char **);
! static void debuggerRegisters(int, char **);
! static void debuggerBreak(int, char **);
! static void debuggerBreakDelete(int, char **);
! static void debuggerBreakList(int, char **);
! static void debuggerBreakArm(int, char **);
! static void debuggerBreakThumb(int, char **);
! static void debuggerBreakChange(int, char **);
! static void debuggerBreakChangeClear(int, char **);
! static void debuggerBreakWriteClear(int, char **);
! static void debuggerBreakWrite(int, char **);
! static void debuggerDebug(int, char **);
! static void debuggerDisassemble(int, char **);
! static void debuggerDisassembleArm(int, char **);
! static void debuggerDisassembleThumb(int, char **);
! static void debuggerEditByte(int, char **);
! static void debuggerEditHalfWord(int, char **);
! static void debuggerEditRegister(int, char **);
! static void debuggerEdit(int, char **);
! static void debuggerFileDisassemble(int, char **);
! static void debuggerFileDisassembleArm(int, char **);
! static void debuggerFileDisassembleThumb(int, char **);
! static void debuggerIo(int, char **);
! static void debuggerLocals(int, char **);
! static void debuggerMemoryByte(int, char **);
! static void debuggerMemoryHalfWord(int, char **);
! static void debuggerMemory(int, char **);
! static void debuggerPrint(int, char **);
! static void debuggerQuit(int, char **);
! static void debuggerSetRadix(int, char **);
! static void debuggerSymbols(int, char **);
! static void debuggerVerbose(int, char **);
! static void debuggerWhere(int, char **);
  
! static void debuggerReadState(int, char **);
! static void debuggerWriteState(int, char **);
! static void debuggerDumpLoad(int, char**);
! static void debuggerDumpSave(int, char**);
! static void debuggerCondValidate(int n, char **args, int start);
! static bool debuggerCondEvaluate(int num);
! static void debuggerCondBreakThumb(int, char **);
! static void debuggerCondBreakArm(int, char **);
  
! static DebuggerCommand debuggerCommands[] = {
    { "?", debuggerHelp,        "Show this help information. Type ? <command> for command help", "[<command>]" },
    { "ba", debuggerBreakArm,   "Add an ARM breakpoint", "<address>" },
***************
*** 369,376 ****
  }
  
! void debuggerPrintValueInternal(Function *, Type *, ELFBlock *, int, int, u32);
! void debuggerPrintValueInternal(Function *f, Type *t,
!                                 int bitSize, int bitOffset,
!                                 u32 objLocation, LocationType type);
  
  static u32 debuggerGetValue(u32 location, LocationType type)
--- 370,377 ----
  }
  
! static void debuggerPrintValueInternal(Function *, Type *, ELFBlock *, int, int, u32);
! static void debuggerPrintValueInternal(Function *f, Type *t,
! 				       int bitSize, int bitOffset,
! 				       u32 objLocation, LocationType type);
  
  static u32 debuggerGetValue(u32 location, LocationType type)
***************
*** 1861,1865 ****
    u32 value2=0;
    
!   char size=NULL;
    int j=1;
    
--- 1862,1866 ----
    u32 value2=0;
    
!   char size=0;
    int j=1;
    
***************
*** 1912,1916 ****
      default:
        printf("Erroneous Condition\n");
!       debuggerUsage((toupper(args[0][2])=='T') ? "cbt" : "cba");
        return;
      }
--- 1913,1917 ----
      default:
        printf("Erroneous Condition\n");
!       debuggerUsage((char *)((toupper(args[0][2])=='T') ? "cbt" : "cba"));
        return;
      }
***************
*** 2011,2015 ****
      default:
        printf("Erroneous Condition\n");
!       debuggerUsage((toupper(args[0][2])=='T') ? "cbt" : "cba");
        return;
      }
--- 2012,2016 ----
      default:
        printf("Erroneous Condition\n");
!       debuggerUsage((char *)((toupper(args[0][2])=='T') ? "cbt" : "cba"));
        return;
      }