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: Sébastien G. <kx...@us...> - 2004-11-01 14:52:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4468 Modified Files: Cheats.cpp Log Message: Compilfix on Linux. Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Cheats.cpp 20 Sep 2004 10:17:18 -0000 1.21 --- Cheats.cpp 1 Nov 2004 14:52:00 -0000 1.22 *************** *** 437,441 **** bool onoff = true; int ticks = 0; ! for (int i = 0; i<4; i++) if (rompatch2addr [i] != 0){ CHEAT_PATCH_ROM_16BIT(rompatch2addr [i],rompatch2oldval [i]); --- 437,442 ---- bool onoff = true; int ticks = 0; ! int i; ! for (i = 0; i<4; i++) if (rompatch2addr [i] != 0){ CHEAT_PATCH_ROM_16BIT(rompatch2addr [i],rompatch2oldval [i]); *************** *** 2440,2442 **** #endif #endif ! } \ No newline at end of file --- 2441,2443 ---- #endif #endif ! } |
|
From: Pokemonhacker <pok...@us...> - 2004-10-31 18:26:12
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18378 Modified Files: GBPaletteView.cpp Log Message: Fix Palette save filename bug Index: GBPaletteView.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBPaletteView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GBPaletteView.cpp 13 May 2004 15:06:49 -0000 1.3 --- GBPaletteView.cpp 31 Oct 2004 18:26:01 -0000 1.4 *************** *** 137,140 **** --- 137,142 ---- } + captureBuffer = dlg.GetPathName(); + PaletteViewControl *p = NULL; |
|
From: Pokemonhacker <pok...@us...> - 2004-10-31 18:25:53
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18311 Modified Files: PaletteView.cpp Log Message: Fix Palette save filename bug Index: PaletteView.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/PaletteView.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PaletteView.cpp 13 May 2004 15:06:55 -0000 1.4 --- PaletteView.cpp 31 Oct 2004 18:25:40 -0000 1.5 *************** *** 135,138 **** --- 135,140 ---- } + captureBuffer = dlg.GetPathName(); + PaletteViewControl *p = NULL; |
|
From: Pokemonhacker <pok...@us...> - 2004-10-13 21:07:14
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30241 Modified Files: RTC.cpp elf.cpp Log Message: - fixed RTC support for day of the week (fixed at Sunday before) - fixed loading of ELF multiboot files (section/program header sizes not taken into account as in the regular case - Thanks J.W.) Index: elf.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** elf.cpp 13 May 2004 15:06:45 -0000 1.18 --- elf.cpp 13 Oct 2004 21:07:03 -0000 1.19 *************** *** 2660,2663 **** --- 2660,2664 ---- data + READ32LE(&ph->offset), READ32LE(&ph->filesz)); + size += READ32LE(&ph->filesz); } } else { *************** *** 2709,2712 **** --- 2710,2714 ---- READ32LE(&sh[i]->offset), READ32LE(&sh[i]->size)); + size += READ32LE(&sh[i]->size); } } else { Index: RTC.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/RTC.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RTC.cpp 13 May 2004 15:06:44 -0000 1.7 --- RTC.cpp 13 Oct 2004 21:07:03 -0000 1.8 *************** *** 132,136 **** rtcClockData.data[1] = toBCD(newtime->tm_mon+1); rtcClockData.data[2] = toBCD(newtime->tm_mday); ! rtcClockData.data[3] = 0; rtcClockData.data[4] = toBCD(newtime->tm_hour); rtcClockData.data[5] = toBCD(newtime->tm_min); --- 132,136 ---- rtcClockData.data[1] = toBCD(newtime->tm_mon+1); rtcClockData.data[2] = toBCD(newtime->tm_mday); ! rtcClockData.data[3] = toBCD(newtime->tm_wday); rtcClockData.data[4] = toBCD(newtime->tm_hour); rtcClockData.data[5] = toBCD(newtime->tm_min); |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:24:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src/i386 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/i386 Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/i386/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 12 May 2004 01:07:07 -0000 1.9 --- Makefile.in 29 Sep 2004 22:23:30 -0000 1.10 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:24:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 20 May 2004 21:01:28 -0000 1.21 --- Makefile.in 29 Sep 2004 22:23:29 -0000 1.22 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:24:08
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/gb Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 12 May 2004 01:07:05 -0000 1.10 --- Makefile.in 29 Sep 2004 22:23:29 -0000 1.11 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:54
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/gtk/images Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/images/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 12 May 2004 01:07:07 -0000 1.1 --- Makefile.in 29 Sep 2004 22:23:39 -0000 1.2 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:54
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/gtk Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 13 May 2004 22:57:09 -0000 1.8 --- Makefile.in 29 Sep 2004 22:23:40 -0000 1.9 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:54
|
Update of /cvsroot/vba/VisualBoyAdvance/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/m4 Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/m4/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 12 May 2004 01:07:04 -0000 1.3 --- Makefile.in 29 Sep 2004 22:23:40 -0000 1.4 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:53
|
Update of /cvsroot/vba/VisualBoyAdvance/src/prof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/prof Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 12 May 2004 01:07:07 -0000 1.7 --- Makefile.in 29 Sep 2004 22:23:30 -0000 1.8 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:53
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/src/sdl Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 20 May 2004 21:01:30 -0000 1.5 --- Makefile.in 29 Sep 2004 22:23:39 -0000 1.6 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:53
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17285/win32 Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 12 May 2004 01:07:23 -0000 1.9 --- Makefile.in 29 Sep 2004 22:23:40 -0000 1.10 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:23:26
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17246 Modified Files: Makefile.in Log Message: Fixed configure for libpng. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 12 May 2004 01:07:03 -0000 1.13 --- Makefile.in 29 Sep 2004 22:23:13 -0000 1.14 *************** *** 78,81 **** --- 78,83 ---- LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ + LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ + LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 22:11:04
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14484 Modified Files: configure.in configure aclocal.m4 Log Message: Fixed configure for libpng. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/aclocal.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** aclocal.m4 12 May 2004 01:07:03 -0000 1.5 --- aclocal.m4 29 Sep 2004 22:10:53 -0000 1.6 *************** *** 1648,1651 **** --- 1648,1709 ---- fi]) + + dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) + dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page + dnl also defines GSTUFF_PKG_ERRORS on error + AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi + ]) + + + # gettext.m4 serial 28 (gettext-0.13) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. *************** *** 4278,4337 **** ]) - - dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) - dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page - dnl also defines GSTUFF_PKG_ERRORS on error - AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi - ]) - - - --- 4336,4337 ---- Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** configure 12 May 2004 01:07:03 -0000 1.25 --- configure 29 Sep 2004 22:10:53 -0000 1.26 *************** *** 310,314 **** #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 CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE PKG_CONFIG GTKMM_CFLAGS GTKMM_LIBS GTKMM_CPPFLAGS VBA_EXTRA VBA_SRC_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #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 PKG_CONFIG LIBPNG_CFLAGS LIBPNG_LIBS CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE GTKMM_CFLAGS GTKMM_LIBS GTKMM_CPPFLAGS VBA_EXTRA VBA_SRC_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 3951,4031 **** - echo "$as_me:$LINENO: checking for png_create_write_struct in -lpng" >&5 - echo $ECHO_N "checking for png_create_write_struct in -lpng... $ECHO_C" >&6 - if test "${ac_cv_lib_png_png_create_write_struct+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpng -lz $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char png_create_write_struct (); - int - main () - { - png_create_write_struct (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_png_png_create_write_struct=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_create_write_struct=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_create_write_struct" >&5 - echo "${ECHO_T}$ac_cv_lib_png_png_create_write_struct" >&6 - if test $ac_cv_lib_png_png_create_write_struct = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBPNG 1 - _ACEOF - - LIBS="-lpng $LIBS" - - else - { { echo "$as_me:$LINENO: error: *** Cannot compile without libpng." >&5 - echo "$as_me: error: *** Cannot compile without libpng." >&2;} - { (exit 1); exit 1; }; } - fi - - echo "$as_me:$LINENO: checking for pthread_yield in -lpthread" >&5 echo $ECHO_N "checking for pthread_yield in -lpthread... $ECHO_C" >&6 --- 3951,3954 ---- *************** *** 4101,4104 **** --- 4024,4128 ---- + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for libpng" >&5 + echo $ECHO_N "checking for libpng... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "libpng" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking LIBPNG_CFLAGS" >&5 + echo $ECHO_N "checking LIBPNG_CFLAGS... $ECHO_C" >&6 + LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng"` + echo "$as_me:$LINENO: result: $LIBPNG_CFLAGS" >&5 + echo "${ECHO_T}$LIBPNG_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking LIBPNG_LIBS" >&5 + echo $ECHO_N "checking LIBPNG_LIBS... $ECHO_C" >&6 + LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng"` + echo "$as_me:$LINENO: result: $LIBPNG_LIBS" >&5 + echo "${ECHO_T}$LIBPNG_LIBS" >&6 + else + LIBPNG_CFLAGS="" + LIBPNG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"` + echo $LIBPNG_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { { echo "$as_me:$LINENO: error: Library requirements (libpng) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 + echo "$as_me: error: Library requirements (libpng) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + + CPPFLAGS="$CPPFLAGS $LIBPNG_CFLAGS" + LIBS="$LIBS $LIBPNG_LIBS" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' *************** *** 4339,4342 **** --- 4363,4367 ---- echo $ECHO_N "checking for X... $ECHO_C" >&6 + ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. *************** *** 4431,4435 **** if test "$ac_x_includes" = no; then ! # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF --- 4456,4460 ---- if test "$ac_x_includes" = no; then ! # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF *************** *** 4565,4570 **** ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" ! echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ! echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi --- 4590,4599 ---- ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" ! # It might be that x_includes is empty (headers are found in the ! # standard search path. Then output the corresponding message ! ac_out_x_includes=$x_includes ! test "x$x_includes" = x && ac_out_x_includes="in standard search path" ! echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 ! echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi *************** *** 8692,8695 **** --- 8721,8727 ---- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@NASM@,$NASM,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@LIBPNG_CFLAGS@,$LIBPNG_CFLAGS,;t t + s,@LIBPNG_LIBS@,$LIBPNG_LIBS,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t *************** *** 8710,8714 **** s,@POSUB@,$POSUB,;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t - s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@GTKMM_CFLAGS@,$GTKMM_CFLAGS,;t t s,@GTKMM_LIBS@,$GTKMM_LIBS,;t t --- 8742,8745 ---- Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.in 12 May 2004 01:07:03 -0000 1.24 --- configure.in 29 Sep 2004 22:10:53 -0000 1.25 *************** *** 64,71 **** AC_CHECK_LIB(z, gzopen, , AC_MSG_ERROR([*** Cannot compile without zlib.])) - AC_CHECK_LIB(png, png_create_write_struct, - , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz]) AC_CHECK_LIB(pthread, pthread_yield) dnl Checks for header files. AC_PATH_X --- 64,73 ---- AC_CHECK_LIB(z, gzopen, , AC_MSG_ERROR([*** Cannot compile without zlib.])) AC_CHECK_LIB(pthread, pthread_yield) + PKG_CHECK_MODULES(LIBPNG, libpng) + CPPFLAGS="$CPPFLAGS $LIBPNG_CFLAGS" + LIBS="$LIBS $LIBPNG_LIBS" + dnl Checks for header files. AC_PATH_X |
|
From: Sébastien G. <kx...@us...> - 2004-09-29 20:34:28
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24568 Modified Files: main.cpp window.h Log Message: Compile fix for some config (gtkmm issue) Index: main.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 21 May 2004 20:44:26 -0000 1.6 --- main.cpp 29 Sep 2004 20:34:18 -0000 1.7 *************** *** 23,30 **** #include <list> - #include <libglademm.h> #include <gtkmm/main.h> #include <gtkmm/window.h> #include <gtkmm/messagedialog.h> #include "images/vba-wm-pixbufs.h" --- 23,30 ---- #include <list> #include <gtkmm/main.h> #include <gtkmm/window.h> #include <gtkmm/messagedialog.h> + #include <libglademm.h> #include "images/vba-wm-pixbufs.h" Index: window.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** window.h 21 May 2004 20:44:26 -0000 1.21 --- window.h 29 Sep 2004 20:34:18 -0000 1.22 *************** *** 24,29 **** #include <stdarg.h> - #include <libglademm.h> #include <gtkmm.h> #ifndef GTKMM20 --- 24,29 ---- #include <stdarg.h> #include <gtkmm.h> + #include <libglademm.h> #ifndef GTKMM20 |
|
From: Pokemonhacker <pok...@us...> - 2004-09-20 10:17:30
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896 Modified Files: Cheats.cpp Log Message: Added almost full ARv3 support Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Cheats.cpp 13 May 2004 15:06:43 -0000 1.20 --- Cheats.cpp 20 Sep 2004 10:17:18 -0000 1.21 *************** *** 69,113 **** * EAAAAAAA YYYY - increase value stored in address */ ! #define UNKNOWN_CODE -1 ! #define INT_8_BIT_WRITE 0 ! #define INT_16_BIT_WRITE 1 ! #define INT_32_BIT_WRITE 2 ! #define GSA_16_BIT_ROM_PATCH 3 ! #define GSA_8_BIT_GS_WRITE 4 ! #define GSA_16_BIT_GS_WRITE 5 ! #define GSA_32_BIT_GS_WRITE 6 [...1246 lines suppressed...] + cheatsAdd(code, desc, addr, value, 257, GSA_32_BIT_IF_AND3); + break; + case 0x63: + cheatsAdd(code, desc, addr, value, 257, GSA_16_BIT_WRITE_IOREGS); + break; + case 0xE3: + cheatsAdd(code, desc, addr, value, 257, GSA_32_BIT_WRITE_IOREGS); + break; default: cheatsAdd(code, desc, address, value, 257, UNKNOWN_CODE); *************** *** 1672,1674 **** #endif #endif ! } --- 2440,2442 ---- #endif #endif ! } \ No newline at end of file |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:14:07
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28648 Modified Files: GBA.dsp Log Message: Index: GBA.dsp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/GBA.dsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** GBA.dsp 29 Feb 2004 13:07:01 -0000 1.20 --- GBA.dsp 15 Sep 2004 22:13:58 -0000 1.21 *************** *** 495,504 **** # Begin Custom Build ! OutDir=.\Release InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o $(OutDir)\$(InputName).obj $(InputPath) # End Custom Build --- 495,504 ---- # Begin Custom Build ! IntDir=.\Release InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o "$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build *************** *** 507,516 **** # Begin Custom Build ! OutDir=.\Debug InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o $(OutDir)\$(InputName).obj $(InputPath) # End Custom Build --- 507,516 ---- # Begin Custom Build ! IntDir=.\Debug InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o "$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build *************** *** 519,528 **** # Begin Custom Build ! OutDir=.\ReleaseNoDev InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o $(OutDir)\$(InputName).obj $(InputPath) # End Custom Build --- 519,528 ---- # Begin Custom Build ! IntDir=.\ReleaseNoDev InputPath=..\src\i386\2xSaImmx.asm InputName=2xSaImmx ! "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! "c:\Program Files\Nasm\nasmw.exe" -D__DJGPP__ -f win32 -o "$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:13:05
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28314 Modified Files: 2xSaI.cpp GBA.cpp Util.h arm-new.h bios.cpp thumb.h Log Message: Added prefetch emulation. Fixed HuffUnComp BIOS emulation regarding the tree size (SourceForge #984608). Index: Util.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Util.h 13 May 2004 15:06:44 -0000 1.10 --- Util.h 15 Sep 2004 22:12:52 -0000 1.11 *************** *** 62,64 **** --- 62,65 ---- extern long utilGzMemTell(gzFile file); extern void utilGBAFindSave(const u8 *, const int); + extern void utilUpdateSystemColorMaps(); #endif Index: thumb.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/thumb.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** thumb.h 13 May 2004 15:06:45 -0000 1.11 --- thumb.h 15 Sep 2004 22:12:52 -0000 1.12 *************** *** 764,768 **** #endif ! u32 opcode = CPUReadHalfWordQuick(armNextPC); clockTicks = thumbCycles[opcode >> 8] + memoryWaitFetch[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION --- 764,769 ---- #endif ! u32 opcode = cpuPrefetch[0]; ! cpuPrefetch[0] = cpuPrefetch[1]; clockTicks = thumbCycles[opcode >> 8] + memoryWaitFetch[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION *************** *** 774,777 **** --- 775,779 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH_NEXT; switch(opcode >> 8) { *************** *** 1295,1298 **** --- 1297,1301 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks++; } *************** *** 1305,1308 **** --- 1308,1312 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks++; } *************** *** 1363,1366 **** --- 1367,1371 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks++; } *************** *** 1373,1376 **** --- 1378,1382 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks++; } *************** *** 1390,1393 **** --- 1396,1400 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; } else { armState = true; *************** *** 1395,1398 **** --- 1402,1406 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } break; *************** *** 1404,1407 **** --- 1412,1416 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; } else { armState = true; *************** *** 1409,1412 **** --- 1418,1422 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } break; *************** *** 1944,1947 **** --- 1954,1958 ---- reg[15].I += 2; reg[13].I = temp; + THUMB_PREFETCH; } break; *************** *** 2261,2264 **** --- 2272,2276 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2270,2273 **** --- 2282,2286 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2279,2282 **** --- 2292,2296 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2288,2291 **** --- 2302,2306 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2297,2300 **** --- 2312,2316 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2306,2309 **** --- 2322,2326 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2315,2318 **** --- 2332,2336 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2324,2327 **** --- 2342,2346 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2333,2336 **** --- 2352,2356 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2342,2345 **** --- 2362,2366 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2351,2354 **** --- 2372,2376 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2360,2363 **** --- 2382,2386 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2369,2372 **** --- 2392,2396 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2378,2381 **** --- 2402,2406 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; clockTicks = 3; } *************** *** 2401,2404 **** --- 2426,2430 ---- armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; } break; *************** *** 2439,2442 **** --- 2465,2469 ---- reg[15].I += 2; reg[14].I = temp|1; + THUMB_PREFETCH; } break; Index: bios.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/bios.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bios.cpp 13 May 2004 15:06:45 -0000 1.12 --- bios.cpp 15 Sep 2004 22:12:52 -0000 1.13 *************** *** 549,553 **** u32 treeStart = source; ! source += (treeSize<<1) + 1; int len = header >> 8; --- 549,553 ---- u32 treeStart = source; ! source += (treeSize+1)<<1; int len = header >> 8; Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** GBA.cpp 11 Jun 2004 22:17:03 -0000 1.56 --- GBA.cpp 15 Sep 2004 22:12:52 -0000 1.57 *************** *** 45,48 **** --- 45,66 ---- #define UPDATE_REG(address, value) WRITE16LE(((u16 *)&ioMem[address]),value) + #define ARM_PREFETCH \ + {\ + cpuPrefetch[0] = CPUReadMemoryQuick(armNextPC);\ + cpuPrefetch[1] = CPUReadMemoryQuick(armNextPC+4);\ + } + + #define THUMB_PREFETCH \ + {\ + cpuPrefetch[0] = CPUReadHalfWordQuick(armNextPC);\ + cpuPrefetch[1] = CPUReadHalfWordQuick(armNextPC+2);\ + } + + #define ARM_PREFETCH_NEXT \ + cpuPrefetch[1] = CPUReadMemoryQuick(armNextPC+4); + + #define THUMB_PREFETCH_NEXT\ + cpuPrefetch[1] = CPUReadHalfWordQuick(armNextPC+2); + #ifdef __GNUC__ #define _stricmp strcasecmp *************** *** 80,83 **** --- 98,103 ---- bool cpuEEPROMSensorEnabled = false; + u32 cpuPrefetch[2]; + #ifdef PROFILING int profilingTicks = 0; *************** *** 813,816 **** --- 833,841 ---- systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + if(armState) { + ARM_PREFETCH; + } else { + THUMB_PREFETCH; + } return true; *************** *** 1627,1630 **** --- 1652,1656 ---- armIrqEnable = false; armNextPC = 0x04; + ARM_PREFETCH; reg[15].I += 4; } *************** *** 1640,1643 **** --- 1666,1670 ---- armIrqEnable = false; armNextPC = 0x08; + ARM_PREFETCH; reg[15].I += 4; } *************** *** 3137,3141 **** reg[15].I = 0x00000000; armMode = 0x13; ! armIrqEnable = false; } else { reg[13].I = 0x03007F00; --- 3164,3168 ---- reg[15].I = 0x00000000; armMode = 0x13; ! armIrqEnable = false; } else { reg[13].I = 0x03007F00; *************** *** 3299,3302 **** --- 3326,3331 ---- } + ARM_PREFETCH; + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; *************** *** 3318,3321 **** --- 3347,3351 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; // if(!holdState) Index: 2xSaI.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/2xSaI.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** 2xSaI.cpp 26 Jan 2004 02:12:15 -0000 1.9 --- 2xSaI.cpp 15 Sep 2004 22:12:51 -0000 1.10 *************** *** 2,5 **** --- 2,7 ---- #include "Port.h" + extern int RGB_LOW_BITS_MASK; + extern "C" { *************** *** 49,52 **** --- 51,55 ---- qRGB_COLOR_MASK[0] = qRGB_COLOR_MASK[1] = 0xF7DEF7DE; hq2x_init(16); + RGB_LOW_BITS_MASK = 0x0821; } else if (BitFormat == 555) { colorMask = 0x7BDE7BDE; *************** *** 58,61 **** --- 61,65 ---- qRGB_COLOR_MASK[0] = qRGB_COLOR_MASK[1] = 0x7BDE7BDE; hq2x_init(15); + RGB_LOW_BITS_MASK = 0x0421; } else { return 0; *************** *** 68,71 **** --- 72,76 ---- qRGB_COLOR_MASK[0] = qRGB_COLOR_MASK[1] = 0xfefefe; hq2x_init(32); + RGB_LOW_BITS_MASK = 0x010101; } else return 0; Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** arm-new.h 13 May 2004 15:06:44 -0000 1.11 --- arm-new.h 15 Sep 2004 22:12:52 -0000 1.12 *************** *** 1130,1137 **** --- 1130,1139 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1167,1174 **** --- 1169,1178 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1209,1216 **** --- 1213,1222 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1244,1251 **** --- 1250,1259 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1287,1294 **** --- 1295,1304 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1330,1337 **** --- 1340,1349 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1375,1382 **** --- 1387,1396 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1417,1424 **** --- 1431,1440 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1465,1472 **** --- 1481,1490 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1502,1509 **** --- 1520,1529 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1538,1545 **** --- 1558,1567 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1579,1586 **** --- 1601,1610 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1613,1620 **** --- 1637,1646 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1655,1662 **** --- 1681,1690 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1697,1704 **** --- 1725,1734 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1741,1748 **** --- 1771,1780 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1782,1789 **** --- 1814,1823 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1829,1836 **** --- 1863,1872 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1865,1872 **** --- 1901,1910 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1899,1906 **** --- 1937,1946 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1935,1942 **** --- 1975,1984 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 1969,1976 **** --- 2011,2020 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2007,2014 **** --- 2051,2060 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2045,2052 **** --- 2091,2100 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2085,2092 **** --- 2133,2142 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2124,2131 **** --- 2174,2183 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2169,2176 **** --- 2221,2230 ---- armNextPC = reg[15].I;\ reg[15].I += 4;\ + ARM_PREFETCH;\ } else {\ reg[15].I &= 0xFFFFFFFE;\ armNextPC = reg[15].I;\ reg[15].I += 2;\ + THUMB_PREFETCH;\ }\ } else {\ *************** *** 2180,2184 **** break; ! u32 opcode = CPUReadMemoryQuick(armNextPC); clockTicks = memoryWaitFetch32[(armNextPC >> 24) & 15]; --- 2234,2239 ---- break; ! u32 opcode = cpuPrefetch[0]; ! cpuPrefetch[0] = cpuPrefetch[1]; clockTicks = memoryWaitFetch32[(armNextPC >> 24) & 15]; *************** *** 2192,2195 **** --- 2247,2252 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH_NEXT; + int cond = opcode >> 28; // suggested optimization for frequent cases *************** *** 3188,3195 **** --- 3245,3254 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } else { reg[15].I = reg[base].I & 0xFFFFFFFE; armNextPC = reg[15].I; reg[15].I += 2; + THUMB_PREFETCH; } } *************** *** 3412,3415 **** --- 3471,3475 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 3444,3447 **** --- 3504,3508 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 3474,3477 **** --- 3535,3539 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 3493,3496 **** --- 3555,3559 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 3510,3513 **** --- 3573,3577 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 3529,3532 **** --- 3593,3597 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4115,4118 **** --- 4180,4184 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4139,4142 **** --- 4205,4209 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4169,4172 **** --- 4236,4240 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4198,4201 **** --- 4266,4270 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4221,4224 **** --- 4290,4294 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4245,4248 **** --- 4315,4319 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4275,4278 **** --- 4346,4350 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4304,4307 **** --- 4376,4380 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4322,4325 **** --- 4395,4399 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4341,4344 **** --- 4415,4419 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4366,4369 **** --- 4441,4445 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4390,4393 **** --- 4466,4470 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4410,4413 **** --- 4487,4491 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4431,4434 **** --- 4509,4513 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4458,4461 **** --- 4537,4541 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4484,4487 **** --- 4564,4568 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4502,4505 **** --- 4583,4587 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4521,4524 **** --- 4603,4607 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4546,4549 **** --- 4629,4633 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4570,4573 **** --- 4654,4658 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4590,4593 **** --- 4675,4679 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4611,4614 **** --- 4697,4701 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4638,4641 **** --- 4725,4729 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 4664,4667 **** --- 4752,4756 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 6229,6232 **** --- 6318,6322 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 6264,6267 **** --- 6354,6358 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } if(!(opcode & (1 << base))) *************** *** 6305,6311 **** --- 6396,6404 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6382,6388 **** --- 6475,6483 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6454,6457 **** --- 6549,6553 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 6489,6492 **** --- 6585,6589 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } if(!(opcode & (1 << base))) *************** *** 6528,6534 **** --- 6625,6633 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6605,6611 **** --- 6704,6712 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6679,6682 **** --- 6780,6784 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 6714,6717 **** --- 6816,6820 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } if(!(opcode & (1 << base))) *************** *** 6755,6761 **** --- 6858,6866 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6832,6838 **** --- 6937,6945 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 6904,6907 **** --- 7011,7015 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } } *************** *** 6939,6942 **** --- 7047,7051 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } if(!(opcode & (1 << base))) *************** *** 6978,6984 **** --- 7087,7095 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 7055,7061 **** --- 7166,7174 ---- armNextPC = reg[15].I & 0xFFFFFFFC; reg[15].I = armNextPC + 4; + ARM_PREFETCH; } else { armNextPC = reg[15].I & 0xFFFFFFFE; reg[15].I = armNextPC + 2; + THUMB_PREFETCH; } } else { *************** *** 7108,7111 **** --- 7221,7225 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } break; *************** *** 7123,7126 **** --- 7237,7241 ---- armNextPC = reg[15].I; reg[15].I += 4; + ARM_PREFETCH; } break; |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:13:04
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28314/sdl Modified Files: SDL.cpp debugger.cpp Log Message: Added prefetch emulation. Fixed HuffUnComp BIOS emulation regarding the tree size (SourceForge #984608). Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SDL.cpp 21 May 2004 20:44:26 -0000 1.5 --- SDL.cpp 15 Sep 2004 22:12:54 -0000 1.6 *************** *** 2377,2397 **** if(sdlCalculateMaskWidth(surface->format->Gmask) == 6) { Init_2xSaI(565); - RGB_LOW_BITS_MASK = 0x821; } else { Init_2xSaI(555); - RGB_LOW_BITS_MASK = 0x421; - } - if(cartridgeType == 2) { - for(int i = 0; i < 0x10000; i++) { - systemColorMap16[i] = (((i >> 1) & 0x1f) << systemBlueShift) | - (((i & 0x7c0) >> 6) << systemGreenShift) | - (((i & 0xf800) >> 11) << systemRedShift); - } - } else { - for(int i = 0; i < 0x10000; i++) { - systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | - (((i & 0x3e0) >> 5) << systemGreenShift) | - (((i & 0x7c00) >> 10) << systemBlueShift); - } } srcPitch = srcWidth * 2+4; --- 2377,2382 ---- *************** *** 2399,2411 **** if(systemColorDepth != 32) filterFunction = NULL; ! RGB_LOW_BITS_MASK = 0x010101; ! if(systemColorDepth == 32) { ! Init_2xSaI(32); ! } ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } if(systemColorDepth == 32) srcPitch = srcWidth*4 + 4; --- 2384,2388 ---- if(systemColorDepth != 32) filterFunction = NULL; ! Init_2xSaI(32); if(systemColorDepth == 32) srcPitch = srcWidth*4 + 4; *************** *** 2414,2417 **** --- 2391,2396 ---- } + utilUpdateSystemColorMaps(); + if(systemColorDepth != 32) { switch(filter) { Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** debugger.cpp 13 May 2004 15:06:48 -0000 1.2 --- debugger.cpp 15 Sep 2004 22:12:54 -0000 1.3 *************** *** 140,143 **** --- 140,166 ---- int debuggerRadix = 0; + extern u32 cpuPrefetch[2]; + + #define ARM_PREFETCH \ + {\ + cpuPrefetch[0] = debuggerReadMemory(armNextPC);\ + cpuPrefetch[1] = debuggerReadMemory(armNextPC+4);\ + } + + #define THUMB_PREFETCH \ + {\ + cpuPrefetch[0] = debuggerReadHalfWord(armNextPC);\ + cpuPrefetch[1] = debuggerReadHalfWord(armNextPC+2);\ + } + + static void debuggerPrefetch() + { + if(armState) { + ARM_PREFETCH; + } else { + THUMB_PREFETCH; + } + } + void debuggerApplyBreakpoint(u32 address, int num, int size) { *************** *** 730,735 **** debuggerContinueAfterBreakpoint(); debuggerEnableBreakpoints(false); ! } else emulator.emuMain(1); } debuggerDisableBreakpoints(); --- 753,760 ---- debuggerContinueAfterBreakpoint(); debuggerEnableBreakpoints(false); ! } else { ! debuggerPrefetch(); emulator.emuMain(1); + } } debuggerDisableBreakpoints(); *************** *** 753,756 **** --- 778,782 ---- debuggerEnableBreakpoints(false); debugger = false; + debuggerPrefetch(); } *************** *** 1095,1098 **** --- 1121,1125 ---- printf("Continuing after breakpoint\n"); debuggerEnableBreakpoints(true); + debuggerPrefetch(); emulator.emuMain(1); debuggerAtBreakpoint = false; |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:13:03
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28314/gtk Modified Files: window.cpp Log Message: Added prefetch emulation. Fixed HuffUnComp BIOS emulation regarding the tree size (SourceForge #984608). Index: window.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** window.cpp 21 May 2004 20:44:26 -0000 1.24 --- window.cpp 15 Sep 2004 22:12:53 -0000 1.25 *************** *** 910,922 **** for (int i = 0; i < 0x10000; i++) { - #if G_BYTE_ORDER == G_LITTLE_ENDIAN - systemColorMap32[i] = (((i & 0x1f) << systemRedShift) - | (((i & 0x3e0) >> 5) << systemGreenShift) - | (((i & 0x7c00) >> 10) << systemBlueShift)); - #else systemColorMap32[i] = (((i & 0x1f) << systemRedShift) | (((i & 0x3e0) >> 5) << systemGreenShift) | (((i & 0x7c00) >> 10) << systemBlueShift)); - #endif } --- 910,916 ---- |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:11:31
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27930/win32 Modified Files: Direct3D.cpp GDIDisplay.cpp MainWndFile.cpp OpenGL.cpp Log Message: moved common system palette initialization to Util.cpp and cleaned up DirectDrawDisplay, GDIDisplay, Direct3D and OpenGLDisplay (+plus the SDL version) Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MainWndFile.cpp 13 May 2004 15:06:50 -0000 1.7 --- MainWndFile.cpp 15 Sep 2004 22:11:20 -0000 1.8 *************** *** 729,733 **** CFileStatus status; CString str; ! time_t time = -1; int found = 0; --- 729,733 ---- CFileStatus status; CString str; ! unsigned long time = -1; int found = 0; *************** *** 736,740 **** if(emulating && CFile::GetStatus(name, status)) { ! if(status.m_mtime.GetTime() < time) { time = status.m_mtime.GetTime(); found = i; --- 736,740 ---- if(emulating && CFile::GetStatus(name, status)) { ! if((unsigned long)status.m_mtime.GetTime() < time) { time = status.m_mtime.GetTime(); found = i; *************** *** 815,819 **** CFileStatus status; CString str; ! time_t time = 0; int found = -1; --- 815,819 ---- CFileStatus status; CString str; ! unsigned long time = 0; int found = -1; *************** *** 822,826 **** if(emulating && CFile::GetStatus(name, status)) { ! if(status.m_mtime.GetTime() > time) { time = status.m_mtime.GetTime(); found = i; --- 822,826 ---- if(emulating && CFile::GetStatus(name, status)) { ! if((unsigned long)status.m_mtime.GetTime() > time) { time = status.m_mtime.GetTime(); found = i; Index: GDIDisplay.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GDIDisplay.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GDIDisplay.cpp 13 May 2004 15:06:50 -0000 1.7 --- GDIDisplay.cpp 15 Sep 2004 22:11:20 -0000 1.8 *************** *** 24,27 **** --- 24,28 ---- #include "../Globals.h" #include "../Text.h" + #include "../Util.h" #include "VBA.h" *************** *** 37,41 **** extern void winlog(const char *,...); - extern int RGB_LOW_BITS_MASK; extern int Init_2xSaI(u32); extern int systemSpeed; --- 38,41 ---- *************** *** 217,224 **** if(systemGreenShift == 6) { Init_2xSaI(565); - RGB_LOW_BITS_MASK=0x821; } else { Init_2xSaI(555); - RGB_LOW_BITS_MASK=0x421; } } else if(systemColorDepth == 32) --- 217,222 ---- *************** *** 242,266 **** #endif ! switch(systemColorDepth) { ! case 16: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! case 24: ! case 32: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! } theApp.updateFilter(); theApp.updateIFB(); --- 240,244 ---- #endif ! utilUpdateSystemColorMaps(); theApp.updateFilter(); theApp.updateIFB(); Index: OpenGL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/OpenGL.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OpenGL.cpp 13 May 2004 15:06:55 -0000 1.7 --- OpenGL.cpp 15 Sep 2004 22:11:20 -0000 1.8 *************** *** 25,28 **** --- 25,29 ---- #include "../Globals.h" #include "../Text.h" + #include "../Util.h" #include "Reg.h" *************** *** 318,342 **** } ! switch(systemColorDepth) { ! case 16: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! case 24: ! case 32: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! } theApp.updateFilter(); theApp.updateIFB(); --- 319,323 ---- } ! utilUpdateSystemColorMaps(); theApp.updateFilter(); theApp.updateIFB(); Index: Direct3D.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Direct3D.cpp 13 May 2004 15:06:49 -0000 1.6 --- Direct3D.cpp 15 Sep 2004 22:11:19 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- #include "../Globals.h" #include "../Text.h" + #include "../Util.h" #include "../gb/gbGlobals.h" *************** *** 356,380 **** restoreDeviceObjects(); ! switch(systemColorDepth) { ! case 16: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! case 24: ! case 32: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! } theApp.updateFilter(); --- 357,361 ---- restoreDeviceObjects(); ! utilUpdateSystemColorMaps(); theApp.updateFilter(); |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:11:30
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27930 Modified Files: Util.cpp Log Message: moved common system palette initialization to Util.cpp and cleaned up DirectDrawDisplay, GDIDisplay, Direct3D and OpenGLDisplay (+plus the SDL version) Index: Util.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Util.cpp 20 May 2004 21:01:29 -0000 1.23 --- Util.cpp 15 Sep 2004 22:11:19 -0000 1.24 *************** *** 48,54 **** #endif // ! _MSC_VER ! static int (*utilGzWriteFunc)(gzFile, const voidp, unsigned int) = NULL; ! static int (*utilGzReadFunc)(gzFile, voidp, unsigned int) = NULL; ! static int (*utilGzCloseFunc)(gzFile) = NULL; bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix) --- 48,62 ---- #endif // ! _MSC_VER ! extern int systemColorDepth; ! extern int systemRedShift; ! extern int systemGreenShift; ! extern int systemBlueShift; ! ! extern u16 systemColorMap16[0x10000]; ! extern u32 systemColorMap32[0x10000]; ! ! static int (ZEXPORT *utilGzWriteFunc)(gzFile, const voidp, unsigned int) = NULL; ! static int (ZEXPORT *utilGzReadFunc)(gzFile, voidp, unsigned int) = NULL; ! static int (ZEXPORT *utilGzCloseFunc)(gzFile) = NULL; bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix) *************** *** 985,989 **** gzFile utilGzOpen(const char *file, const char *mode) { ! utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite; utilGzReadFunc = gzread; utilGzCloseFunc = gzclose; --- 993,997 ---- gzFile utilGzOpen(const char *file, const char *mode) { ! utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; utilGzReadFunc = gzread; utilGzCloseFunc = gzclose; *************** *** 1068,1069 **** --- 1076,1102 ---- flashSetSize(flashSize); } + + void utilUpdateSystemColorMaps() + { + switch(systemColorDepth) { + case 16: + { + for(int i = 0; i < 0x10000; i++) { + systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | + (((i & 0x3e0) >> 5) << systemGreenShift) | + (((i & 0x7c00) >> 10) << systemBlueShift); + } + } + break; + case 24: + case 32: + { + for(int i = 0; i < 0x10000; i++) { + systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | + (((i & 0x3e0) >> 5) << systemGreenShift) | + (((i & 0x7c00) >> 10) << systemBlueShift); + } + } + break; + } + } |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:09:08
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27216 Modified Files: DirectDraw.cpp Log Message: Moved vsync code where it probably should be, past the backbuffer lock/blit/unlock section. I also disabled the call when fullscreen triple buffering is enabled, assuming that the surface Flip() calls are being synced unless a no sync flag is passed. Index: DirectDraw.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectDraw.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DirectDraw.cpp 13 May 2004 15:06:49 -0000 1.6 --- DirectDraw.cpp 15 Sep 2004 22:08:53 -0000 1.7 *************** *** 27,30 **** --- 27,31 ---- #include "../Globals.h" #include "../Text.h" + #include "../Util.h" #include "VBA.h" *************** *** 40,44 **** extern int Init_2xSaI(u32); - extern int RGB_LOW_BITS_MASK; extern void winlog(const char *,...); extern int systemSpeed; --- 41,44 ---- *************** *** 552,556 **** systemGreenShift++; Init_2xSaI(565); - RGB_LOW_BITS_MASK=0x821; } else if((px.dwFlags&DDPF_RGB) != 0 && px.dwRBitMask == 0x7C00 && --- 552,555 ---- *************** *** 558,562 **** px.dwBBitMask == 0x001F) { Init_2xSaI(555); - RGB_LOW_BITS_MASK=0x421; } else if((px.dwFlags&DDPF_RGB) != 0 && px.dwRBitMask == 0x001F && --- 557,560 ---- *************** *** 565,569 **** systemGreenShift++; Init_2xSaI(565); - RGB_LOW_BITS_MASK=0x821; } else if((px.dwFlags&DDPF_RGB) != 0 && px.dwRBitMask == 0x001F && --- 563,566 ---- *************** *** 571,575 **** px.dwBBitMask == 0x7C00) { Init_2xSaI(555); - RGB_LOW_BITS_MASK=0x421; } else { // 32-bit or 24-bit --- 568,571 ---- *************** *** 589,613 **** } ! switch(systemColorDepth) { ! case 16: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap16[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! case 24: ! case 32: ! { ! for(int i = 0; i < 0x10000; i++) { ! systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | ! (((i & 0x3e0) >> 5) << systemGreenShift) | ! (((i & 0x7c00) >> 10) << systemBlueShift); ! } ! } ! break; ! } width = w; height = h; --- 585,589 ---- } ! utilUpdateSystemColorMaps(); width = w; height = h; *************** *** 653,660 **** return; - if(theApp.vsync && !speedup) { - hret = pDirectDraw->WaitForVerticalBlank(DDWAITVB_BLOCKBEGIN, 0); - } - DDSURFACEDESC2 ddsDesc; --- 629,632 ---- *************** *** 805,808 **** --- 777,783 ---- if(hret == DD_OK) { + if(theApp.vsync && !(theApp.tripleBuffering && theApp.videoOption > VIDEO_4X) && !speedup) { // isn't the Flip() call synced unless a certain flag is passed to it? + hret = pDirectDraw->WaitForVerticalBlank(DDWAITVB_BLOCKBEGIN, 0); + } ddsOffscreen->PageLock(0); if(theApp.tripleBuffering && theApp.videoOption > VIDEO_4X) { |
|
From: Sébastien G. <kx...@us...> - 2004-09-15 22:07:53
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26888 Modified Files: MainWnd.cpp Log Message: Fixed a minor repainting bug that occurred when application focus changed. Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MainWnd.cpp 13 May 2004 15:06:50 -0000 1.12 --- MainWnd.cpp 15 Sep 2004 22:07:41 -0000 1.13 *************** *** 1099,1103 **** --- 1099,1108 ---- if(theApp.paused && emulating) + { + theApp.painting = true; systemDrawScreen(); + theApp.painting = false; + theApp.renderedFrames--; + } } |
