From: Anders Handler <s052838@student.dtu.dk>
Date: Tue, 10 Jan 2012 01:05:07 +0000 (-0500)
Subject: CPU: Remove Alpha-specific PC alignment check.
X-Git-Tag: stable_2012_06_28~275^2~27
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b587d511c3819576ce1195b59416083cbd42522a;p=gem5.git

CPU: Remove Alpha-specific PC alignment check.
---

diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index f9955d014..385a83b27 100644
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -84,7 +84,9 @@ PCEventQueue::schedule(PCEvent *event)
 bool
 PCEventQueue::doService(ThreadContext *tc)
 {
-    Addr pc = tc->instAddr() & ~0x3;
+    // This will fail to break on Alpha PALcode addresses, but that is
+    // a rare use case.
+    Addr pc = tc->instAddr();
     int serviced = 0;
     range_t range = equal_range(pc);
     for (iterator i = range.first; i != range.second; ++i) {
@@ -92,7 +94,7 @@ PCEventQueue::doService(ThreadContext *tc)
         // another event.  This for example, prevents two invocations
         // of the SkipFuncEvent.  Maybe we should have separate PC
         // event queues for each processor?
-        if (pc != (tc->instAddr() & ~0x3))
+        if (pc != tc->instAddr())
             continue;
 
         DPRINTF(PCEvent, "PC based event serviced at %#x: %s\n",