Improved timing statistics consistency, now it always starts at the top of the loop for each application (that has a loop)

Author: ducalex

gbsp/main/main.c

@@ -173,6 +173,7 @@ void app_main(void)
     while (true)
     {
         // RG_TIMER_INIT();
+        const int64_t startTime = rg_system_timer();
         uint32_t joystick = rg_input_read_gamepad();
 
         if (joystick & (RG_KEY_MENU | RG_KEY_OPTION))
@@ -182,13 +183,11 @@ void app_main(void)
             else
                 rg_gui_options_menu();
             memset(&mixbuffer, 0, sizeof(mixbuffer));
+            continue;
         }
 
-        int64_t start_time = rg_system_timer();
-
         update_input();
         rumble_frame_reset();
-
         clear_gamepak_stickybits();
         execute_arm(execute_cycles);
         // RG_TIMER_LAP("execute_arm");
@@ -199,7 +198,7 @@ void app_main(void)
         size_t frames_count = sound_read_samples((s16 *)mixbuffer, AUDIO_BUFFER_LENGTH);
         // RG_TIMER_LAP("sound_read_samples");
 
-        rg_system_tick(rg_system_timer() - start_time);
+        rg_system_tick(rg_system_timer() - startTime);
 
         rg_audio_submit(mixbuffer, frames_count);
         // RG_TIMER_LAP("rg_audio_submit");

gwenesis/main/main.c

@@ -323,24 +323,28 @@ void app_main(void)
     extern int hint_pending;
 
     uint32_t keymap[8] = {RG_KEY_UP, RG_KEY_DOWN, RG_KEY_LEFT, RG_KEY_RIGHT, RG_KEY_A, RG_KEY_B, RG_KEY_SELECT, RG_KEY_START};
-    uint32_t joystick = 0, joystick_old;
+    uint32_t joystick_old;
 
     int skipFrames = 0;
 
