Z80: Update all builds to 8 comparators and 16KB code

Change-Id: I8adc986caab323de395301ba397f4c7874e50d49

firmware/AtomBusMon.c

@@ -53,9 +53,7 @@ char *cmdStrings[] = {
 #endif
   "test",
   "srec",
-#if !defined(CPU_Z80)
   "special",
-#endif
 #endif
   "reset",
   "trace",
@@ -96,9 +94,7 @@ void (*cmdFuncs[])(char *params) = {
 #endif
   doCmdTest,
   doCmdSRec,
-#if !defined(CPU_Z80)
   doCmdSpecial,
-#endif
 #endif
   doCmdReset,
   doCmdTrace,
@@ -282,12 +278,7 @@ void (*cmdFuncs[])(char *params) = {
  * Watch/Breakpoint Definitions
  ********************************************************/
 
-// The space available for address comparators depends on the size of the CPU core
-#if defined(CPU_Z80)
-#define MAXBKPTS 4
-#else
 #define MAXBKPTS 8
-#endif
 
 // The current number of watches/breakpoints
 int numbkpts = 0;
@@ -1174,7 +1165,6 @@ void doCmdSRec(char *params) {
 
 }
 
-#if !defined(CPU_Z80)
 void logSpecial(char *function, int value) {
    log0("%s", function);
    if (value) {
@@ -1188,13 +1178,11 @@ void doCmdSpecial(char *params) {
    int special = -1;
    sscanf(params, "%x", &special);
    if (special >= 0 && special <= 3) {
-      CTRL_PORT &= ~SPECIAL_MASK;
       CTRL_PORT = (CTRL_PORT & ~SPECIAL_MASK) | (special << SPECIAL_0);
    }
    logSpecial("NMI", CTRL_PORT & (1 << SPECIAL_1));
    logSpecial("IRQ", CTRL_PORT & (1 << SPECIAL_0));
 }
-#endif
 
 #endif // CPU_EMBEDDED
 

src/Z80CpuMon.vhd

@@ -29,8 +29,8 @@ entity Z80CpuMon is
        ClkMult           : integer := 10;       -- default value correct for GODIL
        ClkDiv            : integer := 31;       -- default value correct for GODIL
        ClkPer            : real    := 20.345;   -- default value correct for GODIL
-       num_comparators   : integer := 4;        -- default value correct for GODIL
-       avr_prog_mem_size : integer :=  1024 * 9 -- default value correct for GODIL
+       num_comparators   : integer := 8;        -- default value correct for GODIL
+       avr_prog_mem_size : integer := 1024 * 16 -- default value correct for GODIL
        );
     port (
         clock49         : in    std_logic;

src/Z80CpuMonALS.vhd

@@ -130,7 +130,7 @@ begin
             ClkMult           => 8,
             ClkDiv            => 25,
             ClkPer            => 20.000,
-            num_comparators   => 4,
+            num_comparators   => 8,
             avr_prog_mem_size => 1024 * 16
             )
       port map (

target/godil_500/icez80/memory.bmm

@@ -1,6 +1,6 @@
 ADDRESS_MAP avrmap PPC405 0
 
-    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x000047ff]
+    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x00007fff]
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[0].Ram [15:0];
         END_BUS_BLOCK;
@@ -36,7 +36,35 @@ ADDRESS_MAP avrmap PPC405 0
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[8].Ram [15:0];
         END_BUS_BLOCK;
-		  		  
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[9].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[10].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[11].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[12].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[13].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[14].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[15].Ram [15:0];
+        END_BUS_BLOCK;
+
     END_ADDRESS_SPACE;
 
 END_ADDRESS_MAP;

target/lx9_jason/icez80/memory.bmm

@@ -1,6 +1,6 @@
 ADDRESS_MAP avrmap PPC405 0
 
-    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x000047ff]
+    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x00007fff]
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[0].Ram [15:0];
         END_BUS_BLOCK;
@@ -36,7 +36,35 @@ ADDRESS_MAP avrmap PPC405 0
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[8].Ram [15:0];
         END_BUS_BLOCK;
-		  		  
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[9].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[10].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[11].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[12].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[13].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[14].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[15].Ram [15:0];
+        END_BUS_BLOCK;
+
     END_ADDRESS_SPACE;
 
 END_ADDRESS_MAP;

target/lx9_jason_flipped/icez80/memory.bmm

@@ -1,6 +1,6 @@
 ADDRESS_MAP avrmap PPC405 0
 
-    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x000047ff]
+    ADDRESS_SPACE rom_code RAMB16 [0x00000000:0x00007fff]
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[0].Ram [15:0];
         END_BUS_BLOCK;
@@ -36,7 +36,35 @@ ADDRESS_MAP avrmap PPC405 0
         BUS_BLOCK
 	    mon/Inst_AVR8/PM_Inst/RAM_Inst[8].Ram [15:0];
         END_BUS_BLOCK;
-		  		  
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[9].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[10].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[11].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[12].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[13].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[14].Ram [15:0];
+        END_BUS_BLOCK;
+
+        BUS_BLOCK
+	    mon/Inst_AVR8/PM_Inst/RAM_Inst[15].Ram [15:0];
+        END_BUS_BLOCK;
+
     END_ADDRESS_SPACE;
 
 END_ADDRESS_MAP;