6 files changed, 18 insertions, 4 deletions

diff --git a/sim/eventq.cc b/sim/eventq.cc
index 0884db994..4bfd6face 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -30,7 +30,6 @@
 
 #include <iostream>
 #include <string>
-#include <sstream>
 #include <vector>
 
 #include "cpu/smt.hh"
diff --git a/sim/faults.cc b/sim/faults.cc
index f7e9a0691..cb095f852 100644
--- a/sim/faults.cc
+++ b/sim/faults.cc
@@ -45,3 +45,8 @@ void FaultBase::invoke(ExecContext * xc)
     assert(!xc->misspeculating());
 }
 #endif
+
+void UnimpFault::invoke(ExecContext * xc)
+{
+    panic("Unimpfault: %s\n", panicStr.c_str());
+}
diff --git a/sim/faults.hh b/sim/faults.hh
index 18601e8f1..9b3bc9103 100644
--- a/sim/faults.hh
+++ b/sim/faults.hh
@@ -64,4 +64,17 @@ class FaultBase : public RefCounted
 
 FaultBase * const NoFault = 0;
 
+class UnimpFault : public FaultBase
+{
+  private:
+    std::string panicStr;
+  public:
+    UnimpFault(std::string _str)
+        : panicStr(_str)
+    { }
+
+    FaultName name() {return "Unimplemented simulator feature";}
+    void invoke(ExecContext * xc);
+};
+
 #endif // __FAULTS_HH__
diff --git a/sim/param.cc b/sim/param.cc
index bc81881d3..8998d7d77 100644
--- a/sim/param.cc
+++ b/sim/param.cc
@@ -28,7 +28,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstdio>
 #include <list>
 #include <string>
 #include <vector>
diff --git a/sim/process.cc b/sim/process.cc
index d88716f1e..1261b8436 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <cstdio>
 #include <string>
 
 #include "base/intmath.hh"
diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index 3cdc05e78..7897b5c8b 100644
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <cstdio>
 
 #include <string>