projects
/
soc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80860c3
)
fix mul fu test helper.py not passing immediate to pia for mulli
author
Jacob Lifshay
<programmerjake@gmail.com>
Wed, 22 Sep 2021 17:58:58 +0000
(10:58 -0700)
committer
Jacob Lifshay
<programmerjake@gmail.com>
Wed, 22 Sep 2021 17:58:58 +0000
(10:58 -0700)
src/soc/fu/mul/test/helper.py
patch
|
blob
|
history
diff --git
a/src/soc/fu/mul/test/helper.py
b/src/soc/fu/mul/test/helper.py
index ec56e1fe3e63f03c21b4f6ccb9ac342754b40957..bb9d8d8490235901a78cb1dd3fee08fda5c66ed3 100644
(file)
--- a/
src/soc/fu/mul/test/helper.py
+++ b/
src/soc/fu/mul/test/helper.py
@@
-59,8
+59,14
@@
def set_alu_inputs(alu, dec2, sim, has_third_input):
overflow = pia.OverflowFlags(so=bool(so),
ov=False,
ov32=False)
overflow = pia.OverflowFlags(so=bool(so),
ov=False,
ov32=False)
+ immediate_ok = yield dec2.e.do.imm_data.ok
+ if immediate_ok:
+ immediate = yield dec2.e.do.imm_data.data
+ else:
+ immediate = None
rc = inp["rc"] if has_third_input else None
return pia.InstructionInput(ra=inp.get("ra"), rb=inp.get("rb"),
rc = inp["rc"] if has_third_input else None
return pia.InstructionInput(ra=inp.get("ra"), rb=inp.get("rb"),
+ immediate=immediate,
rc=rc, overflow=overflow)
rc=rc, overflow=overflow)
@@
-103,15
+109,7
@@
class MulTestHelper(unittest.TestCase):
opname = code.split(' ')[0]
fnname = opname.replace(".", "_")
print(f"{fnname}({pia_inputs})")
opname = code.split(' ')[0]
fnname = opname.replace(".", "_")
print(f"{fnname}({pia_inputs})")
- pia_res = None
- try:
- pia_res = getattr(pia, fnname)(pia_inputs)
- except AttributeError:
- EXPECTED_FAILURES = ["mulli"]
- if fnname not in EXPECTED_FAILURES:
- raise
- else:
- print("not implemented, as expected.")
+ pia_res = getattr(pia, fnname)(pia_inputs)
print(f"-> {pia_res}")
yield from isa_sim.call(opname)
print(f"-> {pia_res}")
yield from isa_sim.call(opname)