From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 28 Feb 2006 11:28:09 +0000 (-0500)
Subject: Corrected some mistakes in the hand merge
X-Git-Tag: m5_2.0_beta1~87^2~55
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a362d04b7aed0fa728af9373bad175a096a7de8;p=gem5.git

Corrected some mistakes in the hand merge

--HG--
extra : convert_revision : 84d852e625f754c4414403e8c3e26bda80500d4f
---

diff --git a/dev/sinic.cc b/dev/sinic.cc
index 1c0e59e0a..31d651249 100644
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -489,18 +489,13 @@ Device::writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data)
         panic("invalid size for %s: cpu=%d da=%#x pa=%#x va=%#x size=%d",
               info.name, cpu, daddr, req->paddr, req->vaddr, req->size);
 
-    //These are commmented out because when the DPRINTF below isn't used,
-    //these values aren't used and gcc issues a warning. With -Werror,
-    //this prevents compilation.
-    //uint32_t reg32 = *(uint32_t *)data;
-    //uint64_t reg64 = *(uint64_t *)data;
+    uint32_t reg32 = *(uint32_t *)data;
+    uint64_t reg64 = *(uint64_t *)data;
     VirtualReg &vnic = virtualRegs[index];
 
     DPRINTF(EthernetPIO,
             "write %s: cpu=%d val=%#x da=%#x pa=%#x va=%#x size=%d\n",
-            info.name, cpu, info.size == 4 ?
-            (*(uint32_t *)data) :
-            (*(uint64_t *)data),
+            info.name, cpu, info.size == 4 ? reg32 : reg64,
             daddr, req->paddr, req->vaddr, req->size);
 
     prepareWrite(cpu, index);