projects
/
ieee754fpu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5ebcdff
)
clarify whats being obtained from _connect_out function
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Tue, 19 Nov 2019 15:37:32 +0000
(15:37 +0000)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Tue, 19 Nov 2019 15:37:32 +0000
(15:37 +0000)
src/nmutil/singlepipe.py
patch
|
blob
|
history
diff --git
a/src/nmutil/singlepipe.py
b/src/nmutil/singlepipe.py
index a526be7be4258df041ff7f3fa9e2caa34b06ca19..e109900dc876faccf3040a745f45a5182f696321 100644
(file)
--- a/
src/nmutil/singlepipe.py
+++ b/
src/nmutil/singlepipe.py
@@
-13,7
+13,7
@@
PipelineAPI:
* StageAPI: combinatorial (NO REGISTERS / LATCHES PERMITTED)
PipelineAPI:
* StageAPI: combinatorial (NO REGISTERS / LATCHES PERMITTED)
- * PipelineAPI: synchronous
(registers / latches MAY added on demand)
+ * PipelineAPI: synchronous
registers / latches get added here
RecordBasedStage:
----------------
RecordBasedStage:
----------------
@@
-951,14
+951,14
@@
class FIFOControl(ControlBase):
m.submodules.fn = fn = NextControl()
fn.valid_o, fn.ready_i, fn.data_o = fifo.readable, fifo.re, fifo.dout
connections = fn._connect_out(self.n, fn=nmoperator.cat)
m.submodules.fn = fn = NextControl()
fn.valid_o, fn.ready_i, fn.data_o = fifo.readable, fifo.re, fifo.dout
connections = fn._connect_out(self.n, fn=nmoperator.cat)
+ valid_eq, ready_eq, data_o = connections
# ok ok so we can't just do the ready/valid eqs straight:
# first 2 from connections are the ready/valid, 3rd is data.
if self.fwft:
# ok ok so we can't just do the ready/valid eqs straight:
# first 2 from connections are the ready/valid, 3rd is data.
if self.fwft:
- m.d.comb +=
connections[:2
] # combinatorial on next ready/valid
+ m.d.comb +=
[valid_eq, ready_eq
] # combinatorial on next ready/valid
else:
else:
- m.d.sync += connections[:2] # non-fwft mode needs sync
- data_o = connections[2] # get the data
+ m.d.sync += [valid_eq, ready_eq] # non-fwft mode needs sync
data_o = self._postprocess(data_o) # XXX TBD, does nothing right now
m.d.comb += data_o
data_o = self._postprocess(data_o) # XXX TBD, does nothing right now
m.d.comb += data_o