idle loop detection (Cyclone only, with debug stuff)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@502 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/base_readme.txt b/base_readme.txt
index 6561c9b..6c8e528 100644 (file)
--- a/base_readme.txt
+++ b/base_readme.txt
@@ -621,6 +621,8 @@ Additional thanks
 * Tasco Deluxe for his reverse engineering work on SVP and some mappers.\r
 * Bart Trzynadlowski for his SSFII and 68000 docs.\r
 * Haze for his research (http://haze.mameworld.info).\r
+* Lordus, Exophase and Rokas for various ideas.\r
+* Nemesis for his YM2612 research.\r
 * Mark and Jean-loup for zlib library.\r
 * ketchupgun for the skin.\r
 #ifdef GP2X\r
@@ -632,7 +634,6 @@ Additional thanks
 * A_SN for his gamma code.\r
 * craigix for supplying the GP2X hardware and making this port possible.\r
 * Alex for the icon.\r
-* Exophase, Rokas and Lordus for various ideas.\r
 * All the people from gp32x boards for their support.\r
 #endif\r
 #ifdef GIZ\r

diff --git a/common/emu.c b/common/emu.c
index 0b8fdf7..fabd521 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -427,8 +427,6 @@ int emu_ReloadRom(void)
                return 0;\r
        }\r
 \r
-       Pico.m.frame_count = 0;\r
-\r
        // insert CD if it was detected\r
        if (cd_state != CIT_NOT_CD) {\r
                ret = Insert_CD(romFileName, cd_state);\r

diff --git a/common/menu.h b/common/menu.h
index 6ecc191..bfa05c4 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -66,6 +66,7 @@ typedef enum
        MA_OPT2_NO_FRAME_LIMIT, /* psp */
        MA_OPT2_SVP_DYNAREC,
        MA_OPT2_NO_SPRITE_LIM,
+       MA_OPT2_NO_IDLE_LOOPS,
        MA_OPT2_DONE,
        MA_OPT3_SCALE,          /* psp (all OPT3) */
        MA_OPT3_HSCALE32,

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 4ebecb4..1066a85 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -128,7 +128,7 @@ OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
 endif\r
 ifeq "$(use_cyclone)" "1"\r
 DEFINC += -DEMU_C68K\r
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
+OBJS += ../../cpu/Cyclone/proj/Cyclone.o ../../cpu/Cyclone/tools/idle.o\r
 endif\r
 # drz80/mz80\r
 ifeq "$(mz80)" "1"\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index db4c9fa..8ec98aa 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -25,7 +25,7 @@
 #include <zlib/zlib.h>\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r
-#error "need d_type for file browser\r
+#error "need d_type for file browser"\r
 #endif\r
 \r
 extern int  mmuhack_status;\r
@@ -67,7 +67,7 @@ static unsigned long wait_for_input(unsigned long interesting)
                repeats = 0;\r
                wait = 20;\r
        }\r
-       if (wait > 6 && (ret&(GP2X_UP|GP2X_LEFT|GP2X_DOWN|GP2X_RIGHT)))\r
+       if (wait > 6 && (ret&(GP2X_UP|GP2X_LEFT|GP2X_DOWN|GP2X_RIGHT|GP2X_L|GP2X_R)))\r
                wait = 6;\r
        inp_prev = ret;\r
        inp_prevjoy = 0;\r
@@ -1075,6 +1075,7 @@ menu_entry opt2_entries[] =
        { "craigix's RAM timings",     MB_ONOFF, MA_OPT2_RAMTIMINGS,    &currentConfig.EmuOpt, 0x0100, 0, 0, 1, 1 },\r
        { NULL,                        MB_ONOFF, MA_OPT2_SQUIDGEHACK,   &currentConfig.EmuOpt, 0x0010, 0, 0, 1, 1 },\r
        { "SVP dynarec",               MB_ONOFF, MA_OPT2_SVP_DYNAREC,   &PicoOpt, 0x20000, 0, 0, 1, 1 },\r
