cpu: O3 add a header declaring the DerivO3CPU

[gem5.git] / src / cpu / func_unit.hh

diff --git a/src/cpu/func_unit.hh b/src/cpu/func_unit.hh
index e8238ba7353074042aedff110fc487e2bbec57d0..51e2011f8776d25ee14d98805086787bf29ccc08 100644 (file)
--- a/src/cpu/func_unit.hh
+++ b/src/cpu/func_unit.hh
@@ -36,8 +36,8 @@
 #include <vector>
 
 #include "cpu/op_class.hh"
-#include "params/OpDesc.hh"
 #include "params/FUDesc.hh"
+#include "params/OpDesc.hh"
 #include "sim/sim_object.hh"
 
 ////////////////////////////////////////////////////////////////////////////
@@ -47,19 +47,21 @@
 //
 //
 
-struct OpDesc : public SimObject
+class OpDesc : public SimObject
 {
+  public:
     OpClass opClass;
-    unsigned    opLat;
-    unsigned    issueLat;
+    Cycles opLat;
+    Cycles issueLat;
 
     OpDesc(const OpDescParams *p)
         : SimObject(p), opClass(p->opClass), opLat(p->opLat),
           issueLat(p->issueLat) {};
 };
 
-struct FUDesc : public SimObject
+class FUDesc : public SimObject
 {
+  public:
     std::vector<OpDesc *> opDescList;
     unsigned         number;