From c2ee69d68750b51cd515d6eeedc5d45cd68baf12 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 14 Jul 2007 12:12:46 -0700
Subject: [PATCH 1/2] Make NO_FAST_ALLOC compile.

--HG--
extra : convert_revision : 80579a61eb8d220e75cdee11bc09ca985c8fd85c
---
 src/base/fast_alloc.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/base/fast_alloc.cc b/src/base/fast_alloc.cc
index 610dff66c..e1298a8bd 100644
--- a/src/base/fast_alloc.cc
+++ b/src/base/fast_alloc.cc
@@ -34,15 +34,15 @@
  * by permission.
  */
 
-#ifndef NO_FAST_ALLOC
+#include <assert.h>
+#include "base/fast_alloc.hh"
+
+#if !NO_FAST_ALLOC
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
 
-#include <assert.h>
-#include "base/fast_alloc.hh"
-
 void *FastAlloc::freeLists[Num_Buckets];
 
 #ifdef FAST_ALLOC_STATS

From e5ecfa27455a8be97429e9f88e8e6582b9819c6f Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 14 Jul 2007 12:22:04 -0700
Subject: [PATCH 2/2] Disable PrintThreadInfo since it causes a panic when
 using VPtr. See Flyspray #281.

--HG--
extra : convert_revision : 199ef802bcabed09f6ea6922c3a3954fea161190
---
 src/arch/alpha/linux/system.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 9a452e10f..e8bdc1d66 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -132,7 +132,12 @@ LinuxAlphaSystem::LinuxAlphaSystem(Params *p)
     debugPrintkEvent = addKernelFuncEvent<DebugPrintkEvent>("dprintk");
     idleStartEvent = addKernelFuncEvent<IdleStartEvent>("cpu_idle");
 
-    if (kernelSymtab->findAddress("alpha_switch_to", addr) && DTRACE(Thread)) {
+    // Disable for now as it runs into panic() calls in VPTr methods
+    // (see sim/vptr.hh).  Once those bugs are fixed, we can
+    // re-enable, but we should find a better way to turn it on than
+    // using DTRACE(Thread), since looking at a trace flag at tick 0
+    // leads to non-intuitive behavior with --trace-start.
+    if (false && kernelSymtab->findAddress("alpha_switch_to", addr)) {
         printThreadEvent = new PrintThreadInfo(&pcEventQueue, "threadinfo",
                                                addr + sizeof(MachInst) * 6);
     } else {