Make it so that all thread contexts are registered with the System, even in

SE.  Process still keeps track of the tc's it owns, but registration occurs
with the System, this eases the way for system-wide context Ids based on
registration.

1 files changed, 29 insertions, 25 deletions

diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index a8fda04eb..987e0465e 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -112,44 +112,45 @@ SparcLiveProcess::startup()
 {
     Process::startup();
 
+    ThreadContext *tc = system->getThreadContext(contextIds[0]);
     //From the SPARC ABI
 
     //Setup default FP state
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_FSR, 0);
+    tc->setMiscRegNoEffect(MISCREG_FSR, 0);
 
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_TICK, 0);
+    tc->setMiscRegNoEffect(MISCREG_TICK, 0);
 
     /*
      * Register window management registers
      */
 
     //No windows contain info from other programs
-    //threadContexts[0]->setMiscRegNoEffect(MISCREG_OTHERWIN, 0);
-    threadContexts[0]->setIntReg(NumIntArchRegs + 6, 0);
+    //tc->setMiscRegNoEffect(MISCREG_OTHERWIN, 0);
+    tc->setIntReg(NumIntArchRegs + 6, 0);
     //There are no windows to pop
-    //threadContexts[0]->setMiscRegNoEffect(MISCREG_CANRESTORE, 0);
-    threadContexts[0]->setIntReg(NumIntArchRegs + 4, 0);
+    //tc->setMiscRegNoEffect(MISCREG_CANRESTORE, 0);
+    tc->setIntReg(NumIntArchRegs + 4, 0);
     //All windows are available to save into
-    //threadContexts[0]->setMiscRegNoEffect(MISCREG_CANSAVE, NWindows - 2);
-    threadContexts[0]->setIntReg(NumIntArchRegs + 3, NWindows - 2);
+    //tc->setMiscRegNoEffect(MISCREG_CANSAVE, NWindows - 2);
+    tc->setIntReg(NumIntArchRegs + 3, NWindows - 2);
     //All windows are "clean"
-    //threadContexts[0]->setMiscRegNoEffect(MISCREG_CLEANWIN, NWindows);
-    threadContexts[0]->setIntReg(NumIntArchRegs + 5, NWindows);
+    //tc->setMiscRegNoEffect(MISCREG_CLEANWIN, NWindows);
+    tc->setIntReg(NumIntArchRegs + 5, NWindows);
     //Start with register window 0
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_CWP, 0);
+    tc->setMiscRegNoEffect(MISCREG_CWP, 0);
     //Always use spill and fill traps 0
-    //threadContexts[0]->setMiscRegNoEffect(MISCREG_WSTATE, 0);
-    threadContexts[0]->setIntReg(NumIntArchRegs + 7, 0);
+    //tc->setMiscRegNoEffect(MISCREG_WSTATE, 0);
+    tc->setIntReg(NumIntArchRegs + 7, 0);
     //Set the trap level to 0
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_TL, 0);
+    tc->setMiscRegNoEffect(MISCREG_TL, 0);
     //Set the ASI register to something fixed
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_ASI, ASI_PRIMARY);
+    tc->setMiscRegNoEffect(MISCREG_ASI, ASI_PRIMARY);
 
     /*
      * T1 specific registers
      */
     //Turn on the icache, dcache, dtb translation, and itb translation.
-    threadContexts[0]->setMiscRegNoEffect(MISCREG_MMU_LSU_CTRL, 15);
+    tc->setMiscRegNoEffect(MISCREG_MMU_LSU_CTRL, 15);
 }
 
 void
@@ -160,8 +161,9 @@ Sparc32LiveProcess::startup()
 
     SparcLiveProcess::startup();
 
+    ThreadContext *tc = system->getThreadContext(contextIds[0]);
     //The process runs in user mode with 32 bit addresses
-    threadContexts[0]->setMiscReg(MISCREG_PSTATE, 0x0a);
+    tc->setMiscReg(MISCREG_PSTATE, 0x0a);
 
     argsInit(32 / 8, VMPageSize);
 }
@@ -174,8 +176,9 @@ Sparc64LiveProcess::startup()
 
     SparcLiveProcess::startup();
 
+    ThreadContext *tc = system->getThreadContext(contextIds[0]);
     //The process runs in user mode
-    threadContexts[0]->setMiscReg(MISCREG_PSTATE, 0x02);
+    tc->setMiscReg(MISCREG_PSTATE, 0x02);
 
     argsInit(sizeof(IntReg), VMPageSize);
 }
@@ -391,20 +394,21 @@ SparcLiveProcess::argsInit(int pageSize)
     fillStart = stack_base;
     spillStart = fillStart + sizeof(MachInst) * numFillInsts;
 
+    ThreadContext *tc = system->getThreadContext(contextIds[0]);
     //Set up the thread context to start running the process
     //assert(NumArgumentRegs >= 2);
-    //threadContexts[0]->setIntReg(ArgumentReg[0], argc);
-    //threadContexts[0]->setIntReg(ArgumentReg[1], argv_array_base);
-    threadContexts[0]->setIntReg(StackPointerReg, stack_min - StackBias);
+    //tc->setIntReg(ArgumentReg[0], argc);
+    //tc->setIntReg(ArgumentReg[1], argv_array_base);
+    tc->setIntReg(StackPointerReg, stack_min - StackBias);
 
     // %g1 is a pointer to a function that should be run at exit. Since we
     // don't have anything like that, it should be set to 0.
-    threadContexts[0]->setIntReg(1, 0);
+    tc->setIntReg(1, 0);
 
     Addr prog_entry = objFile->entryPoint();
-    threadContexts[0]->setPC(prog_entry);
-    threadContexts[0]->setNextPC(prog_entry + sizeof(MachInst));
-    threadContexts[0]->setNextNPC(prog_entry + (2 * sizeof(MachInst)));
+    tc->setPC(prog_entry);
+    tc->setNextPC(prog_entry + sizeof(MachInst));
+    tc->setNextNPC(prog_entry + (2 * sizeof(MachInst)));
 
     //Align the "stack_min" to a page boundary.
     stack_min = roundDown(stack_min, pageSize);