+       { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },\r
        { "done",                      MB_NONE,  MA_OPT2_DONE,          NULL, 0, 0, 0, 1, 0 },\r
 };\r
 \r
@@ -1428,7 +1429,7 @@ static int menu_loop_options(void)
 \r
 static void draw_menu_credits(void)\r
 {\r
-       int tl_x = 15, tl_y = 64, y;\r
+       int tl_x = 15, tl_y = 56, y;\r
        gp2x_pd_clone_buffer2();\r
 \r
        text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");\r
@@ -1438,17 +1439,19 @@ static void draw_menu_credits(void)
        text_out16(tl_x, (y+=10), "      base code of PicoDrive");\r
        text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
        text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
-       text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");\r
-       text_out16(tl_x, (y+=10), "Stephane Dallongeville:");\r
-       text_out16(tl_x, (y+=10), "      opensource Gens");\r
-       text_out16(tl_x, (y+=10), "Haze: Genesis hw info");\r
        text_out16(tl_x, (y+=10), "rlyeh and others: minimal SDK");\r
        text_out16(tl_x, (y+=10), "Squidge: squidgehack");\r
        text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");\r
-       text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");\r
+       text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joy code");\r
        text_out16(tl_x, (y+=10), "craigix: GP2X hardware");\r
        text_out16(tl_x, (y+=10), "ketchupgun: skin design");\r
 \r
+       text_out16(tl_x, (y+=20), "special thanks (for code, docs, ideas)");\r
+       text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");\r
+       text_out16(tl_x, (y+=10), " Stephane Dallongeville,");\r
+       text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");\r
+       text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");\r
+\r
        menu_flip();\r
 }\r
 \r

diff --git a/gp2x/port_config.h b/gp2x/port_config.h
index fe0fcea..22b43cd 100644 (file)
--- a/gp2x/port_config.h
+++ b/gp2x/port_config.h
@@ -19,7 +19,7 @@
 #define CAN_HANDLE_240_LINES   1\r
 \r
 // logging emu events\r
-#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff\r
+#define EL_LOGMASK (EL_STATUS|EL_IDLE) // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff\r
 \r
 //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
 #define dprintf(x...)\r

diff --git a/gp2x/version.h b/gp2x/version.h
index 580a8ae..d4bd447 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.45"\r
+#define VERSION "1.50"\r
 \r

diff --git a/psp/menu.c b/psp/menu.c
index 85669ae..44c7c66 100644 (file)
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -82,7 +82,7 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 
        if (!is_key_config)
                ret |= (ret & 0xf0000000) >> 24; // use analog as d-pad
-       if (wait > 6 && (ret&(BTN_UP|BTN_LEFT|BTN_DOWN|BTN_RIGHT)))
+       if (wait > 6 && (ret&(BTN_UP|BTN_LEFT|BTN_DOWN|BTN_RIGHT|BTN_L|BTN_R)))
                wait = 6;
 
        // we don't need diagonals in menus
@@ -1512,13 +1512,15 @@ static void draw_menu_credits(void)
        text_out16(tl_x, (y+=10), "Chui: Fame/C");
        text_out16(tl_x, (y+=10), "NJ: CZ80");
        text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
-       text_out16(tl_x, (y+=10), "Stephane Dallongeville:");
-       text_out16(tl_x, (y+=10), "    Gens code, base of Fame/C, CZ80");
-       text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
-       text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
        text_out16(tl_x, (y+=10), "ps2dev.org people: PSP SDK/code");
        text_out16(tl_x, (y+=10), "ketchupgun: skin design");
 
+       text_out16(tl_x, (y+=20), "special thanks (for code, docs, ideas):");
+       text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");
+       text_out16(tl_x, (y+=10), " Stephane Dallongeville,");
+       text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");
+       text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");
+
        menu_draw_end();
 }
 

diff --git a/psp/version.h b/psp/version.h
index 9b9d909..d4bd447 100644 (file)
--- a/psp/version.h
+++ b/psp/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.40b"\r
+#define VERSION "1.50"\r
 \r