*.o
+*.img
/m68kmake
/m68kmake.exe
/m68kops.c
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
+#include <time.h>
+#include <endian.h>
#include "ide.h"
+#include "config_file/config_file.h"
+#include "platforms/amiga/amiga-registers.h"
+#include "platforms/shared/rtc.h"
//#define GSTATUS 0xda201c
//#define GCLOW 0xda2010
#define GCS 0xDA8000 // Card Control
#define GIRQ 0xDA9000 // IRQ
#define GINT 0xDAA000 // Int enable
-#define GCONF 0xDAB00 // Gayle Config
+#define GCONF 0xDAB000 // Gayle Config
/* DA8000 */
#define GAYLE_CS_IDE 0x80 /* IDE int status */
static struct ide_controller *ide0;
int fd;
+uint8_t rtc_type = RTC_TYPE_RICOH;
+
char *hdd_image_file[GAYLE_MAX_HARDFILES];
void set_hard_drive_image_file_amiga(uint8_t index, char *filename) {
return;
}
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Byte write to CDTV SRAM?\n");
+ return;
+ }
+ put_rtc_byte(address, value, rtc_type);
+ return;
+ }
+
printf("Write Byte to Gayle Space 0x%06x (0x%06x)\n", address, value);
}
return;
}
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Word write to CDTV SRAM?\n");
+ return;
+ }
+ printf("Word write to RTC.\n");
+ put_rtc_byte(address, (value & 0xFF), rtc_type);
+ put_rtc_byte(address + 1, (value >> 8), rtc_type);
+ return;
+ }
+
printf("Write Word to Gayle Space 0x%06x (0x%06x)\n", address, value);
}
void writeGayleL(unsigned int address, unsigned int value) {
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Longword write to CDTV SRAM?\n");
+ return;
+ }
+ printf("Longword write to RTC.\n");
+ put_rtc_byte(address, (value & 0xFF), rtc_type);
+ put_rtc_byte(address + 1, ((value & 0x0000FF00) >> 8), rtc_type);
+ put_rtc_byte(address + 2, ((value & 0x00FF0000) >> 16), rtc_type);
+ put_rtc_byte(address + 3, (value >> 24), rtc_type);
+ return;
+ }
+
printf("Write Long to Gayle Space 0x%06x (0x%06x)\n", address, value);
}
return ide_read8(ide0, ide_altst_r);
}
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Byte read from CDTV SRAM?\n");
+ return 0;
+ }
+ return get_rtc_byte(address, rtc_type);
+ }
+
if (address == GIDENT) {
uint8_t val;
// printf("Read Byte from Gayle Ident 0x%06x (0x%06x)\n",address,counter);
return value;
}
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Word read from CDTV SRAM?\n");
+ return 0;
+ }
+ return ((get_rtc_byte(address, rtc_type) << 8) | (get_rtc_byte(address + 1, rtc_type)));
+ }
+
printf("Read Word From Gayle Space 0x%06x\n", address);
return 0x8000;
}
uint32_t readGayleL(unsigned int address) {
+ if ((address & GAYLEMASK) == CLOCKBASE) {
+ if ((address & CLOCKMASK) >= 0x8000) {
+ printf("Longword read from CDTV SRAM?\n");
+ return 0;
+ }
+ return ((get_rtc_byte(address, rtc_type) << 24) | (get_rtc_byte(address + 1, rtc_type) << 16) | (get_rtc_byte(address + 2, rtc_type) << 8) | (get_rtc_byte(address + 3, rtc_type)));
+ }
+
printf("Read Long From Gayle Space 0x%06x\n", address);
return 0x8000;
}
platforms/amiga/amiga-platform.c \
platforms/amiga/amiga-registers.c \
platforms/dummy/dummy-platform.c \
- platforms/dummy/dummy-registers.c
+ platforms/dummy/dummy-registers.c \
+ platforms/shared/rtc.c
MUSASHIFILES = m68kcpu.c softfloat/softfloat.c
MUSASHIGENCFILES = m68kops.c
cfg->map_type[index] = type;
cfg->map_offset[index] = addr;
cfg->map_size[index] = size;
+ cfg->map_high[index] = addr + size;
cfg->map_mirror[index] = mirr_addr;
if (strlen(map_id)) {
cfg->map_id[index] = (char *)malloc(strlen(map_id) + 1);
file_size = (int)ftell(in);
if (size == 0) {
cfg->map_size[index] = file_size;
+ cfg->map_high[index] = addr + cfg->map_size[index];
}
fseek(in, 0, SEEK_SET);
cfg->map_data[index] = (unsigned char *)calloc(1, cfg->map_size[index]);
break;
}
- printf("[MAP %d] Added %s mapping for range %.8lX-%.8lX ID: %s\n", index, map_type_names[type], cfg->map_offset[index], cfg->map_offset[index] + cfg->map_size[index] - 1, cfg->map_id[index] ? cfg->map_id[index] : "None");
+ printf("[MAP %d] Added %s mapping for range %.8lX-%.8lX ID: %s\n", index, map_type_names[type], cfg->map_offset[index], cfg->map_high[index] - 1, cfg->map_id[index] ? cfg->map_id[index] : "None");
+ if (cfg->map_size[index] == cfg->rom_size[index])
+ m68k_add_rom_range(cfg->map_offset[index], cfg->map_high[index], cfg->map_data[index]);
return;
unsigned char map_type[MAX_NUM_MAPPED_ITEMS];
long map_offset[MAX_NUM_MAPPED_ITEMS];
+ long map_high[MAX_NUM_MAPPED_ITEMS];
unsigned int map_size[MAX_NUM_MAPPED_ITEMS];
unsigned int rom_size[MAX_NUM_MAPPED_ITEMS];
unsigned char *map_data[MAX_NUM_MAPPED_ITEMS];
unsigned char mouse_enabled, keyboard_enabled;
unsigned int loop_cycles;
+ unsigned int mapped_low, mapped_high;
+ unsigned int custom_low, custom_high;
};
struct platform_config {
char *subsys;
+ unsigned char id;
int (*custom_read)(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type);
int (*custom_write)(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type);
int (*register_write)(unsigned int addr, unsigned int value, unsigned char type);
int (*platform_initial_setup)(struct emulator_config *cfg);
+ void (*handle_reset)(struct emulator_config *cfg);
void (*setvar)(char *var, char *val);
};
unsigned int get_m68k_cpu_type(char *name);
struct emulator_config *load_config_file(char *filename);
-int handle_mapped_read(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type, unsigned char mirror);
-int handle_mapped_write(struct emulator_config *cfg, unsigned int addr, unsigned int value, unsigned char type, unsigned char mirror);
+int handle_mapped_read(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type);
+int handle_mapped_write(struct emulator_config *cfg, unsigned int addr, unsigned int value, unsigned char type);
int get_named_mapped_item(struct emulator_config *cfg, char *name);
unsigned int get_int(char *str);
#include "platforms/platforms.h"
#include "input/input.h"
+#include "platforms/amiga/amiga-registers.h"
+
//#define BCM2708_PERI_BASE 0x20000000 //pi0-1
//#define BCM2708_PERI_BASE 0xFE000000 //pi4
#define BCM2708_PERI_BASE 0x3F000000 // pi3
//unsigned char g_kick[524288];
//unsigned char g_ram[FASTSIZE + 1]; /* RAM */
unsigned char toggle;
-static volatile unsigned char ovl;
+int ovl;
static volatile unsigned char maprom;
void sigint_handler(int sig_num) {
m68k_execute(loop_cycles);
// FIXME: Rework this to use keyboard events instead.
- while (get_key_char(&c)) {
+ /*while (get_key_char(&c)) {
if (c == cfg->keyboard_toggle_key && !kb_hook_enabled) {
kb_hook_enabled = 1;
printf("Keyboard hook enabled.\n");
goto stop_cpu_emulation;
}
}
- }
+ }*/
/*
if (toggle == 1){
srdata = read_reg();
static unsigned int target = 0;
-unsigned int m68k_read_memory_8(unsigned int address) {
- if (cfg->platform->custom_read && cfg->platform->custom_read(cfg, address, &target, OP_TYPE_BYTE) != -1) {
- return target;
+#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 (custom_read_amiga(cfg, address, &target, a) != -1) { \
+ return target; \
+ } \
+ break; \
+ } \
+ default: \
+ break; \
+ } \
+ } \
+ if (ovl || (address >= cfg->mapped_low && address < cfg->mapped_high)) { \
+ if (handle_mapped_read(cfg, address, &target, a) != -1) \
+ return target; \
}
- if (cfg) {
- int ret = handle_mapped_read(cfg, address, &target, OP_TYPE_BYTE, ovl);
- if (ret != -1)
- return target;
- }
+unsigned int m68k_read_memory_8(unsigned int address) {
+ PLATFORM_CHECK_READ(OP_TYPE_BYTE);
address &=0xFFFFFF;
// if (address < 0xffffff) {
}
unsigned int m68k_read_memory_16(unsigned int address) {
- if (cfg->platform->custom_read && cfg->platform->custom_read(cfg, address, &target, OP_TYPE_WORD) != -1) {
- return target;
- }
-
- if (cfg) {
- int ret = handle_mapped_read(cfg, address, &target, OP_TYPE_WORD, ovl);
- if (ret != -1)
- return target;
- }
+ PLATFORM_CHECK_READ(OP_TYPE_WORD);
if (mouse_hook_enabled) {
if (address == JOY0DAT) {
}
unsigned int m68k_read_memory_32(unsigned int address) {
- if (cfg->platform->custom_read && cfg->platform->custom_read(cfg, address, &target, OP_TYPE_LONGWORD) != -1) {
- return target;
- }
-
- if (cfg) {
- int ret = handle_mapped_read(cfg, address, &target, OP_TYPE_LONGWORD, ovl);
- if (ret != -1)
- return target;
- }
+ PLATFORM_CHECK_READ(OP_TYPE_LONGWORD);
// if (address < 0xffffff) {
address &=0xFFFFFF;
// return 1;
}
-void m68k_write_memory_8(unsigned int address, unsigned int value) {
- if (cfg->platform->custom_write && cfg->platform->custom_write(cfg, address, value, OP_TYPE_BYTE) != -1) {
- return;
+#define PLATFORM_CHECK_WRITE(a) \
+ if (address >= cfg->custom_low && address < cfg->custom_high) { \
+ switch(cfg->platform->id) { \
+ case PLATFORM_AMIGA: { \
+ if (custom_write_amiga(cfg, address, value, a) != -1) { \
+ return; \
+ } \
+ break; \
+ } \
+ default: \
+ break; \
+ } \
+ } \
+ if (address >= cfg->mapped_low && address < cfg->mapped_high) { \
+ if (handle_mapped_write(cfg, address, value, a) != -1) \
+ return; \
}
- if (cfg) {
- int ret = handle_mapped_write(cfg, address, value, OP_TYPE_BYTE, ovl);
- if (ret != -1)
- return;
- }
+void m68k_write_memory_8(unsigned int address, unsigned int value) {
+ PLATFORM_CHECK_WRITE(OP_TYPE_BYTE);
if (address == 0xbfe001) {
- ovl = (value & (1 << 0));
- printf("OVL:%x\n", ovl);
+ if (ovl != (value & (1 << 0))) {
+ ovl = (value & (1 << 0));
+ printf("OVL:%x\n", ovl);
+ }
}
// if (address < 0xffffff) {
}
void m68k_write_memory_16(unsigned int address, unsigned int value) {
- if (cfg->platform->custom_write && cfg->platform->custom_write(cfg, address, value, OP_TYPE_WORD) != -1) {
- return;
- }
-
- if (cfg) {
- int ret = handle_mapped_write(cfg, address, value, OP_TYPE_WORD, ovl);
- if (ret != -1)
- return;
- }
+ PLATFORM_CHECK_WRITE(OP_TYPE_WORD);
// if (address < 0xffffff) {
address &=0xFFFFFF;
}
void m68k_write_memory_32(unsigned int address, unsigned int value) {
- if (cfg->platform->custom_write && cfg->platform->custom_write(cfg, address, value, OP_TYPE_LONGWORD) != -1) {
- return;
- }
-
- if (cfg) {
- int ret = handle_mapped_write(cfg, address, value, OP_TYPE_LONGWORD, ovl);
- if (ret != -1)
- return;
- }
+ PLATFORM_CHECK_WRITE(OP_TYPE_LONGWORD);
// if (address < 0xffffff) {
address &=0xFFFFFF;
// return;
}
-void write16(uint32_t address, uint32_t data) {
+inline void write16(uint32_t address, uint32_t data) {
uint32_t addr_h_s = (address & 0x0000ffff) << 8;
uint32_t addr_h_r = (~address & 0x0000ffff) << 8;
uint32_t addr_l_s = (address >> 16) << 8;
// asm volatile ("dmb" ::: "memory");
}
-void write8(uint32_t address, uint32_t data) {
+inline void write8(uint32_t address, uint32_t data) {
if ((address & 1) == 0)
data = data + (data << 8); // EVEN, A0=0,UDS
else
// asm volatile ("dmb" ::: "memory");
}
-uint32_t read16(uint32_t address) {
+inline uint32_t read16(uint32_t address) {
volatile int val;
uint32_t addr_h_s = (address & 0x0000ffff) << 8;
uint32_t addr_h_r = (~address & 0x0000ffff) << 8;
return (val >> 8) & 0xffff;
}
-uint32_t read8(uint32_t address) {
+inline uint32_t read8(uint32_t address) {
int val;
uint32_t addr_h_s = (address & 0x0000ffff) << 8;
uint32_t addr_h_r = (~address & 0x0000ffff) << 8;
void m68k_write_memory_16(unsigned int address, unsigned int value);
void m68k_write_memory_32(unsigned int address, unsigned int value);
+/* PiStorm speed hax */
+void m68k_add_ram_range(uint32_t addr, uint32_t upper, unsigned char *ptr);
+void m68k_add_rom_range(uint32_t addr, uint32_t upper, unsigned char *ptr);
+
/* Special call to simulate undocumented 68k behavior when move.l with a
* predecrement destination mode is executed.
* To simulate real 68k behavior, first write the high word to
extern void (*m68ki_instruction_jump_table[0x10000])(void); /* opcode handler jump table */
extern void m68ki_build_opcode_table(void);
+static unsigned char read_ranges;
+static unsigned int read_addr[8];
+static unsigned int read_upper[8];
+static unsigned char *read_data[8];
+static unsigned char write_ranges;
+static unsigned int write_addr[8];
+static unsigned int write_upper[8];
+static unsigned char *write_data[8];
+
#include "m68kops.h"
#include "m68kcpu.h"
if(src) m68ki_cpu = *(m68ki_cpu_core*)src;
}
+void m68k_add_ram_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
+{
+ if (read_ranges + 1 < 8) {
+ read_addr[read_ranges] = addr;
+ read_upper[read_ranges] = upper;
+ read_data[read_ranges] = ptr;
+ read_ranges++;
+ printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", read_ranges, addr, upper, ptr);
+ }
+ else {
+ printf("Can't Musashi map more than eight RAM/ROM read ranges.\n");
+ }
+ if (write_ranges + 1 < 8) {
+ write_addr[write_ranges] = addr;
+ write_upper[write_ranges] = upper;
+ write_data[write_ranges] = ptr;
+ write_ranges++;
+ printf("[MUSASHI] Mapped write range %d: %.8X-%.8X (%p)\n", write_ranges, addr, upper, ptr);
+ }
+ else {
+ printf("Can't Musashi map more than eight RAM write ranges.\n");
+ }
+}
+
+void m68k_add_rom_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
+{
+ if (read_ranges + 1 < 8) {
+ read_addr[read_ranges] = addr;
+ read_upper[read_ranges] = upper;
+ read_data[read_ranges] = ptr;
+ read_ranges++;
+ printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", read_ranges, addr, upper, ptr);
+ }
+ else {
+ printf("Can't Musashi map more than eight RAM/ROM read ranges.\n");
+ }
+}
+
/* ======================================================================== */
/* ============================== MAME STUFF ============================== */
/* ======================================================================== */
#include "m68k.h"
#include <limits.h>
+#include <endian.h>
#include <setjmp.h>
* These functions will also check for address error and set the function
* code if they are enabled in m68kconf.h.
*/
+
+static unsigned char read_ranges;
+static unsigned int read_addr[8];
+static unsigned int read_upper[8];
+static unsigned char *read_data[8];
+static unsigned char write_ranges;
+static unsigned int write_addr[8];
+static unsigned int write_upper[8];
+static unsigned char *write_data[8];
+
static inline uint m68ki_read_8_fc(uint address, uint fc)
{
(void)fc;
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < read_ranges; i++) {
+ if(address >= read_addr[i] && address < read_upper[i]) {
+ return read_data[i][address];
+ }
+ }
+
return m68k_read_memory_8(ADDRESS_68K(address));
}
static inline uint m68ki_read_16_fc(uint address, uint fc)
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < read_ranges; i++) {
+ if(address >= read_addr[i] && address < read_upper[i]) {
+ return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
+ }
+ }
+
return m68k_read_memory_16(ADDRESS_68K(address));
}
static inline uint m68ki_read_32_fc(uint address, uint fc)
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < read_ranges; i++) {
+ if(address >= read_addr[i] && address < read_upper[i]) {
+ return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
+ }
+ }
+
return m68k_read_memory_32(ADDRESS_68K(address));
}
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < write_ranges; i++) {
+ if(address >= write_addr[i] && address < write_upper[i]) {
+ write_data[i][address] = (unsigned char)value;
+ return;
+ }
+ }
+
m68k_write_memory_8(ADDRESS_68K(address), value);
}
static inline void m68ki_write_16_fc(uint address, uint fc, uint value)
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < write_ranges; i++) {
+ if(address >= write_addr[i] && address < write_upper[i]) {
+ ((short *)(write_data[i] + (address - write_addr[i])))[0] = htobe16(value);
+ return;
+ }
+ }
+
m68k_write_memory_16(ADDRESS_68K(address), value);
}
static inline void m68ki_write_32_fc(uint address, uint fc, uint value)
address = pmmu_translate_addr(address);
#endif
+ for (int i = 0; i < write_ranges; i++) {
+ if(address >= write_addr[i] && address < write_upper[i]) {
+ ((int *)(write_data[i] + (address - write_addr[i])))[0] = htobe32(value);
+ return;
+ }
+ }
+
m68k_write_memory_32(ADDRESS_68K(address), value);
}
#include <endian.h>
#define CHKRANGE(a, b, c) a >= (unsigned int)b && a < (unsigned int)(b + c)
+#define CHKRANGE_ABS(a, b, c) a >= (unsigned int)b && a < (unsigned int) c
static unsigned int target;
+extern int ovl;
extern const char *map_type_names[MAPTYPE_NUM];
const char *op_type_names[OP_TYPE_NUM] = {
"MEM",
};
-int handle_mapped_read(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type, unsigned char mirror) {
+inline int handle_mapped_read(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type) {
unsigned char *read_addr = NULL;
- char handle_regs = 0;
-
- //printf("Mapped read: %.8x\n", addr);
for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
if (cfg->map_type[i] == MAPTYPE_NONE)
continue;
- switch(cfg->map_type[i]) {
- case MAPTYPE_ROM:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- read_addr = cfg->map_data[i] + ((addr - cfg->map_offset[i]) % cfg->rom_size[i]);
- else if (cfg->map_mirror[i] != -1 && mirror && CHKRANGE(addr, cfg->map_mirror[i], cfg->map_size[i]))
- read_addr = cfg->map_data[i] + ((addr - cfg->map_mirror[i]) % cfg->rom_size[i]);
- break;
- case MAPTYPE_RAM:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- read_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
- break;
- case MAPTYPE_REGISTER:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- handle_regs = 1;
- break;
- }
-
- if (!read_addr && !handle_regs)
- continue;
-
- if (handle_regs) {
- if (cfg->platform && cfg->platform->register_read) {
- if (cfg->platform->register_read(addr, type, &target) != -1) {
- *val = target;
- return 1;
- }
+ else if (ovl && cfg->map_type[i] == MAPTYPE_ROM) {
+ if (cfg->map_mirror[i] != -1 && CHKRANGE(addr, cfg->map_mirror[i], cfg->map_size[i])) {
+ read_addr = cfg->map_data[i] + ((addr - cfg->map_mirror[i]) % cfg->rom_size[i]);
+ goto read_value;
}
- return -1;
}
- else if (read_addr) {
- //printf("[PC: %.8X] Read %s from %s (%.8X) (%d)\n", m68k_get_reg(NULL, M68K_REG_PC), op_type_names[type], map_type_names[cfg->map_type[i]], addr, mirror);
- //printf("Readaddr: %.8lX (Base %.8lX\n", (uint64_t)(read_addr), (uint64_t)cfg->map_data[i]);
- switch(type) {
- case OP_TYPE_BYTE:
- *val = read_addr[0];
- //printf("Read val: %.8lX (%d)\n", (uint64_t)val, *val);
- return 1;
- break;
- case OP_TYPE_WORD:
- *val = be16toh(((unsigned short *)read_addr)[0]);
- //printf("Read val: %.8lX (%d)\n", (uint64_t)val, *val);
- return 1;
+ if (CHKRANGE_ABS(addr, cfg->map_offset[i], cfg->map_high[i])) {
+ switch(cfg->map_type[i]) {
+ case MAPTYPE_ROM:
+ read_addr = cfg->map_data[i] + ((addr - cfg->map_offset[i]) % cfg->rom_size[i]);
+ goto read_value;
break;
- case OP_TYPE_LONGWORD:
- *val = be32toh(((unsigned int *)read_addr)[0]);
- //printf("Read val: %.8lX (%d)\n", (uint64_t)val, *val);
- return 1;
+ case MAPTYPE_RAM:
+ read_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
+ goto read_value;
break;
- case OP_TYPE_MEM:
+ case MAPTYPE_REGISTER:
+ if (cfg->platform && cfg->platform->register_read) {
+ if (cfg->platform->register_read(addr, type, &target) != -1) {
+ *val = target;
+ return 1;
+ }
+ }
return -1;
break;
}
}
return -1;
+
+read_value:;
+ //printf("Read value from %.8X\n", addr);
+ switch(type) {
+ case OP_TYPE_BYTE:
+ *val = read_addr[0];
+ return 1;
+ break;
+ case OP_TYPE_WORD:
+ *val = be16toh(((unsigned short *)read_addr)[0]);
+ return 1;
+ break;
+ case OP_TYPE_LONGWORD:
+ *val = be32toh(((unsigned int *)read_addr)[0]);
+ return 1;
+ break;
+ case OP_TYPE_MEM:
+ return -1;
+ break;
+ }
+
+ return 1;
}
-int handle_mapped_write(struct emulator_config *cfg, unsigned int addr, unsigned int value, unsigned char type, unsigned char mirror) {
+inline int handle_mapped_write(struct emulator_config *cfg, unsigned int addr, unsigned int value, unsigned char type) {
unsigned char *write_addr = NULL;
- char handle_regs = 0;
-
- //printf("Mapped write: %.8x\n", addr);
- if (mirror) { }
for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
if (cfg->map_type[i] == MAPTYPE_NONE)
continue;
- switch(cfg->map_type[i]) {
- case MAPTYPE_ROM:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- return 1;
- break;
- case MAPTYPE_RAM:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- write_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
- break;
- case MAPTYPE_REGISTER:
- if (CHKRANGE(addr, cfg->map_offset[i], cfg->map_size[i]))
- handle_regs = 1;
- break;
- }
-
- if (!write_addr && !handle_regs)
- continue;
-
- if (handle_regs) {
- if (cfg->platform && cfg->platform->register_write) {
- return cfg->platform->register_write(addr, value, type);
- }
- }
- else if (write_addr) {
- //printf("[PC: %.8X] Write %s to %s (%.8X) (%d)\n", m68k_get_reg(NULL, M68K_REG_PC), op_type_names[type], map_type_names[cfg->map_type[i]], addr, mirror);
- //printf("Writeaddr: %.8lX (Base %.8lX\n", (uint64_t)(write_addr), (uint64_t)cfg->map_data[i]);
- switch(type) {
- case OP_TYPE_BYTE:
- write_addr[0] = (unsigned char)value;
- //printf("Write val: %.8X (%d)\n", (uint32_t)value, value);
+ else if (CHKRANGE_ABS(addr, cfg->map_offset[i], cfg->map_high[i])) {
+ switch(cfg->map_type[i]) {
+ case MAPTYPE_ROM:
return 1;
break;
- case OP_TYPE_WORD:
- ((short *)write_addr)[0] = htobe16(value);
- //printf("Write val: %.8X (%d)\n", (uint32_t)value, value);
- return 1;
- break;
- case OP_TYPE_LONGWORD:
- ((int *)write_addr)[0] = htobe32(value);
- //printf("Write val: %.8X (%d)\n", (uint32_t)value, value);
- return 1;
+ case MAPTYPE_RAM:
+ write_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
+ goto write_value;
break;
- case OP_TYPE_MEM:
- return -1;
+ case MAPTYPE_REGISTER:
+ if (cfg->platform && cfg->platform->register_write) {
+ return cfg->platform->register_write(addr, value, type);
+ }
break;
}
}
}
return -1;
+
+write_value:;
+ //printf("Write value to %.8X\n", addr);
+ switch(type) {
+ case OP_TYPE_BYTE:
+ write_addr[0] = (unsigned char)value;
+ return 1;
+ break;
+ case OP_TYPE_WORD:
+ ((short *)write_addr)[0] = htobe16(value);
+ return 1;
+ break;
+ case OP_TYPE_LONGWORD:
+ ((int *)write_addr)[0] = htobe32(value);
+ return 1;
+ break;
+ case OP_TYPE_MEM:
+ return -1;
+ break;
+ }
+
+ return 1;
}
return AC_MEM_SIZE_EXT_64MB;
}
+extern void adjust_ranges_amiga(struct emulator_config *cfg);
+
unsigned int autoconfig_read_memory_z3_8(struct emulator_config *cfg, unsigned int address_) {
int address = address_ - AC_Z3_BASE;
int index = ac_z3_index[ac_z3_current_pic];
if (done) {
nib_latch = 0;
- printf("Address of Z3 autoconf RAM assigned to $%.8x\n", ac_base[ac_z3_current_pic]);
+ printf("Address of Z3 autoconf RAM assigned to $%.8x [B]\n", ac_base[ac_z3_current_pic]);
cfg->map_offset[index] = ac_base[ac_z3_current_pic];
+ cfg->map_high[index] = cfg->map_offset[index] + cfg->map_size[index];
+ m68k_add_ram_range(cfg->map_offset[index], cfg->map_high[index], cfg->map_data[index]);
ac_z3_current_pic++;
- if (ac_z3_current_pic == ac_z3_pic_count)
+ if (ac_z3_current_pic == ac_z3_pic_count) {
ac_z3_done = 1;
+ adjust_ranges_amiga(cfg);
+ }
}
return;
switch(address & 0xFF) {
case AC_Z3_REG_WR_ADDR_HI:
- // This is, as far as I know, the only regiter it should write a 16-bit value to.
+ // This is, as far as I know, the only register it should write a 16-bit value to.
ac_base[ac_z3_current_pic] = (ac_base[ac_z3_current_pic] & 0x00000000) | (val << 16);
done = 1;
break;
}
if (done) {
- printf("Address of Z3 autoconf RAM assigned to $%.8x\n", ac_base[ac_z3_current_pic]);
+ printf("Address of Z3 autoconf RAM assigned to $%.8x [W]\n", ac_base[ac_z3_current_pic]);
cfg->map_offset[index] = ac_base[ac_z3_current_pic];
+ cfg->map_high[index] = cfg->map_offset[index] + cfg->map_size[index];
+ m68k_add_ram_range(cfg->map_offset[index], cfg->map_high[index], cfg->map_data[index]);
ac_z3_current_pic++;
if (ac_z3_current_pic == ac_z3_pic_count)
ac_z3_done = 1;
void autoconfig_write_memory_8(struct emulator_config *cfg, unsigned int address_, unsigned int value) {
int address = address_ - AC_Z2_BASE;
int done = 0;
+ int index = ac_z2_index[ac_z2_current_pic];
unsigned int *base = NULL;
if (done) {
printf("Address of Z2 autoconf RAM assigned to $%.8x\n", ac_base[ac_z2_current_pic]);
- cfg->map_offset[ac_z2_index[ac_z2_current_pic]] = ac_base[ac_z2_current_pic];
+ cfg->map_offset[index] = ac_base[ac_z2_current_pic];
+ cfg->map_high[index] = cfg->map_offset[index] + cfg->map_size[index];
+ m68k_add_ram_range(cfg->map_offset[index], cfg->map_high[index], cfg->map_data[index]);
+ printf("Z2 PIC %d at $%.8lX-%.8lX, Size: %d MB\n", ac_z2_current_pic, cfg->map_offset[index], cfg->map_high[index], cfg->map_size[index] / SIZE_MEGA);
ac_z2_current_pic++;
- if (ac_z2_current_pic == ac_z2_pic_count)
+ if (ac_z2_current_pic == ac_z2_pic_count) {
ac_z2_done = 1;
+ adjust_ranges_amiga(cfg);
+ }
}
}
extern int ac_z3_done;
extern int ac_z3_type[AC_PIC_LIMIT];
extern int ac_z3_index[AC_PIC_LIMIT];
+extern int gayle_emulation_enabled;
char *z2_autoconf_id = "z2_autoconf_fast";
char *z2_autoconf_zap_id = "^2_autoconf_fast";
extern const char *op_type_names[OP_TYPE_NUM];
-int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type) {
+#define min(a, b) (a < b) ? a : b
+#define max(a, b) (a > b) ? a : b
+
+inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type) {
if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
if (ac_z2_pic_count == 0) {
ac_z2_done = 1;
return -1;
}
-int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type) {
+inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type) {
if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
if (type == OP_TYPE_BYTE) {
if (ac_z2_pic_count == 0) {
return -1;
}
- printf("Write to Z2 autoconf area.\n");
+ //printf("Write to Z2 autoconf area.\n");
autoconfig_write_memory_8(cfg, addr, val);
return 1;
}
return -1;
}
+void adjust_ranges_amiga(struct emulator_config *cfg) {
+ cfg->mapped_high = 0;
+ cfg->mapped_low = 0;
+ cfg->custom_high = 0;
+ cfg->custom_low = 0;
+
+ // Set up the min/max ranges for mapped reads/writes
+ if (gayle_emulation_enabled) {
+ cfg->mapped_low = GAYLEBASE;
+ cfg->mapped_high = GAYLEBASE + GAYLESIZE;
+ }
+ for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
+ if (cfg->map_type[i] != MAPTYPE_NONE) {
+ if ((cfg->map_offset[i] != 0 && cfg->map_offset[i] < cfg->mapped_low) || cfg->mapped_low == 0)
+ cfg->mapped_low = cfg->map_offset[i];
+ if (cfg->map_offset[i] + cfg->map_size[i] > cfg->mapped_high)
+ cfg->mapped_high = cfg->map_offset[i] + cfg->map_size[i];
+ }
+ }
+
+ if (ac_z2_pic_count && !ac_z2_done) {
+ if (cfg->custom_low == 0)
+ cfg->custom_low = AC_Z2_BASE;
+ else
+ cfg->custom_low = min(cfg->custom_low, AC_Z2_BASE);
+ cfg->custom_high = max(cfg->custom_high, AC_Z2_BASE + AC_SIZE);
+ }
+ if (ac_z3_pic_count && !ac_z3_done) {
+ if (cfg->custom_low == 0)
+ cfg->custom_low = AC_Z3_BASE;
+ else
+ cfg->custom_low = min(cfg->custom_low, AC_Z3_BASE);
+ cfg->custom_high = max(cfg->custom_high, AC_Z3_BASE + AC_SIZE);
+ }
+
+ printf("Platform custom range: %.8X-%.8X\n", cfg->custom_low, cfg->custom_high);
+ printf("Platform mapped range: %.8X-%.8X\n", cfg->mapped_low, cfg->mapped_high);
+}
+
int setup_platform_amiga(struct emulator_config *cfg) {
- if (cfg) {}
printf("Performing setup for Amiga platform.\n");
// Look for Z2 autoconf Fast RAM by id
int index = get_named_mapped_item(cfg, z2_autoconf_id);
index = get_named_mapped_item(cfg, z3_autoconf_id);
if (index != -1)
goto more_z3_fast;
- for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i ++) {
+ for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
if (cfg->map_id[i] && strcmp(cfg->map_id[i], z3_autoconf_zap_id) == 0) {
cfg->map_id[i][0] = z3_autoconf_id[0];
}
}
+
+ index = get_named_mapped_item(cfg, "cpu_slot_ram");
+ if (index != -1) {
+ m68k_add_ram_range((uint32_t)cfg->map_offset[index], (uint32_t)cfg->map_high[index], cfg->map_data[index]);
+ }
+
+ adjust_ranges_amiga(cfg);
return 0;
}
}
}
+void handle_reset_amiga(struct emulator_config *cfg) {
+ ac_z3_done = 0;
+ ac_z2_done = 0;
+
+ adjust_ranges_amiga(cfg);
+}
+
void create_platform_amiga(struct platform_config *cfg, char *subsys) {
cfg->register_read = handle_register_read_amiga;
cfg->register_write = handle_register_write_amiga;
cfg->custom_read = custom_read_amiga;
cfg->custom_write = custom_write_amiga;
cfg->platform_initial_setup = setup_platform_amiga;
+ cfg->handle_reset = handle_reset_amiga;
cfg->setvar = setvar_amiga;
+ cfg->id = PLATFORM_AMIGA;
if (subsys) {
cfg->subsys = malloc(strlen(subsys) + 1);
#include "../../Gayle.h"
#include "../../config_file/config_file.h"
-
-#define GAYLEBASE 0xD80000 // D7FFFF
-#define GAYLESIZE 0x6FFFF
-
-#define CLOCKBASE 0xDC0000
-#define CLOCKSIZE 0x010000
+#include "amiga-registers.h"
uint8_t rtc_emulation_enabled = 1;
+extern int gayle_emulation_enabled;
void configure_rtc_emulation_amiga(uint8_t enabled) {
if (enabled == rtc_emulation_enabled)
}
int handle_register_read_amiga(unsigned int addr, unsigned char type, unsigned int *val) {
- if (!rtc_emulation_enabled && addr >= CLOCKBASE && addr < CLOCKBASE + CLOCKSIZE)
- return -1;
- if (addr >= GAYLEBASE && addr < GAYLEBASE + GAYLESIZE) {
- switch(type) {
- case OP_TYPE_BYTE:
- *val = readGayleB(addr);
- return 1;
- break;
- case OP_TYPE_WORD:
- *val = readGayle(addr);
- return 1;
- break;
- case OP_TYPE_LONGWORD:
- *val = readGayleL(addr);
- return 1;
- break;
- case OP_TYPE_MEM:
+ if (gayle_emulation_enabled) {
+ if (!rtc_emulation_enabled && addr >= CLOCKBASE && addr < CLOCKBASE + CLOCKSIZE)
return -1;
- break;
+ if (addr >= GAYLEBASE && addr < GAYLEBASE + GAYLESIZE) {
+ switch(type) {
+ case OP_TYPE_BYTE:
+ *val = readGayleB(addr);
+ return 1;
+ break;
+ case OP_TYPE_WORD:
+ *val = readGayle(addr);
+ return 1;
+ break;
+ case OP_TYPE_LONGWORD:
+ *val = readGayleL(addr);
+ return 1;
+ break;
+ case OP_TYPE_MEM:
+ return -1;
+ break;
+ }
}
}
return -1;
}
int handle_register_write_amiga(unsigned int addr, unsigned int value, unsigned char type) {
- if (!rtc_emulation_enabled && addr >= CLOCKBASE && addr < CLOCKBASE + CLOCKSIZE)
- return -1;
- if (addr >= GAYLEBASE && addr < GAYLEBASE + GAYLESIZE) {
- switch(type) {
- case OP_TYPE_BYTE:
- writeGayleB(addr, value);
- return 1;
- break;
- case OP_TYPE_WORD:
- writeGayle(addr, value);
- return 1;
- break;
- case OP_TYPE_LONGWORD:
- writeGayleL(addr, value);
- return 1;
- break;
- case OP_TYPE_MEM:
+ if (gayle_emulation_enabled) {
+ if (!rtc_emulation_enabled && addr >= CLOCKBASE && addr < CLOCKBASE + CLOCKSIZE)
return -1;
- break;
+ if (addr >= GAYLEBASE && addr < GAYLEBASE + GAYLESIZE) {
+ switch(type) {
+ case OP_TYPE_BYTE:
+ writeGayleB(addr, value);
+ return 1;
+ break;
+ case OP_TYPE_WORD:
+ writeGayle(addr, value);
+ return 1;
+ break;
+ case OP_TYPE_LONGWORD:
+ writeGayleL(addr, value);
+ return 1;
+ break;
+ case OP_TYPE_MEM:
+ return -1;
+ break;
+ }
}
}
return -1;
void configure_rtc_emulation_amiga(uint8_t enabled);
void set_hard_drive_image_file_amiga(uint8_t index, char *filename);
+int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type);
+int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type);
+
+#define GAYLEBASE 0xD80000
+#define GAYLESIZE 0x070000
+#define GAYLEMASK 0xDF0000
+
+#define CLOCKBASE 0xDC0000
+#define CLOCKSIZE 0x010000
+#define CLOCKMASK 0x00FFFF
--- /dev/null
+#include <time.h>
+#include <stdio.h>
+#include <stdint.h>
+#include "rtc.h"
+
+static unsigned char rtc_mystery_reg[3];
+unsigned char ricoh_memory[0x0F];
+unsigned char ricoh_alarm[0x0F];
+
+void put_rtc_byte(uint32_t address_, uint8_t value, uint8_t rtc_type) {
+ uint32_t address = address_ & 0x3F;
+ address >>= 2;
+ if (rtc_type == RTC_TYPE_MSM) {
+ switch(address) {
+ case 0x0D:
+ rtc_mystery_reg[address - 0x0D] = value & (0x01 | 0x08);
+ break;
+ case 0x0E:
+ case 0x0F:
+ rtc_mystery_reg[address - 0x0D] = value;
+ break;
+ default:
+ return;
+ }
+ }
+ else {
+ int rtc_bank = (rtc_mystery_reg[0] & 0x03);
+ if ((rtc_bank & 0x02) && address < 0x0D) {
+ if (rtc_bank & 0x01) {
+ // Low nibble of value -> high nibble in RTC memory
+ ricoh_memory[address] &= 0x0F;
+ ricoh_memory[address] |= ((value & 0x0F) << 4);
+ }
+ else {
+ // Low nibble of value -> low nibble in RTC memory
+ ricoh_memory[address] &= 0xF0;
+ ricoh_memory[address] |= (value & 0x0F);
+ }
+ return;
+ }
+ else if ((rtc_bank & 0x01) && address < 0x0D) {
+ // RTC alarm stuff, no idea what this is supposed to be for.
+ switch(address) {
+ case 0x00:
+ case 0x01:
+ case 0x09:
+ case 0x0C:
+ ricoh_alarm[address] = 0;
+ break;
+ case 0x03:
+ case 0x06:
+ ricoh_alarm[address] &= (value & (0x08 ^ 0xFF));
+ break;
+ case 0x05:
+ case 0x08:
+ case 0x0B:
+ ricoh_alarm[address] = (value & (0x0C ^ 0xFF));
+ break;
+ case 0x0A:
+ ricoh_alarm[address] = (value & (0x0E ^ 0xFF));
+ break;
+ default:
+ ricoh_alarm[address] = value;
+ break;
+ }
+ //printf("Write to Ricoh alarm @%.2X: %.2X -> %.2X\n", address, value, ricoh_alarm[address]);
+ return;
+ }
+ else if (address >= 0x0D) {
+ rtc_mystery_reg[address - 0x0D] = value;
+ return;
+ }
+ }
+}
+
+uint8_t get_rtc_byte(uint32_t address_, uint8_t rtc_type) {
+ uint32_t address = address_ & 0x3F;
+ address >>= 2;
+ time_t t;
+ time(&t);
+ struct tm *rtc_time = localtime(&t);
+
+ if (rtc_type == RTC_TYPE_RICOH) {
+ int rtc_bank = (rtc_mystery_reg[0] & 0x03);
+ if ((rtc_bank & 0x02) && address < 0x0D) {
+ // Get low/high nibble from memory (bank 2/3)
+ return ((ricoh_memory[address] >> (rtc_bank & 0x01) ? 4 : 0) & 0x0F);
+ }
+ else if ((rtc_bank & 0x01) && address < 0x0D) {
+ // Get byte from alarm
+ return ricoh_alarm[address];
+ }
+ }
+
+ switch (address) {
+ case 0x00: // Seconds low?
+ return rtc_time->tm_sec % 10;
+ case 0x01: // Seconds high?
+ return rtc_time->tm_sec / 10;
+ case 0x02: // Minutes low?
+ return rtc_time->tm_min % 10;
+ case 0x03: // Minutes high?
+ return rtc_time->tm_min / 10;
+ case 0x04: // Hours low?
+ return rtc_time->tm_hour % 10;
+ case 0x05: // Hours high?
+ if (rtc_type == RTC_TYPE_MSM) {
+ if (rtc_mystery_reg[2] & 4) {
+ return (((rtc_time->tm_hour % 12) / 10) | (rtc_time->tm_hour >= 12) ? 0x04 : 0x00);
+ }
+ else
+ return rtc_time->tm_hour / 10;
+ }
+ else {
+ if (ricoh_alarm[10] & 0x01) {
+ return rtc_time->tm_hour / 10;
+ }
+ else {
+ return (((rtc_time->tm_hour % 12) / 10) | (rtc_time->tm_hour >= 12) ? 0x02 : 0x00);
+ }
+ break;
+ }
+ case 0x06: // Day low?
+ if (rtc_type == RTC_TYPE_MSM)
+ return rtc_time->tm_mday % 10;
+ else
+ return rtc_time->tm_wday;
+ case 0x07: // Day high?
+ if (rtc_type == RTC_TYPE_MSM)
+ return rtc_time->tm_mday / 10;
+ else
+ return rtc_time->tm_mday % 10;
+ case 0x08: // Month low?
+ if (rtc_type == RTC_TYPE_MSM)
+ return (rtc_time->tm_mon + 1) % 10;
+ else
+ return rtc_time->tm_mday / 10;
+ case 0x09: // Month high?
+ if (rtc_type == RTC_TYPE_MSM)
+ return (rtc_time->tm_mon + 1) / 10;
+ else
+ return (rtc_time->tm_mon + 1) % 10;
+ case 0x0A: // Year low?
+ if (rtc_type == RTC_TYPE_MSM)
+ return rtc_time->tm_year % 10;
+ else
+ return (rtc_time->tm_mon + 1) / 10;
+ case 0x0B: // Year high?
+ if (rtc_type == RTC_TYPE_MSM)
+ return rtc_time->tm_year / 10;
+ else
+ return rtc_time->tm_year % 10;
+ case 0x0C: // Day of week?
+ if (rtc_type == RTC_TYPE_MSM)
+ return rtc_time->tm_wday;
+ else
+ return rtc_time->tm_year / 10;
+ case 0x0D: // Mystery register D-F?
+ case 0x0E:
+ case 0x0F:
+ if (rtc_type == RTC_TYPE_MSM) {
+ return rtc_mystery_reg[address - 0x0D];
+ }
+ else {
+ if (address == 0x0D) return rtc_mystery_reg[address - 0x0D];
+ return 0;
+ }
+ default:
+ break;
+ }
+
+ return 0x00;
+}
--- /dev/null
+void put_rtc_byte(uint32_t address_, uint8_t value, uint8_t rtc_type);
+uint8_t get_rtc_byte(uint32_t address_, uint8_t rtc_type);
+
+enum rtc_types {
+ RTC_TYPE_MSM,
+ RTC_TYPE_RICOH,
+ RTC_TYPE_NONE,
+};
\ No newline at end of file
projects / pistorm / commitdiff