From c770cb36585c4e1458f897846d15dfbc55e18de3 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Tue, 6 Oct 2020 15:48:17 +0100 Subject: [PATCH] move LDSTException to mem_types --- src/soc/experiment/mem_types.py | 13 +++++++++++++ src/soc/experiment/pimem.py | 14 +------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/soc/experiment/mem_types.py b/src/soc/experiment/mem_types.py index d766fb90..2d730858 100644 --- a/src/soc/experiment/mem_types.py +++ b/src/soc/experiment/mem_types.py @@ -6,6 +6,19 @@ based on Anton Blanchard microwatt common.vhdl from nmutil.iocontrol import RecordObject from nmigen import Signal +# https://bugs.libre-soc.org/show_bug.cgi?id=465 +class LDSTException(RecordObject): + def __init__(self, name=None): + RecordObject.__init__(self, name=name) + self.happened = Signal() + self.alignment = Signal() + self.instr_fault = Signal() + self.invalid = Signal() + self.badtree = Signal() + self.perm_error = Signal() + self.rc_error = Signal() + self.segment_fault = Signal() + class DCacheToLoadStore1Type(RecordObject): def __init__(self, name=None): diff --git a/src/soc/experiment/pimem.py b/src/soc/experiment/pimem.py index dc846c12..2f089c91 100644 --- a/src/soc/experiment/pimem.py +++ b/src/soc/experiment/pimem.py @@ -25,26 +25,14 @@ from nmutil.latch import SRLatch, latchregister from nmutil.util import rising_edge from soc.decoder.power_decoder2 import Data from soc.scoreboard.addr_match import LenExpand +from soc.experiment.mem_types import LDSTException # for testing purposes from soc.experiment.testmem import TestMemory #from soc.scoreboard.addr_split import LDSTSplitter - import unittest -class LDSTException(RecordObject): - def __init__(self, name=None): - RecordObject.__init__(self, name=name) - self.happened = Signal() - self.alignment = Signal() - self.instr_fault = Signal() - self.invalid = Signal() - self.badtree = Signal() - self.perm_error = Signal() - self.rc_error = Signal() - self.segment_fault = Signal() - class PortInterface(RecordObject): """PortInterface -- 2.30.2