[m5-dev] changeset in m5: inorder: fix RUBY_FS build

[Korey Sewell]

changeset c6bc8fe81e79 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=c6bc8fe81e79
description:
        inorder: fix RUBY_FS build
        the current code was using incorrect dummy instruction in interrupts 
function

diffstat:

 src/cpu/inorder/cpu.cc |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r de7601e6e19d -r c6bc8fe81e79 src/cpu/inorder/cpu.cc
--- a/src/cpu/inorder/cpu.cc    Mon Jan 10 11:11:20 2011 -0800
+++ b/src/cpu/inorder/cpu.cc    Wed Jan 12 11:52:29 2011 -0500
@@ -612,7 +612,7 @@
 InOrderCPU::getInterrupts()
 {
     // Check if there are any outstanding interrupts
-    return this->interrupts->getInterrupt(this->threadContexts[0]);
+    return interrupts->getInterrupt(threadContexts[0]);
 }
 
 
@@ -626,12 +626,12 @@
     // @todo: Allow other threads to handle interrupts.
 
     assert(interrupt != NoFault);
-    this->interrupts->updateIntrInfo(this->threadContexts[0]);
+    interrupts->updateIntrInfo(threadContexts[0]);
 
     DPRINTF(InOrderCPU, "Interrupt %s being handled\n", interrupt->name());
-    static StaticInstPtr dummyStatic(TheISA::NoopMachInst, 0);
-    static DynInstPtr dummyDyn = new Impl::DynInst(dummyStatic);
-    this->trap(interrupt, dummyDyn);
+
+    // Note: Context ID ok here? Impl. of FS mode needs to revisit this
+    trap(interrupt, threadContexts[0]->contextId(), dummyBufferInst);
 }
 
 
@@ -1407,13 +1407,13 @@
 void
 InOrderCPU::wakeup()
 {
-    if (this->thread[0]->status() != ThreadContext::Suspended)
+    if (thread[0]->status() != ThreadContext::Suspended)
         return;
 
-    this->wakeCPU();
+    wakeCPU();
 
     DPRINTF(Quiesce, "Suspended Processor woken\n");
-    this->threadContexts[0]->activate();
+    threadContexts[0]->activate();
 }
 #endif
 
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev