Merge branch 'master' into chisel-v2
Conflicts: src/main/scala/memserdes.scala
This commit is contained in:
		@@ -112,8 +112,7 @@ class MemSerdes(w: Int) extends Module
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  io.wide.resp.valid := resp_val
 | 
					  io.wide.resp.valid := resp_val
 | 
				
			||||||
  io.wide.resp.bits.tag := in_buf(io.wide.resp.bits.tag.width-1,0)
 | 
					  io.wide.resp.bits := io.wide.resp.bits.fromBits(in_buf)
 | 
				
			||||||
  io.wide.resp.bits.data := in_buf >> UInt(io.wide.resp.bits.tag.width)
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class MemDesserIO(w: Int) extends Bundle {
 | 
					class MemDesserIO(w: Int) extends Bundle {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user