Menu
▾
▴
vba-commit — CVS commits for VBA
You can subscribe to this list here.
| 2004 |
Jan
(17) |
Feb
(38) |
Mar
(24) |
Apr
(18) |
May
(75) |
Jun
(2) |
Jul
|
Aug
|
Sep
(21) |
Oct
(3) |
Nov
(19) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
|
Mar
|
Apr
(6) |
May
(73) |
Jun
(57) |
Jul
(12) |
Aug
(68) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
|
From: <for...@pr...> - 2004-02-01 15:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src/prof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064/src/prof Modified Files: Makefile.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 21 Nov 2003 21:53:41 -0000 1.3 --- Makefile.in 1 Feb 2004 15:02:39 -0000 1.4 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- |
|
From: <for...@pr...> - 2004-02-01 15:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064/src/gb Modified Files: Makefile.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 21 Nov 2003 21:53:41 -0000 1.6 --- Makefile.in 1 Feb 2004 15:02:39 -0000 1.7 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- |
|
From: <for...@pr...> - 2004-02-01 15:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064/win32 Modified Files: Makefile.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 21 Nov 2003 21:53:42 -0000 1.5 --- Makefile.in 1 Feb 2004 15:02:39 -0000 1.6 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- |
|
From: <for...@pr...> - 2004-02-01 15:04:31
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064 Modified Files: Makefile.am Makefile.in configure configure.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 21 Nov 2003 21:53:40 -0000 1.6 --- Makefile.am 1 Feb 2004 15:02:38 -0000 1.7 *************** *** 2,4 **** SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS qt/VisualBoyAdvance.pro --- 2,5 ---- SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS ! Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 21 Nov 2003 21:53:40 -0000 1.9 --- Makefile.in 1 Feb 2004 15:02:38 -0000 1.10 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- *************** *** 141,145 **** SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS qt/VisualBoyAdvance.pro subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 140,144 ---- SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 319,323 **** $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/qt @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ --- 318,321 ---- Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure 31 Jan 2004 01:14:35 -0000 1.19 --- configure 1 Feb 2004 15:02:38 -0000 1.20 *************** *** 309,313 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM ac_ct_NASM SDL_CONFIG SDL_CFLAGS SDL_LIBS CPP EGREP VBA_MMX VBA_EXTRA VBA_GP VBA_PROF LIBOBJS LTLIBOBJS' ac_subst_files='' --- 309,313 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM ac_ct_NASM SDL_CONFIG SDL_CFLAGS SDL_LIBS CPP EGREP VBA_MMX VBA_EXTRA VBA_PROF LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 862,866 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-gp enable GP32 emulation (default is NO) --enable-c-core enable C core (default is YES) --enable-dev enable development features (default is YES) --- 862,865 ---- *************** *** 1789,1809 **** - # Check whether --enable-gp or --disable-gp was given. - if test "${enable_gp+set}" = set; then - enableval="$enable_gp" - ac_cv_use_gp=$enableval - else - ac_cv_use_gp=no - fi; - echo "$as_me:$LINENO: checking whether to enable GP32 emulation" >&5 - echo $ECHO_N "checking whether to enable GP32 emulation... $ECHO_C" >&6 - if test "${ac_cv_use_gp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_use_gp=no - fi - echo "$as_me:$LINENO: result: $ac_cv_use_gp" >&5 - echo "${ECHO_T}$ac_cv_use_gp" >&6 - # Check whether --enable-c-core or --disable-c-core was given. if test "${enable_c_core+set}" = set; then --- 1788,1791 ---- *************** *** 5728,5737 **** fi - if test "${ac_cv_use_gp}" = "yes"; then - VBA_EXTRA="$VBA_EXTRA gp" - VBA_GP=gp/libgp.a - CXXFLAGS="$CXXFLAGS -DGP_EMULATION" - fi - if test "${ac_cv_use_mmx}" = "yes"; then CXXFLAGS="$CXXFLAGS -DMMX" --- 5710,5713 ---- *************** *** 5755,5760 **** ! ! ac_config_files="$ac_config_files Makefile win32/Makefile src/Makefile src/gb/Makefile src/gp/Makefile src/i386/Makefile src/prof/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 5731,5735 ---- ! ac_config_files="$ac_config_files Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 6342,6346 **** "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/gb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gb/Makefile" ;; - "src/gp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gp/Makefile" ;; "src/i386/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/i386/Makefile" ;; "src/prof/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/prof/Makefile" ;; --- 6317,6320 ---- *************** *** 6498,6502 **** s,@VBA_MMX@,$VBA_MMX,;t t s,@VBA_EXTRA@,$VBA_EXTRA,;t t - s,@VBA_GP@,$VBA_GP,;t t s,@VBA_PROF@,$VBA_PROF,;t t s,@LIBOBJS@,$LIBOBJS,;t t --- 6472,6475 ---- Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure.in 31 Jan 2004 01:14:35 -0000 1.18 --- configure.in 1 Feb 2004 15:02:38 -0000 1.19 *************** *** 17,25 **** AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.1) - AC_ARG_ENABLE(gp, - [ --enable-gp enable GP32 emulation (default is NO)], - ac_cv_use_gp=$enableval, ac_cv_use_gp=no) - AC_CACHE_CHECK(whether to enable GP32 emulation, ac_cv_use_gp, ac_cv_use_gp=no) - AC_ARG_ENABLE(c-core, [ --enable-c-core enable C core (default is YES)], --- 17,20 ---- *************** *** 99,108 **** fi - if test "${ac_cv_use_gp}" = "yes"; then - VBA_EXTRA="$VBA_EXTRA gp" - VBA_GP=gp/libgp.a - CXXFLAGS="$CXXFLAGS -DGP_EMULATION" - fi - if test "${ac_cv_use_mmx}" = "yes"; then CXXFLAGS="$CXXFLAGS -DMMX" --- 94,97 ---- *************** *** 125,130 **** AC_SUBST(VBA_MMX) AC_SUBST(VBA_EXTRA) - AC_SUBST(VBA_GP) AC_SUBST(VBA_PROF) ! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/gp/Makefile src/i386/Makefile src/prof/Makefile) --- 114,118 ---- AC_SUBST(VBA_MMX) AC_SUBST(VBA_EXTRA) AC_SUBST(VBA_PROF) ! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile) |
|
From: <for...@pr...> - 2004-02-01 14:51:38
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11986 Removed Files: GP.cpp GP.h gpGfxRender.cpp gpIO.h Makefile.am Makefile.in Log Message: Remove GP32 code --- GP.cpp DELETED --- --- GP.h DELETED --- --- gpGfxRender.cpp DELETED --- --- gpIO.h DELETED --- --- Makefile.am DELETED --- --- Makefile.in DELETED --- |
|
From: <for...@pr...> - 2004-02-01 14:51:09
|
Update of /cvsroot/vba/VisualBoyAdvance/qt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11588 Removed Files: .cvsignore VisualBoyAdvance.pro Log Message: Remove qt code --- .cvsignore DELETED --- --- VisualBoyAdvance.pro DELETED --- |
Update of /cvsroot/vba/VisualBoyAdvance/src/qt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10918 Removed Files: addcbacode.ui addcbacode.ui.h addgbacode.ui addgbacode.ui.h addgsacode.ui addgsacode.ui.h directories.ui directories.ui.h gbacheats.ui gbacheats.ui.h gbacheatsearch.ui gbacheatsearch.ui.h loggingdlg.ui loggingdlg.ui.h main.cpp qtGUI.cpp qtGUI.h Log Message: Remove qt code --- addcbacode.ui DELETED --- --- addcbacode.ui.h DELETED --- --- addgbacode.ui DELETED --- --- addgbacode.ui.h DELETED --- --- addgsacode.ui DELETED --- --- addgsacode.ui.h DELETED --- --- directories.ui DELETED --- --- directories.ui.h DELETED --- --- gbacheats.ui DELETED --- --- gbacheats.ui.h DELETED --- --- gbacheatsearch.ui DELETED --- --- gbacheatsearch.ui.h DELETED --- --- loggingdlg.ui DELETED --- --- loggingdlg.ui.h DELETED --- --- main.cpp DELETED --- --- qtGUI.cpp DELETED --- --- qtGUI.h DELETED --- |
|
From: <fl...@pr...> - 2004-01-31 21:45:31
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8619/src Modified Files: RTC.cpp Log Message: Small fix Index: RTC.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/RTC.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RTC.cpp 21 Jan 2004 03:40:10 -0000 1.4 --- RTC.cpp 31 Jan 2004 21:43:43 -0000 1.5 *************** *** 68,72 **** } ! return READ16LE((&rom[address & 0x1FFFFFE]));; } --- 68,72 ---- } ! return READ16LE((&rom[address & 0x1FFFFFE])); } |
|
From: <for...@pr...> - 2004-01-31 03:05:01
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25786 Modified Files: gbCodes.h Log Message: Fix HALT bug when IE and IF have no match to cause a HALT Index: gbCodes.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbCodes.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gbCodes.h 9 Dec 2003 01:37:56 -0000 1.3 --- gbCodes.h 30 Jan 2004 00:48:29 -0000 1.4 *************** *** 579,584 **** IFF |= 0x80; } else { ! if(register_IE && register_IF > 0) IFF |= 0x100; } break; --- 579,588 ---- IFF |= 0x80; } else { ! if((register_IE & register_IF) > 0) IFF |= 0x100; + else { + PC.W--; + IFF |= 0x81; + } } break; |
|
From: <for...@pr...> - 2004-01-31 01:16:14
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4196 Modified Files: configure configure.in Log Message: Cleanup + TestEmu fix Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure 10 Dec 2003 13:31:05 -0000 1.18 --- configure 31 Jan 2004 01:14:35 -0000 1.19 *************** *** 1662,1666 **** # Define the identity of the package. PACKAGE=VisualBoyAdvance ! VERSION=1.7 --- 1662,1666 ---- # Define the identity of the package. PACKAGE=VisualBoyAdvance ! VERSION=1.7.1 Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.in 10 Dec 2003 13:31:05 -0000 1.17 --- configure.in 31 Jan 2004 01:14:35 -0000 1.18 *************** *** 15,19 **** esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7) AC_ARG_ENABLE(gp, --- 15,19 ---- esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.1) AC_ARG_ENABLE(gp, |
|
From: <for...@pr...> - 2004-01-31 01:16:13
|
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); } |
|
From: <for...@pr...> - 2004-01-28 18:04:48
|
Update of /cvsroot/vba/VisualBoyAdvance/src/prof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18175 Modified Files: prof.cpp Log Message: Fix compile warnings Index: prof.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/prof.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prof.cpp 6 Feb 2003 21:20:59 -0000 1.2 --- prof.cpp 28 Jan 2004 18:03:26 -0000 1.3 *************** *** 111,115 **** } ! int profWrite(FILE *f, char *buf, int n) { if(fwrite(buf, 1, n, f) != n) --- 111,115 ---- } ! int profWrite(FILE *f, char *buf, unsigned int n) { if(fwrite(buf, 1, n, f) != n) *************** *** 195,199 **** o = highpc - lowpc; if( monsize < o ) ! s_scale = ( (float) monsize / o ) * SCALE_1_TO_1; else s_scale = SCALE_1_TO_1; --- 195,199 ---- o = highpc - lowpc; if( monsize < o ) ! s_scale = (int)(( (float) monsize / o ) * SCALE_1_TO_1); else s_scale = SCALE_1_TO_1; *************** *** 324,328 **** goto overflow; } ! *frompcindex = toindex; top = &tos[toindex]; top->selfpc = selfpc; --- 324,328 ---- goto overflow; } ! *frompcindex = (unsigned short)toindex; top = &tos[toindex]; top->selfpc = selfpc; *************** *** 361,365 **** top->count = 1; top->link = *frompcindex; ! *frompcindex = toindex; goto done; } --- 361,365 ---- top->count = 1; top->link = *frompcindex; ! *frompcindex = (unsigned short)toindex; goto done; } *************** *** 379,383 **** prevtop->link = top->link; top->link = *frompcindex; ! *frompcindex = toindex; goto done; } --- 379,383 ---- prevtop->link = top->link; top->link = *frompcindex; ! *frompcindex = (unsigned short)toindex; goto done; } |
|
From: <for...@pr...> - 2004-01-28 18:01:03
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17373 Modified Files: debugger.cpp GBA.cpp SDL.cpp System.h Log Message: Use structure for emulation functions Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/debugger.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** debugger.cpp 21 Jan 2004 03:40:10 -0000 1.5 --- debugger.cpp 28 Jan 2004 17:59:28 -0000 1.6 *************** *** 30,35 **** extern int emulating; ! extern void (*emuUpdateCPSR)(); ! extern void (*emuMain)(int); #define debuggerReadMemory(addr) \ --- 30,34 ---- extern int emulating; ! extern struct EmulatedSystem emulator; #define debuggerReadMemory(addr) \ *************** *** 732,736 **** debuggerEnableBreakpoints(false); } else ! emuMain(1); } debuggerDisableBreakpoints(); --- 731,735 ---- debuggerEnableBreakpoints(false); } else ! emulator.emuMain(1); } debuggerDisableBreakpoints(); *************** *** 1096,1100 **** printf("Continuing after breakpoint\n"); debuggerEnableBreakpoints(true); ! emuMain(1); debuggerAtBreakpoint = false; } --- 1095,1099 ---- printf("Continuing after breakpoint\n"); debuggerEnableBreakpoints(true); ! emulator.emuMain(1); debuggerAtBreakpoint = false; } *************** *** 1422,1426 **** int commandCount = 0; ! emuUpdateCPSR(); debuggerRegisters(0, NULL); --- 1421,1426 ---- int commandCount = 0; ! if(emulator.emuUpdateCPSR) ! emulator.emuUpdateCPSR(); debuggerRegisters(0, NULL); Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** GBA.cpp 28 Jan 2004 17:44:50 -0000 1.49 --- GBA.cpp 28 Jan 2004 17:59:29 -0000 1.50 *************** *** 3918,3921 **** --- 3918,3925 ---- // emuWriteBMP CPUWriteBMPFile, + // emuUpdateCPSR + CPUUpdateCPSR, + // emuHasDebugger + true, // emuCount #ifdef FINAL_VERSION Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/SDL.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** SDL.cpp 21 Nov 2003 21:53:41 -0000 1.49 --- SDL.cpp 28 Jan 2004 17:59:29 -0000 1.50 *************** *** 118,135 **** #endif ! bool (*emuWriteState)(const char *) = NULL; ! bool (*emuWriteMemState)(char *, int) = NULL; ! bool (*emuReadState)(const char *) = NULL; ! bool (*emuReadMemState)(char *, int) = 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[] = { --- 118,137 ---- #endif ! struct EmulatedSystem emulator = { ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! NULL, ! false, ! 0 ! }; static u8 COPYRIGHT[] = { *************** *** 1362,1367 **** else sprintf(stateName,"%s%d.sgm", filename, num+1); ! if(emuWriteState) ! emuWriteState(stateName); sprintf(stateName, "Wrote state %d", num+1); systemScreenMessage(stateName); --- 1364,1369 ---- else sprintf(stateName,"%s%d.sgm", filename, num+1); ! if(emulator.emuWriteState) ! emulator.emuWriteState(stateName); sprintf(stateName, "Wrote state %d", num+1); systemScreenMessage(stateName); *************** *** 1378,1383 **** sprintf(stateName,"%s%d.sgm", filename, num+1); ! if(emuReadState) ! emuReadState(stateName); sprintf(stateName, "Loaded state %d", num+1); --- 1380,1385 ---- sprintf(stateName,"%s%d.sgm", filename, num+1); ! if(emulator.emuReadState) ! emulator.emuReadState(stateName); sprintf(stateName, "Loaded state %d", num+1); *************** *** 1394,1398 **** sprintf(buffer, "%s.sav", filename); ! emuWriteBattery(buffer); systemScreenMessage("Wrote battery"); --- 1396,1400 ---- sprintf(buffer, "%s.sav", filename); ! emulator.emuWriteBattery(buffer); systemScreenMessage("Wrote battery"); *************** *** 1410,1414 **** bool res = false; ! res = emuReadBattery(buffer); if(res) --- 1412,1416 ---- bool res = false; ! res = emulator.emuReadBattery(buffer); if(res) *************** *** 1715,1719 **** (event.key.keysym.mod & KMOD_CTRL)) { if(emulating) { ! emuReset(); systemScreenMessage("Reset"); --- 1717,1721 ---- (event.key.keysym.mod & KMOD_CTRL)) { if(emulating) { ! emulator.emuReset(); systemScreenMessage("Reset"); *************** *** 1724,1730 **** if(!(event.key.keysym.mod & MOD_NOCTRL) && (event.key.keysym.mod & KMOD_CTRL)) { ! if(emulating && emuReadMemState && rewindMemory && rewindCount) { rewindPos = --rewindPos & 7; ! emuReadMemState(&rewindMemory[REWIND_SIZE*rewindPos], REWIND_SIZE); rewindCount--; rewindCounter = 0; --- 1726,1734 ---- if(!(event.key.keysym.mod & MOD_NOCTRL) && (event.key.keysym.mod & KMOD_CTRL)) { ! if(emulating && emulator.emuReadMemState && rewindMemory ! && rewindCount) { rewindPos = --rewindPos & 7; ! emulator.emuReadMemState(&rewindMemory[REWIND_SIZE*rewindPos], ! REWIND_SIZE); rewindCount--; rewindCounter = 0; *************** *** 2205,2222 **** if(!failed) { cartridgeType = 1; ! emuWriteState = gbWriteSaveState; ! emuWriteMemState = gbWriteMemSaveState; ! emuReadState = gbReadSaveState; ! emuReadMemState = gbReadMemSaveState; ! emuWriteBattery = gbWriteBatteryFile; ! emuReadBattery = gbReadBatteryFile; ! emuReset = gbReset; ! emuCleanUp = gbCleanUp; ! emuWritePNG = gbWritePNGFile; ! emuWriteBMP = gbWriteBMPFile; ! emuMain = gbEmulate; ! emuUpdateCPSR = NULL; ! emuHasDebugger = false; ! emuCount = 70000/4; if(sdlAutoIPS) { int size = gbRomSize; --- 2209,2213 ---- if(!failed) { cartridgeType = 1; ! emulator = GBSystem; if(sdlAutoIPS) { int size = gbRomSize; *************** *** 2240,2257 **** cartridgeType = 0; ! emuWriteState = CPUWriteState; ! emuWriteMemState = CPUWriteMemState; ! emuReadState = CPUReadState; ! emuReadMemState = CPUReadMemState; ! emuWriteBattery = CPUWriteBatteryFile; ! emuReadBattery = CPUReadBatteryFile; ! emuReset = CPUReset; ! emuCleanUp = CPUCleanUp; ! emuWritePNG = CPUWritePNGFile; ! emuWriteBMP = CPUWriteBMPFile; ! emuMain = CPULoop; ! emuUpdateCPSR = CPUUpdateCPSR; ! emuHasDebugger = true; ! emuCount = 50000; if(removeIntros && rom != NULL) { --- 2231,2235 ---- cartridgeType = 0; ! emulator = GBASystem; if(removeIntros && rom != NULL) { *************** *** 2269,2294 **** } } - #ifdef GP_EMULATION - } else if(GPIsGPImage(szFile) || cartridgeType == 2) { - failed = !GPLoadRom(szFile); - if(!failed) { - 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 } --- 2247,2250 ---- *************** *** 2310,2325 **** 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); --- 2266,2270 ---- ioMem = (u8 *)calloc(1, 0x400); ! emulator = GBASystem; CPUInit(biosFileName, useBios); *************** *** 2613,2627 **** while(emulating) { if(!paused && active) { ! if(debugger && emuHasDebugger) dbgMain(); else { ! emuMain(emuCount); ! if(rewindSaveNeeded && rewindMemory && emuWriteMemState) { rewindCount++; if(rewindCount > 8) rewindCount = 8; ! if(emuWriteMemState && ! emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], ! REWIND_SIZE)) { rewindPos = ++rewindPos & 7; if(rewindCount == 8) --- 2558,2572 ---- while(emulating) { if(!paused && active) { ! if(debugger && emulator.emuHasDebugger) dbgMain(); else { ! emulator.emuMain(emulator.emuCount); ! if(rewindSaveNeeded && rewindMemory && emulator.emuWriteMemState) { rewindCount++; if(rewindCount > 8) rewindCount = 8; ! if(emulator.emuWriteMemState && ! emulator.emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], ! REWIND_SIZE)) { rewindPos = ++rewindPos & 7; if(rewindCount == 8) *************** *** 2650,2654 **** if(gbRom != NULL || rom != NULL) { sdlWriteBattery(); ! emuCleanUp(); } --- 2595,2599 ---- if(gbRom != NULL || rom != NULL) { sdlWriteBattery(); ! emulator.emuCleanUp(); } *************** *** 2949,2953 **** sprintf(buffer, "%s%02d.bmp", filename, a); ! emuWriteBMP(buffer); } else { if(captureDir[0]) --- 2894,2898 ---- sprintf(buffer, "%s%02d.bmp", filename, a); ! emulator.emuWriteBMP(buffer); } else { if(captureDir[0]) *************** *** 2955,2959 **** else sprintf(buffer, "%s%02d.png", filename, a); ! emuWritePNG(buffer); } --- 2900,2904 ---- else sprintf(buffer, "%s%02d.png", filename, a); ! emulator.emuWritePNG(buffer); } Index: System.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/System.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** System.h 28 Jan 2004 17:44:50 -0000 1.10 --- System.h 28 Jan 2004 17:59:31 -0000 1.11 *************** *** 69,72 **** --- 69,76 ---- // write BMP file bool (*emuWriteBMP)(const char *); + // emulator update CPSR (ARM only) + void (*emuUpdateCPSR)(); + // emulator has debugger + bool emuHasDebugger; // clock ticks to emulate int emuCount; |
|
From: <for...@pr...> - 2004-01-28 18:00:18
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17142 Modified Files: GB.cpp Log Message: Use structure for emulation functions Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GB.cpp 28 Jan 2004 17:45:13 -0000 1.15 --- GB.cpp 28 Jan 2004 17:58:59 -0000 1.16 *************** *** 3165,3168 **** --- 3165,3172 ---- // emuWriteBMP gbWriteBMPFile, + // emuUpdateCPSR + NULL, + // emuHasDebugger + false, // emuCount #ifdef FINAL_VERSION |
|
From: <for...@pr...> - 2004-01-28 17:46:51
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14688 Modified Files: MainWnd.cpp MainWndFile.cpp MainWndTools.cpp VBA.cpp VBA.h Log Message: Use structure for emulation functions Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MainWnd.cpp 28 Jan 2004 13:51:43 -0000 1.7 --- MainWnd.cpp 28 Jan 2004 17:45:37 -0000 1.8 *************** *** 437,441 **** writeBatteryFile(); cheatSearchCleanup(&cheatSearchData); ! theApp.emuCleanUp(); remoteCleanUp(); emulating = false; --- 437,441 ---- writeBatteryFile(); cheatSearchCleanup(&cheatSearchData); ! theApp.emulator.emuCleanUp(); remoteCleanUp(); emulating = false; *************** *** 475,494 **** if(!gbLoadRom(theApp.szFile)) return false; ! theApp.emuWriteState = gbWriteSaveState; ! theApp.emuWriteMemState = gbWriteMemSaveState; ! theApp.emuReadState = gbReadSaveState; ! theApp.emuReadMemState = gbReadMemSaveState; ! theApp.emuWriteBattery = gbWriteBatteryFile; ! theApp.emuReadBattery = gbReadBatteryFile; ! theApp.emuReset = gbReset; ! theApp.emuCleanUp = gbCleanUp; ! theApp.emuWritePNG = gbWritePNGFile; ! theApp.emuWriteBMP = gbWriteBMPFile; ! theApp.emuMain = gbEmulate; ! #ifdef FINAL_VERSION ! theApp.emuCount = 70000/4; ! #else ! theApp.emuCount = 1000; ! #endif gbBorderOn = theApp.winGbBorderOn; theApp.romSize = gbRomSize; --- 475,479 ---- if(!gbLoadRom(theApp.szFile)) return false; ! theApp.emulator = GBSystem; gbBorderOn = theApp.winGbBorderOn; theApp.romSize = gbRomSize; *************** *** 549,569 **** if(i != (UINT)-1 && (i <= 5)) cpuSaveType = (int)i; ! ! theApp.emuWriteState = CPUWriteState; ! theApp.emuWriteMemState = CPUWriteMemState; ! theApp.emuReadState = CPUReadState; ! theApp.emuReadMemState = CPUReadMemState; ! theApp.emuWriteBattery = CPUWriteBatteryFile; ! theApp.emuReadBattery = CPUReadBatteryFile; ! theApp.emuReset = CPUReset; ! theApp.emuCleanUp = CPUCleanUp; ! theApp.emuWritePNG = CPUWritePNGFile; ! theApp.emuWriteBMP = CPUWriteBMPFile; ! theApp.emuMain = CPULoop; ! #ifdef FINAL_VERSION ! theApp.emuCount = 250000; ! #else ! theApp.emuCount = 5000; ! #endif if(theApp.removeIntros && rom != NULL) { *((u32 *)rom)= 0xea00002e; --- 534,539 ---- if(i != (UINT)-1 && (i <= 5)) cpuSaveType = (int)i; ! ! theApp.emulator = GBASystem; if(theApp.removeIntros && rom != NULL) { *((u32 *)rom)= 0xea00002e; *************** *** 865,870 **** filename.Format("%s\\%s.sav", saveDir, buffer); ! if(theApp.emuWriteBattery) ! theApp.emuWriteBattery(filename); } --- 835,840 ---- filename.Format("%s\\%s.sav", saveDir, buffer); ! if(theApp.emulator.emuWriteBattery) ! theApp.emulator.emuWriteBattery(filename); } *************** *** 894,899 **** bool res = false; ! if(theApp.emuReadBattery) ! res = theApp.emuReadBattery(filename); if(res) --- 864,869 ---- bool res = false; ! if(theApp.emulator.emuReadBattery) ! res = theApp.emulator.emuReadBattery(filename); if(res) *************** *** 911,916 **** bool MainWnd::loadSaveGame(const char *name) { ! if(theApp.emuReadState) ! return theApp.emuReadState(name); return false; } --- 881,886 ---- bool MainWnd::loadSaveGame(const char *name) { ! if(theApp.emulator.emuReadState) ! return theApp.emulator.emuReadState(name); return false; } *************** *** 918,923 **** bool MainWnd::writeSaveGame(const char *name) { ! if(theApp.emuWriteState) ! return theApp.emuWriteState(name); return false; } --- 888,893 ---- bool MainWnd::writeSaveGame(const char *name) { ! if(theApp.emulator.emuWriteState) ! return theApp.emulator.emuWriteState(name); return false; } *************** *** 1072,1078 **** if(theApp.captureFormat == 0) ! theApp.emuWritePNG(buffer); else ! theApp.emuWriteBMP(buffer); CString msg = winResLoadString(IDS_SCREEN_CAPTURE); --- 1042,1048 ---- if(theApp.captureFormat == 0) ! theApp.emulator.emuWritePNG(buffer); else ! theApp.emulator.emuWriteBMP(buffer); CString msg = winResLoadString(IDS_SCREEN_CAPTURE); Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainWndFile.cpp 20 Nov 2003 02:46:45 -0000 1.2 --- MainWndFile.cpp 28 Jan 2004 17:45:37 -0000 1.3 *************** *** 70,74 **** { if(emulating) { ! theApp.emuReset(); systemScreenMessage(winResLoadString(IDS_RESET)); } --- 70,74 ---- { if(emulating) { ! theApp.emulator.emuReset(); systemScreenMessage(winResLoadString(IDS_RESET)); } *************** *** 147,151 **** winSaveCheatListDefault(); writeBatteryFile(); ! theApp.emuCleanUp(); remoteCleanUp(); } --- 147,151 ---- winSaveCheatListDefault(); writeBatteryFile(); ! theApp.emulator.emuCleanUp(); remoteCleanUp(); } *************** *** 369,378 **** bool res = false; ! res = theApp.emuReadBattery(dlg.GetPathName()); if(!res) systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", dlg.GetPathName()); else { ! theApp.emuReset(); } } --- 369,378 ---- bool res = false; ! res = theApp.emulator.emuReadBattery(dlg.GetPathName()); if(!res) systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", dlg.GetPathName()); else { ! theApp.emulator.emuReset(); } } *************** *** 484,488 **** result = gbWriteBatteryFile(dlg.GetPathName(), false); } else ! result = theApp.emuWriteBattery(dlg.GetPathName()); if(!result) --- 484,488 ---- result = gbWriteBatteryFile(dlg.GetPathName(), false); } else ! result = theApp.emulator.emuWriteBattery(dlg.GetPathName()); if(!result) *************** *** 590,596 **** if(dlg.getFilterIndex() == 2) ! theApp.emuWriteBMP(dlg.GetPathName()); else ! theApp.emuWritePNG(dlg.GetPathName()); systemScreenMessage(winResLoadString(IDS_SCREEN_CAPTURE)); --- 590,596 ---- if(dlg.getFilterIndex() == 2) ! theApp.emulator.emuWriteBMP(dlg.GetPathName()); else ! theApp.emulator.emuWritePNG(dlg.GetPathName()); systemScreenMessage(winResLoadString(IDS_SCREEN_CAPTURE)); Index: MainWndTools.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndTools.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MainWndTools.cpp 4 Nov 2003 14:09:52 -0000 1.1 --- MainWndTools.cpp 28 Jan 2004 17:45:37 -0000 1.2 *************** *** 218,233 **** ioMem = (u8 *)calloc(1, 0x400); ! theApp.emuWriteState = CPUWriteState; ! theApp.emuReadState = CPUReadState; ! theApp.emuWriteBattery = CPUWriteBatteryFile; ! theApp.emuReadBattery = CPUReadBatteryFile; ! theApp.emuReset = CPUReset; ! theApp.emuCleanUp = CPUCleanUp; ! theApp.emuWritePNG = CPUWritePNGFile; ! theApp.emuWriteBMP = CPUWriteBMPFile; ! theApp.emuMain = CPULoop; ! // emuUpdateCPSR = CPUUpdateCPSR; ! // emuHasDebugger = true; ! theApp.emuCount = 50000; CPUInit(theApp.biosFileName, theApp.useBiosFile ? true : false); --- 218,222 ---- ioMem = (u8 *)calloc(1, 0x400); ! theApp.emulator = GBASystem; CPUInit(theApp.biosFileName, theApp.useBiosFile ? true : false); *************** *** 584,590 **** void MainWnd::OnToolsRewind() { ! if(emulating && theApp.emuReadMemState && theApp.rewindMemory && theApp.rewindCount) { theApp.rewindPos = --theApp.rewindPos & 7; ! theApp.emuReadMemState(&theApp.rewindMemory[REWIND_SIZE*theApp.rewindPos], REWIND_SIZE); theApp.rewindCount--; theApp.rewindCounter = 0; --- 573,579 ---- void MainWnd::OnToolsRewind() { ! if(emulating && theApp.emulator.emuReadMemState && theApp.rewindMemory && theApp.rewindCount) { theApp.rewindPos = --theApp.rewindPos & 7; ! theApp.emulator.emuReadMemState(&theApp.rewindMemory[REWIND_SIZE*theApp.rewindPos], REWIND_SIZE); theApp.rewindCount--; theApp.rewindCounter = 0; Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VBA.cpp 28 Jan 2004 13:51:43 -0000 1.6 --- VBA.cpp 28 Jan 2004 17:45:37 -0000 1.7 *************** *** 268,284 **** updateCount = 0; ! ! emuWriteMemState = NULL; ! emuWriteState = NULL; ! emuReadMemState = NULL; ! emuReadState = NULL; ! emuWriteBattery = NULL; ! emuReadBattery = NULL; ! emuReset = NULL; ! emuCleanUp = NULL; ! emuWritePNG = NULL; ! emuWriteBMP = NULL; ! emuMain = NULL; ! emuCount = 0; hAccel = NULL; --- 268,273 ---- updateCount = 0; ! ! ZeroMemory(&emulator, sizeof(emulator)); hAccel = NULL; *************** *** 339,343 **** ((MainWnd *)m_pMainWnd)->writeBatteryFile(); cheatSearchCleanup(&cheatSearchData); ! emuCleanUp(); } --- 328,332 ---- ((MainWnd *)m_pMainWnd)->writeBatteryFile(); cheatSearchCleanup(&cheatSearchData); ! emulator.emuCleanUp(); } *************** *** 1091,1101 **** } else if(emulating && active && !paused) { for(int i = 0; i < 2; i++) { ! emuMain(emuCount); ! if(rewindSaveNeeded && rewindMemory && emuWriteMemState) { rewindCount++; if(rewindCount > 8) rewindCount = 8; ! if(emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], REWIND_SIZE)) { rewindPos = ++rewindPos & 7; if(rewindCount == 8) --- 1080,1091 ---- } else if(emulating && active && !paused) { for(int i = 0; i < 2; i++) { ! emulator.emuMain(emulator.emuCount); ! if(rewindSaveNeeded && rewindMemory && emulator.emuWriteMemState) { rewindCount++; if(rewindCount > 8) rewindCount = 8; ! if(emulator.emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], ! REWIND_SIZE)) { rewindPos = ++rewindPos & 7; if(rewindCount == 8) Index: VBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VBA.h 28 Jan 2004 13:51:43 -0000 1.3 --- VBA.h 28 Jan 2004 17:45:37 -0000 1.4 *************** *** 191,206 **** RECT dest; ! bool (*emuWriteMemState)(char *, int); ! bool (*emuWriteState)(const char *); ! bool (*emuReadMemState)(char *, int); ! bool (*emuReadState)(const char *); ! bool (*emuWriteBattery)(const char *); ! bool (*emuReadBattery)(const char *); ! void (*emuReset)(); ! void (*emuCleanUp)(); ! bool (*emuWritePNG)(const char *); ! bool (*emuWriteBMP)(const char *); ! void (*emuMain)(int); ! int emuCount; CString szFile; --- 191,195 ---- RECT dest; ! struct EmulatedSystem emulator; CString szFile; |
|
From: <for...@pr...> - 2004-01-28 17:46:27
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14611 Modified Files: GB.cpp GB.h Log Message: Use structure for emulation functions Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GB.cpp 20 Jan 2004 00:47:03 -0000 1.14 --- GB.cpp 28 Jan 2004 17:45:13 -0000 1.15 *************** *** 3141,3142 **** --- 3141,3173 ---- } } + + struct EmulatedSystem GBSystem = { + // emuMain + gbEmulate, + // emuReset + gbReset, + // emuCleanUp + gbCleanUp, + // emuReadBattery + gbReadBatteryFile, + // emuWriteBattery + gbWriteBatteryFile, + // emuReadState + gbReadSaveState, + // emuWriteState + gbWriteSaveState, + // emuReadMemState + gbReadMemSaveState, + // emuWriteMemState + gbWriteMemSaveState, + // emuWritePNG + gbWritePNGFile, + // emuWriteBMP + gbWriteBMPFile, + // emuCount + #ifdef FINAL_VERSION + 70000/4, + #else + 1000, + #endif + }; Index: GB.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GB.h 4 Nov 2003 14:08:07 -0000 1.3 --- GB.h 28 Jan 2004 17:45:13 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #ifndef VBA_GB_GB_H + #define VBA_GB_GB_H + #define C_FLAG 0x10 #define H_FLAG 0x20 *************** *** 51,52 **** --- 54,59 ---- extern bool gbWriteBMPFile(const char *); extern bool gbReadGSASnapshot(const char *); + + extern struct EmulatedSystem GBSystem; + + #endif |
|
From: <for...@pr...> - 2004-01-28 17:46:06
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14448 Modified Files: GBA.cpp GBA.h System.h Log Message: Use structure for emulation functions Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** GBA.cpp 23 Jan 2004 11:41:38 -0000 1.48 --- GBA.cpp 28 Jan 2004 17:44:50 -0000 1.49 *************** *** 3894,3895 **** --- 3894,3926 ---- } } + + struct EmulatedSystem GBASystem = { + // emuMain + CPULoop, + // emuReset + CPUReset, + // emuCleanUp + CPUCleanUp, + // emuReadBattery + CPUReadBatteryFile, + // emuWriteBattery + CPUWriteBatteryFile, + // emuReadState + CPUReadState, + // emuWriteState + CPUWriteState, + // emuReadMemState + CPUReadMemState, + // emuWriteMemState + CPUWriteMemState, + // emuWritePNG + CPUWritePNGFile, + // emuWriteBMP + CPUWriteBMPFile, + // emuCount + #ifdef FINAL_VERSION + 250000 + #else + 5000 + #endif + }; Index: GBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GBA.h 20 Jan 2004 22:30:40 -0000 1.17 --- GBA.h 28 Jan 2004 17:44:50 -0000 1.18 *************** *** 114,117 **** --- 114,119 ---- #endif + extern struct EmulatedSystem GBASystem; + #define R13_IRQ 18 #define R14_IRQ 19 Index: System.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/System.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** System.h 4 Nov 2003 14:11:52 -0000 1.9 --- System.h 28 Jan 2004 17:44:50 -0000 1.10 *************** *** 46,49 **** --- 46,76 ---- #endif + struct EmulatedSystem { + // main emulation function + void (*emuMain)(int); + // reset emulator + void (*emuReset)(); + // clean up memory + void (*emuCleanUp)(); + // load battery file + bool (*emuReadBattery)(const char *); + // write battery file + bool (*emuWriteBattery)(const char *); + // load state + bool (*emuReadState)(const char *); + // save state + bool (*emuWriteState)(const char *); + // load memory state (rewind) + bool (*emuReadMemState)(char *, int); + // write memory state (rewind) + bool (*emuWriteMemState)(char *, int); + // write PNG file + bool (*emuWritePNG)(const char *); + // write BMP file + bool (*emuWriteBMP)(const char *); + // clock ticks to emulate + int emuCount; + }; + extern void log(const char *,...); |
|
From: <for...@pr...> - 2004-01-28 13:52:55
|
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; |
|
From: <fl...@pr...> - 2004-01-26 02:13:02
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9608/src Modified Files: 2xSaI.cpp bilinear.cpp motionblur.cpp pixel.cpp scanline.cpp simple2x.cpp Log Message: More filter optimizations Index: 2xSaI.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/2xSaI.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** 2xSaI.cpp 20 Jan 2004 22:02:03 -0000 1.8 --- 2xSaI.cpp 26 Jan 2004 02:12:15 -0000 1.9 *************** *** 354,358 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; deltaPtr += srcPitch; } // endof: for (; height; height--) --- 354,358 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; deltaPtr += srcPitch; } // endof: for (; height; height--) *************** *** 479,483 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; // deltaPtr += srcPitch; } // endof: for (; height; height--) --- 479,483 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; // deltaPtr += srcPitch; } // endof: for (; height; height--) *************** *** 625,629 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; deltaPtr += srcPitch; } // endof: for (height; height; height--) --- 625,629 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; deltaPtr += srcPitch; } // endof: for (height; height; height--) *************** *** 754,758 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; deltaPtr += srcPitch; } // endof: for (height; height; height--) --- 754,758 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; deltaPtr += srcPitch; } // endof: for (height; height; height--) *************** *** 927,931 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; deltaPtr += srcPitch; } // endof: for (height; height; height--) --- 927,931 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; deltaPtr += srcPitch; } // endof: for (height; height; height--) *************** *** 1081,1085 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; // deltaPtr += srcPitch; } // endof: for (height; height; height--) --- 1081,1085 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; // deltaPtr += srcPitch; } // endof: for (height; height; height--) Index: bilinear.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/bilinear.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bilinear.cpp 7 Apr 2003 12:42:15 -0000 1.2 --- bilinear.cpp 26 Jan 2004 02:12:15 -0000 1.3 *************** *** 154,158 **** // update the pointers for start of next pair of lines from = (u16 *)((u8 *)from_orig + srcPitch); ! to = (u16 *)((u8 *)to_orig + 2*dstPitch); to_odd = (u16 *)((u8 *)to + dstPitch); } --- 154,158 ---- // update the pointers for start of next pair of lines from = (u16 *)((u8 *)from_orig + srcPitch); ! to = (u16 *)((u8 *)to_orig + (dstPitch << 1)); to_odd = (u16 *)((u8 *)to + dstPitch); } *************** *** 243,247 **** // update the pointers for start of next pair of lines from = (u16 *)((u8 *)from_orig + srcPitch); ! to = (u16 *)((u8 *)to_orig + 2*dstPitch); to_odd = (u16 *)((u8 *)to + dstPitch); } --- 243,247 ---- // update the pointers for start of next pair of lines from = (u16 *)((u8 *)from_orig + srcPitch); ! to = (u16 *)((u8 *)to_orig + (dstPitch << 1)); to_odd = (u16 *)((u8 *)to + dstPitch); } *************** *** 323,327 **** // update the pointers for start of next pair of lines from = (u32 *)((u8 *)from_orig + srcPitch); ! to = (u32 *)((u8 *)to_orig + 2*dstPitch); to_odd = (u32 *)((u8 *)to + dstPitch); } --- 323,327 ---- // update the pointers for start of next pair of lines from = (u32 *)((u8 *)from_orig + srcPitch); ! to = (u32 *)((u8 *)to_orig + (dstPitch << 1)); to_odd = (u32 *)((u8 *)to + dstPitch); } *************** *** 414,418 **** // update the pointers for start of next pair of lines from = (u32 *)((u8 *)from_orig + srcPitch); ! to = (u32 *)((u8 *)to_orig + 2*dstPitch); to_odd = (u32 *)((u8 *)to + dstPitch); } --- 414,418 ---- // update the pointers for start of next pair of lines from = (u32 *)((u8 *)from_orig + srcPitch); ! to = (u32 *)((u8 *)to_orig + (dstPitch << 1)); to_odd = (u32 *)((u8 *)to + dstPitch); } Index: motionblur.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/motionblur.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** motionblur.cpp 20 Jan 2004 22:02:03 -0000 1.7 --- motionblur.cpp 26 Jan 2004 02:12:15 -0000 1.8 *************** *** 113,118 **** deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 113,118 ---- deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 188,193 **** deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 188,193 ---- deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); Index: pixel.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/pixel.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pixel.cpp 20 Jan 2004 22:02:03 -0000 1.8 --- pixel.cpp 26 Jan 2004 02:12:15 -0000 1.9 *************** *** 91,96 **** deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 91,96 ---- deltaPtr += srcPitch; srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 146,151 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 146,151 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); Index: scanline.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/scanline.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** scanline.cpp 20 Jan 2004 22:02:03 -0000 1.4 --- scanline.cpp 26 Jan 2004 02:12:15 -0000 1.5 *************** *** 68,73 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 68,73 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 117,122 **** srcPtr += srcPitch; ! dstPtr += dstPitch*2; ! nextLine += dstPitch*2; } while (--height); --- 117,122 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 175,180 **** srcPtr += srcPitch; ! dstPtr += dstPitch*2; ! nextLine += dstPitch*2; } while (--height); --- 175,180 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 226,231 **** srcPtr += srcPitch; ! dstPtr += dstPitch*2; ! nextLine += dstPitch*2; } while (--height); --- 226,231 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); Index: simple2x.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/simple2x.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** simple2x.cpp 4 Nov 2003 14:11:52 -0000 1.8 --- simple2x.cpp 26 Jan 2004 02:12:15 -0000 1.9 *************** *** 63,68 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 63,68 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); *************** *** 100,105 **** srcPtr += srcPitch; ! dstPtr += dstPitch * 2; ! nextLine += dstPitch * 2; } while (--height); --- 100,105 ---- srcPtr += srcPitch; ! dstPtr += dstPitch << 1; ! nextLine += dstPitch << 1; } while (--height); |
|
From: <fl...@pr...> - 2004-01-26 01:49:59
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5646/src/gb Modified Files: gbGlobals.cpp Log Message: Default to CGB/SGB Index: gbGlobals.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbGlobals.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gbGlobals.cpp 9 Dec 2003 01:39:13 -0000 1.3 --- gbGlobals.cpp 26 Jan 2004 01:49:13 -0000 1.4 *************** *** 44,48 **** int gbColorOption = 0; int gbPaletteOption = 0; ! int gbEmulatorType = 1; int gbBorderOn = 1; int gbBorderAutomatic = 0; --- 44,48 ---- int gbColorOption = 0; int gbPaletteOption = 0; ! int gbEmulatorType = 0; int gbBorderOn = 1; int gbBorderAutomatic = 0; |
|
From: <for...@pr...> - 2004-01-25 13:53:42
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30442 Modified Files: README README-win.txt Log Message: Update readme with new version and URL Index: README =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/README,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** README 11 Dec 2003 01:06:51 -0000 1.25 --- README 25 Jan 2004 13:52:53 -0000 1.26 *************** *** 1,3 **** ! Welcome to version 1.7 of VisualBoyAdvance-SDL. This is a GB/GBC/GBA emulator for Windows, Linux and BeOS. --- 1,3 ---- ! Welcome to version 1.7.1 of VisualBoyAdvance-SDL. This is a GB/GBC/GBA emulator for Windows, Linux and BeOS. *************** *** 73,77 **** Please support VisualBoyAdvance by making a donation. You can donate money using PayPal (www.paypal.com). Use the contact form to find how you can ! send donations. System requirements --- 73,86 ---- Please support VisualBoyAdvance by making a donation. You can donate money using PayPal (www.paypal.com). Use the contact form to find how you can ! send donations. Also, it is recommended that you use the VisualBoyAdvance ! forum on www.ngemu.com message board. ! ! FAQ ! --- ! ! See online FAQ for more information: http://vba.ngemu.com/faq.shtml ! ! Please don't email about what you think it is problem before consulting ! the FAQ. System requirements *************** *** 451,456 **** just a hobby. ! Forgotten (http://vboy.emuhq.com/contact.shtml) ! http://vboy.emuhq.com Special Thanks --- 460,465 ---- just a hobby. ! Forgotten (http://vba.ngemu.com/contact.shtml) ! http://vba.ngemu.com Special Thanks Index: README-win.txt =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/README-win.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** README-win.txt 11 Dec 2003 01:06:51 -0000 1.12 --- README-win.txt 25 Jan 2004 13:52:55 -0000 1.13 *************** *** 1,3 **** ! Welcome to VisualBoyAdvance version 1.7. Compiling the sources --- 1,3 ---- ! Welcome to VisualBoyAdvance version 1.7.1. Compiling the sources *************** *** 19,23 **** Please support VisualBoyAdvance by making a donation. You can donate money using PayPal (www.paypal.com). Use the contact form to find how you can ! send donations. Default keys (can be edited in the Options menu) --- 19,24 ---- Please support VisualBoyAdvance by making a donation. You can donate money using PayPal (www.paypal.com). Use the contact form to find how you can ! send donations. Also, it is recommended that you use the VisualBoyAdvance ! forum on www.ngemu.com message board. Default keys (can be edited in the Options menu) *************** *** 167,171 **** --- ! See online FAQ for more information: http://vboy.emuhq.com/faq.shtml Please don't email about what you think it is problem before consulting --- 168,172 ---- --- ! See online FAQ for more information: http://vba.ngemu.com/faq.shtml Please don't email about what you think it is problem before consulting *************** *** 233,236 **** This is just a hobby. ! Forgotten (http://vboy.emuhq.com/contact.shtml) ! http://vboy.emuhq.com --- 234,237 ---- This is just a hobby. ! Forgotten (http://vba.ngemu.com/contact.shtml) ! http://vba.ngemu.com |
|
From: <for...@pr...> - 2004-01-25 13:50:16
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29944 Modified Files: vba.rc Log Message: Update url Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** vba.rc 8 Dec 2003 11:44:46 -0000 1.43 --- vba.rc 25 Jan 2004 13:49:29 -0000 1.44 *************** *** 99,103 **** CTEXT "Copyright (c) 2001-03 by Forgotten",IDC_STATIC,31,35, 110,8 ! CTEXT "http://vboy.emuhq.com",IDC_URL,42,55,76,8 CTEXT "Contribution by Costis",IDC_STATIC,30,45,102,8 CTEXT "Version",IDC_STATIC,45,16,70,8 --- 99,103 ---- CTEXT "Copyright (c) 2001-03 by Forgotten",IDC_STATIC,31,35, 110,8 ! CTEXT "http://vba.ngemu.com",IDC_URL,42,55,76,8 CTEXT "Contribution by Costis",IDC_STATIC,30,45,102,8 CTEXT "Version",IDC_STATIC,45,16,70,8 |
|
From: <fl...@us...> - 2004-01-21 03:40:13
|
Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11211/src
Modified Files:
RTC.cpp debugger.cpp
Log Message:
Fix warnings in gcc
Index: RTC.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/RTC.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RTC.cpp 17 Jun 2003 15:34:20 -0000 1.3
--- RTC.cpp 21 Jan 2004 03:40:10 -0000 1.4
***************
*** 186,189 ****
--- 186,191 ----
}
break;
+ default:
+ break;
}
} else
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/debugger.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** debugger.cpp 4 Jul 2003 12:33:50 -0000 1.4
--- debugger.cpp 21 Jan 2004 03:40:10 -0000 1.5
***************
*** 1420,1424 ****
char buffer[1024];
char *commands[10];
! char commandCount = 0;
emuUpdateCPSR();
--- 1420,1424 ----
char buffer[1024];
char *commands[10];
! int commandCount = 0;
emuUpdateCPSR();
|
|
From: <fl...@us...> - 2004-01-21 03:40:13
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1:/tmp/cvs-serv11211 Modified Files: .cvsignore Log Message: Fix warnings in gcc Index: .cvsignore =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 21 Nov 2003 21:53:40 -0000 1.1 --- .cvsignore 21 Jan 2004 03:40:10 -0000 1.2 *************** *** 1 **** --- 1,2 ---- autom4te.cache + .DS_Store |
