Changes to build m5.fast

--HG--
extra : convert_revision : 2ec600b8e72e40e8b96e3b1dbe0334aa05e0f30b

diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 312b7fc715b82c483089bffae1d1f54a08d37749..304c97f2f73eeb9351164b154f00d957ddf60c30 100644 (file)
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@ -679,9 +679,9 @@ decode OP default Unknown::unknown()
                 0x0: Trap::tcci({{
                     if(passesCondition(Ccr<3:0>, COND2))
                     {
+#if FULL_SYSTEM
                         int lTrapNum = I ? (Rs1 + SW_TRAP) : (Rs1 + Rs2);
                         DPRINTF(Sparc, "The trap number is %d\n", lTrapNum);
-#if FULL_SYSTEM
                         fault = new TrapInstruction(lTrapNum);
 #else
                         DPRINTF(Sparc, "The syscall number is %d\n", R1);
@@ -692,9 +692,9 @@ decode OP default Unknown::unknown()
                 0x2: Trap::tccx({{
                     if(passesCondition(Ccr<7:4>, COND2))
                     {
+#if FULL_SYSTEM
                         int lTrapNum = I ? (Rs1 + SW_TRAP) : (Rs1 + Rs2);
                         DPRINTF(Sparc, "The trap number is %d\n", lTrapNum);
-#if FULL_SYSTEM
                         fault = new TrapInstruction(lTrapNum);
 #else
                         DPRINTF(Sparc, "The syscall number is %d\n", R1);

diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 70c7e719f42aad92706722446efce86f9cddadcc..1506641483ce89439147f7c154ad71f227e06c2f 100644 (file)
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -249,7 +249,10 @@ SparcLiveProcess::argsInit(int intSize, int pageSize)
     Addr envp_array_base = auxv_array_base - envp_array_size;
     Addr argv_array_base = envp_array_base - argv_array_size;
     Addr argc_base = argv_array_base - argc_size;
+#ifndef NDEBUG
+    // only used in DPRINTF
     Addr window_save_base = argc_base - window_save_size;
+#endif
 
     DPRINTF(Sparc, "The addresses of items on the initial stack:\n");
     DPRINTF(Sparc, "0x%x - aux data\n", aux_data_base);

diff --git a/src/mem/cache/base_cache.cc b/src/mem/cache/base_cache.cc
index 8978fef02253ad70b3f7e5fabe9411f4fe3ad58a..a172847df67e15cea9b3d99423e2694c4955ec06 100644 (file)
--- a/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@ -200,8 +200,7 @@ BaseCache::CacheEvent::process()
     }
     //Response
     //Know the packet to send, no need to mark in service (must succed)
-    bool success = cachePort->sendTiming(pkt);
-    assert(success);
+    assert(cachePort->sendTiming(pkt));
 }
 
 const char *

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index c8b0cdaed60a1a950c59be42df1cdfc38555a1dc..068fea678f6b85ef5d6b7f22edefbd2dce73b23d 100644 (file)
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -223,7 +223,7 @@ class Packet
     bool isNoAllocate() { return (flags & NO_ALLOCATE) != 0; }
     bool isCompressed() { return (flags & COMPRESSED) != 0; }
 
-    bool nic_pkt() { assert("Unimplemented\n" && 0); }
+    bool nic_pkt() { assert("Unimplemented\n" && 0); return false; }
 
     /** Possible results of a packet's request. */
     enum Result