Merge pull request #13 from ShutOstrich/master

OpenEmu · Sep 7, 2023 · 07de1ad · 07de1ad
2 parents 7e9cde3 + 23bc100
commit 07de1ad
Show file tree

Hide file tree

Showing 81 changed files with 2,917 additions and 472 deletions.
diff --git a/FCEU.xcodeproj/project.pbxproj b/FCEU.xcodeproj/project.pbxproj
@@ -72,6 +72,7 @@
  8F28FD5229FD3E7D008FC4A9 /* inx007t.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F28FD4F29FD3E7D008FC4A9 /* inx007t.cpp */; };
  8F28FD5529FD3EA4008FC4A9 /* debugsymboltable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F28FD5329FD3EA4008FC4A9 /* debugsymboltable.cpp */; };
  8F28FD5829FD3EB8008FC4A9 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F28FD5629FD3EB8008FC4A9 /* mutex.cpp */; };
+ 8F5A69CF2A9BF26400B405DB /* ld65dbg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F5A69CB2A9BF26400B405DB /* ld65dbg.cpp */; };
  945942D014E4F2DC0015D2AA /* FCEUX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 945942CF14E4F2DC0015D2AA /* FCEUX.icns */; };
  949BBA741A9EF079007B49CC /* 01-222.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949BB7521A9EED55007B49CC /* 01-222.cpp */; };
  949BBA751A9EF079007B49CC /* 09-034a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949BB7531A9EED55007B49CC /* 09-034a.cpp */; };
@@ -346,6 +347,12 @@
  8F28FD5429FD3EA4008FC4A9 /* debugsymboltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugsymboltable.h; sourceTree = "<group>"; };
  8F28FD5629FD3EB8008FC4A9 /* mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mutex.cpp; sourceTree = "<group>"; };
  8F28FD5729FD3EB8008FC4A9 /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutex.h; sourceTree = "<group>"; };
+ 8F5A69C72A9BF26400B405DB /* timeStamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timeStamp.cpp; sourceTree = "<group>"; };
+ 8F5A69C82A9BF26400B405DB /* profiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = profiler.h; sourceTree = "<group>"; };
+ 8F5A69C92A9BF26400B405DB /* profiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = profiler.cpp; sourceTree = "<group>"; };
+ 8F5A69CA2A9BF26400B405DB /* timeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timeStamp.h; sourceTree = "<group>"; };
+ 8F5A69CB2A9BF26400B405DB /* ld65dbg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ld65dbg.cpp; sourceTree = "<group>"; };
+ 8F5A69CC2A9BF26400B405DB /* ld65dbg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ld65dbg.h; sourceTree = "<group>"; };
  945942CE14E4EF180015D2AA /* OENESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OENESSystemResponderClient.h; path = ../OpenEmu/SystemPlugins/NES/OENESSystemResponderClient.h; sourceTree = "<group>"; };
  945942CF14E4F2DC0015D2AA /* FCEUX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = FCEUX.icns; sourceTree = "<group>"; };
  949BB74E1A9EED55007B49CC /* asm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = asm.cpp; sourceTree = "<group>"; };
@@ -816,6 +823,8 @@
  949BB9A11A9EED59007B49CC /* input */,
  949BB9B61A9EED59007B49CC /* input.cpp */,
  949BB9B71A9EED59007B49CC /* input.h */,
+ 8F5A69CB2A9BF26400B405DB /* ld65dbg.cpp */,
+ 8F5A69CC2A9BF26400B405DB /* ld65dbg.h */,
  949BB9F71A9EED5A007B49CC /* lua-engine.cpp */,
  949BB9F81A9EED5A007B49CC /* movie.cpp */,
  949BB9F91A9EED5A007B49CC /* movie.h */,
@@ -832,6 +841,8 @@
  949BBA0B1A9EED5A007B49CC /* ppu.cpp */,
  949BBA0C1A9EED5A007B49CC /* ppu.h */,
  949BBA0D1A9EED5A007B49CC /* pputile.inc */,
