Changes to build m5.fast

--HG--
extra : convert_revision : 2ec600b8e72e40e8b96e3b1dbe0334aa05e0f30b
This commit is contained in:
Steve Reinhardt 2006-08-17 23:13:11 -04:00
parent a21afd7bc4
commit 2b70b74c9b
4 changed files with 7 additions and 5 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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 *

View file

@ -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