cyclone_debug improvements

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

diff --git a/cpu/musashi/m68kcpu.h b/cpu/musashi/m68kcpu.h
index 8885595..14bc2e1 100644 (file)
--- a/cpu/musashi/m68kcpu.h
+++ b/cpu/musashi/m68kcpu.h
@@ -891,13 +891,16 @@ typedef struct
        void (*set_fc_callback)(unsigned int new_fc);     /* Called when the CPU function code changes */\r
        void (*instr_hook_callback)(void);                /* Called every instruction cycle prior to execution */\r
 \r
+       sint cyc_remaining_cycles;\r
 } m68ki_cpu_core;\r
 \r
 \r
 extern m68ki_cpu_core *m68ki_cpu_p;\r
 #define m68ki_cpu (*m68ki_cpu_p) // test\r
 \r
-extern sint           m68ki_remaining_cycles;\r
+// extern sint           m68ki_remaining_cycles;\r
+#define m68ki_remaining_cycles m68ki_cpu_p->cyc_remaining_cycles\r
+\r
 extern uint           m68ki_tracing;\r
 extern uint8          m68ki_shift_8_table[];\r
 extern uint16         m68ki_shift_16_table[];\r
@@ -1952,7 +1955,10 @@ void m68ki_exception_interrupt(uint int_level)
 \r
        /* If we are halted, don't do anything */\r
        if(CPU_STOPPED)\r
+       {\r
+               printf("mu stopped! (%x)\n", CPU_STOPPED);\r
                return;\r
+       }\r
 \r
        /* Acknowledge the interrupt */\r
        vector = m68ki_int_ack(int_level);\r
@@ -2009,6 +2015,7 @@ void m68ki_exception_interrupt(uint int_level)
 /* ASG: Check for interrupts */\r
 INLINE void m68ki_check_interrupts(void)\r
 {\r
+       //printf("mu level, mask: %04x %04x\n", CPU_INT_LEVEL, FLAG_INT_MASK);\r
        if(CPU_INT_LEVEL > FLAG_INT_MASK)\r
                m68ki_exception_interrupt(CPU_INT_LEVEL>>8);\r
 }\r