+ 8F5A69C92A9BF26400B405DB /* profiler.cpp */,
+ 8F5A69C82A9BF26400B405DB /* profiler.h */,
  949BBA0F1A9EED5A007B49CC /* sound.cpp */,
  949BBA101A9EED5A007B49CC /* sound.h */,
  949BBA111A9EED5A007B49CC /* state.cpp */,
@@ -1185,6 +1196,8 @@
  949BBA291A9EED5B007B49CC /* memory.h */,
  8F28FD5629FD3EB8008FC4A9 /* mutex.cpp */,
  8F28FD5729FD3EB8008FC4A9 /* mutex.h */,
+ 8F5A69C72A9BF26400B405DB /* timeStamp.cpp */,
+ 8F5A69CA2A9BF26400B405DB /* timeStamp.h */,
  949BBA2B1A9EED5B007B49CC /* unzip.cpp */,
  949BBA2C1A9EED5B007B49CC /* unzip.h */,
  949BBA2D1A9EED5B007B49CC /* valuearray.h */,
@@ -1463,6 +1476,7 @@
  949BBAF61A9EF07A007B49CC /* sa-9602b.cpp in Sources */,
  870D6EA61D4C1F82001E8FC6 /* BMW8544.cpp in Sources */,
  870D6EB41D4C20B3001E8FC6 /* inlnsf.cpp in Sources */,
+ 8F5A69CF2A9BF26400B405DB /* ld65dbg.cpp in Sources */,
  949BBAF71A9EF07A007B49CC /* sachen.cpp in Sources */,
  949BBAF81A9EF07A007B49CC /* sc-127.cpp in Sources */,
  870D6EB31D4C20B3001E8FC6 /* hp898f.cpp in Sources */,

diff --git a/Info.plist b/Info.plist
@@ -17,7 +17,7 @@
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>2.6.5</string>
+ <string>2.6.6</string>
  <key>NSPrincipalClass</key>
  <string>OEGameCoreController</string>
  <key>OEGameCoreClass</key>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -22,6 +22,12 @@ if ( ${QHELP} )
  add_definitions( -D_USE_QHELP )
 endif()
 
+if ( ${FCEU_PROFILER_ENABLE} )
+ message( STATUS "FCEU Profiler Enabled")
+ add_definitions( -D__FCEU_PROFILER_ENABLE__ )
+endif()
+
+
 if ( ${QT6} )
  find_package( Qt6 REQUIRED COMPONENTS Widgets OpenGL OpenGLWidgets ${QtHelpModule})
  add_definitions( ${Qt6Widgets_DEFINITIONS} ${Qt6Help_DEFINITIONS} ${Qt6OpenGLWidgets_DEFINITIONS} )
@@ -41,12 +47,15 @@ if(WIN32)
  add_definitions( -DMSVC -D_CRT_SECURE_NO_WARNINGS )
  add_definitions( -D__SDL__ -D__QT_DRIVER__ -DQT_DEPRECATED_WARNINGS )
  add_definitions( -DFCEUDEF_DEBUGGER )
+ add_definitions( -D_USE_LIBARCHIVE )
  add_definitions( /wd4267 /wd4244 )
  #add_definitions( /wd4018 ) # Integer comparison sign mismatch warnings
  include_directories( ${SDL_INSTALL_PREFIX}/SDL2/include )
+ include_directories( ${LIBARCHIVE_INSTALL_PREFIX}/libarchive/include )
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib )
  set( OPENGL_LDFLAGS OpenGL::GL )
  set( SDL2_LDFLAGS ${SDL_INSTALL_PREFIX}/SDL2/lib/x64/SDL2.lib )
+ set( LIBARCHIVE_LDFLAGS ${LIBARCHIVE_INSTALL_PREFIX}/libarchive/lib/archive.lib )
  set( SYS_LIBS wsock32 ws2_32 vfw32 Htmlhelp )
  set(APP_ICON_RESOURCES_WINDOWS ${CMAKE_SOURCE_DIR}/icons/fceux.rc )
 
@@ -93,6 +102,12 @@ else(WIN32)
  #endif()
  add_definitions( -D__QT_DRIVER__ -DQT_DEPRECATED_WARNINGS )
 
