Finish migrating to new mem handling. Make carthw db external.

[picodrive.git] / cpu / musashi / m68kcpu.h

diff --git a/cpu/musashi/m68kcpu.h b/cpu/musashi/m68kcpu.h
index 350c975..7b050f7 100644 (file)
--- a/cpu/musashi/m68kcpu.h
+++ b/cpu/musashi/m68kcpu.h
@@ -27,8 +27,10 @@
 #define M68KCPU__HEADER\r
 \r
 // notaz: something's missing this\r
-#ifndef UINT16\r
+#ifndef UINT64\r
 #define UINT64 unsigned long long\r
+#endif\r
+#ifndef UINT16\r
 #define UINT32 unsigned int\r
 #define UINT16 unsigned short\r
 #define UINT8  unsigned char\r
@@ -1534,7 +1536,8 @@ INLINE void m68ki_set_sr_noint_nosp(uint value)
 INLINE void m68ki_set_sr(uint value)\r
 {\r
        m68ki_set_sr_noint(value);\r
-       m68ki_check_interrupts();\r
+       if (GET_CYCLES() >= 0) // notaz\r
+               m68ki_check_interrupts();\r
 }\r
 \r
 \r
@@ -2009,6 +2012,7 @@ void m68ki_exception_interrupt(uint int_level)
 \r
        /* Get the new PC */\r
        new_pc = m68ki_read_data_32((vector<<2) + REG_VBR);\r
+       //new_pc = m68k_read_immediate_32((vector<<2) + REG_VBR); // notaz hack\r
 \r
        /* If vector is uninitialized, call the uninitialized interrupt vector */\r
        if(new_pc == 0)\r