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

More side-effect-neutral way to handle PC updates.

Browse Source
This commit is contained in:
cdkersey
2015-08-04 13:38:22 -06:00
parent 6880e01db6
commit 3459ed22aa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/instruction.cpp
View File

@@ -285,7 +285,6 @@ void Instruction::executeOn(Warp &c) {
nextActiveThreads = 0; nextActiveThreads = 0;
break; break;
case TRAP: c.interrupt(0); case TRAP: c.interrupt(0);
nextPc = c.core->interruptEntry;
break; break;
case JMPRU: c.supervisorMode = false; case JMPRU: c.supervisorMode = false;
if (!pcSet) nextPc = reg[rsrc[0]]; if (!pcSet) nextPc = reg[rsrc[0]];
@@ -392,7 +391,10 @@ void Instruction::executeOn(Warp &c) {
D(3, "End instruction execute."); D(3, "End instruction execute.");
c.activeThreads = nextActiveThreads; c.activeThreads = nextActiveThreads;
c.pc = nextPc;
// This way, if pc was set by a side effect (such as interrupt), it will
// retain its new value.
if (pcSet) c.pc = nextPc;
if (nextActiveThreads > c.reg.size()) { if (nextActiveThreads > c.reg.size()) {
cerr << "Error: attempt to spawn " << nextActiveThreads << " threads. " cerr << "Error: attempt to spawn " << nextActiveThreads << " threads. "