commit 6684d617da52d1956f955a9452ff90058d66cf9e
author Anouk Van Laer <anouk.vanlaer@arm.com> Tue Jan 22 18:08:44 2019 +0000
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Fri Feb 01 11:22:50 2019 +0000
tree f6cc9882b3f57670cf3b4ce349adacffe2cac40d
parent a119a963240a35ab66a5baee3f77cfcd99c6bbbb

dev, arm: Removed contextId variable

The contextId variable is only used by the debug flag and will prevent
a more optimised binary (i.e. fast) from compiling.

Change-Id: I6cefb5bc06d0d4b415df62f1278db53ba309fb87
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/16042
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>

src/dev/arm/gic_v3.cc

diff --git a/src/dev/arm/gic_v3.cc b/src/dev/arm/gic_v3.cc
index 738eb11..2fb90ea 100644
--- a/src/dev/arm/gic_v3.cc
+++ b/src/dev/arm/gic_v3.cc
@@ -91,7 +91,6 @@
 {
     const Addr addr = pkt->getAddr();
     const size_t size = pkt->getSize();
-    const ContextID context_id = pkt->req->contextId();
     bool is_secure_access = pkt->isSecure();
     uint64_t resp = 0;
     Tick delay = 0;
@@ -103,7 +102,7 @@
         delay = params()->dist_pio_delay;
         DPRINTF(GIC, "Gicv3::read(): (distributor) context_id %d register %#x "
                 "size %d is_secure_access %d (value %#x)\n",
-                context_id, daddr, size, is_secure_access, resp);
+                pkt->req->contextId(), daddr, size, is_secure_access, resp);
     } else if (redistRange.contains(addr)) {
         Addr daddr = addr - redistRange.start();
         uint32_t redistributor_id =
@@ -117,8 +116,8 @@
         delay = params()->redist_pio_delay;
         DPRINTF(GIC, "Gicv3::read(): (redistributor %d) context_id %d "
                 "register %#x size %d is_secure_access %d (value %#x)\n",
-                redistributor_id, context_id, daddr, size, is_secure_access,
-                resp);
+                redistributor_id, pkt->req->contextId(), daddr, size,
+                is_secure_access, resp);
     } else {
         panic("Gicv3::read(): unknown address %#x\n", addr);
     }
@@ -134,7 +133,6 @@
     const size_t size = pkt->getSize();
     uint64_t data = pkt->getUintX(LittleEndianByteOrder);
     const Addr addr = pkt->getAddr();
-    const ContextID context_id = pkt->req->contextId();
     bool is_secure_access = pkt->isSecure();
     Tick delay = 0;
 
@@ -143,7 +141,7 @@
         panic_if(!distributor, "Distributor is null!");
         DPRINTF(GIC, "Gicv3::write(): (distributor) context_id %d "
                 "register %#x size %d is_secure_access %d value %#x\n",
-                context_id, daddr, size, is_secure_access, data);
+                pkt->req->contextId(), daddr, size, is_secure_access, data);
         distributor->write(daddr, data, size, is_secure_access);
         delay = params()->dist_pio_delay;
     } else if (redistRange.contains(addr)) {
@@ -156,8 +154,8 @@
         panic_if(!redistributors[redistributor_id], "Redistributor is null!");
         DPRINTF(GIC, "Gicv3::write(): (redistributor %d) context_id %d "
                 "register %#x size %d is_secure_access %d value %#x\n",
-                redistributor_id, context_id, daddr, size, is_secure_access,
-                data);
+                redistributor_id, pkt->req->contextId(), daddr, size,
+                is_secure_access, data);
         redistributors[redistributor_id]->write(daddr, data, size,
                                                 is_secure_access);
         delay = params()->redist_pio_delay;