switch contexts on palcode rather than kernel code

cpu/pc_event.cc:
    mask off lower three bits so we can have an event in palcode

--HG--
extra : convert_revision : 49fcdc5c359ca2bd9149f092f80f77abcd7b20ee

1 files changed, 20 insertions, 3 deletions

diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index 91ad45157..539bac649 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -145,14 +145,29 @@ LinuxSystem::LinuxSystem(Params *p)
         printThreadEvent->schedule(addr + sizeof(MachInst) * 6);
 
     intStartEvent = new InterruptStartEvent(&pcEventQueue, "intStartEvent");
-    if (kernelSymtab->findAddress("do_entInt", addr))
+    if (palSymtab->findAddress("sys_int_21", addr))
         intStartEvent->schedule(addr + sizeof(MachInst) * 2);
+    else
+        panic("could not find symbol\n");
 
-    intEndEvent = new InterruptEndEvent(&pcEventQueue, "intStartEvent");
-    if (palSymtab->findAddress("Call_Pal_Rti", addr))
+    intEndEvent = new InterruptEndEvent(&pcEventQueue, "intEndEvent");
+    if (palSymtab->findAddress("rti_to_kern", addr))
         intEndEvent->schedule(addr + sizeof(MachInst));
     else
         panic("could not find symbol\n");
+
+    intEndEvent2 = new InterruptEndEvent(&pcEventQueue, "intEndEvent2");
+    if (palSymtab->findAddress("rti_to_user", addr))
+        intEndEvent2->schedule(addr + sizeof(MachInst));
+    else
+        panic("could not find symbol\n");
+
+
+    intEndEvent3 = new InterruptEndEvent(&pcEventQueue, "intEndEvent3");
+    if (kernelSymtab->findAddress("do_softirq", addr))
+        intEndEvent3->schedule(addr + sizeof(MachInst));
+    else
+        panic("could not find symbol\n");
 }
 
 LinuxSystem::~LinuxSystem()
@@ -167,6 +182,8 @@ LinuxSystem::~LinuxSystem()
     delete idleStartEvent;
     delete printThreadEvent;
     delete intStartEvent;
+    delete intEndEvent;
+    delete intEndEvent2;
 }