projects
/
soc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0250d3
)
sync onto fu.go_wr_i otherwise a loop occurs
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Thu, 4 Jun 2020 13:21:42 +0000
(14:21 +0100)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Thu, 4 Jun 2020 13:21:42 +0000
(14:21 +0100)
src/soc/simple/core.py
patch
|
blob
|
history
diff --git
a/src/soc/simple/core.py
b/src/soc/simple/core.py
index a6fc30ce6fb8eaa03037a753bdc2ee625b5e1451..95aed902ecd1ab36b30707f2a3e4e74be1bdd36a 100644
(file)
--- a/
src/soc/simple/core.py
+++ b/
src/soc/simple/core.py
@@
-50,7
+50,7
@@
class NonProductionCore(Elaboratable):
def elaborate(self, platform):
m = Module()
- comb
= m.d.comb
+ comb
, sync = m.d.comb, m.d.sync
m.submodules.pdecode2 = dec2 = self.pdecode2
m.submodules.fus = self.fus
@@
-179,7
+179,7
@@
class NonProductionCore(Elaboratable):
fu_active = fu_bitdict[funame]
pick = fu.wr.rel[idx] & fu_active & wrflag
comb += wrpick.i[pi].eq(pick)
-
comb += fu.go_wr_i[idx].eq(wrpick.o[pi]
)
+
sync += fu.go_wr_i[idx].eq(wrpick.o[pi] & wrpick.en_o
)
# connect regfile port to input
print ("reg connect widths",
regfile, regname, pi, funame,