From: Rob Andrews <rob@aphlor.org>
Date: Mon, 8 Mar 2021 16:31:52 +0000 (+0000)
Subject: Merge branch 'wip-crap' of https://github.com/beeanyew/pistorm into 0.x-borb
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c051b90dd3461dbf3d74d18576d515b3c72f011;p=pistorm

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

8c051b90dd3461dbf3d74d18576d515b3c72f011
diff --cc emulator.c
index b80a37f,b1ac4bc..9ef71b2
--- a/emulator.c
+++ b/emulator.c
@@@ -60,8 -55,6 +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 -467,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