frameskip_type current_frameskip_type = auto_frameskip;
u32 global_cycles_per_instruction = 1;
u32 random_skip = 0;
+u32 fps_debug = 0;
-#ifdef GP2X_BUILD
u32 frameskip_value = 2;
-u64 frame_count_initial_timestamp = 0;
u64 last_frame_interval_timestamp;
-u32 gp2x_fps_debug = 0;
-
-void gp2x_init(void);
-void gp2x_quit(void);
-#else
-u32 frameskip_value = 4;
-#endif
u32 skip_next_frame = 0;
u32 frameskip_counter = 0;
#else
u32 clock_speed = 333;
#endif
-u8 main_path[512];
+char main_path[512];
void trigger_ext_event();
} \
} \
-u8 *file_ext[] = { ".gba", ".bin", ".zip", NULL };
+static const char *file_ext[] = { ".gba", ".bin", ".zip", NULL };
#ifdef ARM_ARCH
void ChangeWorkingDirectory(char *exe)
int main(int argc, char *argv[])
{
- u32 i;
- u32 vcount = 0;
- u32 ticks;
- u32 dispstat;
- u8 load_filename[512];
- u8 bios_filename[512];
-
#ifdef PSP_BUILD
sceKernelRegisterSubIntrHandler(PSP_VBLANK_INT, 0,
vblank_interrupt_handler, NULL);
sceKernelEnableSubIntr(PSP_VBLANK_INT, 0);
-#elif !defined(GP2X_BUILD)
- freopen("CON", "wb", stdout);
#endif
- extern char *cpu_mode_names[];
-
init_gamepak_buffer();
// Copy the directory path of the executable into main_path
#endif
getcwd(main_path, 512);
- load_config_file();
-
- gamepak_filename[0] = 0;
#ifdef PSP_BUILD
delay_us(2500000);
#endif
-#ifdef GP2X_BUILD
- // Overclocking GP2X and MMU patch goes here
- gp2x_init();
+#ifndef PC_BUILD
+ gpsp_plat_init();
#endif
+ load_config_file();
+
+ gamepak_filename[0] = 0;
init_video();
#ifdef GP2X_BUILD
+ char bios_filename[512];
sprintf(bios_filename, "%s/%s", main_path, "gba_bios.bin");
if(load_bios(bios_filename) == -1)
#else
debug_screen_printl("a860e8c0b6d573d191e4ec7db1b1e4f6 ");
debug_screen_printl(" ");
debug_screen_printl("When you do get it name it gba_bios.bin and put it");
+#ifdef PND_BUILD
+ debug_screen_printl("in <CD card>/pandora/appdata/gpsp/ . ");
+#else
debug_screen_printl("in the same directory as gpSP. ");
+#endif
debug_screen_printl(" ");
debug_screen_printl("Press any button to exit. ");
{
if(load_gamepak(argv[1]) == -1)
{
-#ifdef PC_BUILD
- printf("Failed to load gamepak %s, exiting.\n", load_filename);
+#ifndef PSP_BUILD
+ printf("Failed to load gamepak %s, exiting.\n", argv[1]);
#endif
exit(-1);
}
}
else
{
+ char load_filename[512];
if(load_file(file_ext, load_filename) == -1)
{
menu(copy_screen());
{
if(load_gamepak(load_filename) == -1)
{
-#ifdef PC_BUILD
+#ifndef PSP_BUILD
printf("Failed to load gamepak %s, exiting.\n", load_filename);
#endif
exit(-1);
}
+ set_clock_speed();
set_gba_resolution(screen_scale);
video_resolution_small();
execute_arm_translate(execute_cycles);
#else
-#ifdef GP2X_BUILD
- get_ticks_us(&frame_count_initial_timestamp);
-#endif
-
/* u8 current_savestate_filename[512];
get_savestate_filename_noshot(savestate_slot,
current_savestate_filename);
static u32 event_number = 0;
static u64 benchmark_ticks[16];
u64 new_ticks;
- u8 current_savestate_filename[512];
+ char current_savestate_filename[512];
return;
event_number++;
}
+static u32 fps = 60;
+static u32 frames_drawn = 60;
+
u32 update_gba()
{
irq_type irq_raised = IRQ_NONE;
continue;
update_gbc_sound(cpu_ticks);
- synchronize();
+
+ if(fps_debug)
+ {
+ char print_buffer[32];
+ sprintf(print_buffer, "%2d (%2d)", fps, frames_drawn);
+ print_string(print_buffer, 0xFFFF, 0x000, 0, 0);
+ }
+ if(!synchronize_flag)
+ print_string("-FF-", 0xFFFF, 0x000, 216, 0);
update_screen();
+ synchronize();
+
if(update_backup_flag)
update_backup();
return execute_cycles;
}
-u64 last_screen_timestamp = 0;
-u32 frame_speed = 15000;
-
-
#ifdef PSP_BUILD
u32 real_frame_count = 0;
if(!synchronize_flag)
{
- print_string("--FF--", 0xFFFF, 0x000, 0, 0);
used_frameskip = 4;
virtual_frame_count = real_frame_count - 1;
}
*/
}
-#endif
-
-#ifdef GP2X_BUILD
+#else
u32 real_frame_count = 0;
u32 virtual_frame_count = 0;
u32 interval_skipped_frames;
u32 frames;
-u32 skipped_frames = 0;
-u32 ticks_needed_total = 0;
const u32 frame_interval = 60;
void synchronize()
{
u64 new_ticks;
u64 time_delta;
- static u32 fps = 60;
- static u32 frames_drawn = 60;
-
- if(gp2x_fps_debug)
- {
- char print_buffer[128];
- sprintf(print_buffer, "%d (%d)", fps, frames_drawn);
- print_string(print_buffer, 0xFFFF, 0x000, 0, 0);
- }
get_ticks_us(&new_ticks);
- time_delta = new_ticks - last_screen_timestamp;
- last_screen_timestamp = new_ticks;
- ticks_needed_total += time_delta;
skip_next_frame = 0;
virtual_frame_count++;
- real_frame_count = ((new_ticks -
- frame_count_initial_timestamp) * 3) / 50000;
+ real_frame_count = (new_ticks * 3) / 50000;
if(real_frame_count >= virtual_frame_count)
{
num_skipped_frames = 0;
}
}
- else
+ else if (synchronize_flag)
{
- if((synchronize_flag) &&
- ((time_delta < frame_speed) && synchronize_flag))
- {
- delay_us(frame_speed - time_delta);
- }
+#if defined(PND_BUILD)
+ fb_wait_vsync();
+#elif !defined(GP2X_BUILD) // sleeping on GP2X is a bad idea
+ delay_us((u64)virtual_frame_count * 50000 / 3 - new_ticks + 2);
+#endif
}
frames++;
last_frame_interval_timestamp = new_ticks;
interval_skipped_frames = 0;
- ticks_needed_total = 0;
frames = 0;
}
interval_skipped_frames += skip_next_frame;
- if(!synchronize_flag)
- print_string("--FF--", 0xFFFF, 0x000, 0, 0);
-}
-
-#endif
-
-
-#ifdef PC_BUILD
-
-u32 ticks_needed_total = 0;
-float us_needed = 0.0;
-u32 frames = 0;
-const u32 frame_interval = 60;
-
-void synchronize()
-{
- u64 new_ticks;
- u64 time_delta;
+#if !defined(GP2X_BUILD) && !defined(PND_BUILD)
char char_buffer[64];
-
- get_ticks_us(&new_ticks);
- time_delta = new_ticks - last_screen_timestamp;
- last_screen_timestamp = new_ticks;
- ticks_needed_total += time_delta;
-
- skip_next_frame = 0;
-
- if((time_delta < frame_speed) && synchronize_flag)
- {
- delay_us(frame_speed - time_delta);
- }
-
- frames++;
-
- if(frames == frame_interval)
- {
- us_needed = (float)ticks_needed_total / frame_interval;
- ticks_needed_total = 0;
- frames = 0;
- }
-
- if(current_frameskip_type == manual_frameskip)
- {
- frameskip_counter = (frameskip_counter + 1) %
- (frameskip_value + 1);
- if(random_skip)
- {
- if(frameskip_counter != (rand() % (frameskip_value + 1)))
- skip_next_frame = 1;
- }
- else
- {
- if(frameskip_counter)
- skip_next_frame = 1;
- }
- }
-
- if(synchronize_flag == 0)
- print_string("--FF--", 0xFFFF, 0x000, 0, 0);
-
- sprintf(char_buffer, "gpSP: %.1fms %.1ffps", us_needed / 1000.0,
- 1000000.0 / us_needed);
+ sprintf(char_buffer, "gpSP: %2d (%2d) fps", fps, frames_drawn);
SDL_WM_SetCaption(char_buffer, "gpSP");
-
-/*
- sprintf(char_buffer, "%02d %02d %06d %07d", frameskip, (u32)ms_needed,
- ram_translation_ptr - ram_translation_cache, rom_translation_ptr -
- rom_translation_cache);
- print_string(char_buffer, 0xFFFF, 0x0000, 0, 0);
-*/
+#endif
}
#endif
#else
SDL_Quit();
-#ifdef GP2X_BUILD
- gp2x_quit();
+#ifndef PC_BUILD
+ gpsp_plat_quit();
#endif
exit(0);
#ifdef PSP_BUILD
-u32 file_length(u8 *filename, s32 dummy)
+u32 file_length(char *filename, s32 dummy)
{
SceIoStat stats;
sceIoGetstat(filename, &stats);
#else
-u32 file_length(u8 *dummy, FILE *fp)
+u32 file_length(char *dummy, FILE *fp)
{
u32 length;
void get_ticks_us(u64 *ticks_return)
{
- *ticks_return = (SDL_GetTicks() * 1000);
+ *ticks_return = (u64)SDL_GetTicks() * 1000;
}
#else
#endif
-void change_ext(u8 *src, u8 *buffer, u8 *extension)
+void change_ext(const char *src, char *buffer, const char *extension)
{
- u8 *dot_position;
+ char *dot_position;
strcpy(buffer, src);
dot_position = strrchr(buffer, '.');
{
printf(str, val);
}
+
+void set_clock_speed()
+{
+ static u32 clock_speed_old = default_clock_speed;
+ if (clock_speed != clock_speed_old)
+ {
+ printf("about to set CPU clock to %iMHz\n", clock_speed);
+ #ifdef PSP_BUILD
+ scePowerSetClockFrequency(clock_speed, clock_speed, clock_speed / 2);
+ #elif defined(GP2X_BUILD)
+ set_FCLK(clock_speed);
+ #endif
+ clock_speed_old = clock_speed;
+ }
+}
+
notaz.gp2x.de / gpsp.git / blobdiff