Enabled SXT and SOB in the PDP2011 core; added to standard build; tes…

…ted MCS file Change-Id: Id3ecc60eac27b873dcbe9c50079f387406ed16fd
hoglet67 · Aug 11, 2015 · c7284cb · c7284cb
1 parent a093cee
commit c7284cb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/gen_mcs.sh b/gen_mcs.sh
@@ -9,12 +9,12 @@
 # design 0010      - 0x0fc000 - working/LX9CoPro6809.bit
 # design 0011      - 0x150000 - working/LX9CoPro80186.bit
 # design 0100      - 0x1a4000 - working/LX9Co_BIST.bit
-# design 1000      - 0x1f8000 - working/LX9CoPro6502fast.bit (32/16/8/4MHz)
-# design 1001      - 0x24c000 - working/LX9CoProZ80fast.bit(36/24/12/8Mhz)
-# design 1010      - 0x2a0000 - spare
-# design 1011      - 0x2f4000 - spare
-# design 1011      - 0x348000 - spare
-# design xxxx      - 0x39c000 - spare
+# design 10xx      - 0x1f8000 - working/LX9CoPro6502fast.bit (32/16/8/4MHz)
+# design 11xx      - 0x24c000 - working/LX9CoProZ80fast.bit(36/24/12/8Mhz)
+# design 0111      - 0x2a0000 - working/LX9CoProPDP11.bit
+# design 0110      - 0x2f4000 - spare
+# design 0101      - 0x348000 - spare
+# design ????      - 0x39c000 - spare
 
 NAME=multiboot/LX9CoProCombined_$(date +"%Y%m%d_%H%M")_$USER
 
@@ -29,6 +29,7 @@ promgen                                 \
 -u 1A4000 working/LX9Co_BIST.bit        \
 -u 1F8000 working/LX9CoPro6502fast.bit  \
 -u 24C000 working/LX9CoProZ80fast.bit   \
+-u 2A0000 working/LX9CoProPDP11.bit   \
 -o $NAME.mcs  -p mcs -w -spi -s 8192
 
 rm -f $NAME.cfi $NAME.prm

diff --git a/ise_build_all.tcl b/ise_build_all.tcl
@@ -23,5 +23,8 @@ project close
 project open LX9Co-z80fast.xise
 process run "Generate Programming File"
 project close
+project open LX9Co-PDP11.xise
+process run "Generate Programming File"
+project close
 exit
 
diff --git a/ise_clean_all.tcl b/ise_clean_all.tcl
@@ -23,4 +23,7 @@ project close
 project open LX9Co-z80fast.xise
 project clean
 project close
+project open LX9Co-PDP11.xise
+project clean
+project close
 exit
diff --git a/src/ICAP_reboot.v b/src/ICAP_reboot.v
@@ -147,6 +147,7 @@ always @(MBT_REBOOT or state or sw)
                     4'b0010: icap_din    = 16'hC000;
                     4'b0011: icap_din    = 16'h0000;
                     4'b0100: icap_din    = 16'h4000;
+                    4'b0111: icap_din    = 16'h0000;
                     4'b1000: icap_din    = 16'h8000;
                     4'b1001: icap_din    = 16'h8000;
                     4'b1010: icap_din    = 16'h8000;
@@ -181,6 +182,7 @@ always @(MBT_REBOOT or state or sw)
                     4'b0010: icap_din    = 16'h030f;
                     4'b0011: icap_din    = 16'h0315;
                     4'b0100: icap_din    = 16'h031a;
+                    4'b0111: icap_din    = 16'h032a;
                     4'b1000: icap_din    = 16'h031f;
                     4'b1001: icap_din    = 16'h031f;
                     4'b1010: icap_din    = 16'h031f;

diff --git a/src/PDP2011/cpu.vhd b/src/PDP2011/cpu.vhd
@@ -797,6 +797,7 @@ begin
       1 when 3,
       1 when 23 | 24,                  -- kdf11
       1 when 34,
+      1 when 35 | 40,
       1 when 44,
       1 when 45 | 50 | 55,
       1 when 60,
@@ -808,6 +809,7 @@ begin
       1 when 3,
       1 when 23 | 24,                  -- kdf11
       1 when 34,
+      1 when 35 | 40,
       1 when 44,
       1 when 45 | 50 | 55,
       1 when 60,