diff options
| author | Thomas Bauereiss | 2017-08-08 13:52:49 +0100 |
|---|---|---|
| committer | Thomas Bauereiss | 2017-08-08 14:53:42 +0100 |
| commit | 6100aecd642766252b73d3271a026d17de605fa0 (patch) | |
| tree | 00f18dd834a71d133612a465caa68d11d13999b0 /mips_new_tc/mips_insts.sail | |
| parent | 3071a02cf521d076f1ac0f4c6069e4e943aa15e7 (diff) | |
Fix Lem bindings in test cases
Add a test case with the MIPS spec using the TLB stub.
Use the sequential monad for Lem testing for now; the free monad (in
"prompt.lem") has not been updated for machine words yet.
Diffstat (limited to 'mips_new_tc/mips_insts.sail')
| -rw-r--r-- | mips_new_tc/mips_insts.sail | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mips_new_tc/mips_insts.sail b/mips_new_tc/mips_insts.sail index 1d3c5f4a..96826dae 100644 --- a/mips_new_tc/mips_insts.sail +++ b/mips_new_tc/mips_insts.sail @@ -1136,24 +1136,24 @@ function clause execute (Load(width, signed, linked, base, rt, offset)) = else let pAddr = (TLBTranslate(vAddr, LoadData)) in { - (bit[64]) memResult := if (linked) then + (bit[64]) memResult := if (linked) then { CP0LLBit := 0b1; - CP0LLAddr := pAddr; - switch wordWidthBytes(width) { - case ([:1:]) w -> extendLoad(MEMr_reserve_wrapper(pAddr, w), signed) - case ([:2:]) w -> extendLoad(MEMr_reserve_wrapper(pAddr, w), signed) - case ([:4:]) w -> extendLoad(MEMr_reserve_wrapper(pAddr, w), signed) - case ([:8:]) w -> extendLoad(MEMr_reserve_wrapper(pAddr, w), signed) - } + CP0LLAddr := pAddr; + w := wordWidthBytes(width); + if w == 1 then extendLoad(MEMr_reserve_wrapper(pAddr, 1), signed) + else if w == 2 then extendLoad(MEMr_reserve_wrapper(pAddr, 2), signed) + else if w == 4 then extendLoad(MEMr_reserve_wrapper(pAddr, 4), signed) + else extendLoad(MEMr_reserve_wrapper(pAddr, 8), signed) } else - switch wordWidthBytes(width) { - case ([:1:]) w -> extendLoad(MEMr_wrapper(pAddr, w), signed) - case ([:2:]) w -> extendLoad(MEMr_wrapper(pAddr, w), signed) - case ([:4:]) w -> extendLoad(MEMr_wrapper(pAddr, w), signed) - case ([:8:]) w -> extendLoad(MEMr_wrapper(pAddr, w), signed) - }; + { + w := wordWidthBytes(width); + if w == 1 then extendLoad(MEMr_reserve_wrapper(pAddr, 1), signed) + else if w == 2 then extendLoad(MEMr_reserve_wrapper(pAddr, 2), signed) + else if w == 4 then extendLoad(MEMr_reserve_wrapper(pAddr, 4), signed) + else extendLoad(MEMr_reserve_wrapper(pAddr, 8), signed); + }; wGPR(rt) := memResult } } |
