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

fix shadow set bugs in MIPS code that caused out of bounds access...

Browse source 
panic rdpgpr/wrpgpr instructions until a better impl.
of MIPS shadow sets is available.
This commit is contained in:
Korey Sewell 2008-10-06 02:07:04 -04:00
parent b25755993b
commit 6c046a28dc
5 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/arch/mips/isa/decoder.isa
View file

@ -603,7 +603,8 @@ decode OPCODE_HI default Unknown::unknown() {
0xA: rdpgpr({{
if(Config_AR >= 1)
{ // Rev 2 of the architecture
Rd = xc->tcBase()->readIntReg(RT + NumIntRegs * SRSCtl_PSS);
panic("Shadow Sets Not Fully Implemented.\n");
//Rd = xc->tcBase()->readIntReg(RT + NumIntRegs * SRSCtl_PSS);
}
else
{
@ -613,7 +614,8 @@ decode OPCODE_HI default Unknown::unknown() {
0xE: wrpgpr({{
if(Config_AR >= 1)
{ // Rev 2 of the architecture
xc->tcBase()->setIntReg(RD + NumIntRegs * SRSCtl_PSS,Rt);
panic("Shadow Sets Not Fully Implemented.\n");
//xc->tcBase()->setIntReg(RD + NumIntRegs * SRSCtl_PSS,Rt);
// warn("Writing %d to %d, PSS: %d, SRS: %x\n",Rt,RD + NumIntRegs * SRSCtl_PSS, SRSCtl_PSS,SRSCtl);
}
else

2
src/arch/mips/isa_traits.hh
View file

@ -181,6 +181,8 @@ namespace MipsISA
const int NumIntRegs = NumIntArchRegs*NumShadowRegSets + NumIntSpecialRegs; //HI & LO Regs
const int NumFloatRegs = NumFloatArchRegs + NumFloatSpecialRegs;//
const int TotalArchRegs = NumIntArchRegs * NumShadowRegSets;
// Static instruction parameters
const int MaxInstSrcRegs = 10;
const int MaxInstDestRegs = 8;

33
src/arch/mips/regfile/int_regfile.cc
View file

@ -44,6 +44,12 @@ IntRegFile::clear()
currShadowSet=0;
}
int
IntRegFile::readShadowSet()
{
return currShadowSet;
}
void
IntRegFile::setShadowSet(int css)
{
@ -54,21 +60,17 @@ IntRegFile::setShadowSet(int css)
IntReg
IntRegFile::readReg(int intReg)
{
if (intReg < NumIntRegs) {
if (intReg < NumIntArchRegs) {
// Regular GPR Read
DPRINTF(MipsPRA, "Reading Reg: %d, CurrShadowSet: %d\n", intReg,
currShadowSet);
if (intReg >= NumIntArchRegs * NumShadowRegSets) {
return regs[intReg + NumIntRegs * currShadowSet];
return regs[intReg + NumIntArchRegs * currShadowSet];
} else {
int index = intReg + NumIntArchRegs * currShadowSet;
index = index % NumIntArchRegs;
return regs[index];
}
} else {
// Read from shadow GPR .. probably called by RDPGPR
return regs[intReg];
unsigned special_reg_num = intReg - NumIntArchRegs;
// Read A Special Reg
return regs[TotalArchRegs + special_reg_num];
}
}
@ -76,13 +78,12 @@ Fault
IntRegFile::setReg(int intReg, const IntReg &val)
{
if (intReg != ZeroReg) {
if (intReg < NumIntRegs) {
if (intReg >= NumIntArchRegs * NumShadowRegSets)
regs[intReg] = val;
else
regs[intReg + NumIntRegs * currShadowSet] = val;
if (intReg < NumIntArchRegs) {
regs[intReg + NumIntArchRegs * currShadowSet] = val;
} else {
regs[intReg] = val;
unsigned special_reg_num = intReg - NumIntArchRegs;
regs[TotalArchRegs + special_reg_num] = val;
}
}

3
src/arch/mips/regfile/int_regfile.hh
View file

@ -48,7 +48,7 @@ namespace MipsISA
}
enum MiscIntRegNums {
LO = NumIntArchRegs*NumShadowRegSets,
LO = NumIntArchRegs,
HI,
DSPACX0,
DSPLo1,
@ -72,6 +72,7 @@ namespace MipsISA
int currShadowSet;
public:
void clear();
int readShadowSet();
void setShadowSet(int css);
IntReg readReg(int intReg);
Fault setReg(int intReg, const IntReg &val);

2
src/arch/mips/regfile/misc_regfile.cc
View file

@ -40,7 +40,7 @@
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
#include "params/DerivO3CPU.hh"
//#include "params/DerivO3CPU.hh"
using namespace std;