Yet another merge with the main repository.

[gem5.git] / src / cpu / inorder / resources / graduation_unit.hh

diff --git a/src/cpu/inorder/resources/graduation_unit.hh b/src/cpu/inorder/resources/graduation_unit.hh
index f53b6797f469f0429584f8d166aae00e7bcf081c..836b568a66175e2740a4f78a436c60cad06f50a0 100644 (file)
--- a/src/cpu/inorder/resources/graduation_unit.hh
+++ b/src/cpu/inorder/resources/graduation_unit.hh
@@ -32,20 +32,21 @@
 #ifndef __CPU_INORDER_GRAD_UNIT_HH__
 #define __CPU_INORDER_GRAD_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class GraduationUnit : public Resource {
   public:
     typedef ThePipeline::DynInstPtr DynInstPtr;
 
     enum Command {
+        CheckFault,
         GraduateInst
     };
 
@@ -53,16 +54,13 @@ class GraduationUnit : public Resource {
     GraduationUnit(std::string res_name, int res_id, int res_width,
                    int res_latency, InOrderCPU *_cpu,
                    ThePipeline::Params *params);
-    virtual ~GraduationUnit() {}
 
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
   protected:
-    Tick lastCycleGrad;
-    int numCycleGrad;
-
+    Tick lastNonSpecTick[ThePipeline::MaxThreads];
+    Tick lastFaultTick[ThePipeline::MaxThreads];
     bool *nonSpecInstActive[ThePipeline::MaxThreads];
-
     InstSeqNum *nonSpecSeqNum[ThePipeline::MaxThreads];
 };