wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use require statement

Browse Source
This commit is contained in:
Edward Wang
2017-07-21 10:32:48 -07:00
committed by edwardcwang
parent 3cb424cf80
commit 80ca2e538f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tapeout/src/main/scala/transforms/macros/MacroCompiler.scala
View File

@@ -176,11 +176,8 @@ class MacroCompilerPass(mems: Option[Seq[Macro]],
if (libPort.src.effectiveMaskGran == libPort.src.width) { if (libPort.src.effectiveMaskGran == libPort.src.width) {
bits(WRef(mem), low / memPort.src.effectiveMaskGran) bits(WRef(mem), low / memPort.src.effectiveMaskGran)
} else { } else {
if (libPort.src.effectiveMaskGran != 1) { require(libPort.src.effectiveMaskGran == 1, "only single-bit mask supported for now")
// TODO
System.err println "only single-bit mask supported"
return None
}
cat(((low to high) map (i => bits(WRef(mem), i / memPort.src.effectiveMaskGran))).reverse) cat(((low to high) map (i => bits(WRef(mem), i / memPort.src.effectiveMaskGran))).reverse)
} }
case None => case None =>

6
tapeout/src/main/scala/transforms/macros/Utils.scala
View File

@@ -18,9 +18,9 @@ class FirrtlMacroPort(port: MacroPort) {
val isWriter = !port.writeEnable.isEmpty && port.readEnable.isEmpty val isWriter = !port.writeEnable.isEmpty && port.readEnable.isEmpty
val isReadWriter = !port.writeEnable.isEmpty && !port.readEnable.isEmpty val isReadWriter = !port.writeEnable.isEmpty && !port.readEnable.isEmpty
val AddrType = UIntType(IntWidth(ceilLog2(port.depth) max 1)) val addrType = UIntType(IntWidth(ceilLog2(port.depth) max 1))
val DataType = UIntType(IntWidth(port.width)) val dataType = UIntType(IntWidth(port.width))
val MaskType = UIntType(IntWidth(port.width / port.effectiveMaskGran)) val maskType = UIntType(IntWidth(port.width / port.effectiveMaskGran))
// Bundle representing this macro port. // Bundle representing this macro port.
val tpe = BundleType(Seq( val tpe = BundleType(Seq(