-    RG_LOGI("emulation loop\n");
+    RG_LOGI("emulation loop");
     while (true)
     {
-        joystick_old = joystick;
-        joystick = rg_input_read_gamepad();
+        const int64_t startTime = rg_system_timer();
+        uint32_t joystick = rg_input_read_gamepad();
+        bool drawFrame = skipFrames == 0;
+        bool slowFrame = false;
 
         if (joystick & (RG_KEY_MENU | RG_KEY_OPTION))
         {
             if (joystick & RG_KEY_MENU)
                 rg_gui_game_menu();
             else
                 rg_gui_options_menu();
+            continue;
         }
-        else if (joystick != joystick_old)
+
+        if (joystick != joystick_old)
         {
             for (int i = 0; i < 8; i++)
             {
@@ -349,12 +353,9 @@ void app_main(void)
                 else
                     gwenesis_io_pad_release_button(0, i);
             }
+            joystick_old = joystick;
         }
 
-        int64_t startTime = rg_system_timer();
-        bool drawFrame = skipFrames == 0;
-        bool slowFrame = false;
-
         int lines_per_frame = REG1_PAL ? LINES_PER_FRAME_PAL : LINES_PER_FRAME_NTSC;
         int hint_counter = gwenesis_vdp_regs[10];
 

retro-core/components/pce-go/gfx.c

@@ -311,8 +311,6 @@ gfx_latch_context(int force)
 static inline void
 render_lines(int min_line, int max_line)
 {
-	gfx_context.latched = 0;
-
 	uint8_t *screen_buffer = osd_gfx_framebuffer(PCE.VDC.screen_width, PCE.VDC.screen_height);
 	if (!screen_buffer) {
 		return;
@@ -399,7 +397,7 @@ gfx_irq(int type)
 	Process one scanline
 */
 void
-gfx_run(void)
+gfx_run(bool draw)
 {
 	int scanline = PCE.Scanline;
 
@@ -431,8 +429,10 @@ gfx_run(void)
 
 		if (scanline >= IO_VDC_MINLINE && scanline <= IO_VDC_MAXLINE) {
 			if (gfx_context.latched) {
-				render_lines(last_line_counter, line_counter);
+				if (draw)
+					render_lines(last_line_counter, line_counter);
 				last_line_counter = line_counter;
+				gfx_context.latched = 0;
 			}
 			line_counter++;
 		}
@@ -442,7 +442,9 @@ gfx_run(void)
 
 		// Draw any lines left in the context
 		gfx_latch_context(0);
-		render_lines(last_line_counter, line_counter);
+		if (draw)
+			render_lines(last_line_counter, line_counter);
+		gfx_context.latched = 0;
 
 		// Trigger interrupts
 		if (SpHitON && sprite_hit_check()) {

retro-core/components/pce-go/gfx.h

@@ -3,7 +3,7 @@
 #include <stdbool.h>
 
 int gfx_init(void);
-void gfx_run(void);
+void gfx_run(bool draw);
 void gfx_term(void);
 void gfx_irq(int type);
 void gfx_reset(bool hard);

retro-core/components/pce-go/pce-go.c

@@ -93,8 +93,6 @@ static const struct {
 	{0x00000000, "Unknown", 0},
 };
 
-static bool running = false;
-
 /**
  * Load card into memory and set its memory map
  * NOTE: This function takes ownership of `data`
@@ -320,19 +318,21 @@ PalettePCE(int bitdepth)
  * Start the emulation
  */
 void
-RunPCE(void)
+RunPCE(bool draw)
 {
-	running = true;
-
-	while (running)
-	{
-		osd_input_read(PCE.Joypad.regs);
-		pce_run();
-		osd_vsync();
-	}
+	pce_run(draw);
 }
 
 
+/**
+ * Set joystick status
+ */
+void
+InputPCE(int port, uint32_t value)
+{
+	PCE.Joypad.regs[port & 0x7] = value & 0xFF;
+}
+
 /**
  * Load saved state
  */
@@ -441,7 +441,7 @@ SaveState(const char *name)
  * Cleanup and quit (not used in retro-go)
  */
 void
-ShutdownPCE()
+ShutdownPCE(void)
 {
 	gfx_term();
 	psg_term();

retro-core/components/pce-go/pce-go.h

@@ -70,16 +70,16 @@
 #define XBUF_WIDTH 	(352 + 16)
 #define	XBUF_HEIGHT	(242)
 
+int InitPCE(int samplerate, bool stereo);
+void ResetPCE(bool hard);
+void InputPCE(int port, uint32_t value);
+void RunPCE(bool draw);
+void ShutdownPCE(void);
+
 int LoadState(const char *name);
 int SaveState(const char *name);
-void ResetPCE(bool);
-void RunPCE(void);
-void ShutdownPCE();
-int InitPCE(int samplerate, bool stereo);
 int LoadCard(uint8_t *data, size_t size);
 int LoadFile(const char *name);
 void *PalettePCE(int bitdepth);
 
 extern uint8_t *osd_gfx_framebuffer(int width, int height);
-extern void osd_input_read(uint8_t joypads[8]);
-extern void osd_vsync(void);

retro-core/components/pce-go/pce.c

@@ -122,7 +122,7 @@ pce_term(void)
   * Run emulation for one frame
   **/
 void
-pce_run(void)
+pce_run(bool draw)
 {
 	// Handle pending video mode changes
 	if (PCE.VDC.mode_chg) {
@@ -139,7 +139,7 @@ pce_run(void)
 			PCE.MaxCycles -= PCE.Cycles;
 			PCE.Cycles = 0;
 		}
-		gfx_run();
+		gfx_run(draw);
 	}
 }
 

retro-core/components/pce-go/pce.h

@@ -266,8 +266,7 @@ extern uint8_t *PageW[8];
 int  pce_init(void);
 void pce_reset(bool hard);
 void pce_term(void);
-void pce_run(void);
-void pce_pause(void);
+void pce_run(bool draw);
 void pce_writeIO(uint16_t A, uint8_t V);
 uint8_t pce_readIO(uint16_t A);
 

retro-core/main/main_gbc.c

@@ -313,11 +313,12 @@ void gbc_main(void)
     // Ready!
 
     uint32_t joystick_old = -1;
-    uint32_t joystick = 0;
 
     while (true)
     {
-        joystick = rg_input_read_gamepad();
+        const int64_t startTime = rg_system_timer();
+        uint32_t joystick = rg_input_read_gamepad();
+        bool drawFrame = !skipFrames;
 
         if (joystick & (RG_KEY_MENU|RG_KEY_OPTION))
         {
@@ -329,8 +330,10 @@ void gbc_main(void)
             }
             else
                 rg_gui_options_menu();
+            continue;
         }
-        else if (joystick != joystick_old)
+
+        if (joystick != joystick_old)
         {
             int pad = 0;
             if (joystick & RG_KEY_UP) pad |= GB_PAD_UP;
@@ -345,9 +348,6 @@ void gbc_main(void)
             joystick_old = joystick;
         }
 
-        int64_t startTime = rg_system_timer();
-        bool drawFrame = !skipFrames;
-
         video_time = audio_time = 0;
 
         if (drawFrame)

retro-core/main/main_gw.c

@@ -229,19 +229,24 @@ void gw_main(void)
 
     while (true)
     {
+        const int64_t startTime = rg_system_timer();
+        uint32_t joystick = rg_input_read_gamepad();
+        bool drawFrame = true;
+
         /* refresh internal G&W timer on emulated CPU state transition */
         if (previous_m_halt != m_halt)
             gw_check_time();
 
         previous_m_halt = m_halt;
 
-        // hardware keys
-        uint32_t joystick = rg_input_read_gamepad();
-
-        if (joystick & RG_KEY_MENU)
-            rg_gui_game_menu();
-        else if (joystick & RG_KEY_OPTION)
-            rg_gui_options_menu();
+        if (joystick & (RG_KEY_MENU|RG_KEY_OPTION))
+        {
+            if (joystick & RG_KEY_MENU)
+                rg_gui_game_menu();
+            else if (joystick & RG_KEY_OPTION)
+                rg_gui_options_menu();
+            continue;
+        }
 
         // soft keys emulation
         if (softkey_duration > 0)
@@ -253,14 +258,21 @@ void gw_main(void)
             softkey_alarm_pressed = 0;
         }
 
-        int64_t startTime = rg_system_timer();
-        bool drawFrame = true;
 
         /* Emulate and Blit */
         // Call the emulator function with number of clock cycles
         // to execute on the emulated device
         gw_system_run(GW_SYSTEM_CYCLES);
 
+        /* copy audio samples for DMA */
+        rg_audio_sample_t mixbuffer[GW_AUDIO_BUFFER_LENGTH];
+        for (size_t i = 0; i < GW_AUDIO_BUFFER_LENGTH; i++)
+        {
+            mixbuffer[i].left = gw_audio_buffer[i] << 13;
+            mixbuffer[i].right = gw_audio_buffer[i] << 13;
+        }
+        gw_audio_buffer_copied = true;
+
         // Our refresh rate is 128Hz, which is way too fast for our display
         // so make sure the previous frame is done sending before queuing a new one
         if (rg_display_sync(false) && drawFrame)
@@ -272,15 +284,6 @@ void gw_main(void)
 
         // Tick before submitting audio/syncing
         rg_system_tick(rg_system_timer() - startTime);
-
-        /* copy audio samples for DMA */
-        rg_audio_sample_t mixbuffer[GW_AUDIO_BUFFER_LENGTH];
-        for (size_t i = 0; i < GW_AUDIO_BUFFER_LENGTH; i++)
-        {
-            mixbuffer[i].left = gw_audio_buffer[i] << 13;
-            mixbuffer[i].right = gw_audio_buffer[i] << 13;
-        }
         rg_audio_submit(mixbuffer, GW_AUDIO_BUFFER_LENGTH);
-        gw_audio_buffer_copied = true;
     } // end of loop
 }