Changeset 3c30832 in buchla-emu for emu/cpu.c

Timestamp:

07/23/2017 08:57:53 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

375f7fb

Parents:

8e1b163

Message:

Interrupt handling. Serial console shows ROMP.

File:

• emu/cpu.c (modified) (5 diffs)

emu/cpu.c

@@ -37 +37 @@
 typedef void (*hw_init_t)(void);
 typedef void (*hw_quit_t)(void);
-typedef void (*hw_exec_t)(void);
+typedef bool (*hw_exec_t)(void);
 typedef uint32_t (*hw_read_t)(uint32_t off, int32_t sz);
 typedef void (*hw_write_t)(uint32_t off, int32_t sz, uint32_t val);
@@ -44 +44 @@
         uint32_t addr_beg;
         uint32_t addr_end;
+        uint32_t irq;
         hw_init_t init;
         hw_quit_t quit;
@@ -67 +68 @@
 
 static hw_t hw_map[] = {
-        { 0x180000, 0x200000, fpu_init, fpu_quit, fpu_exec, fpu_read, fpu_write },
-        { 0x200000, 0x280000, vid_init, vid_quit, vid_exec, vid_read, vid_write },
-        { 0x3a0001, 0x3a4001, tim_init, tim_quit, tim_exec, tim_read, tim_write },
-        { 0x3a4001, 0x3a8001, lcd_init, lcd_quit, lcd_exec, lcd_read, lcd_write },
-        { 0x3a8001, 0x3ac001, ser_init, ser_quit, ser_exec, ser_read, ser_write },
-        { 0x3ac001, 0x3b0001, mid_init, mid_quit, mid_exec, mid_read, mid_write },
-        { 0x3b0001, 0x3b4001, fdd_init, fdd_quit, fdd_exec, fdd_read, fdd_write },
-        { 0x3b4001, 0x3b8001, snd_init, snd_quit, snd_exec, snd_read, snd_write },
-        { 0x3b8001, 0x3bc001, led_init, led_quit, led_exec, led_read, led_write },
-        { 0x3bc001, 0x3c0001, kbd_init, kbd_quit, kbd_exec, kbd_read, kbd_write }
+        { 0x180000, 0x200000, 0, fpu_init, fpu_quit, fpu_exec, fpu_read, fpu_write },
+        { 0x200000, 0x280000, 0, vid_init, vid_quit, vid_exec, vid_read, vid_write },
+        { 0x3a0001, 0x3a4001, 0, tim_init, tim_quit, tim_exec, tim_read, tim_write },
+        { 0x3a4001, 0x3a8001, 0, lcd_init, lcd_quit, lcd_exec, lcd_read, lcd_write },
+        { 0x3a8001, 0x3ac001, 5, ser_init, ser_quit, ser_exec, ser_read, ser_write },
+        { 0x3ac001, 0x3b0001, 0, mid_init, mid_quit, mid_exec, mid_read, mid_write },
+        { 0x3b0001, 0x3b4001, 0, fdd_init, fdd_quit, fdd_exec, fdd_read, fdd_write },
+        { 0x3b4001, 0x3b8001, 0, snd_init, snd_quit, snd_exec, snd_read, snd_write },
+        { 0x3b8001, 0x3bc001, 0, led_init, led_quit, led_exec, led_read, led_write },
+        { 0x3bc001, 0x3c0001, 0, kbd_init, kbd_quit, kbd_exec, kbd_read, kbd_write }
 };
 
@@ -108 +109 @@
 }
 
-static void hw_exec(void)
-{
+static uint32_t hw_exec(void)
+{
+        uint32_t irq = 0;
+
         for (int32_t i = 0; i < ARRAY_COUNT(hw_map); ++i) {
-                hw_map[i].exec();
-        }
+                if (hw_map[i].exec() && hw_map[i].irq > irq) {
+                        irq = hw_map[i].irq;
+                }
+        }
+
+        return irq;
 }
 
@@ -629 +636 @@
 
                 m68k_execute(CPU_FREQ / PER_SEC);
-                hw_exec();
+                uint32_t irq = hw_exec();
+
+                if (irq > 0) {
+                        ver2("irq %u", irq);
+                }
+
+                m68k_set_irq(irq);
 
                 SDL_Event ev;