X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=c63360c647f89b0de2df34972843d182edd37515;hb=04092e329bbd050073d42defcd609550d8545e74;hp=96025fff739d6bdf9974a2aead01f728902fe42e;hpb=1d7a28a723d59da67b58e42a61bc9f1905044fd5;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index 96025ff..c63360c 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -61,7 +61,7 @@ void PicoPower(void)
   Pico.m.frame_count = 0;
 
   // clear all memory of the emulated machine
-  memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
+  memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);
 
   memset(&Pico.video,0,sizeof(Pico.video));
   memset(&Pico.m,0,sizeof(Pico.m));
@@ -272,6 +272,8 @@ PICO_INTERNAL int CheckDMA(void)
 static __inline void SekRunM68k(int cyc)
 {
   int cyc_do;
+  pprof_start(m68k);
+
   SekCycleAim+=cyc;
   if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
 #if defined(EMU_CORE_DEBUG)
@@ -286,6 +288,8 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_F68K)
   SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
 #endif
+
+  pprof_end(m68k);
 }
 
 #include "pico_cmn.c"
@@ -303,38 +307,47 @@ PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
   z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);
   cnt = z80_cycle_aim - z80_cycle_cnt;
 
+  pprof_start(z80);
+
   elprintf(EL_BUSREQ, "z80 sync %i (%i|%i -> %i|%i)", cnt, z80_cycle_cnt, z80_cycle_cnt / 228,
     z80_cycle_aim, z80_cycle_aim / 228);
 
   if (cnt > 0)
     z80_cycle_cnt += z80_run(cnt);
+
+  pprof_end(z80);
 }
 
 
 void PicoFrame(void)
 {
+  pprof_start(frame);
+
   Pico.m.frame_count++;
 
   if (PicoAHW & PAHW_SMS) {
     PicoFrameMS();
-    return;
+    goto end;
   }
 
   // TODO: MCD+32X
   if (PicoAHW & PAHW_MCD) {
     PicoFrameMCD();
-    return;
+    goto end;
   }
 
   if (PicoAHW & PAHW_32X) {
     PicoFrame32x();
-    return;
+    goto end;
   }
 
   //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode
 
   PicoFrameStart();
   PicoFrameHints();
+
+end:
+  pprof_end(frame);
 }
 
 void PicoFrameDrawOnly(void)