From 5629fb62bf17a2a763d94f23fd9c80be30500fb9 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 1 Jun 2016 21:58:00 -0700
Subject: [PATCH] Avoid bitwise sub-assignment

---
 uncore/src/main/scala/debug.scala | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/uncore/src/main/scala/debug.scala b/uncore/src/main/scala/debug.scala
index eb22d2b7..13fa1555 100644
--- a/uncore/src/main/scala/debug.scala
+++ b/uncore/src/main/scala/debug.scala
@@ -6,7 +6,6 @@ import Chisel._
 
 import junctions._
 import cde.{Parameters, Config, Field}
-import Math.{ceil, max, min}
 
 // *****************************************
 // Constants which are interesting even
@@ -413,12 +412,12 @@ class DebugModule ()(implicit val p:cde.Parameters)
   val interruptRegs = Reg(init=Vec.fill(cfg.nComponents){Bool(false)})
 
   val haltnotRegs     = Reg(init=Vec.fill(cfg.nComponents){Bool(false)})
-  val numHaltnotStatus = (Math.ceil(cfg.nComponents / 32)).toInt
+  val numHaltnotStatus = ((cfg.nComponents - 1) / 32) + 1
 
   val haltnotStatus = Wire(Vec(numHaltnotStatus, Bits(width = 32)))
   val rdHaltnotStatus = Wire(Bits(width = 32))
-  
-  val haltnotSummary = Wire(Bits(width = 32))
+
+  val haltnotSummary = Vec(haltnotStatus.map(_.orR)).toBits
 
   // --- Debug RAM
 
@@ -540,19 +539,7 @@ class DebugModule ()(implicit val p:cde.Parameters)
   }
 
   for (ii <- 0 until numHaltnotStatus) {
-    for (jj <- 0 until 32) {
-      val component = ii * 32 + jj
-      if (component < cfg.nComponents){
-        haltnotStatus(ii)(jj) := haltnotRegs(component)
-      } else {
-        haltnotStatus(ii)(jj) := Bool(false)
-      }
-    }
-  }
-
-  haltnotSummary := Bits(0)
-  for (ii <- 0 until numHaltnotStatus) {
-    haltnotSummary(ii) := haltnotStatus(ii).orR
+    haltnotStatus(ii) := Vec(haltnotRegs.slice(ii * 32, (ii + 1) * 32)).toBits
   }
 
   //--------------------------------------------------------------