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

SPARC: Tighten up the clone system call and SPARCs copyRegs.

Browse source
This commit is contained in:
Gabe Black 2009-04-24 23:11:21 -07:00
parent 7c056e44e5
commit 9d0fa27d09
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/arch/sparc/regfile.cc
View file

@ -359,19 +359,20 @@ void SparcISA::copyRegs(ThreadContext *src, ThreadContext *dest)
for (int x = 0; x < MaxGL; ++x) {
src->setMiscRegNoEffect(MISCREG_GL, x);
dest->setMiscRegNoEffect(MISCREG_GL, x);
for (int y = 0; y < 8; y++)
// Skip %g0 which is always zero.
for (int y = 1; y < 8; y++)
dest->setIntReg(y, src->readIntReg(y));
}
//Locals/Ins/Outs
//Locals and ins. Outs are all also ins.
for (int x = 0; x < NWindows; ++x) {
src->setMiscRegNoEffect(MISCREG_CWP, x);
dest->setMiscRegNoEffect(MISCREG_CWP, x);
for (int y = 8; y < 32; y++)
for (int y = 16; y < 32; y++)
dest->setIntReg(y, src->readIntReg(y));
}
//MicroIntRegs
for (int y = 0; y < NumMicroIntRegs; ++y)
dest->setIntReg(y+32, src->readIntReg(y+32));
//Microcode reg and pseudo int regs (misc regs in the integer regfile).
for (int y = NumIntArchRegs; y < NumIntArchRegs + NumMicroIntRegs; ++y)
dest->setIntReg(y, src->readIntReg(y));
//Restore src's GL, CWP
src->setMiscRegNoEffect(MISCREG_GL, old_gl);
@ -379,7 +380,7 @@ void SparcISA::copyRegs(ThreadContext *src, ThreadContext *dest)
// Then loop through the floating point registers.
for (int i = 0; i < SparcISA::NumFloatRegs; ++i) {
for (int i = 0; i < SparcISA::NumFloatArchRegs; ++i) {
dest->setFloatRegBits(i, src->readFloatRegBits(i));
}

6
src/sim/syscall_emul.cc
View file

@ -723,11 +723,7 @@ cloneFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
ctc->setPC(tc->readNextPC());
ctc->setNextPC(tc->readNextPC() + sizeof(TheISA::MachInst));
// In SPARC, need NNPC too...
#if THE_ISA == SPARC_ISA
ctc->setNextNPC(tc->readNextNPC() + sizeof(TheISA::MachInst));
#endif
ctc->setNextNPC(tc->readNextNPC() + sizeof(TheISA::MachInst));
ctc->activate();