sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some changes which weren't needed before doing a bk pull were needed afterwards, for some reason.

Browse source 
arch/alpha/ev5.cc:
    Took out the unnecessary check for a null Fault pointer.
arch/alpha/isa/mem.isa:
    Changed Fault to Fault *, and removed underscores from fault names.

--HG--
extra : convert_revision : 367a58a375f911185ddcc5fc826034af96427461
This commit is contained in:
Gabe Black 2006-02-16 02:08:13 -05:00
parent b161d2a731
commit 00f451cc02
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/alpha/ev5.cc
View file

@ -180,8 +180,8 @@ AlphaISA::zeroRegisters(CPU *cpu)
void void
ExecContext::ev5_trap(Fault * fault) ExecContext::ev5_trap(Fault * fault)
{ {
DPRINTF(Fault, "Fault %s at PC: %#x\n", fault ? fault->name : "none", regs.pc); DPRINTF(Fault, "Fault %s at PC: %#x\n", fault->name, regs.pc);
cpu->recordEvent(csprintf("Fault %s", fault ? fault->name : "none")); cpu->recordEvent(csprintf("Fault %s", fault->name));
assert(!misspeculating()); assert(!misspeculating());
kernelStats->fault(fault); kernelStats->fault(fault);

46
arch/alpha/isa/mem.isa
View file

@ -173,12 +173,12 @@ def template LoadStoreDeclare {{
def template InitiateAccDeclare {{ def template InitiateAccDeclare {{
Fault initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const; Fault * initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const;
}}; }};
def template CompleteAccDeclare {{ def template CompleteAccDeclare {{
Fault completeAcc(uint8_t *, %(CPU_exec_context)s *, Trace::InstRecord *) const; Fault * completeAcc(uint8_t *, %(CPU_exec_context)s *, Trace::InstRecord *) const;
}}; }};
@ -283,11 +283,11 @@ def template LoadExecute {{
def template LoadInitiateAcc {{ def template LoadInitiateAcc {{
Fault %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc, Fault * %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
Addr EA; Addr EA;
Fault fault = No_Fault; Fault * fault = NoFault;
%(mem_acc_type)s Mem = 0; %(mem_acc_type)s Mem = 0;
%(fp_enable_check)s; %(fp_enable_check)s;
@ -295,7 +295,7 @@ def template LoadInitiateAcc {{
%(op_rd)s; %(op_rd)s;
%(ea_code)s; %(ea_code)s;
if (fault == No_Fault) { if (fault == NoFault) {
fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags); fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags);
} }
@ -305,11 +305,11 @@ def template LoadInitiateAcc {{
def template LoadCompleteAcc {{ def template LoadCompleteAcc {{
Fault %(class_name)s::completeAcc(uint8_t *data, Fault * %(class_name)s::completeAcc(uint8_t *data,
%(CPU_exec_context)s *xc, %(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
Fault fault = No_Fault; Fault * fault = NoFault;
%(mem_acc_type)s Mem = 0; %(mem_acc_type)s Mem = 0;
%(fp_enable_check)s; %(fp_enable_check)s;
@ -317,11 +317,11 @@ def template LoadCompleteAcc {{
memcpy(&Mem, data, sizeof(Mem)); memcpy(&Mem, data, sizeof(Mem));
if (fault == No_Fault) { if (fault == NoFault) {
%(memacc_code)s; %(memacc_code)s;
} }
if (fault == No_Fault) { if (fault == NoFault) {
%(op_wb)s; %(op_wb)s;
} }
@ -403,11 +403,11 @@ def template StoreExecute {{
}}; }};
def template StoreInitiateAcc {{ def template StoreInitiateAcc {{
Fault %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc, Fault * %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
Addr EA; Addr EA;
Fault fault = No_Fault; Fault * fault = NoFault;
uint64_t write_result = 0; uint64_t write_result = 0;
%(mem_acc_type)s Mem = 0; %(mem_acc_type)s Mem = 0;
@ -416,11 +416,11 @@ def template StoreInitiateAcc {{
%(op_rd)s; %(op_rd)s;
%(ea_code)s; %(ea_code)s;
if (fault == No_Fault) { if (fault == NoFault) {
%(memacc_code)s; %(memacc_code)s;
} }
if (fault == No_Fault) { if (fault == NoFault) {
fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA, fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
memAccessFlags, &write_result); memAccessFlags, &write_result);
if (traceData) { traceData->setData(Mem); } if (traceData) { traceData->setData(Mem); }
@ -432,11 +432,11 @@ def template StoreInitiateAcc {{
def template StoreCompleteAcc {{ def template StoreCompleteAcc {{
Fault %(class_name)s::completeAcc(uint8_t *data, Fault * %(class_name)s::completeAcc(uint8_t *data,
%(CPU_exec_context)s *xc, %(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
Fault fault = No_Fault; Fault * fault = NoFault;
uint64_t write_result = 0; uint64_t write_result = 0;
%(fp_enable_check)s; %(fp_enable_check)s;
@ -444,11 +444,11 @@ def template StoreCompleteAcc {{
memcpy(&write_result, data, sizeof(write_result)); memcpy(&write_result, data, sizeof(write_result));
if (fault == No_Fault) { if (fault == NoFault) {
%(postacc_code)s; %(postacc_code)s;
} }
if (fault == No_Fault) { if (fault == NoFault) {
%(op_wb)s; %(op_wb)s;
} }
@ -498,32 +498,32 @@ def template MiscExecute {{
}}; }};
def template MiscInitiateAcc {{ def template MiscInitiateAcc {{
Fault %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc, Fault * %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
Addr EA; Addr EA;
Fault fault = No_Fault; Fault * fault = NoFault;
%(fp_enable_check)s; %(fp_enable_check)s;
%(op_decl)s; %(op_decl)s;
%(op_rd)s; %(op_rd)s;
%(ea_code)s; %(ea_code)s;
if (fault == No_Fault) { if (fault == NoFault) {
%(memacc_code)s; %(memacc_code)s;
} }
return No_Fault; return NoFault;
} }
}}; }};
def template MiscCompleteAcc {{ def template MiscCompleteAcc {{
Fault %(class_name)s::completeAcc(uint8_t *data, Fault * %(class_name)s::completeAcc(uint8_t *data,
%(CPU_exec_context)s *xc, %(CPU_exec_context)s *xc,
Trace::InstRecord *traceData) const Trace::InstRecord *traceData) const
{ {
return No_Fault; return NoFault;
} }
}}; }};