X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=memory_mapped.c;h=0b5b358804bc0ccda644135b91f9884afffb49a7;hb=HEAD;hp=26a2161c91e7c1e01fdf931cf48f397dd7db2c8f;hpb=37bb73e0c6425365607b7ea60b3384417d370b92;p=pistorm

diff --git a/memory_mapped.c b/memory_mapped.c
index 26a2161..0b5b358 100644
--- a/memory_mapped.c
+++ b/memory_mapped.c
@@ -1,10 +1,15 @@
+// SPDX-License-Identifier: MIT
+
 #include "config_file/config_file.h"
-#include "Gayle.h"
+#include "m68k.h"
+#include "platforms/amiga/Gayle.h"
 #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] = {
@@ -14,62 +19,37 @@ 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]);
-        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]);
-        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 (handle_register_read(addr, type, &target) != -1) {
-        *val = target;
-        return 1;
+    else if (ovl && (cfg->map_type[i] == MAPTYPE_ROM || cfg->map_type[i] == MAPTYPE_RAM_WTC)) {
+      if (cfg->map_mirror[i] != ((unsigned int)-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("Read %s from %s (%.8X) (%d)\n", 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;
+    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_WORD:
-          *val = be16toh(((unsigned short *)read_addr)[0]);
-          //printf("Read val: %.8lX (%d)\n", (uint64_t)val, *val);
-          return 1;
-          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:
+        case MAPTYPE_RAM_WTC:
+        case MAPTYPE_RAM_NOALLOC:
+          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;
       }
@@ -77,65 +57,90 @@ int handle_mapped_read(struct emulator_config *cfg, unsigned int addr, unsigned
   }
 
   return -1;
+
+read_value:;
+  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) {
+  int res = -1;
   unsigned char *write_addr = NULL;
-  char handle_regs = 0;
-
-  //printf("Mapped write: %.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 (cfg->map_mirror[i] != -1 && mirror && CHKRANGE(addr, cfg->map_mirror[i], cfg->map_size[i]))
-          return -1;
-        else 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) {
-      return handle_register_write(addr, value, type);
+    else if (ovl && cfg->map_type[i] == MAPTYPE_RAM_WTC) {
+      if (cfg->map_mirror[i] != ((unsigned int)-1) && CHKRANGE(addr, cfg->map_mirror[i], cfg->map_size[i])) {
+        write_addr = cfg->map_data[i] + ((addr - cfg->map_mirror[i]) % cfg->rom_size[i]);
+        res = -1;
+        goto write_value;
+      }
     }
-    else if (write_addr) {
-      //printf("Write %s to %s (%.8X) (%d)\n", 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;
+        case MAPTYPE_RAM:
+        case MAPTYPE_RAM_NOALLOC:
+          write_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
+          res = 1;
+          goto write_value;
           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_WTC:
+          //printf("Some write to WTC RAM.\n");
+          write_addr = cfg->map_data[i] + (addr - cfg->map_offset[i]);
+          res = -1;
+          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;
+  return res;
+
+write_value:;
+  switch(type) {
+    case OP_TYPE_BYTE:
+      write_addr[0] = (unsigned char)value;
+      return res;
+      break;
+    case OP_TYPE_WORD:
+      ((short *)write_addr)[0] = htobe16(value);
+      return res;
+      break;
+    case OP_TYPE_LONGWORD:
+      ((int *)write_addr)[0] = htobe32(value);
+      return res;
+      break;
+    case OP_TYPE_MEM:
+      return -1;
+      break;
+  }
+
+  // This should never actually happen.
+  return res;
 }