From: Luke Kenneth Casson Leighton Date: Tue, 8 Sep 2020 09:52:37 +0000 (+0100) Subject: whoops trap address being set in wrong Decode2ExecuteType object X-Git-Tag: semi_working_ecp5~129 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f00688ca407b33764615fb24a6dad3fe40a8e83;p=soc.git whoops trap address being set in wrong Decode2ExecuteType object --- diff --git a/src/soc/decoder/power_decoder2.py b/src/soc/decoder/power_decoder2.py index decdad46..b1167f85 100644 --- a/src/soc/decoder/power_decoder2.py +++ b/src/soc/decoder/power_decoder2.py @@ -817,8 +817,8 @@ class PowerDecode2(PowerDecodeSubset): # set the trapaddr to 0x700 for a td/tw/tdi/twi operation with m.If(op.internal_op == MicrOp.OP_TRAP): # *DO NOT* call self.trap here. that would reset absolutely - # rverything including destroying read of RA and RB. - comb += self.do_copy("trapaddr", 0x70, True) # strip first nibble + # everything including destroying read of RA and RB. + comb += self.do_copy("trapaddr", 0x70) # strip first nibble # check if instruction is privileged is_priv_insn = instr_is_priv(m, op.internal_op, e.do.insn)