projects
/
soc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b422a15
)
Fixed missing nia.ok.eq(1) in OP_RFID
author
colepoirier
<colepoirier@gmail.com>
Wed, 3 Jun 2020 02:27:54 +0000
(19:27 -0700)
committer
colepoirier
<colepoirier@gmail.com>
Wed, 3 Jun 2020 02:27:54 +0000
(19:27 -0700)
src/soc/fu/trap/main_stage.py
patch
|
blob
|
history
diff --git
a/src/soc/fu/trap/main_stage.py
b/src/soc/fu/trap/main_stage.py
index 3f5c11e9758129887a08956185b3015c035819a5..8352895799d41697f650ca3259af1291cd4ffab2 100644
(file)
--- a/
src/soc/fu/trap/main_stage.py
+++ b/
src/soc/fu/trap/main_stage.py
@@
-181,9
+181,8
@@
class TrapMainStage(PipeModBase):
ctrl_tmp.msr(MSR_DR) <= '1';
end if;
"""
- # TODO translate this, import and use br_ext from branch stage
- # f_out.redirect_nia <= a_in(63 downto 2) & "00"; -- srr0
comb += self.o.nia.data.eq(br_ext(a[63:1] & 0))
+ comb += self.o.nia.ok.eq(1)
for stt, end in [(0,16), (22, 27), (31, 64)]:
comb += self.o.msr.data[stt:end].eq(a[stt:end])
with m.If(a[MSR_PR]):