cores
/
power-fv
3
1
Fork 0
Code Issues 18 Pull Requests Projects Releases Wiki Activity

checks._branch: fix branches to LR/CTR/TAR.

Browse Source 
- remove check for undefined mnemonics (afaiu, their BO value isn't illegal).
- add check for illegal bcctr/bcctrl forms (with BO(2) = 0).
- fix target offset for branches to LR/CTR/TAR.
- use MSR.SF to check the upper bits of target addresses.
main
Jean-François Nguyen 2 years ago
parent 5649f60c78
commit 5c097b9474
2 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File

15
cores/microwatt/run.py
Unescape Escape View File

@ -105,16 +105,15 @@ if __name__ == "__main__":
("insn_bla", None, 15), ("insn_bla", None, 15),
("insn_bc", None, 15), ("insn_bc", None, 15),
("insn_bca", None, 15), ("insn_bca", None, 15),
("insn_bcl", None, 15),
("insn_bcla", None, 15), ("insn_bcla", None, 15),


# TODO: ("insn_bclr", None, 15),
#("insn_bcl", None, 15), ("insn_bclrl", None, 15),
#("insn_bclr", None, 15), ("insn_bcctr", None, 15),
#("insn_bclrl", None, 15), ("insn_bcctrl", None, 15),
#("insn_bcctr", None, 15), ("insn_bctar", None, 15),
#("insn_bcctrl", None, 15), ("insn_bctarl", None, 15),
#("insn_bctar", None, 15),
#("insn_bctarl", None, 15),
] ]


with multiprocessing.Pool(processes=args.jobs) as pool: with multiprocessing.Pool(processes=args.jobs) as pool:

99
power_fv/checks/_branch.py
Unescape Escape View File

@ -3,6 +3,7 @@ from amaranth.asserts import *


from .. import pfv from .. import pfv
from ..insn import * from ..insn import *
from ..utils import iea_mask




__all__ = ["Check"] __all__ = ["Check"]
@ -24,46 +25,47 @@ class Check(Elaboratable):
def elaborate(self, platform): def elaborate(self, platform):
m = Module() m = Module()


# TODO:
# - support MSR (stop assuming 64-bit mode)
# - support interrupts (detect illegal forms)

spec_insn = self._insn_cls() spec_insn = self._insn_cls()


with m.If(self.trig.post): with m.If(self.trig.post):
m.d.sync += [ m.d.sync += [
Assume(self.pfv.stb), Assume(self.pfv.stb),
Assume(self.pfv.insn[32:] == spec_insn), Assume(self.pfv.insn[32:] == spec_insn),
Assert(self.pfv.msr.w_stb),
] ]


msr_w_sf = Signal()
m.d.comb += msr_w_sf.eq(self.pfv.msr.w_data[63])

if isinstance(spec_insn, (Instruction_B, Instruction_XL_b)): if isinstance(spec_insn, (Instruction_B, Instruction_XL_b)):
bo_valid_patterns = [ bo_valid_patterns = [
"0000-",
"0001-",
"001--", "001--",
"0100-",
"0101-",
"011--", "011--",
"1-00-", "1-1--",
"1-01-"
] ]
if not isinstance(spec_insn, Instruction_B): if not isinstance(spec_insn, (BCCTR, BCCTRL)):
# "Branch always" mnemonics are undefined for B-form conditional branches. # bcctr/bcctrl forms with BO(2)=0 ("decrement and test CTR") are illegal.
# (Appendix C.2.2, Book I) bo_valid_patterns += [
bo_valid_patterns.append("1-1--") "0000-",

"0001-",
bo_valid = Signal() "0100-",
m.d.comb += bo_valid.eq(spec_insn.bo.matches(*bo_valid_patterns)) "0101-",
"1-00-",
"1-01-",
]

bo_invalid = Signal()
m.d.comb += bo_invalid.eq(~spec_insn.bo.matches(*bo_valid_patterns))


# FIXME(microwatt,interrupts): turn this into an assert
with m.If(self.trig.post): with m.If(self.trig.post):
m.d.sync += Assume(bo_valid | self.pfv.intr) m.d.sync += Assert(bo_invalid.implies(self.pfv.intr))


