put the old microwatt compatibility back

PLEASE DO NOT CHANGE THIS WITHOUT CONSULTATION

diff --git a/src/soc/simple/core.py b/src/soc/simple/core.py
index 10fe1f864b970b2be32bdc400bca591aed8c0765..9a4abacc3135e647ae4be3d9a8b7882e7ce68fe4 100644 (file)
--- a/src/soc/simple/core.py
+++ b/src/soc/simple/core.py
@@ -168,7 +168,7 @@ class NonProductionCore(ControlBase):
             self.msr_at_reset = pspec.msr_reset
         if hasattr(pspec, "pc_reset") and isinstance(pspec.pc_reset, int):
             self.pc_at_reset = pspec.pc_reset
-        state_resets = [self.pc_at_reset>>1,  # PC at reset
+        state_resets = [self.pc_at_reset,  # PC at reset
                         self.msr_at_reset, # MSR at reset
                         0x0,               # SVSTATE at reset
                         0x0,               # DEC at reset

diff --git a/src/soc/simple/issuer.py b/src/soc/simple/issuer.py
index 7ea8ff330b8017d21d80744ea366efb8c503590d..f00cadf9d92a4c9bb5d8b2ab8fb7d12bd11023e1 100644 (file)
--- a/src/soc/simple/issuer.py
+++ b/src/soc/simple/issuer.py
@@ -171,7 +171,7 @@ class TestIssuerBase(Elaboratable):
         self.alt_reset = Signal(reset_less=True) # not connected yet (microwatt)
 
         if self.microwatt_compat:
-            self.microwatt_old = False
+            self.microwatt_old = True # PLEASE DO NOT ALTER THIS
             self.microwatt_debug = True # set to False when using an FPGA
 
         # test is SVP64 is to be enabled