32x: new SH2 memory handling, hopefully faster

[picodrive.git] / cpu / sh2 / sh2.h

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 33293b6..f9435e0 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,16 +1,6 @@
 #ifndef __SH2_H__\r
 #define __SH2_H__\r
 \r
-// pico memhandlers\r
-// XXX: move somewhere else\r
-unsigned int p32x_sh2_read8(unsigned int a, int id);\r
-unsigned int p32x_sh2_read16(unsigned int a, int id);\r
-unsigned int p32x_sh2_read32(unsigned int a, int id);\r
-void p32x_sh2_write8(unsigned int a, unsigned int d, int id);\r
-void p32x_sh2_write16(unsigned int a, unsigned int d, int id);\r
-void p32x_sh2_write32(unsigned int a, unsigned int d, int id);\r
-\r
-\r
 typedef struct\r
 {\r
        unsigned int    r[16];          // 00\r
@@ -27,10 +17,15 @@ typedef struct
        unsigned int    delay;\r
        unsigned int    test_irq;\r
 \r
+       // common\r
+       void    *read8_map;             // 70\r
+       void    *read16_map;\r
+       void    *write8_map;\r
+       void    *write16_map;\r
+\r
        // drc stuff\r
-       void    **pc_hashtab;           // 70\r
+       void    **pc_hashtab;           // 80\r
 \r
-       // common\r
        int     pending_level;          // MAX(pending_irl, pending_int_irq)\r
        int     pending_irl;\r
        int     pending_int_irq;        // internal irq\r
@@ -53,4 +48,13 @@ void sh2_do_irq(SH2 *sh2, int level, int vector);
 \r
 void sh2_execute(SH2 *sh2, int cycles);\r
 \r
+// pico memhandlers\r
+// XXX: move somewhere else\r
+unsigned int p32x_sh2_read8(unsigned int a, SH2 *sh2);\r
+unsigned int p32x_sh2_read16(unsigned int a, SH2 *sh2);\r
+unsigned int p32x_sh2_read32(unsigned int a, SH2 *sh2);\r
+void p32x_sh2_write8(unsigned int a, unsigned int d, SH2 *sh2);\r
+void p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
+void p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
+\r
 #endif /* __SH2_H__ */\r