wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hacked a fix for indirect-load-on-page-fault bug.

Browse Source
This commit is contained in:
cdkersey
2015-09-04 13:13:13 -06:00
parent a9dfe00b48
commit 3804d09803
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/instruction.cpp
View File

@@ -138,6 +138,18 @@ void Instruction::executeOn(Warp &c) {
Size wordSz = c.core->a.getWordSize(); Size wordSz = c.core->a.getWordSize();
Word nextPc = c.pc; Word nextPc = c.pc;
// If we have a load, overwriting a register's contents, we have to make sure
// ahead of time it will not fault. Otherwise we may perform an indirect load
// by mistake.
if (op == LD && rdest == rsrc[0]) {
for (Size t = 0; t < c.activeThreads; t++) {
if ((!predicated || c.pred[t][pred]) && c.tmask[t]) {
Word memAddr = c.reg[t][rsrc[0]] + immsrc;
c.core->mem.read(memAddr, c.supervisorMode);
}
}
}
bool sjOnce(true), // Has not yet split or joined once. bool sjOnce(true), // Has not yet split or joined once.
pcSet(false); // PC has already been set pcSet(false); // PC has already been set
for (Size t = 0; t < c.activeThreads; t++) { for (Size t = 0; t < c.activeThreads; t++) {