#include "platforms/amiga/gayle-ide/ide.h"
#include "platforms/amiga/amiga-registers.h"
#include "platforms/amiga/rtg/rtg.h"
+#include "platforms/amiga/piscsi/piscsi.h"
+#include "platforms/amiga/piscsi/piscsi-enums.h"
+#include "platforms/amiga/net/pi-net.h"
+#include "platforms/amiga/net/pi-net-enums.h"
#include "gpio/gpio.h"
unsigned char read_ranges;
irq = 0;
if (gayle_emulation_enabled) {
- if ((gayle_int & 0x80) && get_ide(0)->drive->intrq) {
+ if (((gayle_int & 0x80) || gayle_a4k_int) && (get_ide(0)->drive[0].intrq || get_ide(0)->drive[1].intrq)) {
+ //get_ide(0)->drive[0].intrq = 0;
gayleirq = 1;
m68k_end_timeslice();
}
m68k_set_reg(M68K_REG_PC, 0x0);
}
- char c = 0;
+ char c = 0, c_code = 0, c_type = 0;
pthread_t id;
int err;
m68k_pulse_reset();
while (42) {
if (mouse_hook_enabled) {
- if (get_mouse_status(&mouse_dx, &mouse_dy, &mouse_buttons)) {
- //printf("Maus: %d (%.2X), %d (%.2X), B:%.2X\n", mouse_dx, mouse_dx, mouse_dy, mouse_dy, mouse_buttons);
- }
+ get_mouse_status(&mouse_dx, &mouse_dy, &mouse_buttons);
}
if (cpu_emulation_running)
if (realtime_disassembly) {
m68k_execute(1);
m68k_disassemble(disasm_buf, m68k_get_reg(NULL, M68K_REG_PC), cpu_type);
+ /*printf("REGA: 0:$%.8X 1:$%.8X 2:$%.8X 3:$%.8X 4:$%.8X 5:$%.8X 6:$%.8X 7:$%.8X\n", m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1), m68k_get_reg(NULL, M68K_REG_A2), m68k_get_reg(NULL, M68K_REG_A3), \
+ m68k_get_reg(NULL, M68K_REG_A4), m68k_get_reg(NULL, M68K_REG_A5), m68k_get_reg(NULL, M68K_REG_A6), m68k_get_reg(NULL, M68K_REG_A7));
+ printf("REGD: 0:$%.8X 1:$%.8X 2:$%.8X 3:$%.8X 4:$%.8X 5:$%.8X 6:$%.8X 7:$%.8X\n", m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1), m68k_get_reg(NULL, M68K_REG_D2), m68k_get_reg(NULL, M68K_REG_D3), \
+ m68k_get_reg(NULL, M68K_REG_D4), m68k_get_reg(NULL, M68K_REG_D5), m68k_get_reg(NULL, M68K_REG_D6), m68k_get_reg(NULL, M68K_REG_D7));*/
printf("%.8X (%.8X)]] %s\n", m68k_get_reg(NULL, M68K_REG_PC), (m68k_get_reg(NULL, M68K_REG_PC) & 0xFFFFFF), disasm_buf);
}
if (irq) {
unsigned int status = read_reg();
m68k_set_irq((status & 0xe000) >> 13);
- //printf("There was an IRQ: %d\n", (status & 0xe000) >> 13);
}
else if (gayleirq) {
write16(0xdff09c, 0x8000 | (1 << 3));
m68k_set_irq(0);
}
- //usleep(0);
- // FIXME: Rework this to use keyboard events instead.
- while (get_key_char(&c)) {
- if (c == cfg->keyboard_toggle_key && !kb_hook_enabled) {
+ while (get_key_char(&c, &c_code, &c_type)) {
+ if (c && c == cfg->keyboard_toggle_key && !kb_hook_enabled) {
kb_hook_enabled = 1;
printf("Keyboard hook enabled.\n");
}
- else if (c == 0x1B && kb_hook_enabled) {
- kb_hook_enabled = 0;
- printf("Keyboard hook disabled.\n");
+ else if (kb_hook_enabled) {
+ if (c == 0x1B && c_type) {
+ kb_hook_enabled = 0;
+ printf("Keyboard hook disabled.\n");
+ }
+ else {
+ /*printf("Key code: %.2X - ", c_code);
+ switch (c_type) {
+ case 0:
+ printf("released.\n");
+ break;
+ case 1:
+ printf("pressed.\n");
+ break;
+ case 2:
+ printf("repeat.\n");
+ break;
+ default:
+ printf("unknown.\n");
+ break;
+ }*/
+ if (queue_keypress(c_code, c_type, cfg->platform->id)) {
+ m68k_set_irq(2);
+ }
+ }
}
- if (!kb_hook_enabled) {
- if (c == cfg->mouse_toggle_key) {
+
+ if (!kb_hook_enabled && c_type) {
+ if (c && c == cfg->mouse_toggle_key) {
mouse_hook_enabled ^= 1;
printf("Mouse hook %s.\n", mouse_hook_enabled ? "enabled" : "disabled");
mouse_dx = mouse_dy = mouse_buttons = 0;
}
if (c == 'R') {
cpu_pulse_reset();
- m68k_pulse_reset();
+ //m68k_pulse_reset();
printf("CPU emulation reset.\n");
}
if (c == 'q') {
}
static unsigned int target = 0;
+static uint8_t send_keypress = 0;
+
+uint8_t cdtv_dmac_reg_idx_read();
+void cdtv_dmac_reg_idx_write(uint8_t value);
+uint32_t cdtv_dmac_read(uint32_t address, uint8_t type);
+void cdtv_dmac_write(uint32_t address, uint32_t value, uint8_t type);
#define PLATFORM_CHECK_READ(a) \
if (address >= cfg->custom_low && address < cfg->custom_high) { \
unsigned int target = 0; \
switch(cfg->platform->id) { \
case PLATFORM_AMIGA: { \
+ if (address >= PISCSI_OFFSET && address < PISCSI_UPPER) { \
+ return handle_piscsi_read(address, a); \
+ } \
+ if (address >= PINET_OFFSET && address < PINET_UPPER) { \
+ return handle_pinet_read(address, a); \
+ } \
if (address >= PIGFX_RTG_BASE && address < PIGFX_UPPER) { \
return rtg_read((address & 0x0FFFFFFF), a); \
} \
unsigned int m68k_read_memory_8(unsigned int address) {
PLATFORM_CHECK_READ(OP_TYPE_BYTE);
- address &=0xFFFFFF;
- return read8((uint32_t)address);
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("BYTE read from DMAC @%.8X:", address);
+ uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_BYTE);
+ printf("%.2X\n", v);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return v;
+ }*/
+
+ if (mouse_hook_enabled) {
+ if (address == CIAAPRA) {
+ unsigned char result = (unsigned int)read8((uint32_t)address);
+ if (mouse_buttons & 0x01) {
+ //mouse_buttons -= 1;
+ return (unsigned int)(result ^ 0x40);
+ }
+ else
+ return (unsigned int)result;
+ }
+ }
+ if (kb_hook_enabled) {
+ unsigned char result = (unsigned int)read8((uint32_t)address);
+ if (address == CIAAICR) {
+ if (get_num_kb_queued() && (!send_keypress || send_keypress == 1)) {
+ result |= 0x08;
+ if (!send_keypress)
+ send_keypress = 1;
+ }
+ if (send_keypress == 2) {
+ result |= 0x02;
+ send_keypress = 0;
+ }
+ return result;
+ }
+ if (address == CIAADAT) {
+ if (send_keypress) {
+ uint8_t c = 0, t = 0;
+ pop_queued_key(&c, &t);
+ t ^= 0x01;
+ result = ((c << 1) | t) ^ 0xFF;
+ send_keypress = 2;
+ }
+ return result;
+ }
+ }
+
+ if (address & 0xFF000000)
+ return 0;
+
+ return read8((uint32_t)address);
}
unsigned int m68k_read_memory_16(unsigned int address) {
PLATFORM_CHECK_READ(OP_TYPE_WORD);
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("WORD read from DMAC @%.8X:", address);
+ uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_WORD);
+ printf("%.2X\n", v);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return v;
+ }*/
+
if (mouse_hook_enabled) {
if (address == JOY0DAT) {
// Forward mouse valueses to Amyga.
unsigned short result = (mouse_dy << 8) | (mouse_dx);
- mouse_dx = mouse_dy = 0;
return (unsigned int)result;
}
- if (address == CIAAPRA) {
+ /*if (address == CIAAPRA) {
unsigned short result = (unsigned int)read16((uint32_t)address);
if (mouse_buttons & 0x01) {
- mouse_buttons -= 1;
return (unsigned int)(result | 0x40);
}
else
return (unsigned int)result;
- }
+ }*/
if (address == POTGOR) {
unsigned short result = (unsigned int)read16((uint32_t)address);
if (mouse_buttons & 0x02) {
- mouse_buttons -= 2;
- return (unsigned int)(result | 0x2);
+ return (unsigned int)(result ^ (0x2 << 9));
}
else
- return (unsigned int)result;
+ return (unsigned int)(result & 0xFFFD);
}
}
+ if (address & 0xFF000000)
+ return 0;
- address &=0xFFFFFF;
+ if (address & 0x01) {
+ return ((read8(address) << 8) | read8(address + 1));
+ }
return (unsigned int)read16((uint32_t)address);
}
unsigned int m68k_read_memory_32(unsigned int address) {
PLATFORM_CHECK_READ(OP_TYPE_LONGWORD);
- address &=0xFFFFFF;
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("LONGWORD read from DMAC @%.8X:", address);
+ uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_LONGWORD);
+ printf("%.2X\n", v);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return v;
+ }*/
+
+ if (address & 0xFF000000)
+ return 0;
+
+ if (address & 0x01) {
+ uint32_t c = read8(address);
+ c |= (be16toh(read16(address+1)) << 8);
+ c |= (read8(address + 3) << 24);
+ return htobe32(c);
+ }
uint16_t a = read16(address);
uint16_t b = read16(address + 2);
return (a << 16) | b;
if (address >= cfg->custom_low && address < cfg->custom_high) { \
switch(cfg->platform->id) { \
case PLATFORM_AMIGA: { \
+ if (address >= PISCSI_OFFSET && address < PISCSI_UPPER) { \
+ handle_piscsi_write(address, value, a); \
+ } \
+ if (address >= PINET_OFFSET && address < PINET_UPPER) { \
+ handle_pinet_write(address, value, a); \
+ } \
if (address >= PIGFX_RTG_BASE && address < PIGFX_UPPER) { \
rtg_write((address & 0x0FFFFFFF), value, a); \
return; \
void m68k_write_memory_8(unsigned int address, unsigned int value) {
PLATFORM_CHECK_WRITE(OP_TYPE_BYTE);
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("BYTE write to DMAC @%.8X: %.2X\n", address, value);
+ cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_BYTE);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return;
+ }*/
+
if (address == 0xbfe001) {
if (ovl != (value & (1 << 0))) {
ovl = (value & (1 << 0));
}
}
- address &=0xFFFFFF;
+ if (address & 0xFF000000)
+ return;
+
write8((uint32_t)address, value);
return;
}
void m68k_write_memory_16(unsigned int address, unsigned int value) {
PLATFORM_CHECK_WRITE(OP_TYPE_WORD);
- address &=0xFFFFFF;
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("WORD write to DMAC @%.8X: %.4X\n", address, value);
+ cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_WORD);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return;
+ }*/
+
+ if (address == 0xDFF030) {
+ char *beb = (char *)&value;
+ printf("%c%c", beb[1], beb[0]);
+ }
+
+ if (address & 0xFF000000)
+ return;
+
+ if (address & 0x01)
+ printf("Unaligned WORD write!\n");
+
write16((uint32_t)address, value);
return;
}
void m68k_write_memory_32(unsigned int address, unsigned int value) {
PLATFORM_CHECK_WRITE(OP_TYPE_LONGWORD);
- address &=0xFFFFFF;
+ /*if (address >= 0xE90000 && address < 0xF00000) {
+ printf("LONGWORD write to DMAC @%.8X: %.8X\n", address, value);
+ cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_LONGWORD);
+ m68k_end_timeslice();
+ cpu_emulation_running = 0;
+ return;
+ }*/
+
+ if (address & 0xFF000000)
+ return;
+
+ if (address & 0x01)
+ printf("Unaligned LONGWORD write!\n");
+
write16(address, value >> 16);
write16(address + 2, value);
return;