# NIA # NIA


spec_nia = Signal(unsigned(64)) spec_nia = Signal(unsigned(64))
taken = Signal() taken = Signal()
offset = Signal(signed(62)) offset = Signal(signed(62))
target = Signal(signed(64))


if isinstance(spec_insn, Instruction_I): if isinstance(spec_insn, Instruction_I):
m.d.comb += [ m.d.comb += [
@ -79,24 +81,25 @@ class Check(Elaboratable):


m.d.comb += [ m.d.comb += [
cond_bit.eq(self.pfv.cr.r_data[::-1].bit_select(spec_insn.bi, width=1)), cond_bit.eq(self.pfv.cr.r_data[::-1].bit_select(spec_insn.bi, width=1)),
ctr_any .eq(self.pfv.ctr.w_data.any()), ctr_any .eq( self.pfv.ctr.w_data[:32].any() |
cond_ok .eq(spec_insn.bo[4] | (spec_insn.bo[3] == cond_bit)), (self.pfv.ctr.w_data[32:].any() & msr_w_sf)),
ctr_ok .eq(spec_insn.bo[2] | (ctr_any ^ spec_insn.bo[1])), cond_ok .eq(spec_insn.bo[4-0] | (spec_insn.bo[4-1] == cond_bit)),
ctr_ok .eq(spec_insn.bo[4-2] | (ctr_any ^ spec_insn.bo[4-3])),
] ]


if isinstance(spec_insn, Instruction_XL_b) and spec_insn.xo.value == 528: # bcctr/bcctrl if isinstance(spec_insn, (BCCTR, BCCTRL)):
m.d.comb += taken.eq(cond_ok) m.d.comb += taken.eq(cond_ok)
else: else:
m.d.comb += taken.eq(cond_ok & ctr_ok) m.d.comb += taken.eq(cond_ok & ctr_ok)


if isinstance(spec_insn, Instruction_B): if isinstance(spec_insn, Instruction_B):
m.d.comb += offset.eq(spec_insn.bd) m.d.comb += offset.eq(spec_insn.bd)
elif spec_insn.xo.value == 16: # bclr/bclrl elif isinstance(spec_insn, (BCLR, BCLRL)):
m.d.comb += offset.eq(self.pfv.lr .r_data[:61]) m.d.comb += offset.eq(self.pfv.lr .r_data[2:])
elif spec_insn.xo.value == 528: # bcctr/bcctrl elif isinstance(spec_insn, (BCCTR, BCCTRL)):
m.d.comb += offset.eq(self.pfv.ctr.r_data[:61]) m.d.comb += offset.eq(self.pfv.ctr.r_data[2:])
elif spec_insn.xo.value == 560: # bctar/bctarl elif isinstance(spec_insn, (BCTAR, BCTARL)):
m.d.comb += offset.eq(self.pfv.tar.r_data[:61]) m.d.comb += offset.eq(self.pfv.tar.r_data[2:])
else: else:
assert False assert False


@ -105,11 +108,13 @@ class Check(Elaboratable):


with m.If(taken): with m.If(taken):
if isinstance(spec_insn, (Instruction_I, Instruction_B)) and spec_insn.aa.value == 0: if isinstance(spec_insn, (Instruction_I, Instruction_B)) and spec_insn.aa.value == 0:
m.d.comb += spec_nia.eq(self.pfv.cia + (offset << 2)) m.d.comb += target.eq(self.pfv.cia + (offset << 2))
else: else:
m.d.comb += spec_nia.eq(offset << 2) m.d.comb += target.eq(offset << 2)
with m.Else(): with m.Else():
m.d.comb += spec_nia.eq(self.pfv.cia + 4) m.d.comb += target.eq(self.pfv.cia + 4)

m.d.comb += spec_nia.eq(iea_mask(target, msr_w_sf))


with m.If(self.trig.post & ~self.pfv.intr): with m.If(self.trig.post & ~self.pfv.intr):
m.d.sync += Assert(self.pfv.nia == spec_nia) m.d.sync += Assert(self.pfv.nia == spec_nia)
@ -139,13 +144,19 @@ class Check(Elaboratable):
if isinstance(spec_insn, (Instruction_I, Instruction_B)): if isinstance(spec_insn, (Instruction_I, Instruction_B)):
m.d.comb += spec_lr_r_stb.eq(0) m.d.comb += spec_lr_r_stb.eq(0)
elif isinstance(spec_insn, (Instruction_XL_b)): elif isinstance(spec_insn, (Instruction_XL_b)):
m.d.comb += spec_lr_r_stb.eq(spec_insn.xo == 16) # bclr/bclrl if isinstance(spec_insn, (BCLR, BCLRL)):
m.d.comb += spec_lr_r_stb.eq(1)
else:
m.d.comb += spec_lr_r_stb.eq(0)
else: else:
assert False assert False


cia_4 = Signal(unsigned(64))
m.d.comb += cia_4.eq(self.pfv.cia + 4)

m.d.comb += [ m.d.comb += [
spec_lr_w_stb .eq(spec_insn.lk), spec_lr_w_stb .eq(spec_insn.lk),
spec_lr_w_data.eq(self.pfv.cia + 4), spec_lr_w_data.eq(iea_mask(cia_4, msr_w_sf)),
] ]


with m.If(self.trig.post & ~self.pfv.intr): with m.If(self.trig.post & ~self.pfv.intr):
@ -164,21 +175,24 @@ class Check(Elaboratable):
if isinstance(spec_insn, Instruction_I): if isinstance(spec_insn, Instruction_I):
m.d.comb += spec_ctr_r_stb.eq(0) m.d.comb += spec_ctr_r_stb.eq(0)
elif isinstance(spec_insn, Instruction_B): elif isinstance(spec_insn, Instruction_B):
m.d.comb += spec_ctr_r_stb.eq(~spec_insn.bo[2]) m.d.comb += spec_ctr_r_stb.eq(~spec_insn.bo[4-2])
elif isinstance(spec_insn, (Instruction_B, Instruction_XL_b)): elif isinstance(spec_insn, Instruction_XL_b):
m.d.comb += spec_ctr_r_stb.eq(1) if isinstance(spec_insn, (BCCTR, BCCTRL)):
m.d.comb += spec_ctr_r_stb.eq(1)
else:
m.d.comb += spec_ctr_r_stb.eq(~spec_insn.bo[4-2])
else: else:
assert False assert False


if isinstance(spec_insn, Instruction_I): if isinstance(spec_insn, Instruction_I):
m.d.comb += spec_ctr_w_stb.eq(0) m.d.comb += spec_ctr_w_stb.eq(0)
elif isinstance(spec_insn, Instruction_B): elif isinstance(spec_insn, Instruction_B):
m.d.comb += spec_ctr_w_stb.eq(~spec_insn.bo[2]) m.d.comb += spec_ctr_w_stb.eq(~spec_insn.bo[4-2])
elif isinstance(spec_insn, Instruction_XL_b): elif isinstance(spec_insn, Instruction_XL_b):
if spec_insn.xo.value == 528: # bcctr/bcctrl if isinstance(spec_insn, (BCCTR, BCCTRL)):
m.d.comb += spec_ctr_w_stb.eq(0) m.d.comb += spec_ctr_w_stb.eq(0)
else: else:
m.d.comb += spec_ctr_w_stb.eq(~spec_insn.bo[2]) m.d.comb += spec_ctr_w_stb.eq(~spec_insn.bo[4-2])
else: else:
assert False assert False


@ -198,7 +212,10 @@ class Check(Elaboratable):
if isinstance(spec_insn, (Instruction_I, Instruction_B)): if isinstance(spec_insn, (Instruction_I, Instruction_B)):
m.d.comb += spec_tar_r_stb.eq(0) m.d.comb += spec_tar_r_stb.eq(0)
elif isinstance(spec_insn, (Instruction_XL_b)): elif isinstance(spec_insn, (Instruction_XL_b)):
m.d.comb += spec_tar_r_stb.eq(spec_insn.xo == 560) # bctar/bctarl if isinstance(spec_insn, (BCTAR, BCTARL)):
m.d.comb += spec_tar_r_stb.eq(1)
else:
m.d.comb += spec_tar_r_stb.eq(0)
else: else:
assert False assert False



Write Preview
Loading…
Cancel
Save