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...> - 2006-09-03 23:17:16
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22261/win32 Modified Files: Makefile.am Makefile.in Log Message: FIX: fixed compilation issues on Linux Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 29 Sep 2004 22:23:40 -0000 1.10 --- Makefile.in 3 Sep 2006 23:17:14 -0000 1.11 *************** *** 164,170 **** gba.sln \ GBA.vcproj \ ! SDL-1.2.2 \ ! lib \ ! include subdir = win32 --- 164,168 ---- gba.sln \ GBA.vcproj \ ! dependencies subdir = win32 Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 29 Mar 2004 22:08:41 -0000 1.2 --- Makefile.am 3 Sep 2006 23:17:14 -0000 1.3 *************** *** 8,14 **** gba.sln \ GBA.vcproj \ ! SDL-1.2.2 \ ! lib \ ! include dist-hook: --- 8,12 ---- gba.sln \ GBA.vcproj \ ! dependencies dist-hook: |
From: Sébastien G. <kx...@us...> - 2006-09-03 22:57:17
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14480 Modified Files: Gfx.h Log Message: FIX: fixed compilation issues on Linux Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Gfx.h 25 Aug 2006 14:50:53 -0000 1.18 --- Gfx.h 3 Sep 2006 22:57:09 -0000 1.19 *************** *** 29,69 **** //#define SPRITE_DEBUG ! void gfxDrawTextScreen(u16, u16, u16, u32 *); ! void gfxDrawRotScreen(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! void gfxDrawRotScreen16Bit(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! void gfxDrawRotScreen256(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! void gfxDrawRotScreen16Bit160(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! void gfxDrawSprites(u32 *); ! void gfxIncreaseBrightness(u32 *line, int coeff); ! void gfxDecreaseBrightness(u32 *line, int coeff); ! void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb); void mode0RenderLine(); --- 29,69 ---- //#define SPRITE_DEBUG ! static void gfxDrawTextScreen(u16, u16, u16, u32 *); ! static void gfxDrawRotScreen(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! static void gfxDrawRotScreen16Bit(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! static void gfxDrawRotScreen256(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! static void gfxDrawRotScreen16Bit160(u16, ! u16, u16, ! u16, u16, ! u16, u16, ! u16, u16, ! int&, int&, ! int, ! u32*); ! static void gfxDrawSprites(u32 *); ! static void gfxIncreaseBrightness(u32 *line, int coeff); ! static void gfxDecreaseBrightness(u32 *line, int coeff); ! static void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb); void mode0RenderLine(); *************** *** 116,120 **** extern int gfxLastVCOUNT; ! inline void gfxClearArray(u32 *array) { for(int i = 0; i < 240; i++) { --- 116,120 ---- extern int gfxLastVCOUNT; ! static inline void gfxClearArray(u32 *array) { for(int i = 0; i < 240; i++) { *************** *** 123,128 **** } ! inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; --- 123,128 ---- } ! static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; *************** *** 268,279 **** } ! inline void gfxDrawRotScreen(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; --- 268,279 ---- } ! static inline void gfxDrawRotScreen(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; *************** *** 434,445 **** } ! inline void gfxDrawRotScreen16Bit(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *screenBase = (u16 *)&vram[0]; --- 434,445 ---- } ! static inline void gfxDrawRotScreen16Bit(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *screenBase = (u16 *)&vram[0]; *************** *** 531,542 **** } ! inline void gfxDrawRotScreen256(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int ¤tX, int& currentY, ! int changed, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; --- 531,542 ---- } ! static inline void gfxDrawRotScreen256(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int ¤tX, int& currentY, ! int changed, ! u32 *line) { u16 *palette = (u16 *)paletteRAM; *************** *** 632,643 **** } ! inline void gfxDrawRotScreen16Bit160(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *screenBase = (DISPCNT & 0x0010) ? (u16 *)&vram[0xa000] : --- 632,643 ---- } ! static inline void gfxDrawRotScreen16Bit160(u16 control, ! u16 x_l, u16 x_h, ! u16 y_l, u16 y_h, ! u16 pa, u16 pb, ! u16 pc, u16 pd, ! int& currentX, int& currentY, ! int changed, ! u32 *line) { u16 *screenBase = (DISPCNT & 0x0010) ? (u16 *)&vram[0xa000] : *************** *** 731,735 **** } ! inline void gfxDrawSprites(u32 *lineOBJ) { // lineOBJpix is used to keep track of the drawn OBJs --- 731,735 ---- } ! static inline void gfxDrawSprites(u32 *lineOBJ) { // lineOBJpix is used to keep track of the drawn OBJs *************** *** 1194,1198 **** } ! inline void gfxDrawOBJWin(u32 *lineOBJWin) { gfxClearArray(lineOBJWin); --- 1194,1198 ---- } ! static inline void gfxDrawOBJWin(u32 *lineOBJWin) { gfxClearArray(lineOBJWin); *************** *** 1513,1517 **** } ! inline u32 gfxIncreaseBrightness(u32 color, int coeff) { int r = (color & 0x1F); --- 1513,1517 ---- } ! static inline u32 gfxIncreaseBrightness(u32 color, int coeff) { int r = (color & 0x1F); *************** *** 1532,1536 **** } ! inline void gfxIncreaseBrightness(u32 *line, int coeff) { for(int x = 0; x < 240; x++) { --- 1532,1536 ---- } ! static inline void gfxIncreaseBrightness(u32 *line, int coeff) { for(int x = 0; x < 240; x++) { *************** *** 1553,1557 **** } ! inline u32 gfxDecreaseBrightness(u32 color, int coeff) { int r = (color & 0x1F); --- 1553,1557 ---- } ! static inline u32 gfxDecreaseBrightness(u32 color, int coeff) { int r = (color & 0x1F); *************** *** 1573,1577 **** } ! inline void gfxDecreaseBrightness(u32 *line, int coeff) { for(int x = 0; x < 240; x++) { --- 1573,1577 ---- } ! static inline void gfxDecreaseBrightness(u32 *line, int coeff) { for(int x = 0; x < 240; x++) { *************** *** 1594,1598 **** } ! inline u32 gfxAlphaBlend(u32 color, u32 color2, int ca, int cb) { if(color < 0x80000000) { --- 1594,1598 ---- } ! static inline u32 gfxAlphaBlend(u32 color, u32 color2, int ca, int cb) { if(color < 0x80000000) { *************** *** 1620,1624 **** } ! inline void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb) { for(int x = 0; x < 240; x++) { --- 1620,1624 ---- } ! static inline void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb) { for(int x = 0; x < 240; x++) { |
From: Sébastien G. <kx...@us...> - 2006-09-03 21:52:27
|
Update of /cvsroot/vba/VisualBoyAdvance/po In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21464/po Modified Files: fr.gmo fr.po Added Files: vba-1.8.0.pot Log Message: FIX: fixed compilation issues on Linux --- NEW FILE: vba-1.8.0.pot --- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR VBA development team # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: undefined\n" "POT-Creation-Date: 2006-09-03 22:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: src/Cheats.cpp:1473 src/Cheats.cpp:1478 src/Cheats.cpp:1487 [...1076 lines suppressed...] #: src/gtk/window.cpp:1787 msgid "Loaded battery" msgstr "" #: src/gtk/window.cpp:1806 msgid "Saved battery" msgstr "" #: src/gtk/window.cpp:1864 src/gtk/window.cpp:1911 msgid "----/--/-- --:--:--" msgstr "" #: src/gtk/window.cpp:1896 msgid "%Y/%m/%d %H:%M:%S" msgstr "" #: src/prof/prof.cpp:137 msgid "No space for profiling buffer(s)\n" msgstr "" Index: fr.po =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/po/fr.po,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** fr.po 21 May 2004 20:44:25 -0000 1.11 --- fr.po 3 Sep 2006 21:52:24 -0000 1.12 *************** *** 10,15 **** "Project-Id-Version: VisualBoyAdvance 1.7.2\n" "Report-Msgid-Bugs-To: undefined\n" ! "POT-Creation-Date: 2004-05-21 18:02+0200\n" ! "PO-Revision-Date: 2004-05-21 18:03+0200\n" "Last-Translator: Sébastien Guignot <kx...@ts...>\n" "Language-Team: French <@>\n" --- 10,15 ---- "Project-Id-Version: VisualBoyAdvance 1.7.2\n" "Report-Msgid-Bugs-To: undefined\n" ! "POT-Creation-Date: 2006-09-03 22:57+0200\n" ! "PO-Revision-Date: 2006-09-03 23:45+0200\n" "Last-Translator: Sébastien Guignot <kx...@ts...>\n" "Language-Team: French <@>\n" *************** *** 18,36 **** "Content-Transfer-Encoding: 8bit\n" ! #: src/Cheats.cpp:653 src/Cheats.cpp:658 src/Cheats.cpp:667 src/Cheats.cpp:675 #, c-format msgid "Invalid cheat code '%s'" msgstr "Cheat code incorrect '%s'" ! #: src/Cheats.cpp:694 #, c-format msgid "Invalid cheat code address: %08x" msgstr "Adresse de cheat code incorrecte : %08x" ! #: src/Cheats.cpp:738 src/Cheats.cpp:747 msgid "Invalid GSA code. Format is XXXXXXXXYYYYYYYY" msgstr "Code GSA incorrect. Le format est XXXXXXXXYYYYYYYY" ! #: src/Cheats.cpp:773 #, c-format msgid "" --- 18,37 ---- "Content-Transfer-Encoding: 8bit\n" ! #: src/Cheats.cpp:1473 src/Cheats.cpp:1478 src/Cheats.cpp:1487 ! #: src/Cheats.cpp:1495 #, c-format msgid "Invalid cheat code '%s'" msgstr "Cheat code incorrect '%s'" ! #: src/Cheats.cpp:1524 #, c-format msgid "Invalid cheat code address: %08x" msgstr "Adresse de cheat code incorrecte : %08x" ! #: src/Cheats.cpp:1603 src/Cheats.cpp:1612 msgid "Invalid GSA code. Format is XXXXXXXXYYYYYYYY" msgstr "Code GSA incorrect. Le format est XXXXXXXXYYYYYYYY" ! #: src/Cheats.cpp:1638 #, c-format msgid "" *************** *** 41,50 **** "Les codes peuvent ne pas fonctionner correctement." ! #: src/Cheats.cpp:1307 src/Cheats.cpp:1316 src/Cheats.cpp:1323 ! #: src/Cheats.cpp:1331 msgid "Invalid CBA code. Format is XXXXXXXX YYYY." msgstr "Code CBA incorrect. Le format est XXXXXXXX YYYY." ! #: src/Cheats.cpp:1385 msgid "" "Warning: Codes seem to be for a different game.\n" --- 42,51 ---- "Les codes peuvent ne pas fonctionner correctement." ! #: src/Cheats.cpp:2458 src/Cheats.cpp:2467 src/Cheats.cpp:2474 ! #: src/Cheats.cpp:2482 msgid "Invalid CBA code. Format is XXXXXXXX YYYY." msgstr "Code CBA incorrect. Le format est XXXXXXXX YYYY." ! #: src/Cheats.cpp:2538 msgid "" "Warning: Codes seem to be for a different game.\n" *************** *** 54,137 **** "Ils peuvent ne pas fonctionner correctement." ! #: src/Cheats.cpp:1545 src/gb/gbCheats.cpp:130 #, c-format msgid "Unsupported cheat list version %d" msgstr "Version de liste de cheats %d non supportée" ! #: src/Cheats.cpp:1558 src/gb/gbCheats.cpp:143 #, c-format msgid "Unsupported cheat list type %d" msgstr "Type de liste de cheats %d non supporté" ! #: src/elf.cpp:2814 #, c-format msgid "Not a valid ELF file %s" msgstr "%s n'est pas un fichier ELF correct" ! #: src/GBA.cpp:664 src/GBA.cpp:849 src/GBA.cpp:887 src/Util.cpp:61 ! #: src/Util.cpp:270 src/gb/GB.cpp:1662 src/gb/GB.cpp:1679 src/gb/GB.cpp:1696 ! #: src/gb/GB.cpp:1719 src/gb/GB.cpp:1736 #, c-format msgid "Error creating file %s" msgstr "Erreur lors de la création du fichier %s" ! #: src/GBA.cpp:701 #, c-format msgid "Unsupported VisualBoyAdvance save game version %d" msgstr "Version de sauvegarde VisualBoyAdvance %d non supportée" ! #: src/GBA.cpp:715 #, c-format msgid "Cannot load save game for %s" msgstr "Impossible de charger la sauvegarde pour %s" ! #: src/GBA.cpp:724 msgid "Save game is not using the BIOS files" msgstr "La sauvegarde n'utilise pas de fichier BIOS" ! #: src/GBA.cpp:727 msgid "Save game is using the BIOS file" msgstr "La sauvegarde utilise le fichier BIOS" ! #: src/GBA.cpp:807 #, c-format msgid "Unsupported save type %d" msgstr "Type de sauvegarde %d non supporté" ! #: src/GBA.cpp:922 src/GBA.cpp:989 src/Util.cpp:588 src/Util.cpp:700 ! #: src/gb/gbCheats.cpp:400 src/gb/GB.cpp:1977 #, c-format msgid "Cannot open file %s" msgstr "Impossible d'ouvrir le fichier %s" ! #: src/GBA.cpp:957 src/gb/GB.cpp:1991 #, c-format msgid "Cannot import snapshot for %s. Current game is %s" msgstr "Impossible d'importer le snapshot pour %s. Le jeu courant est %s" ! #: src/GBA.cpp:971 src/gb/GB.cpp:2018 #, c-format msgid "Unsupported snapshot file %s" msgstr "Fichier snapshot %s non supporté" ! #: src/GBA.cpp:1274 src/GBA.cpp:1280 src/GBA.cpp:1329 src/GBA.cpp:1336 ! #: src/GBA.cpp:1343 src/GBA.cpp:1350 src/GBA.cpp:1357 src/GBA.cpp:1364 ! #: src/GBA.cpp:1371 src/Util.cpp:767 src/Util.cpp:825 src/Util.cpp:933 #, c-format msgid "Failed to allocate memory for %s" msgstr "Ãchec de l'allocation de mémoire pour : %s" ! #: src/GBA.cpp:1292 src/Util.cpp:756 src/Util.cpp:802 src/Util.cpp:816 ! #: src/Util.cpp:920 #, c-format msgid "Error opening image %s" msgstr "Erreur lors de l'ouverture de l'image %s" ! #: src/GBA.cpp:1606 #, c-format msgid "Unsupported ARM mode %02x" msgstr "Mode ARM %02x non supporté" ! #: src/GBA.cpp:1839 #, c-format msgid "" --- 55,138 ---- "Ils peuvent ne pas fonctionner correctement." ! #: src/Cheats.cpp:2723 src/gb/gbCheats.cpp:132 #, c-format msgid "Unsupported cheat list version %d" msgstr "Version de liste de cheats %d non supportée" ! #: src/Cheats.cpp:2737 src/gb/gbCheats.cpp:145 #, c-format msgid "Unsupported cheat list type %d" msgstr "Type de liste de cheats %d non supporté" ! #: src/elf.cpp:2811 #, c-format msgid "Not a valid ELF file %s" msgstr "%s n'est pas un fichier ELF correct" ! #: src/GBA.cpp:863 src/GBA.cpp:1084 src/GBA.cpp:1122 src/Util.cpp:69 ! #: src/Util.cpp:278 src/gb/GB.cpp:2708 src/gb/GB.cpp:2728 src/gb/GB.cpp:2750 ! #: src/gb/GB.cpp:2777 src/gb/GB.cpp:2797 src/gb/GB.cpp:2815 src/gb/GB.cpp:2845 #, c-format msgid "Error creating file %s" msgstr "Erreur lors de la création du fichier %s" ! #: src/GBA.cpp:900 #, c-format msgid "Unsupported VisualBoyAdvance save game version %d" msgstr "Version de sauvegarde VisualBoyAdvance %d non supportée" ! #: src/GBA.cpp:914 #, c-format msgid "Cannot load save game for %s" msgstr "Impossible de charger la sauvegarde pour %s" ! #: src/GBA.cpp:923 src/gb/GB.cpp:3628 msgid "Save game is not using the BIOS files" msgstr "La sauvegarde n'utilise pas de fichier BIOS" ! #: src/GBA.cpp:926 src/gb/GB.cpp:3631 msgid "Save game is using the BIOS file" msgstr "La sauvegarde utilise le fichier BIOS" ! #: src/GBA.cpp:1035 #, c-format msgid "Unsupported save type %d" msgstr "Type de sauvegarde %d non supporté" ! #: src/GBA.cpp:1157 src/GBA.cpp:1224 src/Util.cpp:596 src/Util.cpp:708 ! #: src/gb/gbCheats.cpp:409 src/gb/GB.cpp:3368 #, c-format msgid "Cannot open file %s" msgstr "Impossible d'ouvrir le fichier %s" ! #: src/GBA.cpp:1192 src/gb/GB.cpp:3381 #, c-format msgid "Cannot import snapshot for %s. Current game is %s" msgstr "Impossible d'importer le snapshot pour %s. Le jeu courant est %s" ! #: src/GBA.cpp:1206 src/gb/GB.cpp:3408 #, c-format msgid "Unsupported snapshot file %s" msgstr "Fichier snapshot %s non supporté" ! #: src/GBA.cpp:1508 src/GBA.cpp:1514 src/GBA.cpp:1563 src/GBA.cpp:1570 ! #: src/GBA.cpp:1577 src/GBA.cpp:1584 src/GBA.cpp:1591 src/GBA.cpp:1598 ! #: src/GBA.cpp:1605 src/Util.cpp:775 src/Util.cpp:833 src/Util.cpp:941 #, c-format msgid "Failed to allocate memory for %s" msgstr "Ãchec de l'allocation de mémoire pour : %s" ! #: src/GBA.cpp:1526 src/Util.cpp:764 src/Util.cpp:810 src/Util.cpp:824 ! #: src/Util.cpp:928 #, c-format msgid "Error opening image %s" msgstr "Erreur lors de l'ouverture de l'image %s" ! #: src/GBA.cpp:1859 #, c-format msgid "Unsupported ARM mode %02x" msgstr "Mode ARM %02x non supporté" ! #: src/GBA.cpp:2198 #, c-format msgid "" *************** *** 142,205 **** "nécessaire pour obtenir un comportement correct." ! #: src/GBA.cpp:2947 msgid "Invalid BIOS file size" msgstr "Taille de fichier BIOS incorrecte" ! #: src/RTC.cpp:157 #, c-format msgid "Unknown RTC command %02x" msgstr "Commande RTC %02x inconnue" ! #: src/Util.cpp:596 src/Util.cpp:616 src/Util.cpp:707 src/Util.cpp:727 #, c-format msgid "Bad ZIP file %s" msgstr "Fichier ZIP incorrect : %s" ! #: src/Util.cpp:639 src/Util.cpp:745 #, c-format msgid "No image found on ZIP file %s" msgstr "Pas d'image trouvée dans le fichier ZIP %s" ! #: src/Util.cpp:783 src/Util.cpp:838 src/Util.cpp:877 src/Util.cpp:946 #, c-format msgid "Error reading image %s" msgstr "Erreur lors de la lecture de l'image %s" ! #: src/Util.cpp:889 #, c-format msgid "No image found on RAR file %s" msgstr "Pas d'image trouvée dans le fichier RAR %s" ! #: src/gb/gbCheats.cpp:194 src/gb/gbCheats.cpp:304 msgid "Maximum number of cheats reached." msgstr "Le nombre maximum de cheats a été atteint." ! #: src/gb/gbCheats.cpp:200 #, c-format msgid "Invalid GameShark code: %s" msgstr "Code GameShark incorrect : %s" ! #: src/gb/gbCheats.cpp:310 #, c-format msgid "Invalid GameGenie code: %s" msgstr "Code GameGenie incorrect : %s" ! #: src/gb/gbCheats.cpp:355 #, c-format msgid "Invalid cheat to remove %d" msgstr "Cheat à supprimer %d incorrect" ! #: src/gb/gbCodesCB.h:1285 src/gb/gbCodes.h:1404 #, c-format msgid "Unknown opcode %02x at %04x" msgstr "Opcode %02x inconnu à %04x" ! #: src/gb/GB.cpp:1761 src/gb/GB.cpp:1785 src/gb/GB.cpp:1810 src/gb/GB.cpp:1842 ! #: src/gb/GB.cpp:1866 #, c-format ! msgid "Failed to read complete save game %s (%d)" ! msgstr "La lecture de la sauvegarde %s complète a échouée (%d)" ! #: src/gb/GB.cpp:1818 #, c-format msgid "Failed to read RTC from save game %s (continuing)" --- 143,224 ---- "nécessaire pour obtenir un comportement correct." ! #: src/GBA.cpp:3400 msgid "Invalid BIOS file size" msgstr "Taille de fichier BIOS incorrecte" ! #: src/RTC.cpp:159 #, c-format msgid "Unknown RTC command %02x" msgstr "Commande RTC %02x inconnue" ! #: src/Util.cpp:604 src/Util.cpp:624 src/Util.cpp:715 src/Util.cpp:735 #, c-format msgid "Bad ZIP file %s" msgstr "Fichier ZIP incorrect : %s" ! #: src/Util.cpp:647 src/Util.cpp:753 #, c-format msgid "No image found on ZIP file %s" msgstr "Pas d'image trouvée dans le fichier ZIP %s" ! #: src/Util.cpp:791 src/Util.cpp:846 src/Util.cpp:885 src/Util.cpp:954 #, c-format msgid "Error reading image %s" msgstr "Erreur lors de la lecture de l'image %s" ! #: src/Util.cpp:897 #, c-format msgid "No image found on RAR file %s" msgstr "Pas d'image trouvée dans le fichier RAR %s" ! #: src/gb/gbCheats.cpp:192 src/gb/gbCheats.cpp:310 msgid "Maximum number of cheats reached." msgstr "Le nombre maximum de cheats a été atteint." ! #: src/gb/gbCheats.cpp:198 #, c-format msgid "Invalid GameShark code: %s" msgstr "Code GameShark incorrect : %s" ! #: src/gb/gbCheats.cpp:227 ! #, c-format ! msgid "Wrong GameShark code type : %s" ! msgstr "Code GameShark incorrect : %s" ! ! #: src/gb/gbCheats.cpp:230 ! #, c-format ! msgid "Unsupported GameShark code type : %s" ! msgstr "Code GameShark %s non supporté" ! ! #: src/gb/gbCheats.cpp:316 #, c-format msgid "Invalid GameGenie code: %s" msgstr "Code GameGenie incorrect : %s" ! #: src/gb/gbCheats.cpp:364 #, c-format msgid "Invalid cheat to remove %d" msgstr "Cheat à supprimer %d incorrect" ! #: src/gb/gbCodesCB.h:1287 src/gb/gbCodes.h:1456 #, c-format msgid "Unknown opcode %02x at %04x" msgstr "Opcode %02x inconnu à %04x" ! #: src/gb/GB.cpp:2123 ! msgid "Invalid BOOTROM file size" ! msgstr "Taille de fichier BIOS incorrecte" ! ! #: src/gb/GB.cpp:2875 src/gb/GB.cpp:2890 src/gb/GB.cpp:2921 src/gb/GB.cpp:2937 ! #: src/gb/GB.cpp:2972 src/gb/GB.cpp:3002 src/gb/GB.cpp:3029 src/gb/GB.cpp:3045 ! #: src/gb/GB.cpp:3075 src/gb/GB.cpp:3091 src/gb/GB.cpp:3129 src/gb/GB.cpp:3159 ! #: src/gb/GB.cpp:3187 src/gb/GB.cpp:3202 #, c-format ! msgid "" ! "Battery file's size incompatible with the rom settings %s (%d).\n" ! "Warning : save of the battery file is now disabled !" ! msgstr "" ! #: src/gb/GB.cpp:2981 src/gb/GB.cpp:2987 src/gb/GB.cpp:3138 src/gb/GB.cpp:3144 #, c-format msgid "Failed to read RTC from save game %s (continuing)" *************** *** 207,216 **** "La lecture de la RTC de la sauvegarde %s a échoué (le chargement se poursuit)" ! #: src/gb/GB.cpp:2195 #, c-format msgid "Unsupported VisualBoy save game version %d" msgstr "Version de sauvegarde VisualBoy %d non supportée" ! #: src/gb/GB.cpp:2205 #, c-format msgid "Cannot load save game for %s. Playing %s" --- 226,235 ---- "La lecture de la RTC de la sauvegarde %s a échoué (le chargement se poursuit)" ! #: src/gb/GB.cpp:3601 #, c-format msgid "Unsupported VisualBoy save game version %d" msgstr "Version de sauvegarde VisualBoy %d non supportée" ! #: src/gb/GB.cpp:3611 #, c-format msgid "Cannot load save game for %s. Playing %s" *************** *** 218,232 **** "Impossible de charger la sauvegarde pour le jeu %s. Le jeu %s est en cours." ! #: src/gb/GB.cpp:2464 #, c-format msgid "Unsupported rom size %02x" msgstr "Taille de rom %02x non supportée" ! #: src/gb/GB.cpp:2476 #, c-format msgid "Unsupported ram size %02x" msgstr "Taille de ram %02x non supportée" ! #: src/gb/GB.cpp:2552 #, c-format msgid "Unknown cartridge type %02x" --- 237,251 ---- "Impossible de charger la sauvegarde pour le jeu %s. Le jeu %s est en cours." ! #: src/gb/GB.cpp:4061 #, c-format msgid "Unsupported rom size %02x" msgstr "Taille de rom %02x non supportée" ! #: src/gb/GB.cpp:4116 #, c-format msgid "Unsupported ram size %02x" msgstr "Taille de ram %02x non supportée" ! #: src/gb/GB.cpp:4258 #, c-format msgid "Unknown cartridge type %02x" *************** *** 1073,1114 **** msgstr "Seules les images GBA sont supportées." ! #: src/gtk/window.cpp:1427 #, c-format msgid "Unknown file type %s" msgstr "Type de fichier inconnu %s" ! #: src/gtk/window.cpp:1708 src/gtk/window.cpp:1722 msgid "Open" msgstr "Ouvrir" ! #: src/gtk/window.cpp:1749 msgid "All Gameboy Advance files" msgstr "Tous les fichiers Gameboy Advance" ! #: src/gtk/window.cpp:1756 msgid "Gameboy Advance files" msgstr "Fichiers Gameboy Advance" ! #: src/gtk/window.cpp:1763 msgid "Gameboy files" msgstr "Fichiers Gameboy" ! #: src/gtk/window.cpp:1793 msgid "Loaded battery" msgstr "Batterie chargée" ! #: src/gtk/window.cpp:1812 msgid "Saved battery" msgstr "Batterie enregistrée" ! #: src/gtk/window.cpp:1870 src/gtk/window.cpp:1917 msgid "----/--/-- --:--:--" msgstr "--/--/---- --:--:--" ! #: src/gtk/window.cpp:1902 msgid "%Y/%m/%d %H:%M:%S" msgstr "%d/%m/%Y %H:%M:%S" ! #: src/prof/prof.cpp:143 msgid "No space for profiling buffer(s)\n" msgstr "Pas de place pour le(s) tampon(s) de profil\n" --- 1092,1136 ---- msgstr "Seules les images GBA sont supportées." ! #: src/gtk/window.cpp:1421 #, c-format msgid "Unknown file type %s" msgstr "Type de fichier inconnu %s" ! #: src/gtk/window.cpp:1702 src/gtk/window.cpp:1716 msgid "Open" msgstr "Ouvrir" ! #: src/gtk/window.cpp:1743 msgid "All Gameboy Advance files" msgstr "Tous les fichiers Gameboy Advance" ! #: src/gtk/window.cpp:1750 msgid "Gameboy Advance files" msgstr "Fichiers Gameboy Advance" ! #: src/gtk/window.cpp:1757 msgid "Gameboy files" msgstr "Fichiers Gameboy" ! #: src/gtk/window.cpp:1787 msgid "Loaded battery" msgstr "Batterie chargée" ! #: src/gtk/window.cpp:1806 msgid "Saved battery" msgstr "Batterie enregistrée" ! #: src/gtk/window.cpp:1864 src/gtk/window.cpp:1911 msgid "----/--/-- --:--:--" msgstr "--/--/---- --:--:--" ! #: src/gtk/window.cpp:1896 msgid "%Y/%m/%d %H:%M:%S" msgstr "%d/%m/%Y %H:%M:%S" ! #: src/prof/prof.cpp:137 msgid "No space for profiling buffer(s)\n" msgstr "Pas de place pour le(s) tampon(s) de profil\n" + + #~ msgid "Failed to read complete save game %s (%d)" + #~ msgstr "La lecture de la sauvegarde %s complète a échouée (%d)" Index: fr.gmo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/po/fr.gmo,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvs69fRHH and /tmp/cvs5EsKy1 differ |
From: Sébastien G. <kx...@us...> - 2006-09-03 21:52:27
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21464/src Modified Files: GBAinline.h expr-lex.cpp expr.l exprNode.cpp memgzio.h remote.cpp Log Message: FIX: fixed compilation issues on Linux Index: expr.l =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/expr.l,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** expr.l 20 Oct 2002 13:03:12 -0000 1.1 --- expr.l 3 Sep 2006 21:52:25 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- #include <io.h> #define isatty _isatty + #define fileno _fileno #endif Index: expr-lex.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/expr-lex.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** expr-lex.cpp 13 May 2006 16:32:15 -0000 1.3 --- expr-lex.cpp 3 Sep 2006 21:52:25 -0000 1.4 *************** *** 387,390 **** --- 387,391 ---- #include <io.h> #define isatty _isatty + #define fileno _fileno #endif *************** *** 1286,1290 **** b->yy_is_interactive = 0; #else ! b->yy_is_interactive = file ? (isatty( _fileno(file) ) > 0) : 0; #endif #endif --- 1287,1291 ---- b->yy_is_interactive = 0; #else ! b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; #endif #endif Index: memgzio.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/memgzio.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** memgzio.h 23 Aug 2006 22:13:29 -0000 1.3 --- memgzio.h 3 Sep 2006 21:52:25 -0000 1.4 *************** *** 9,13 **** * Adapted from original gzio.c from zlib library by Forgotten */ ! #include <zutil.h> gzFile ZEXPORT memgzopen(char *memory, int, const char *); --- 9,18 ---- * Adapted from original gzio.c from zlib library by Forgotten */ ! ! #if defined(HAVE_ZUTIL_H) || defined(_WIN32) ! # include <zutil.h> ! #else ! # include "../win32/dependencies/zlib/zutil.h" ! #endif gzFile ZEXPORT memgzopen(char *memory, int, const char *); Index: exprNode.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/exprNode.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exprNode.cpp 13 May 2006 16:32:15 -0000 1.4 --- exprNode.cpp 3 Sep 2006 21:52:25 -0000 1.5 *************** *** 26,29 **** --- 26,33 ---- #include "exprNode.h" + #ifndef __GNUC__ + #define strdup _strdup + #endif + extern char *yytext; *************** *** 51,55 **** { Node *n = (Node *)calloc(1, sizeof(Node)); ! n->name = _strdup(yytext); exprNodeClean(n->name); --- 55,59 ---- { Node *n = (Node *)calloc(1, sizeof(Node)); ! n->name = strdup(yytext); exprNodeClean(n->name); Index: GBAinline.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBAinline.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GBAinline.h 24 Jun 2006 20:21:47 -0000 1.16 --- GBAinline.h 3 Sep 2006 21:52:25 -0000 1.17 *************** *** 54,58 **** READ32LE(((u32*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask])) ! inline u32 CPUReadMemory(u32 address) { --- 54,58 ---- READ32LE(((u32*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask])) ! static inline u32 CPUReadMemory(u32 address) { *************** *** 179,183 **** extern u32 myROM[]; ! inline u32 CPUReadHalfWord(u32 address) { #ifdef DEV_VERSION --- 179,183 ---- extern u32 myROM[]; ! static inline u32 CPUReadHalfWord(u32 address) { #ifdef DEV_VERSION *************** *** 298,302 **** } ! inline u16 CPUReadHalfWordSigned(u32 address) { u16 value = CPUReadHalfWord(address); --- 298,302 ---- } ! static inline u16 CPUReadHalfWordSigned(u32 address) { u16 value = CPUReadHalfWord(address); *************** *** 306,310 **** } ! inline u8 CPUReadByte(u32 address) { switch(address >> 24) { --- 306,310 ---- } ! static inline u8 CPUReadByte(u32 address) { switch(address >> 24) { *************** *** 388,392 **** } ! inline void CPUWriteMemory(u32 address, u32 value) { --- 388,392 ---- } ! static inline void CPUWriteMemory(u32 address, u32 value) { Index: remote.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/remote.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** remote.cpp 6 Jun 2006 22:32:19 -0000 1.10 --- remote.cpp 3 Sep 2006 21:52:25 -0000 1.11 *************** *** 33,36 **** --- 33,37 ---- # define socklen_t int # endif // ! HAVE_ARPA_INET_H + # define SOCKET int #else // _WIN32 # include <winsock.h> |
From: Sébastien G. <kx...@us...> - 2006-09-03 21:52:27
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21464/src/gtk Modified Files: system.cpp Log Message: FIX: fixed compilation issues on Linux Index: system.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/system.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** system.cpp 10 May 2004 14:59:43 -0000 1.8 --- system.cpp 3 Sep 2006 21:52:25 -0000 1.9 *************** *** 339,342 **** --- 339,346 ---- } + void debuggerBreakOnWrite(u32 address, u32 oldvalue, u32 value, int size, int t) + { + } + void (*dbgMain)() = debuggerMain; void (*dbgSignal)(int, int) = debuggerSignal; |
From: Sébastien G. <kx...@us...> - 2006-09-03 21:52:27
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21464 Modified Files: configure configure.in Log Message: FIX: fixed compilation issues on Linux Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** configure 20 Dec 2004 15:02:27 -0000 1.27 --- configure 3 Sep 2006 21:52:24 -0000 1.28 *************** *** 4464,4468 **** cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ ! #include <X11/Intrinsic.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 4464,4468 ---- cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ ! #include <X11/Xlib.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4491,4495 **** for ac_dir in $ac_x_header_dirs; do ! if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break --- 4491,4495 ---- for ac_dir in $ac_x_header_dirs; do ! if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break *************** *** 4505,4509 **** # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS ! LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ --- 4505,4509 ---- # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS ! LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ *************** *** 4512,4520 **** cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ ! #include <X11/Intrinsic.h> int main () { ! XtMalloc (0) ; return 0; --- 4512,4520 ---- cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ ! #include <X11/Xlib.h> int main () { ! XrmInitialize () ; return 0; *************** *** 4554,4558 **** # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do ! if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 --- 4554,4558 ---- # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do ! if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 *************** *** 5654,5657 **** --- 5654,5659 ---- VBA_LIBS="../gb/libgb.a" + CXXFLAGS="$CXXFLAGS -DBKPT_SUPPORT" + if test "x$enable_c_core" = xyes; then CXXFLAGS="$CXXFLAGS -DC_CORE" Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure.in 20 Dec 2004 15:02:43 -0000 1.26 --- configure.in 3 Sep 2006 21:52:24 -0000 1.27 *************** *** 105,108 **** --- 105,110 ---- VBA_LIBS="../gb/libgb.a" + CXXFLAGS="$CXXFLAGS -DBKPT_SUPPORT" + if test "x$enable_c_core" = xyes; then CXXFLAGS="$CXXFLAGS -DC_CORE" |
From: Spacy <sp...@us...> - 2006-08-25 16:11:50
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27316/src/win32 Modified Files: DirectSound.cpp Log Message: Sound is now hearable when unchecked "Pause when inactive window" and VBA does not have the focus. Index: DirectSound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectSound.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DirectSound.cpp 6 Aug 2006 12:40:35 -0000 1.5 --- DirectSound.cpp 25 Aug 2006 16:11:43 -0000 1.6 *************** *** 185,189 **** ZeroMemory( &dsbdesc, sizeof(DSBUFFERDESC) ); dsbdesc.dwSize = sizeof(DSBUFFERDESC); ! dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY; if( theApp.dsoundDisableHardwareAcceleration ) { dsbdesc.dwFlags |= DSBCAPS_LOCSOFTWARE; --- 185,189 ---- ZeroMemory( &dsbdesc, sizeof(DSBUFFERDESC) ); dsbdesc.dwSize = sizeof(DSBUFFERDESC); ! dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY | DSBCAPS_GLOBALFOCUS; if( theApp.dsoundDisableHardwareAcceleration ) { dsbdesc.dwFlags |= DSBCAPS_LOCSOFTWARE; |
From: Spacy <sp...@us...> - 2006-08-25 15:27:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8862/src/win32 Modified Files: skinButton.cpp Log Message: Fixed bug [ 1154031 ] Skin Buttons by Nunya Business - thecloudofsmoke Index: skinButton.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skinButton.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** skinButton.cpp 27 May 2006 14:47:33 -0000 1.8 --- skinButton.cpp 25 Aug 2006 15:27:16 -0000 1.9 *************** *** 127,130 **** --- 127,132 ---- inside &= PtInRegion(region, pt.x, pt.y); if(inside) { + ReleaseCapture(); + Invalidate(); HWND hWnd = m_hWnd; if(idCommand != 0) |
From: Spacy <sp...@us...> - 2006-08-25 14:51:00
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25724/src Modified Files: Gfx.h Log Message: Fixed bug [ 1472649 ] Alpha blending loses precision by JSensebe - jsensebe Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Gfx.h 3 Sep 2005 12:28:23 -0000 1.17 --- Gfx.h 25 Aug 2006 14:50:53 -0000 1.18 *************** *** 1604,1611 **** int b0 = ((color2 >> 10) & 0x1F); ! r = ((r * ca) >> 4) + ((r0 * cb) >> 4); ! g = ((g * ca) >> 4) + ((g0 * cb) >> 4); ! b = ((b * ca) >> 4) + ((b0 * cb) >> 4); ! if(r > 31) r = 31; --- 1604,1611 ---- int b0 = ((color2 >> 10) & 0x1F); ! r = ((r * ca) + (r0 * cb)) >> 4; ! g = ((g * ca) + (g0 * cb)) >> 4; ! b = ((b * ca) + (b0 * cb)) >> 4; ! if(r > 31) r = 31; *************** *** 1633,1639 **** int b0 = ((color2 >> 10) & 0x1F); ! r = ((r * ca) >> 4) + ((r0 * cb) >> 4); ! g = ((g * ca) >> 4) + ((g0 * cb) >> 4); ! b = ((b * ca) >> 4) + ((b0 * cb) >> 4); if(r > 31) --- 1633,1639 ---- int b0 = ((color2 >> 10) & 0x1F); ! r = ((r * ca) + (r0 * cb)) >> 4; ! g = ((g * ca) + (g0 * cb)) >> 4; ! b = ((b * ca) + (b0 * cb)) >> 4; if(r > 31) |
From: Spacy <sp...@us...> - 2006-08-25 14:13:41
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8786/src Modified Files: GBA.cpp GBA.h Log Message: Applied patch [ 1044856 ] Enable profiling multiple regions of memory. by Rib Rdb - ribrdb Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** GBA.cpp 25 Aug 2006 13:30:08 -0000 1.69 --- GBA.cpp 25 Aug 2006 14:13:38 -0000 1.70 *************** *** 105,112 **** int profilingTicks = 0; int profilingTicksReload = 0; ! static char *profilBuffer = NULL; ! static int profilSize = 0; ! static u32 profilLowPC = 0; ! static int profilScale = 0; #endif --- 105,109 ---- int profilingTicks = 0; int profilingTicksReload = 0; ! static profile_segment *profilSegment = NULL; #endif *************** *** 502,511 **** #ifdef PROFILING ! void cpuProfil(char *buf, int size, u32 lowPC, int scale) { ! profilBuffer = buf; ! profilSize = size; ! profilLowPC = lowPC; ! profilScale = scale; } --- 499,505 ---- #ifdef PROFILING ! void cpuProfil(profile_segment *seg) { ! profilSegment = seg; } *************** *** 4275,4284 **** if(profilingTicks <= 0) { profilingTicks += profilingTicksReload; ! if(profilBuffer && profilSize) { ! u16 *b = (u16 *)profilBuffer; ! int pc = ((reg[15].I - profilLowPC) * profilScale)/0x10000; ! if(pc >= 0 && pc < profilSize) { b[pc]++; } } } --- 4269,4284 ---- if(profilingTicks <= 0) { profilingTicks += profilingTicksReload; ! if(profilSegment) { ! profile_segment *seg = profilSegment; ! do { ! u16 *b = (u16 *)seg->sbuf; ! int pc = ((reg[15].I - seg->s_lowpc) * seg->s_scale)/0x10000; ! if(pc >= 0 && pc < seg->ssiz) { b[pc]++; + break; } + + seg = seg->next; + } while(seg); } } Index: GBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** GBA.h 24 Jun 2006 20:21:47 -0000 1.23 --- GBA.h 25 Aug 2006 14:13:38 -0000 1.24 *************** *** 123,127 **** extern bool CPUIsZipFile(const char *); #ifdef PROFILING ! extern void cpuProfil(char *buffer, int, u32, int); extern void cpuEnableProfiling(int hz); #endif --- 123,128 ---- extern bool CPUIsZipFile(const char *); #ifdef PROFILING ! #include "prof/prof.h" ! extern void cpuProfil(profile_segment *seg); extern void cpuEnableProfiling(int hz); #endif |
From: Spacy <sp...@us...> - 2006-08-25 14:13:41
|
Update of /cvsroot/vba/VisualBoyAdvance/src/prof In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8786/src/prof Modified Files: prof.cpp prof.h Log Message: Applied patch [ 1044856 ] Enable profiling multiple regions of memory. by Rib Rdb - ribrdb Index: prof.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/prof.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** prof.cpp 13 May 2004 15:06:47 -0000 1.5 --- prof.cpp 25 Aug 2006 14:13:38 -0000 1.6 *************** *** 58,75 **** #include "../NLS.h" /* * froms is actually a bunch of unsigned shorts indexing tos */ static int profiling = 3; - static unsigned short *froms; - static struct tostruct *tos = 0; - static long tolimit = 0; - static u32 s_lowpc = 0; - static u32 s_highpc = 0; - static unsigned long s_textsize = 0; ! static int ssiz; ! static char *sbuf; ! static int s_scale; static int hz = 0; --- 58,69 ---- #include "../NLS.h" + #include "prof.h" /* for struct profile_segment */ + /* * froms is actually a bunch of unsigned shorts indexing tos */ static int profiling = 3; ! static profile_segment *first_segment = NULL; static int hz = 0; *************** *** 128,132 **** /* start */ #ifdef PROFILING ! cpuProfil(sbuf, ssiz, (u32)s_lowpc, s_scale); #endif profiling = 0; --- 122,126 ---- /* start */ #ifdef PROFILING ! cpuProfil(first_segment); #endif profiling = 0; *************** *** 134,138 **** /* stop */ #ifdef PROFILING ! cpuProfil(NULL, 0, 0, 0); #endif profiling = 3; --- 128,132 ---- /* stop */ #ifdef PROFILING ! cpuProfil(NULL); #endif profiling = 3; *************** *** 148,152 **** --- 142,154 ---- char *buffer; int o; + profile_segment *newseg = (profile_segment*)calloc(1,sizeof(profile_segment)); + if (newseg) { + newseg->next = first_segment; + first_segment = newseg; + } else { + systemMessage(0, MSG); + return; + } /* * round lowpc and highpc to multiples of the density we're using *************** *** 154,162 **** */ lowpc = ROUNDDOWN(lowpc, HISTFRACTION*sizeof(HISTCOUNTER)); ! s_lowpc = lowpc; highpc = ROUNDUP(highpc, HISTFRACTION*sizeof(HISTCOUNTER)); ! s_highpc = highpc; ! s_textsize = highpc - lowpc; ! monsize = (s_textsize / HISTFRACTION); buffer = (char *)calloc(1, 2*monsize ); if ( buffer == NULL ) { --- 156,164 ---- */ lowpc = ROUNDDOWN(lowpc, HISTFRACTION*sizeof(HISTCOUNTER)); ! newseg->s_lowpc = lowpc; highpc = ROUNDUP(highpc, HISTFRACTION*sizeof(HISTCOUNTER)); ! newseg->s_highpc = highpc; ! newseg->s_textsize = highpc - lowpc; ! monsize = (newseg->s_textsize / HISTFRACTION); buffer = (char *)calloc(1, 2*monsize ); if ( buffer == NULL ) { *************** *** 164,169 **** return; } ! froms = (unsigned short *) calloc(1, 4*s_textsize / HASHFRACTION ); ! if ( froms == NULL ) { systemMessage(0, MSG); free(buffer); --- 166,171 ---- return; } ! newseg->froms = (unsigned short *) calloc(1, 4*newseg->s_textsize / HASHFRACTION ); ! if ( newseg->froms == NULL ) { systemMessage(0, MSG); free(buffer); *************** *** 171,182 **** return; } ! tolimit = s_textsize * ARCDENSITY / 100; ! if ( tolimit < MINARCS ) { ! tolimit = MINARCS; ! } else if ( tolimit > 65534 ) { ! tolimit = 65534; } ! tos = (struct tostruct *) calloc(1, tolimit * sizeof( struct tostruct ) ); ! if ( tos == NULL ) { systemMessage(0, MSG); --- 173,184 ---- return; } ! newseg->tolimit = newseg->s_textsize * ARCDENSITY / 100; ! if ( newseg->tolimit < MINARCS ) { ! newseg->tolimit = MINARCS; ! } else if ( newseg->tolimit > 65534 ) { ! newseg->tolimit = 65534; } ! newseg->tos = (struct tostruct *) calloc(1, newseg->tolimit * sizeof( struct tostruct ) ); ! if ( newseg->tos == NULL ) { systemMessage(0, MSG); *************** *** 184,202 **** buffer = NULL; ! free(froms); ! froms = NULL; return; } ! tos[0].link = 0; ! sbuf = buffer; ! ssiz = monsize; if ( monsize <= 0 ) return; o = highpc - lowpc; if( monsize < o ) ! s_scale = (int)(( (float) monsize / o ) * SCALE_1_TO_1); else ! s_scale = SCALE_1_TO_1; profControl(1); } --- 186,204 ---- buffer = NULL; ! free(newseg->froms); ! newseg->froms = NULL; return; } ! newseg->tos[0].link = 0; ! newseg->sbuf = buffer; ! newseg->ssiz = monsize; if ( monsize <= 0 ) return; o = highpc - lowpc; if( monsize < o ) ! newseg->s_scale = (int)(( (float) monsize / o ) * SCALE_1_TO_1); else ! newseg->s_scale = SCALE_1_TO_1; profControl(1); } *************** *** 210,213 **** --- 212,216 ---- int toindex; struct gmon_hdr ghdr; + profile_segment *seg = first_segment; profControl(0); *************** *** 230,238 **** hz = 100; ! hist_num_bins = ssiz; if(profWrite8(fd, GMON_TAG_TIME_HIST) || ! profWrite32(fd, (u32)s_lowpc) || ! profWrite32(fd, (u32)s_highpc) || profWrite32(fd, hist_num_bins) || profWrite32(fd, hz) || --- 233,243 ---- hz = 100; ! while(seg) { ! ! hist_num_bins = seg->ssiz; if(profWrite8(fd, GMON_TAG_TIME_HIST) || ! profWrite32(fd, (u32)seg->s_lowpc) || ! profWrite32(fd, (u32)seg->s_highpc) || profWrite32(fd, hist_num_bins) || profWrite32(fd, hz) || *************** *** 243,247 **** return; } ! u16 *hist_sample = (u16 *)sbuf; u16 count; --- 248,252 ---- return; } ! u16 *hist_sample = (u16 *)seg->sbuf; u16 count; *************** *** 258,272 **** } ! endfrom = s_textsize / (HASHFRACTION * sizeof(*froms)); for ( fromindex = 0 ; fromindex < endfrom ; fromindex++ ) { ! if ( froms[fromindex] == 0 ) { continue; } ! frompc = s_lowpc + (fromindex * HASHFRACTION * sizeof(*froms)); ! for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) { if(profWrite8(fd, GMON_TAG_CG_ARC) || profWrite32(fd, (u32)frompc) || ! profWrite32(fd, (u32)tos[toindex].selfpc) || ! profWrite32(fd, tos[toindex].count)) { systemMessage(0, "mcount: arc"); fclose(fd); --- 263,277 ---- } ! endfrom = seg->s_textsize / (HASHFRACTION * sizeof(*seg->froms)); for ( fromindex = 0 ; fromindex < endfrom ; fromindex++ ) { ! if ( seg->froms[fromindex] == 0 ) { continue; } ! frompc = seg->s_lowpc + (fromindex * HASHFRACTION * sizeof(*seg->froms)); ! for (toindex=seg->froms[fromindex]; toindex!=0; toindex=seg->tos[toindex].link) { if(profWrite8(fd, GMON_TAG_CG_ARC) || profWrite32(fd, (u32)frompc) || ! profWrite32(fd, (u32)seg->tos[toindex].selfpc) || ! profWrite32(fd, seg->tos[toindex].count)) { systemMessage(0, "mcount: arc"); fclose(fd); *************** *** 275,278 **** --- 280,285 ---- } } + seg = seg->next; + } fclose(fd); } *************** *** 285,288 **** --- 292,296 ---- register struct tostruct *prevtop; register long toindex; + profile_segment *seg = first_segment; /* *************** *** 310,319 **** * not from text space. too bad. */ ! frompcindex = (unsigned short *) ((long) frompcindex - (long) s_lowpc); ! if ((unsigned long) frompcindex > s_textsize) { goto done; } frompcindex = ! &froms[((long) frompcindex) / (HASHFRACTION * sizeof(*froms))]; toindex = *frompcindex; if (toindex == 0) { --- 318,334 ---- * not from text space. too bad. */ ! while(seg) { ! u32 index = (long)frompcindex - (long)seg->s_lowpc; ! if (index <= seg->s_textsize) { ! frompcindex = (unsigned short *) index; ! break; ! } ! seg = seg->next; ! } ! if ((unsigned long) frompcindex > seg->s_textsize) { goto done; } frompcindex = ! &(seg->froms[((long) frompcindex) / (HASHFRACTION * sizeof(*seg->froms))]); toindex = *frompcindex; if (toindex == 0) { *************** *** 321,330 **** * first time traversing this arc */ ! toindex = ++tos[0].link; ! if (toindex >= tolimit) { goto overflow; } *frompcindex = (unsigned short)toindex; ! top = &tos[toindex]; top->selfpc = selfpc; top->count = 1; --- 336,345 ---- * first time traversing this arc */ ! toindex = ++seg->tos[0].link; ! if (toindex >= seg->tolimit) { goto overflow; } *frompcindex = (unsigned short)toindex; ! top = &seg->tos[toindex]; top->selfpc = selfpc; top->count = 1; *************** *** 332,336 **** goto done; } ! top = &tos[toindex]; if (top->selfpc == selfpc) { /* --- 347,351 ---- goto done; } ! top = &seg->tos[toindex]; if (top->selfpc == selfpc) { /* *************** *** 354,362 **** * and link it to the head of the chain. */ ! toindex = ++tos[0].link; ! if (toindex >= tolimit) { goto overflow; } ! top = &tos[toindex]; top->selfpc = selfpc; top->count = 1; --- 369,377 ---- * and link it to the head of the chain. */ ! toindex = ++seg->tos[0].link; ! if (toindex >= seg->tolimit) { goto overflow; } ! top = &seg->tos[toindex]; top->selfpc = selfpc; top->count = 1; *************** *** 369,373 **** */ prevtop = top; ! top = &tos[top->link]; if (top->selfpc == selfpc) { /* --- 384,388 ---- */ prevtop = top; ! top = &seg->tos[top->link]; if (top->selfpc == selfpc) { /* Index: prof.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/prof.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prof.h 13 May 2004 15:06:47 -0000 1.2 --- prof.h 25 Aug 2006 14:13:38 -0000 1.3 *************** *** 25,28 **** --- 25,46 ---- all the data structures are ready. */ + + typedef struct profile_segment { + unsigned short *froms; + struct tostruct *tos; + long tolimit; + + u32 s_lowpc; + u32 s_highpc; + unsigned long s_textsize; + + int ssiz; + char *sbuf; + int s_scale; + + struct profile_segment *next; + + } profile_segment; + extern void profControl(int mode); extern void profStartup(u32 lowpc, u32 highpc); |
From: Spacy <sp...@us...> - 2006-08-25 14:06:10
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5171/src/sdl Modified Files: SDL.cpp Log Message: Applied patch [ 1264167 ] Buffer overflow patch by Quirky - richq Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** SDL.cpp 25 Aug 2006 13:59:54 -0000 1.17 --- SDL.cpp 25 Aug 2006 14:06:01 -0000 1.18 *************** *** 188,191 **** --- 188,192 ---- #define REWIND_SIZE 400000 + #define SYSMSG_BUFFER_SIZE 1024 #define _stricmp strcasecmp *************** *** 2193,2196 **** --- 2194,2203 ---- if(optind < argc) { char *szFile = argv[optind]; + u32 len = strlen(szFile); + if (len > SYSMSG_BUFFER_SIZE) + { + fprintf(stderr,"%s :%s: File name too long\n",argv[0],szFile); + exit(-1); + } utilGetBaseName(szFile, filename); *************** *** 2612,2616 **** void systemMessage(int num, const char *msg, ...) { ! char buffer[2048]; va_list valist; --- 2619,2623 ---- void systemMessage(int num, const char *msg, ...) { ! char buffer[SYSMSG_BUFFER_SIZE*2]; va_list valist; |
From: Spacy <sp...@us...> - 2006-08-25 14:00:58
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2767/src/sdl Modified Files: debugger.cpp Log Message: Added [ 1334509 ] Binary/Text search feature patch by devzz / F-Zero Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** debugger.cpp 25 Aug 2006 13:30:15 -0000 1.11 --- debugger.cpp 25 Aug 2006 14:00:49 -0000 1.12 *************** *** 75,79 **** --- 75,87 ---- }; + unsigned int SearchStart = 0xFFFFFFFF; + unsigned int SearchMaxMatches = 5; + u8 SearchData [64]; // It doesn't make much sense to search for more than 64 bytes + unsigned int SearchLength = 0; + unsigned int SearchResults; + static void debuggerContinueAfterBreakpoint(); + void debuggerDoSearch(); + unsigned int AddressToGBA(u8* mem); static void debuggerHelp(int,char **); *************** *** 101,104 **** --- 109,115 ---- static void debuggerFileDisassembleArm(int, char **); static void debuggerFileDisassembleThumb(int, char **); + static void debuggerFindText(int, char **); + static void debuggerFindHex(int, char **); + static void debuggerFindResume(int, char **); static void debuggerIo(int, char **); static void debuggerLast(int, char **); *************** *** 149,152 **** --- 160,166 ---- { "fda", debuggerFileDisassembleArm, "Disassemble ARM instructions to file", "<file> [<address> [<number>]]" }, { "fdt", debuggerFileDisassembleThumb, "Disassemble THUMB instructions to file", "<file> [<address> [<number>]]" }, + { "ft", debuggerFindText, "Search memory for ASCII-string.", "<start> [<max-result>] <string>" }, + { "fh", debuggerFindHex, "Search memory for hex-string.", "<start> [<max-result>] <hex-string>" }, + { "fr", debuggerFindResume, "Resume current search.", "[<max-result>]" }, { "h", debuggerHelp, "Show this help information. Type h <command> for command help", "[<command>]" }, { "io", debuggerIo, "Show I/O registers status", "[video|video2|dma|timer|misc]" }, *************** *** 1528,1531 **** --- 1542,1743 ---- } + void debuggerFindText(int n, char **args) + { + if ((n == 4) || (n == 3)) + { + SearchResults = 0; + sscanf(args[1], "%x", &SearchStart); + + if (n == 4) + { + sscanf(args[2], "%u", &SearchMaxMatches); + strncpy((char*) SearchData, args[3], 64); + SearchLength = strlen(args[3]); + } + else if (n == 3) + { + strncpy((char*) SearchData, args[2], 64); + SearchLength = strlen(args[2]); + }; + + if (SearchLength > 64) + { + printf ("Entered string (length: %d) is longer than 64 bytes and was cut.\n", SearchLength); + SearchLength = 64; + }; + + debuggerDoSearch (); + + } else + debuggerUsage("ft"); + }; + + void debuggerFindHex(int n, char **args) + { + if ((n == 4) || (n == 3)) + { + SearchResults = 0; + sscanf(args[1], "%x", &SearchStart); + + char SearchHex [128]; + if (n == 4) + { + sscanf(args[2], "%u", &SearchMaxMatches); + strncpy(SearchHex, args[3], 128); + SearchLength = strlen(args[3]); + } + else if (n == 3) + { + strncpy(SearchHex, args[2], 128); + SearchLength = strlen(args[2]); + }; + + if (SearchLength & 1) + printf ("Unaligned bytecount: %d,5. Last digit (%c) cut.\n", SearchLength / 2, SearchHex [SearchLength - 1]); + + SearchLength /= 2; + + if (SearchLength > 64) + { + printf ("Entered string (length: %d) is longer than 64 bytes and was cut.\n", SearchLength); + SearchLength = 64; + }; + + for (unsigned int i = 0; i < SearchLength; i++) + { + unsigned int cbuf = 0; + sscanf (&SearchHex [i << 1], "%02x", &cbuf); + SearchData [i] = cbuf; + }; + + debuggerDoSearch (); + + } else + debuggerUsage("fh"); + }; + + void debuggerFindResume(int n, char **args) + { + if ((n == 1) || (n == 2)) + { + if (SearchLength == 0) + { + printf("Error: No search in progress. Start a search with ft or fh.\n"); + debuggerUsage("fr"); + return; + }; + + if (n == 2) + sscanf(args[1], "%u", &SearchMaxMatches); + + debuggerDoSearch(); + + } else + debuggerUsage("fr"); + }; + + void debuggerDoSearch() + { + int count = 0; + + while (true) + { + unsigned int final = SearchStart + SearchLength - 1; + u8* end; + u8* start; + + switch (SearchStart >> 24) + { + case 0: + if (final > 0x00003FFF) { SearchStart = 0x02000000; continue; } + else { start = bios + (SearchStart & 0x3FFF); end = bios + 0x3FFF; break; }; + case 2: + if (final > 0x0203FFFF) { SearchStart = 0x03000000; continue; } + else { start = workRAM + (SearchStart & 0x3FFFF); end = workRAM + 0x3FFFF; break; }; + case 3: + if (final > 0x03007FFF) { SearchStart = 0x04000000; continue; } + else { start = internalRAM + (SearchStart & 0x7FFF); end = internalRAM + 0x7FFF; break; }; + case 4: + if (final > 0x040003FF) { SearchStart = 0x05000000; continue; } + else { start = ioMem + (SearchStart & 0x3FF); end = ioMem + 0x3FF; break; }; + case 5: + if (final > 0x050003FF) { SearchStart = 0x06000000; continue; } + else { start = paletteRAM + (SearchStart & 0x3FF); end = paletteRAM + 0x3FF; break; }; + case 6: + if (final > 0x0601FFFF) { SearchStart = 0x07000000; continue; } + else { start = vram + (SearchStart & 0x1FFFF); end = vram + 0x1FFFF; break; }; + case 7: + if (final > 0x070003FF) { SearchStart = 0x08000000; continue; } + else { start = oam + (SearchStart & 0x3FF); end = oam + 0x3FF; break; }; + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + if (final <= 0x09FFFFFF) + { start = rom + (SearchStart & 0x01FFFFFF); end = rom + 0x01FFFFFF; break; }; + default: + printf ("Search completed.\n"); + SearchLength = 0; + return; + }; + + end -= SearchLength - 1; + u8 firstbyte = SearchData [0]; + while (start <= end) + { + while ((start <= end) && (*start != firstbyte)) + start++; + + if (start > end) + break; + + unsigned int p = 1; + while ((start [p] == SearchData [p]) && (p < SearchLength)) + p++; + + if (p == SearchLength) + { + printf ("Search result (%d): %08x\n", count + SearchResults, AddressToGBA (start)); + count++; + if (count == SearchMaxMatches) + { + SearchStart = AddressToGBA (start + p); + SearchResults += count; + return; + }; + + start += p; // assume areas don't overlap; alternative: start++; + } else + start++; + }; + + SearchStart = AddressToGBA (end + SearchLength - 1) + 1; + }; + }; + + unsigned int AddressToGBA(u8* mem) + { + if(mem >= &bios[0] && mem <= &bios[0x3fff]) + return 0x00000000 + (mem - &bios[0]); + else if(mem >= &workRAM[0] && mem <= &workRAM[0x3ffff]) + return 0x02000000 + (mem - &workRAM[0]); + else if(mem >= &internalRAM[0] && mem <= &internalRAM[0x7fff]) + return 0x03000000 + (mem - &internalRAM[0]); + else if(mem >= &ioMem[0] && mem <= &ioMem[0x3ff]) + return 0x04000000 + (mem - &ioMem[0]); + else if(mem >= &paletteRAM[0] && mem <= &paletteRAM[0x3ff]) + return 0x05000000 + (mem - &paletteRAM[0]); + else if(mem >= &vram[0] && mem <= &vram[0x1ffff]) + return 0x06000000 + (mem - &vram[0]); + else if(mem >= &oam[0] && mem <= &oam[0x3ff]) + return 0x07000000 + (mem - &oam[0]); + else if(mem >= &rom[0] && mem <= &rom[0x1ffffff]) + return 0x08000000 + (mem - &rom[0]); + else + return 0xFFFFFFFF; + }; + static void debuggerFileDisassemble(int n, char **args) { *************** *** 2345,2348 **** --- 2557,2618 ---- } + char* strqtok (char* string, const char* ctrl) + { // quoted tokens + static char* nexttoken = NULL; + char* str; + + if (string != NULL) + str = string; + else { + if (nexttoken == NULL) + return NULL; + str = nexttoken; + }; + + char deli [32]; + memset (deli, 0, 32 * sizeof (char)); + while (*ctrl) + { + deli [*ctrl >> 3] |= (1 << (*ctrl & 7)); + ctrl++; + }; + // can't allow to be set + deli ['"' >> 3] &= ~(1 << ('"' & 7)); + + // jump over leading delimiters + while ((deli [*str >> 3] & (1 << (*str & 7))) && *str) + str++; + + if (*str == '"') + { + string = ++str; + + // only break if another quote or end of string is found + while ((*str != '"') && *str) + str++; + } else { + string = str; + + // break on delimiter + while (!(deli [*str >> 3] & (1 << (*str & 7))) && *str) + str++; + }; + + if (string == str) + { + nexttoken = NULL; + return NULL; + } else { + if (*str) + { + *str = 0; + nexttoken = str + 1; + } else + nexttoken = NULL; + + return string; + }; + }; + /*extern*/ void debuggerMain() { *************** *** 2362,2370 **** char *s = fgets(buffer, 1024, stdin); ! commands[0] = strtok(s, " \t\n"); if(commands[0] == NULL) continue; commandCount++; ! while((s = strtok(NULL, " \t\n"))) { commands[commandCount++] = s; if(commandCount == 10) --- 2632,2640 ---- char *s = fgets(buffer, 1024, stdin); ! commands[0] = strqtok(s, " \t\n"); if(commands[0] == NULL) continue; commandCount++; ! while((s = strqtok(NULL, " \t\n"))) { commands[commandCount++] = s; if(commandCount == 10) |
From: Spacy <sp...@us...> - 2006-08-25 13:59:57
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2262/src/sdl Modified Files: SDL.cpp Log Message: reopened sound deadlock patch Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SDL.cpp 25 Aug 2006 13:30:14 -0000 1.16 --- SDL.cpp 25 Aug 2006 13:59:54 -0000 1.17 *************** *** 3024,3028 **** { // Patch #1382692 by deathpudding. ! SDL_CloseAudio (); SDL_DestroySemaphore (sdlBufferLock); SDL_DestroySemaphore (sdlBufferFull); --- 3024,3028 ---- { // Patch #1382692 by deathpudding. ! SDL_CloseAudio (); //TODO: fix freeze SDL_DestroySemaphore (sdlBufferLock); SDL_DestroySemaphore (sdlBufferFull); |
From: Spacy <sp...@us...> - 2006-08-25 13:30:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20255/src Modified Files: GBA.cpp Sound.cpp arm-new.h Log Message: applied patch [ 1471725 ] Silence some compilation warning (and fix some real bugs) Index: Sound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Sound.cpp 6 Jun 2006 21:04:20 -0000 1.17 --- Sound.cpp 25 Aug 2006 13:30:08 -0000 1.18 *************** *** 868,872 **** soundDSAValue = (soundDSFifoA[soundDSFifoAIndex]); ! soundDSFifoAIndex = (++soundDSFifoAIndex) & 31; soundDSFifoACount--; } else --- 868,872 ---- soundDSAValue = (soundDSFifoA[soundDSFifoAIndex]); ! soundDSFifoAIndex = (soundDSFifoAIndex + 1) & 31; soundDSFifoACount--; } else *************** *** 897,901 **** soundDSBValue = (soundDSFifoB[soundDSFifoBIndex]); ! soundDSFifoBIndex = (++soundDSFifoBIndex) & 31; soundDSFifoBCount--; } else { --- 897,901 ---- soundDSBValue = (soundDSFifoB[soundDSFifoBIndex]); ! soundDSFifoBIndex = (soundDSFifoBIndex + 1) & 31; soundDSFifoBCount--; } else { Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** GBA.cpp 24 Jun 2006 20:21:47 -0000 1.68 --- GBA.cpp 25 Aug 2006 13:30:08 -0000 1.69 *************** *** 2240,2244 **** int sw = 0; int dw = 0; - bool blank = false; int sc = c; --- 2240,2243 ---- *************** *** 4402,4404 **** 5000 #endif ! }; \ No newline at end of file --- 4401,4403 ---- 5000 #endif ! }; Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** arm-new.h 30 Apr 2006 14:34:50 -0000 1.17 --- arm-new.h 25 Aug 2006 13:30:08 -0000 1.18 *************** *** 8699,8701 **** if (clockTicks == 0) ! clockTicks = codeTicksAccessSeq32(oldArmNextPC) + 1; \ No newline at end of file --- 8699,8701 ---- if (clockTicks == 0) ! clockTicks = codeTicksAccessSeq32(oldArmNextPC) + 1; |
From: Spacy <sp...@us...> - 2006-08-25 13:30:19
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20255/win32 Modified Files: vba_vs2005.vcproj Log Message: applied patch [ 1471725 ] Silence some compilation warning (and fix some real bugs) Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** vba_vs2005.vcproj 25 Aug 2006 13:09:04 -0000 1.17 --- vba_vs2005.vcproj 25 Aug 2006 13:30:15 -0000 1.18 *************** *** 2562,2565 **** --- 2562,2569 ---- </FileConfiguration> </File> + <File + RelativePath="..\src\win32\VisualBoyAdvance.exe.manifest" + > + </File> </Filter> <Filter *************** *** 4853,4860 **** </File> </Filter> - <File - RelativePath="..\src\win32\VisualBoyAdvance.exe.manifest" - > - </File> </Files> <Globals> --- 4857,4860 ---- |
From: Spacy <sp...@us...> - 2006-08-25 13:30:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20255/src/gb Modified Files: GB.cpp Log Message: applied patch [ 1471725 ] Silence some compilation warning (and fix some real bugs) Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** GB.cpp 6 Jun 2006 21:04:20 -0000 1.28 --- GB.cpp 25 Aug 2006 13:30:09 -0000 1.29 *************** *** 4617,4621 **** { gbLYChangeHappened = true; ! gbMemory[0xff44] = register_LY = (++register_LY) % 154; if (register_LY == 0x91) --- 4617,4621 ---- { gbLYChangeHappened = true; ! gbMemory[0xff44] = register_LY = (register_LY + 1) % 154; if (register_LY == 0x91) *************** *** 5128,5132 **** } } - int newmask = gbJoymask[0] & 255; gbFrameCount++; --- 5128,5131 ---- *************** *** 5441,5443 **** 1000, #endif ! }; \ No newline at end of file --- 5440,5442 ---- 1000, #endif ! }; |
From: Spacy <sp...@us...> - 2006-08-25 13:30:18
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20255/src/sdl Modified Files: SDL.cpp debugger.cpp Log Message: applied patch [ 1471725 ] Silence some compilation warning (and fix some real bugs) Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SDL.cpp 31 Jul 2006 15:51:01 -0000 1.15 --- SDL.cpp 25 Aug 2006 13:30:14 -0000 1.16 *************** *** 1731,1735 **** if(emulating && emulator.emuReadMemState && rewindMemory && rewindCount) { ! rewindPos = --rewindPos & 7; emulator.emuReadMemState(&rewindMemory[REWIND_SIZE*rewindPos], REWIND_SIZE); --- 1731,1735 ---- if(emulating && emulator.emuReadMemState && rewindMemory && rewindCount) { ! rewindPos = (rewindPos - 1) & 7; emulator.emuReadMemState(&rewindMemory[REWIND_SIZE*rewindPos], REWIND_SIZE); *************** *** 2572,2578 **** emulator.emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], REWIND_SIZE)) { ! rewindPos = ++rewindPos & 7; if(rewindCount == 8) ! rewindTopPos = ++rewindTopPos & 7; } } --- 2572,2578 ---- emulator.emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE], REWIND_SIZE)) { ! rewindPos = (rewindPos + 1) & 7; if(rewindCount == 8) ! rewindTopPos = (rewindTopPos + 1) & 7; } } Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** debugger.cpp 24 Jun 2006 20:21:47 -0000 1.10 --- debugger.cpp 25 Aug 2006 13:30:15 -0000 1.11 *************** *** 2026,2030 **** char *op=args[start+1]; char *value=args[start+2]; - char *returnmsg=""; char *tsize,*taddress,*tvalue; --- 2026,2029 ---- |
From: Spacy <sp...@us...> - 2006-08-25 13:09:12
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11079/win32 Modified Files: vba_vs2005.vcproj Log Message: Applied patch 1362211 [crash when exiting, wrong calloc size] Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** vba_vs2005.vcproj 25 Aug 2006 12:28:39 -0000 1.16 --- vba_vs2005.vcproj 25 Aug 2006 13:09:04 -0000 1.17 *************** *** 268,272 **** OutputFile="$(OutDir)\VisualBoyAdvance_SDL_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories="" GenerateManifest="false" IgnoreDefaultLibraryNames="" --- 268,272 ---- OutputFile="$(OutDir)\VisualBoyAdvance_SDL_debug.exe" LinkIncremental="2" ! AdditionalLibraryDirectories="".\dependencies\sdl\$(ConfigurationName)"" GenerateManifest="false" IgnoreDefaultLibraryNames="" *************** *** 360,364 **** OutputFile="$(OutDir)\VisualBoyAdvance_SDL.exe" LinkIncremental="1" ! AdditionalLibraryDirectories="" GenerateManifest="false" IgnoreDefaultLibraryNames="" --- 360,364 ---- OutputFile="$(OutDir)\VisualBoyAdvance_SDL.exe" LinkIncremental="1" ! AdditionalLibraryDirectories="".\dependencies\sdl\$(ConfigurationName)"" GenerateManifest="false" IgnoreDefaultLibraryNames="" *************** *** 1213,1216 **** --- 1213,1232 ---- RelativePath="..\src\win32\skinButton.h" > + <FileConfiguration + Name="SDL_Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="SDL_Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File *************** *** 2237,2240 **** --- 2253,2272 ---- RelativePath="..\src\win32\skin.h" > + <FileConfiguration + Name="SDL_Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="SDL_Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File *************** *** 2765,2768 **** --- 2797,2816 ---- RelativePath="..\src\win32\skinButton.cpp" > + <FileConfiguration + Name="SDL_Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="SDL_Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File *************** *** 3973,3976 **** --- 4021,4040 ---- RelativePath="..\src\win32\skin.cpp" > + <FileConfiguration + Name="SDL_Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="SDL_Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File |
From: Spacy <sp...@us...> - 2006-08-25 13:09:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11079/src/sdl Modified Files: TestEmu.cpp Log Message: Applied patch 1362211 [crash when exiting, wrong calloc size] Index: TestEmu.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TestEmu.cpp 6 Jun 2006 21:04:20 -0000 1.7 --- TestEmu.cpp 25 Aug 2006 13:09:04 -0000 1.8 *************** *** 257,261 **** vram = (u8 *)calloc(1, 0x20000); oam = (u8 *)calloc(1, 0x400); ! pix = (u8 *)calloc(1, 4 * 240 * 160); ioMem = (u8 *)calloc(1, 0x400); --- 257,261 ---- vram = (u8 *)calloc(1, 0x20000); oam = (u8 *)calloc(1, 0x400); ! pix = (u8 *)calloc(1, 4 * 241 * 162); ioMem = (u8 *)calloc(1, 0x400); |
From: Spacy <sp...@us...> - 2006-08-25 13:09:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11079/src/win32 Modified Files: MainWndTools.cpp Log Message: Applied patch 1362211 [crash when exiting, wrong calloc size] Index: MainWndTools.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndTools.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MainWndTools.cpp 21 Jun 2006 16:58:15 -0000 1.5 --- MainWndTools.cpp 25 Aug 2006 13:09:04 -0000 1.6 *************** *** 215,219 **** vram = (u8 *)calloc(1, 0x20000); oam = (u8 *)calloc(1, 0x400); ! pix = (u8 *)calloc(1, 4 * 240 * 160); ioMem = (u8 *)calloc(1, 0x400); --- 215,219 ---- vram = (u8 *)calloc(1, 0x20000); oam = (u8 *)calloc(1, 0x400); ! pix = (u8 *)calloc(1, 4 * 241 * 162); ioMem = (u8 *)calloc(1, 0x400); |
From: Spacy <sp...@us...> - 2006-08-25 13:07:30
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Debug In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9696/win32/dependencies/sdl/SDL_Debug Added Files: SDL.lib SDLmain.lib Log Message: renamed sdl lib dir --- NEW FILE: SDL.lib --- (This appears to be a binary file; contents omitted.) --- NEW FILE: SDLmain.lib --- (This appears to be a binary file; contents omitted.) |
From: Spacy <sp...@us...> - 2006-08-25 13:07:29
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Release In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9696/win32/dependencies/sdl/SDL_Release Added Files: SDL.lib SDLmain.lib Log Message: renamed sdl lib dir --- NEW FILE: SDL.lib --- (This appears to be a binary file; contents omitted.) --- NEW FILE: SDLmain.lib --- (This appears to be a binary file; contents omitted.) |
From: Spacy <sp...@us...> - 2006-08-25 13:03:26
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Debug In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8825/SDL_Debug Log Message: Directory /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Debug added to the repository |
From: Spacy <sp...@us...> - 2006-08-25 13:03:25
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Release In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8825/SDL_Release Log Message: Directory /cvsroot/vba/VisualBoyAdvance/win32/dependencies/sdl/SDL_Release added to the repository |