RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

idle loop detection (Cyclone only, with debug stuff)

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@502 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-06-29 20:07:34 +00:00
parent d95259bdaa
commit 053fd9b42f
17 changed files with 372 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
platform/base_readme.txt
View file

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

2
platform/common/emu.c
View file

@ -427,8 +427,6 @@ int emu_ReloadRom(void)
return 0;
}
Pico.m.frame_count = 0;
// insert CD if it was detected
if (cd_state != CIT_NOT_CD) {
ret = Insert_CD(romFileName, cd_state);

1
platform/common/menu.h
View file

@ -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,

14
platform/gizmondo/menu.c
View file

@ -70,7 +70,7 @@ static unsigned long wait_for_input(unsigned int interesting)
repeats = 0;
wait = 20;
}
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;
inp_prev = ret;
@ -1315,7 +1315,7 @@ static int menu_loop_options(void)
static void draw_menu_credits(void)
{
int tl_x = 15, tl_y = 64, y;
int tl_x = 15, tl_y = 56, y;
menu_draw_begin(1);
text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");
@ -1326,14 +1326,16 @@ static void draw_menu_credits(void)
text_out16(tl_x, (y+=10), " base code of PicoDrive");
text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");
text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
text_out16(tl_x, (y+=10), "Stephane Dallongeville:");
text_out16(tl_x, (y+=10), " opensource Gens");
text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
text_out16(tl_x, (y+=10), "Reesy: kgsdk wrapper, sound code");
text_out16(tl_x, (y+=10), "jens.l: gizmondo hardware");
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();
}

2
platform/gp2x/Makefile
View file

@ -128,7 +128,7 @@ OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
endif
ifeq "$(use_cyclone)" "1"
DEFINC += -DEMU_C68K
OBJS += ../../cpu/Cyclone/proj/Cyclone.o
OBJS += ../../cpu/Cyclone/proj/Cyclone.o ../../cpu/Cyclone/tools/idle.o
endif
# drz80/mz80
ifeq "$(mz80)" "1"

19
platform/gp2x/menu.c
View file

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

2
platform/gp2x/port_config.h
View file

@ -19,7 +19,7 @@
#define CAN_HANDLE_240_LINES 1
// logging emu events
#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff
#define EL_LOGMASK (EL_STATUS|EL_IDLE) // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
#define dprintf(x...)

2
platform/gp2x/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.45"
#define VERSION "1.50"

12
platform/psp/menu.c
View file

@ -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();
}

2
platform/psp/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.40b"
#define VERSION "1.50"