+ if ( ${GPROF_ENABLE} )
+ add_definitions( -pg )
+ set( GPROF_LDFLAGS -pg )
+ message( STATUS "GNU Profiling Enabled" )
+ endif()
+
  if ( ${ASAN_ENABLE} )
  add_definitions( -fsanitize=address -fsanitize=bounds-strict )
  add_definitions( -fsanitize=undefined -fno-sanitize=vptr )
@@ -110,6 +125,13 @@ else(WIN32)
  add_definitions( -D_SYSTEM_MINIZIP ${MINIZIP_CFLAGS} )
  endif()
 
+ pkg_check_modules( LIBARCHIVE libarchive)
+
+ if ( ${LIBARCHIVE_FOUND} )
+ message( STATUS "Using System Libarchive Library ${LIBARCHIVE_VERSION}" )
+ add_definitions( -D_USE_LIBARCHIVE ${LIBARCHIVE_CFLAGS} )
+ endif()
+
  pkg_check_modules( X264 x264)
 
  if ( ${X264_FOUND} )
@@ -287,11 +309,13 @@ set(SRC_CORE
  ${CMAKE_CURRENT_SOURCE_DIR}/filter.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/ines.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/input.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ld65dbg.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/movie.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/netplay.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/nsf.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/oldmovie.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/palette.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/profiler.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/ppu.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/sound.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/state.cpp
@@ -503,6 +527,7 @@ set(SRC_CORE
  ${CMAKE_CURRENT_SOURCE_DIR}/utils/md5.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/utils/memory.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/utils/mutex.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils/timeStamp.cpp
 )
 
 
@@ -525,6 +550,8 @@ set(SRC_DRIVERS_SDL
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleWindow.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleViewerGL.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleViewerSDL.cpp 
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleViewerQWidget.cpp 
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleViewerInterface.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/InputConf.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/GamePadConf.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/FamilyKeyboard.cpp 
@@ -550,6 +577,7 @@ set(SRC_DRIVERS_SDL
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleUtilities.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleVideoConf.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/ConsoleSoundConf.cpp 
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/StateRecorderConf.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/iNesHeaderEditor.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/SplashScreen.cpp 
  ${CMAKE_CURRENT_SOURCE_DIR}/drivers/Qt/TraceLogger.cpp 
@@ -634,14 +662,15 @@ add_executable( ${APP_NAME} ${SOURCES} ../resources.qrc
  ${CMAKE_CURRENT_BINARY_DIR}/fceux_git_info.cpp)
 endif()
 
-target_link_libraries( ${APP_NAME} ${ASAN_LDFLAGS}
+target_link_libraries( ${APP_NAME}
+ ${ASAN_LDFLAGS} ${GPROF_LDFLAGS}
  ${${Qt}Widgets_LIBRARIES}
  ${${Qt}Help_LIBRARIES}
  ${${Qt}OpenGL_LIBRARIES}
  ${${Qt}OpenGLWidgets_LIBRARIES}
  ${OPENGL_LDFLAGS} 
  ${SDL2_LDFLAGS}
- ${MINIZIP_LDFLAGS} ${ZLIB_LIBRARIES}
+ ${MINIZIP_LDFLAGS} ${ZLIB_LIBRARIES} ${LIBARCHIVE_LDFLAGS}
  ${LUA_LDFLAGS} ${X264_LDFLAGS} ${X265_LDFLAGS} ${LIBAV_LDFLAGS}
  ${SYS_LIBS}
 )

diff --git a/src/boards/15.cpp b/src/boards/15.cpp
@@ -24,7 +24,7 @@
 static uint16 latchea;
 static uint8 latched;
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 static SFORMAT StateRegs[] =
 {
  { &latchea, 2, "AREG" },
@@ -108,8 +108,7 @@ void Mapper15_Init(CartInfo *info) {
  WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/164.cpp b/src/boards/164.cpp
@@ -27,7 +27,7 @@
 static uint8 laststrobe, trigger;
 static uint8 reg[8];
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 
 static writefunc pcmwrite;
 
@@ -123,8 +123,7 @@ void Mapper164_Init(CartInfo *info) {
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  GameStateRestore = StateRestore;
@@ -172,8 +171,7 @@ void Mapper163_Init(CartInfo *info) {
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
  GameStateRestore = StateRestore;
  AddExState(&StateRegs, ~0, 0, 0);
@@ -223,8 +221,7 @@ void UNLFS304_Init(CartInfo *info) {
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  GameStateRestore = StateRestore;

diff --git a/src/boards/177.cpp b/src/boards/177.cpp
@@ -23,7 +23,7 @@
 static uint8 reg;
 
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 
 static SFORMAT StateRegs[] =
 {
@@ -73,8 +73,7 @@ void Mapper177_Init(CartInfo *info) {
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/178.cpp b/src/boards/178.cpp
@@ -27,7 +27,7 @@
 static uint8 reg[4];
 
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 
 // Tennis with VR sensor, very simple behaviour
 extern void GetMouseData(uint32 (&md)[3]);
@@ -192,8 +192,7 @@ void Mapper178_Init(CartInfo *info) {
  WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 

diff --git a/src/boards/18.cpp b/src/boards/18.cpp
@@ -24,7 +24,7 @@ static uint8 preg[4], creg[8];
 static uint8 IRQa, mirr;
 static int32 IRQCount, IRQLatch;
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 
 static SFORMAT StateRegs[] =
 {
@@ -125,8 +125,7 @@ void Mapper18_Init(CartInfo *info) {
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/246.cpp b/src/boards/246.cpp
@@ -22,7 +22,7 @@
 
 static uint8 regs[8];
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE = 0;
 
 static SFORMAT StateRegs[] =
 {
@@ -79,8 +79,7 @@ void Mapper246_Init(CartInfo *info) {
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/252.cpp b/src/boards/252.cpp
@@ -23,9 +23,9 @@
 static uint8 creg[8], preg[2];
 static int32 IRQa, IRQCount, IRQClock, IRQLatch;
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 static uint8 *CHRRAM = NULL;
-static uint32 CHRRAMSIZE;
+static uint32 CHRRAMSIZE=0;
 
 static SFORMAT StateRegs[] =
 {
@@ -127,8 +127,7 @@ void Mapper252_Init(CartInfo *info) {
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
  GameStateRestore = StateRestore;
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/253.cpp b/src/boards/253.cpp
@@ -23,9 +23,9 @@
 static uint8 chrlo[8], chrhi[8], prg[2], mirr, vlock;
 static int32 IRQa, IRQCount, IRQLatch, IRQClock;
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
+static uint32 WRAMSIZE=0;
 static uint8 *CHRRAM = NULL;
-static uint32 CHRRAMSIZE;
+static uint32 CHRRAMSIZE=0;
 
 static SFORMAT StateRegs[] =
 {
@@ -144,8 +144,7 @@ void Mapper253_Init(CartInfo *info) {
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
 
  AddExState(&StateRegs, ~0, 0, 0);

diff --git a/src/boards/354.cpp b/src/boards/354.cpp
@@ -58,6 +58,7 @@ static void Mapper354_Sync(void)
  setprg32(0x8000, prg >> 1 | 3);
  break;
  }
+ SetupCartCHRMapping(0, CHRptr[0], CHRsize[0], (latchAddr & 8) ? 0 : 1);
  setchr8(0);
  setmirror(latchData & 0x40 ? MI_H : MI_V);
 }

diff --git a/src/boards/68.cpp b/src/boards/68.cpp
@@ -24,7 +24,7 @@ static uint8 chr_reg[4];
 static uint8 kogame, prg_reg, nt1, nt2, mirr;
 
 static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE, count;
+static uint32 WRAMSIZE=0, count=0;
 
 static SFORMAT StateRegs[] =
 {
@@ -156,8 +156,7 @@ void Mapper68_Init(CartInfo *info) {
  WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
  SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
  if (info->battery) {
- info->SaveGame[0] = WRAM;
- info->SaveGameLen[0] = WRAMSIZE;
+ info->addSaveGameBuf( WRAM, WRAMSIZE );
  }
  AddExState(WRAM, WRAMSIZE, 0, "WRAM");
  AddExState(&StateRegs, ~0, 0, 0);