summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-17 23:13:11 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-17 23:13:11 -0400
commit2b70b74c9bc575005a26fd727be26e11ac6db032 (patch)
tree3fde74911287314ebec2e84a4d12475a75fc1362 /src
parenta21afd7bc45c1d2e571a85dc54649d292fcd8c7f (diff)
downloadgem5-2b70b74c9bc575005a26fd727be26e11ac6db032.tar.xz
Changes to build m5.fast
--HG-- extra : convert_revision : 2ec600b8e72e40e8b96e3b1dbe0334aa05e0f30b
Diffstat (limited to 'src')
-rw-r--r--src/arch/sparc/isa/decoder.isa4
-rw-r--r--src/arch/sparc/process.cc3
-rw-r--r--src/mem/cache/base_cache.cc3
-rw-r--r--src/mem/packet.hh2
4 files changed, 7 insertions, 5 deletions
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 312b7fc71..304c97f2f 100644
--- 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 70c7e719f..150664148 100644
--- 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 8978fef02..a172847df 100644
--- 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 c8b0cdaed..068fea678 100644
--- 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