From a1ac23d7ec6132aa40eaafb61185f082107c6f6f Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Wed, 18 Oct 2017 16:44:53 -0700 Subject: [PATCH 1/2] coreplex: continue to print the device name in the address map --- src/main/scala/coreplex/BaseCoreplex.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/coreplex/BaseCoreplex.scala b/src/main/scala/coreplex/BaseCoreplex.scala index f5e1c845..09db8ba6 100644 --- a/src/main/scala/coreplex/BaseCoreplex.scala +++ b/src/main/scala/coreplex/BaseCoreplex.scala @@ -152,7 +152,7 @@ trait HasTilesModuleImp extends LazyModuleImp abstract class BaseCoreplexModule[+L <: BaseCoreplex](_outer: L) extends BareCoreplexModule(_outer) { println("Generated Address Map") private val aw = (outer.sharedMemoryTLEdge.bundle.addressBits-1)/4 + 1 - private val fmt = s"\t%${aw}x - %${aw}x %c%c%c%c %s" + private val fmt = s"\t%${aw}x - %${aw}x %c%c%c%c%c %s" private def collect(path: List[String], value: ResourceValue): List[(String, ResourceAddress)] = { value match { From 82b1aa811607944912357d857e3711e4909c17ba Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Wed, 18 Oct 2017 16:52:35 -0700 Subject: [PATCH 2/2] coreplex: print the A first to look nicer --- src/main/scala/coreplex/BaseCoreplex.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/coreplex/BaseCoreplex.scala b/src/main/scala/coreplex/BaseCoreplex.scala index 09db8ba6..bb004313 100644 --- a/src/main/scala/coreplex/BaseCoreplex.scala +++ b/src/main/scala/coreplex/BaseCoreplex.scala @@ -169,11 +169,11 @@ abstract class BaseCoreplexModule[+L <: BaseCoreplex](_outer: L) extends BareCor println(fmt.format( range.base, range.base+range.size, + if (a) 'A' else ' ', if (r) 'R' else ' ', if (w) 'W' else ' ', if (x) 'X' else ' ', if (c) 'C' else ' ', - if (a) 'A' else ' ', names.mkString(", "))) s"""{"base":[${range.base}],"size":[${range.size}],"r":[$r],"w":[$w],"x":[$x],"c":[$c],"a":[$a],"names":[${names.map('"'+_+'"').mkString(",")}]}""" }