[Vba-commit] VisualBoyAdvance/src/win32 BugReport.cpp,1.1,1.2 MainWnd.cpp,1.6,1.7 VBA.cpp,1.5,1.6 VBA.h,1.2,1.3

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

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

Modified Files:
	BugReport.cpp MainWnd.cpp VBA.cpp VBA.h 
Log Message:
Include cart save string in bug report

Index: BugReport.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BugReport.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BugReport.cpp	8 Dec 2003 11:44:46 -0000	1.1
--- BugReport.cpp	28 Jan 2004 13:51:43 -0000	1.2
***************
*** 28,31 ****
--- 28,32 ----
  #include "../GBA.h"
  #include "../Globals.h"
+ #include "../Port.h"
  #include "../RTC.h"
  #include "../Sound.h"
***************
*** 171,174 ****
--- 172,210 ----
        buffer[4] = 0;
        AppendFormat(report, "Game code    : %s\r\n", buffer);
+ 
+       CString res = "";
+       u32 *p = (u32 *)rom;
+       u32 *end = (u32 *)((char *)rom+theApp.romSize);
+       while(p  < end) {
+         u32 d = READ32LE(p);
+     
+         if(d == 0x52504545) {
+           if(memcmp(p, "EEPROM_", 7) == 0) {
+             res += (const char *)p;
+             res += ' ';
+           }
+         } else if (d == 0x4D415253) {
+           if(memcmp(p, "SRAM_", 5) == 0) {
+             res += (const char *)p;
+             res += ' ';
+           }
+         } else if (d == 0x53414C46) {
+           if(memcmp(p, "FLASH1M_", 8) == 0) {
+             res += (const char *)p;
+             res += ' ';
+           }
+         } else if(memcmp(p, "FLASH", 5) == 0) {
+           res += (const char *)p;
+           res += ' ';
+         } else if (d == 0x52494953) {
+           if(memcmp(p, "SIIRTC_V", 8) == 0) {
+             res += (const char *)p;
+             res += ' ';
+           }
+         }
+         p++;
+       }
+       if(res.GetLength() > 0)
+         AppendFormat(report, "Cart Save    : %s\r\n", res);
      } else if(theApp.cartridgeType == 1) {
        strncpy(buffer, (const char *)&gbRom[0x134], 15);

Index: MainWnd.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MainWnd.cpp	19 Jan 2004 23:52:56 -0000	1.6
--- MainWnd.cpp	28 Jan 2004 13:51:43 -0000	1.7
***************
*** 492,495 ****
--- 492,496 ----
  #endif
      gbBorderOn = theApp.winGbBorderOn;
+     theApp.romSize = gbRomSize;
      if(theApp.autoIPS) {
        int size = gbRomSize;
***************
*** 499,502 ****
--- 500,504 ----
          gbUpdateSizes();
          gbReset();
+         theApp.romSize = size;
        }
      }
***************
*** 505,508 ****
--- 507,512 ----
      if(!size)
        return false;
+ 
+     theApp.romSize = size;
      
      flashSetSize(theApp.winFlashSize);

Index: VBA.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VBA.cpp	20 Jan 2004 11:46:17 -0000	1.5
--- VBA.cpp	28 Jan 2004 13:51:43 -0000	1.6
***************
*** 265,268 ****
--- 265,269 ----
    autoLoadMostRecent = false;
    fsMaxScale = 0;
+   romSize = 0;
    
    updateCount = 0;

Index: VBA.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VBA.h	20 Nov 2003 02:48:27 -0000	1.2
--- VBA.h	28 Jan 2004 13:51:43 -0000	1.3
***************
*** 180,183 ****
--- 180,184 ----
    bool autoLoadMostRecent;
    int fsMaxScale;
+   int romSize;
   
    CList<IUpdateListener *, IUpdateListener*&> updateList;