pull the PC masking into the code translation cache, so that we only need to mask...

[pistorm] / emulator.c

diff --git a/emulator.c b/emulator.c
index 0dac22a22304f9c81dcef51044a5d2570f4793dd..1be7bcd00ebb3e58229ac6a725a9ae801378e272 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -4,6 +4,7 @@
 #include "emulator.h"
 #include "platforms/platforms.h"
 #include "input/input.h"
+#include "m68kcpu.h"
 
 #include "platforms/amiga/Gayle.h"
 #include "platforms/amiga/amiga-registers.h"
@@ -43,6 +44,7 @@ unsigned char write_ranges;
 unsigned int write_addr[8];
 unsigned int write_upper[8];
 unsigned char *write_data[8];
+address_translation_cache code_translation_cache = {0};
 
 int kb_hook_enabled = 0;
 int mouse_hook_enabled = 0;
@@ -59,6 +61,7 @@ extern uint8_t gayle_a4k_int;
 extern volatile unsigned int *gpio;
 extern volatile uint16_t srdata;
 extern uint8_t realtime_graphics_debug;
+extern uint8_t rtg_on;
 uint8_t realtime_disassembly, int2_enabled = 0;
 uint32_t do_disasm = 0, old_level;
 uint32_t last_irq = 8, last_last_irq = 8;
@@ -235,9 +238,9 @@ cpu_loop:
   }*/
   if (do_reset) {
     cpu_pulse_reset();
-    m68k_pulse_reset();
     do_reset=0;
     usleep(1000000); // 1sec
+    rtg_on=0;
 //    while(amiga_reset==0);
 //    printf("CPU emulation reset.\n");
   }
@@ -433,11 +436,6 @@ int main(int argc, char *argv[]) {
   int g;
   //const struct sched_param priority = {99};
 
-  if (argc > 1) {
-    irq_delay = atoi(argv[1]);
-    printf("Setting IRQ delay to %d loops (%s).\n", irq_delay, argv[1]);
-  }
-
   // Some command line switch stuffles
   for (g = 1; g < argc; g++) {
     if (strcmp(argv[g], "--cpu_type") == 0 || strcmp(argv[g], "--cpu") == 0) {