from soc.fu.base_input_record import CompOpSubsetBase
-from soc.decoder.power_enums import (MicrOp, Function)
-from soc.consts import TT
+from openpower.decoder.power_enums import (MicrOp, Function)
+from openpower.consts import TT
from soc.experiment.mem_types import LDSTException
class CompTrapOpSubset(CompOpSubsetBase):
layout = [('insn_type', MicrOp),
('fn_unit', Function),
('insn', 32),
- ('msr', 64), # TODO: "state" in separate Record
- ('cia', 64), # likewise
+ ('msr', 64), # from core.state
+ ('cia', 64), # likewise
+ ('svstate', 64), # likewise
('is_32bit', 1),
('traptype', TT.size), # see trap main_stage.py, PowerDecoder2
('trapaddr', 13),
+ ('ldst_exc', LDSTException.length), # blech
]
- # add LDST field exception types
- #for f in LDSTException._exc_types:
- # layout.append((f, 1))
-
super().__init__(layout, name=name)