derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu-minor: Check pc valid before printing (#107)

Browse Source 
In https://gem5-review.googlesource.com/c/public/gem5/+/52047 inst.pc
was changed from an object to a pointer. It is possible that this
pointer is null (e.g., if there is an interrupt and there is a bubble).
Make sure to check that it's not null before printing.

I believe that other places this pointer is dereferenced without an
explicit null check are safe, but I'm not certain.

Should fix #97 

Change-Id: Idbe246cfdb62d4d75416d41b451fb3c076233bbc
This commit is contained in:
Bobby R. Bruce
2023-07-25 17:14:38 -07:00
committed by GitHub
parent 556c9154dd 27cfe4cc1b
commit 7601fcfba6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpu/minor/dyn_inst.cc
View File

@@ -112,6 +112,11 @@ MinorDynInst::reportData(std::ostream &os) const
std::ostream & std::ostream &
operator <<(std::ostream &os, const MinorDynInst &inst) operator <<(std::ostream &os, const MinorDynInst &inst)
{ {
if (!inst.pc) {
os << inst.id << " pc: 0x???????? (bubble)";
return os;
}
os << inst.id << " pc: 0x" os << inst.id << " pc: 0x"
<< std::hex << inst.pc->instAddr() << std::dec << " ("; << std::hex << inst.pc->instAddr() << std::dec << " (";
@@ -169,7 +174,7 @@ MinorDynInst::minorTraceInst(const Named &named_object) const
{ {
if (isFault()) { if (isFault()) {
minorInst(named_object, "id=F;%s addr=0x%x fault=\"%s\"\n", minorInst(named_object, "id=F;%s addr=0x%x fault=\"%s\"\n",
id, pc->instAddr(), fault->name()); id, pc ? pc->instAddr() : 0, fault->name());
} else { } else {
unsigned int num_src_regs = staticInst->numSrcRegs(); unsigned int num_src_regs = staticInst->numSrcRegs();
unsigned int num_dest_regs = staticInst->numDestRegs(); unsigned int num_dest_regs = staticInst->numDestRegs();
@@ -209,7 +214,7 @@ MinorDynInst::minorTraceInst(const Named &named_object) const
minorInst(named_object, "id=%s addr=0x%x inst=\"%s\" class=%s" minorInst(named_object, "id=%s addr=0x%x inst=\"%s\" class=%s"
" flags=\"%s\"%s%s\n", " flags=\"%s\"%s%s\n",
id, pc->instAddr(), id, pc ? pc->instAddr() : 0,
(staticInst->opClass() == No_OpClass ? (staticInst->opClass() == No_OpClass ?
"(invalid)" : staticInst->disassemble(0,NULL)), "(invalid)" : staticInst->disassemble(0,NULL)),
enums::OpClassStrings[staticInst->opClass()], enums::OpClassStrings[staticInst->opClass()],