#define NOP asm("nop"); asm("nop"); asm("nop"); asm("nop");
+#define DEBUG_EMULATOR
+#ifdef DEBUG_EMULATOR
+#define DEBUG printf
+#else
+#define DEBUG(...)
+#endif
+
// Configurable emulator options
unsigned int cpu_type = M68K_CPU_TYPE_68000;
unsigned int loop_cycles = 300, irq_status = 0;
char keyboard_file[256] = "/dev/input/event1";
uint64_t trig_irq = 0, serv_irq = 0;
+uint16_t irq_delay = 0;
void *iplThread(void *args) {
printf("IPL thread running\n");
+ uint16_t old_irq = 0;
+ uint32_t value;
while (1) {
- if (!gpio_get_irq()) {
+ value = *(gpio + 13);
+
+ if (!(value & (1 << PIN_IPL_ZERO))) {
irq = 1;
+ old_irq = irq_delay;
+ NOP
M68K_END_TIMESLICE;
}
else {
- irq = 0;
+ if (irq) {
+ if (old_irq) {
+ old_irq--;
+ }
+ else {
+ irq = 0;
+ }
+ NOP
+ M68K_END_TIMESLICE;
+ }
}
if (gayle_ide_enabled) {
gayleirq = 0;
}
//usleep(0);
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
- NOP NOP NOP NOP NOP NOP
+ NOP NOP NOP NOP NOP NOP NOP NOP
+ NOP NOP NOP NOP NOP NOP NOP NOP
+ NOP NOP NOP NOP NOP NOP NOP NOP
+ /*NOP NOP NOP NOP NOP NOP NOP NOP
+ NOP NOP NOP NOP NOP NOP NOP NOP
+ NOP NOP NOP NOP NOP NOP NOP NOP*/
}
return args;
}
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) {
cpu_pulse_reset();
char c = 0, c_code = 0, c_type = 0;
- uint32_t last_irq = 0;
+ uint32_t last_irq = 0, last_last_irq = 0;
pthread_t id;
int err;
}
if (irq) {
- unsigned int status = read_reg();
- if (((status & 0xe000) >> 13) != last_irq) {
- last_irq = ((status & 0xe000) >> 13);
- serv_irq++;
- M68K_SET_IRQ(last_irq);
+ while (irq) {
+ last_irq = ((read_reg() & 0xe000) >> 13);
+ if (last_irq != last_last_irq) {
+ last_last_irq = last_irq;
+ M68K_SET_IRQ(last_irq);
+ }
+ m68k_execute(5);
}
+ if (gayleirq && int2_enabled) {
+ write16(0xdff09c, 0x8000 | (1 << 3) && last_irq != 2);
+ last_last_irq = last_irq;
+ last_irq = 2;
+ M68K_SET_IRQ(2);
+ }
+ M68K_SET_IRQ(0);
+ last_last_irq = 0;
}
- else if (gayleirq && int2_enabled) {
- write16(0xdff09c, 0x8000 | (1 << 3));
- last_irq = 2;
- M68K_SET_IRQ(2);
- }
- else {
+ /*else {
if (last_irq != 0) {
- last_irq = 0;
M68K_SET_IRQ(0);
+ last_last_irq = last_irq;
+ last_irq = 0;
}
- }
+ }*/
while (get_key_char(&c, &c_code, &c_type)) {
if (c && c == cfg->keyboard_toggle_key && !kb_hook_enabled) {
printf("unknown.\n");
break;
}*/
- if (queue_keypress(c_code, c_type, cfg->platform->id) && int2_enabled) {
- last_irq = 2;
- M68K_SET_IRQ(2);
+ if (queue_keypress(c_code, c_type, cfg->platform->id) && int2_enabled && last_irq != 2) {
+ //last_irq = 0;
+ //M68K_SET_IRQ(2);
}
}
}
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
m68k_write_memory_8(0xbfe001, 0x0001); // AMIGA OVL high (ROM@0x0)
send_keypress = 1;
}
if (send_keypress == 2) {
- // result |= 0x02;
+ //result |= 0x02;
send_keypress = 0;
}
return result;
}
if (address == CIAADAT) {
- if (send_keypress) {
+ //if (send_keypress) {
uint8_t c = 0, t = 0;
pop_queued_key(&c, &t);
t ^= 0x01;
result = ((c << 1) | t) ^ 0xFF;
send_keypress = 2;
- }
+ //M68K_SET_IRQ(0);
+ //}
return result;
}
}