X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.h;h=407270f1111183878cf705de7ea0284892d2b9dd;hb=6ee3a0f98a05b082fd626d8109f2098da650ae06;hp=d0b7377c796690b2cbb13f3cd0b8a67a997941a1;hpb=f81107f59093904c3daac2e9c257261fddc6caf0;p=picodrive.git

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index d0b7377..407270f 100644
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,11 +1,7 @@
 #ifndef __SH2_H__
 #define __SH2_H__
 
-#if !defined(REGPARM) && defined(__i386__) 
-#define REGPARM(x) __attribute__((regparm(x)))
-#else
-#define REGPARM(x)
-#endif
+#include "../../pico/pico_port.h"
 
 // registers - matches structure order
 typedef enum {
@@ -89,7 +85,23 @@ void sh2_do_irq(SH2 *sh2, int level, int vector);
 void sh2_pack(const SH2 *sh2, unsigned char *buff);
 void sh2_unpack(SH2 *sh2, const unsigned char *buff);
 
-int  sh2_execute(SH2 *sh2, int cycles);
+int  sh2_execute_drc(SH2 *sh2c, int cycles);
+int  sh2_execute_interpreter(SH2 *sh2c, int cycles);
+
+static __inline int sh2_execute(SH2 *sh2, int cycles, int use_drc)
+{
+  int ret;
+
+  sh2->cycles_timeslice = cycles;
+#ifdef DRC_SH2
+  if (use_drc)
+    ret = sh2_execute_drc(sh2, cycles);
+  else
+#endif
+    ret = sh2_execute_interpreter(sh2, cycles);
+
+  return sh2->cycles_timeslice - ret;
+}
 
 // regs, pending_int*, cycles, reserved
 #define SH2_STATE_SIZE ((24 + 2 + 2 + 12) * 4)
@@ -106,7 +118,7 @@ void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);
 // debug
 #ifdef DRC_CMP
 void do_sh2_trace(SH2 *current, int cycles);
-void do_sh2_cmp(SH2 *current);
+void REGPARM(1) do_sh2_cmp(SH2 *current);
 #endif
 
 #endif /* __SH2_H__ */