riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

fix Hasti and Smi converters

Browse Source
This commit is contained in:
Howard Mao
2016-07-15 15:39:00 -07:00
parent 66b9c5ad05
commit 897e6ccf8a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
junctions/src/main/scala/hasti.scala
View File

@ -403,7 +403,11 @@ class HastiMasterIONastiIOConverter(implicit p: Parameters) extends HastiModule(
last = (len === UInt(0)))
assert(!r_queue.io.enq.valid || r_queue.io.enq.ready,
"HASTI -> NASTI converter queue overflow")
"NASTI -> HASTI converter queue overflow")
val next_count = r_queue.io.count +
r_queue.io.enq.valid -
r_queue.io.deq.ready
io.hasti.haddr := addr
io.hasti.hsize := size
@ -418,7 +422,7 @@ class HastiMasterIONastiIOConverter(implicit p: Parameters) extends HastiModule(
Mux(first, HTRANS_IDLE, HTRANS_BUSY)),
s_read -> MuxCase(HTRANS_BUSY, Seq(
first -> HTRANS_NONSEQ,
(r_queue.io.count <= UInt(1)) -> HTRANS_SEQ))))
(next_count <= UInt(1)) -> HTRANS_SEQ))))
when (io.nasti.aw.fire()) {
first := Bool(true)