Merge branch 'wip-crap' of https://github.com/beeanyew/pistorm into 0.x-borb

[pistorm] / emulator.c

diff --git a/emulator.c b/emulator.c
index b80a37f06f500442d768d47256ab7de9275df0f0..9ef71b21c337be5aa3e302ec45f96f96f81f7a48 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -60,8 +60,8 @@ extern volatile uint16_t srdata;
 extern uint8_t realtime_graphics_debug;
 uint8_t realtime_disassembly, int2_enabled = 0;
 uint32_t do_disasm = 0, old_level;
-uint32_t last_irq = 0, last_last_irq = 0;
 char c = 0, c_code = 0, c_type = 0; // @todo temporary main/cpu_task scope workaround until input moved to a thread
+uint32_t last_irq = 0, last_last_irq = 0;
 
 char disasm_buf[4096];
 
@@ -553,7 +553,6 @@ void cpu_pulse_reset(void) {
   if (cfg->platform->handle_reset)
     cfg->platform->handle_reset(cfg);
 
-
   m68k_write_memory_16(INTENA, 0x7FFF);
   ovl = 1;
   m68k_write_memory_8(0xbfe201, 0x0001);  // AMIGA OVL