From 16113a96ba88760a0689adff144796b180e3bac4 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Mon, 25 Mar 2013 19:09:08 -0700 Subject: [PATCH] fixes after merge --- rocket/src/main/scala/htif.scala | 2 +- rocket/src/main/scala/tile.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rocket/src/main/scala/htif.scala b/rocket/src/main/scala/htif.scala index 3c42a705..6a872715 100644 --- a/rocket/src/main/scala/htif.scala +++ b/rocket/src/main/scala/htif.scala @@ -92,7 +92,7 @@ class rocketHTIF(w: Int)(implicit conf: UncoreConfiguration) extends Component w val cmd_readmem :: cmd_writemem :: cmd_readcr :: cmd_writecr :: cmd_ack :: cmd_nack :: Nil = Enum(6) { UFix() } val pcr_addr = addr(io.cpu(0).pcr_req.bits.addr.width-1, 0) - val pcr_coreid = if (conf.ln.nClients == 1) UFix(0) else addr(log2Up(conf.ln.nClients)-1+20,20) + val pcr_coreid = addr(log2Up(conf.ln.nClients)-1+20+1,20) val pcr_wdata = packet_ram(0) val bad_mem_packet = size(OFFSET_BITS-1-3,0).orR || addr(OFFSET_BITS-1-3,0).orR diff --git a/rocket/src/main/scala/tile.scala b/rocket/src/main/scala/tile.scala index c04feedb..b073f9be 100644 --- a/rocket/src/main/scala/tile.scala +++ b/rocket/src/main/scala/tile.scala @@ -55,13 +55,13 @@ class Tile(resetSignal: Bool = null)(confIn: RocketConfiguration) extends Compon io.tilelink.release.bits := dcache.io.mem.release.bits io.tilelink.release.bits.payload.client_xact_id := Cat(dcache.io.mem.release.bits.payload.client_xact_id, UFix(dcachePortId, log2Up(memPorts))) // Mimic client id extension done by UncachedTileLinkIOArbiter for Acquires from either client) - val ioSubBundles = io.tilelink.getClass.getMethods.filter( x => + /*val ioSubBundles = io.tilelink.getClass.getMethods.filter( x => classOf[ClientSourcedIO[Data]].isAssignableFrom(x.getReturnType)).map{ m => m.invoke(io.tilelink).asInstanceOf[ClientSourcedIO[LogicalNetworkIO[Data]]] } ioSubBundles.foreach{ m => m.bits.header.dst := UFix(0) m.bits.header.src := UFix(0) - } + }*/ if (conf.vec) { val vicache = new Frontend()(ICacheConfig(128, 1, conf.co), lnConf) // 128 sets x 1 ways (8KB)