bring MMU exception out where AllFunctionUnits (and then core)

can get at it

diff --git a/src/soc/fu/compunits/compunits.py b/src/soc/fu/compunits/compunits.py
index ee9f49817ddcd7826a8322754b29e142ece74070..4077451cc6cc793635b98131417b3826bea2aad7 100644 (file)
--- a/src/soc/fu/compunits/compunits.py
+++ b/src/soc/fu/compunits/compunits.py
@@ -242,6 +242,7 @@ class MMUFSMFunctionUnit(FunctionUnitBaseSingle):
 
     def __init__(self, idx, parent_pspec):
         super().__init__(MMUPipeSpec, FSMMMUStage, idx, parent_pspec)
+        self.exc_o = self.alu.exc_o # get at MMU exception
 
 
 class DivPipeFunctionUnit(FunctionUnitBaseSingle):

diff --git a/src/soc/fu/mmu/fsm.py b/src/soc/fu/mmu/fsm.py
index 3517dcf593a0a0e8f266cc1a5c156bcbe22ace5d..3f20d9ab11951f57e6cec780495cd990cedf4811 100644 (file)
--- a/src/soc/fu/mmu/fsm.py
+++ b/src/soc/fu/mmu/fsm.py
@@ -45,6 +45,7 @@ class FSMMMUStage(ControlBase):
         # set up p/n data
         self.p.i_data = MMUInputData(pspec)
         self.n.o_data = MMUOutputData(pspec)
+        self.exc_o = self.n.o_data.exception # AllFunctionUnits needs this
 
         self.mmu = MMU()