Fix compile issues on gcc 4.1.x related to namespaces.

This basically involves moving the builder code outside of any
namespace.  While we're at it, move a few braces outside of
a couple #if/#else/#endif blocks so it's easier to match up
the braces.

--HG--
extra : convert_revision : a7834532aadc63b0e0ff988dd5745049e02e6312

diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index c21bf94f52875048ec4964abda264cc34c11e0ea..1e015513811469bf404df32151d1599b920fa138 100644 (file)
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -46,8 +46,7 @@
 using namespace std;
 using namespace EV5;
 
-namespace AlphaISA
-{
+namespace AlphaISA {
 ///////////////////////////////////////////////////////////////////////
 //
 //  Alpha TLB
@@ -116,10 +115,11 @@ TLB::checkCacheability(RequestPtr &req)
 
 
 #if ALPHA_TLASER
-    if (req->getPaddr() & PAddrUncachedBit39) {
+    if (req->getPaddr() & PAddrUncachedBit39)
 #else
-    if (req->getPaddr() & PAddrUncachedBit43) {
+    if (req->getPaddr() & PAddrUncachedBit43)
 #endif
+    {
         // IPR memory space not implemented
         if (PAddrIprSpace(req->getPaddr())) {
             return new UnimpFault("IPR memory space not implemented!");
@@ -313,10 +313,11 @@ ITB::translate(RequestPtr &req, ThreadContext *tc) const
         // VA<47:41> == 0x7e, VA<40:13> maps directly to PA<40:13> for EV6
 #if ALPHA_TLASER
         if ((MCSR_SP(tc->readMiscReg(IPR_MCSR)) & 2) &&
-            VAddrSpaceEV5(req->getVaddr()) == 2) {
+            VAddrSpaceEV5(req->getVaddr()) == 2)
 #else
-        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
+        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
 #endif
+        {
             // only valid in kernel mode
             if (ICM_CM(tc->readMiscReg(IPR_ICM)) !=
                 mode_kernel) {
@@ -487,10 +488,11 @@ DTB::translate(RequestPtr &req, ThreadContext *tc, bool write) const
         // Check for "superpage" mapping
 #if ALPHA_TLASER
         if ((MCSR_SP(tc->readMiscReg(IPR_MCSR)) & 2) &&
-            VAddrSpaceEV5(req->getVaddr()) == 2) {
+            VAddrSpaceEV5(req->getVaddr()) == 2)
 #else
-        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
+        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
 #endif
+        {
 
             // only valid in kernel mode
             if (DTB_CM_CM(tc->readMiscReg(IPR_DTB_CM)) !=
@@ -592,6 +594,8 @@ TLB::index(bool advance)
     return *pte;
 }
 
+/* end namespace AlphaISA */ }
+
 DEFINE_SIM_OBJECT_CLASS_NAME("AlphaTLB", TLB)
 
 BEGIN_DECLARE_SIM_OBJECT_PARAMS(ITB)
@@ -633,4 +637,3 @@ CREATE_SIM_OBJECT(DTB)
 }
 
 REGISTER_SIM_OBJECT("AlphaDTB", DTB)
-}

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 82b1ed175de378bd069de06aee49ec05c9397cc9..8a9ea3d0e1a35fec1bd56a465d50335939867bb3 100644 (file)
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -43,8 +43,7 @@
 
 /* @todo remove some of the magic constants.  -- ali
  * */
-namespace SparcISA
-{
+namespace SparcISA {
 
 TLB::TLB(const std::string &name, int s)
     : SimObject(name), size(s), usedEntries(0), lastReplaced(0),
@@ -1329,6 +1328,9 @@ TLB::unserialize(Checkpoint *cp, const std::string &section)
     }
 }
 
+/* end namespace SparcISA */ }
+
+using namespace SparcISA;
 
 DEFINE_SIM_OBJECT_CLASS_NAME("SparcTLB", TLB)
 
@@ -1371,4 +1373,3 @@ CREATE_SIM_OBJECT(DTB)
 }
 
 REGISTER_SIM_OBJECT("SparcDTB", DTB)
-}