inorder: cleanup virtual functions

remove the annotation 'virtual' from  function declaration that isnt being derived from

10 files changed, 44 insertions, 49 deletions

diff --git a/src/cpu/inorder/resources/agen_unit.hh b/src/cpu/inorder/resources/agen_unit.hh
index fbfd2f446..7c9c5fd89 100644
--- a/src/cpu/inorder/resources/agen_unit.hh
+++ b/src/cpu/inorder/resources/agen_unit.hh
@@ -49,7 +49,6 @@ class AGENUnit : public Resource {
   public:
     AGENUnit(std::string res_name, int res_id, int res_width,
              int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~AGENUnit() {}
 
     enum Command {
         GenerateAddr
diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh
index 7d0b3348a..00915fd0d 100644
--- a/src/cpu/inorder/resources/branch_predictor.hh
+++ b/src/cpu/inorder/resources/branch_predictor.hh
@@ -56,14 +56,14 @@ class BranchPredictor : public Resource {
     BranchPredictor(std::string res_name, int res_id, int res_width,
               int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
 
-    virtual void regStats();
+    void regStats();
 
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
-    virtual void squash(DynInstPtr inst, int stage_num,
+    void squash(DynInstPtr inst, int stage_num,
                         InstSeqNum squash_seq_num, ThreadID tid);
 
-    virtual void instGraduated(InstSeqNum seq_num, ThreadID tid);
+    void instGraduated(InstSeqNum seq_num, ThreadID tid);
 
   protected:
     /** List of instructions this resource is currently
diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh
index 7e3052bd7..177f81559 100644
--- a/src/cpu/inorder/resources/cache_unit.hh
+++ b/src/cpu/inorder/resources/cache_unit.hh
@@ -101,30 +101,30 @@ class CacheUnit : public Resource
 
       protected:
         /** Atomic version of receive.  Panics. */
-        virtual Tick recvAtomic(PacketPtr pkt);
+        Tick recvAtomic(PacketPtr pkt);
 
         /** Functional version of receive.  Panics. */
-        virtual void recvFunctional(PacketPtr pkt);
+        void recvFunctional(PacketPtr pkt);
 
         /** Receives status change.  Other than range changing, panics. */
-        virtual void recvStatusChange(Status status);
+        void recvStatusChange(Status status);
 
         /** Returns the address ranges of this device. */
-        virtual void getDeviceAddressRanges(AddrRangeList &resp,
+        void getDeviceAddressRanges(AddrRangeList &resp,
                                             AddrRangeList &snoop)
         { resp.clear(); snoop.clear(); }
 
         /** Timing version of receive. Handles setting fetch to the
          * proper status to start fetching. */
-        virtual bool recvTiming(PacketPtr pkt);
+        bool recvTiming(PacketPtr pkt);
 
         /** Handles doing a retry of a failed fetch. */
-        virtual void recvRetry();
+        void recvRetry();
     };
 
     void init();
 
-    virtual ResourceRequest* getRequest(DynInstPtr _inst, int stage_num,
+    ResourceRequest* getRequest(DynInstPtr _inst, int stage_num,
                                         int res_idx, int slot_num,
                                         unsigned cmd);
 
@@ -238,7 +238,7 @@ class CacheUnitEvent : public ResourceEvent {
     virtual ~CacheUnitEvent() {}
 
     /** Processes a resource event. */
-    virtual void process();
+    void process();
 };
 
 class CacheRequest : public ResourceRequest
diff --git a/src/cpu/inorder/resources/decode_unit.hh b/src/cpu/inorder/resources/decode_unit.hh
index 1a700c211..1c4dc0523 100644
--- a/src/cpu/inorder/resources/decode_unit.hh
+++ b/src/cpu/inorder/resources/decode_unit.hh
@@ -49,13 +49,12 @@ class DecodeUnit : public Resource {
   public:
     DecodeUnit(std::string res_name, int res_id, int res_width,
               int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~DecodeUnit() {}
 
     enum Command {
         DecodeInst
     };
 
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
     void squash(DynInstPtr inst, int stage_num, InstSeqNum squash_seq_num,
                 ThreadID tid);
diff --git a/src/cpu/inorder/resources/execution_unit.hh b/src/cpu/inorder/resources/execution_unit.hh
index e852e3ed0..8be339f4a 100644
--- a/src/cpu/inorder/resources/execution_unit.hh
+++ b/src/cpu/inorder/resources/execution_unit.hh
@@ -54,13 +54,13 @@ class ExecutionUnit : public Resource {
               int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
 
   public:
-    virtual void regStats();
+    void regStats();
 
     /** Execute the function of this resource. The Default is action
      *  is to do nothing. More specific models will derive from this
      *  class and define their own execute function.
      */
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
   protected:
     /////////////////////////////////////////////////////////////////
diff --git a/src/cpu/inorder/resources/fetch_seq_unit.hh b/src/cpu/inorder/resources/fetch_seq_unit.hh
index 289e150aa..aab462224 100644
--- a/src/cpu/inorder/resources/fetch_seq_unit.hh
+++ b/src/cpu/inorder/resources/fetch_seq_unit.hh
@@ -54,13 +54,13 @@ class FetchSeqUnit : public Resource {
   public:
     FetchSeqUnit(std::string res_name, int res_id, int res_width,
               int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~FetchSeqUnit();
+    ~FetchSeqUnit();
     
-    virtual void init();
-    virtual void activateThread(ThreadID tid);
-    virtual void deactivateThread(ThreadID tid);
-    virtual void suspendThread(ThreadID tid);
-    virtual void execute(int slot_num);
+    void init();
+    void activateThread(ThreadID tid);
+    void deactivateThread(ThreadID tid);
+    void suspendThread(ThreadID tid);
+    void execute(int slot_num);
     void updateAfterContextSwitch(DynInstPtr inst, ThreadID tid);
     
 
@@ -68,7 +68,7 @@ class FetchSeqUnit : public Resource {
      *  looks in the global communication buffer to get squash
      *  info
      */
-    virtual void squash(DynInstPtr inst, int squash_stage,
+    void squash(DynInstPtr inst, int squash_stage,
                         InstSeqNum squash_seq_num, ThreadID tid);
 
 
@@ -110,10 +110,10 @@ class FetchSeqUnit : public Resource {
       public:
         /** Constructs a resource event. */
         FetchSeqEvent();
-        virtual ~FetchSeqEvent() {}
+        ~FetchSeqEvent() {}
 
         /** Processes a resource event. */
-        virtual void process();
+        void process();
     };
 
 };
diff --git a/src/cpu/inorder/resources/graduation_unit.hh b/src/cpu/inorder/resources/graduation_unit.hh
index f53b6797f..aae41993f 100644
--- a/src/cpu/inorder/resources/graduation_unit.hh
+++ b/src/cpu/inorder/resources/graduation_unit.hh
@@ -53,9 +53,8 @@ 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;
diff --git a/src/cpu/inorder/resources/inst_buffer.hh b/src/cpu/inorder/resources/inst_buffer.hh
index b655e132f..fcbdc20df 100644
--- a/src/cpu/inorder/resources/inst_buffer.hh
+++ b/src/cpu/inorder/resources/inst_buffer.hh
@@ -57,21 +57,20 @@ class InstBuffer : public Resource {
   public:
     InstBuffer(std::string res_name, int res_id, int res_width,
                int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~InstBuffer() {}
 
-    virtual void regStats();
+    void regStats();
 
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
-    virtual void insert(DynInstPtr inst);
+    void insert(DynInstPtr inst);
 
-    virtual void remove(DynInstPtr inst);
+    void remove(DynInstPtr inst);
 
-    virtual void pop(ThreadID tid);
+    void pop(ThreadID tid);
 
-    virtual DynInstPtr top(ThreadID tid);
+    DynInstPtr top(ThreadID tid);
 
-    virtual void squash(DynInstPtr inst, int stage_num,
+    void squash(DynInstPtr inst, int stage_num,
                         InstSeqNum squash_seq_num, ThreadID tid);
   protected:
     /** List of instructions this resource is currently
diff --git a/src/cpu/inorder/resources/mult_div_unit.hh b/src/cpu/inorder/resources/mult_div_unit.hh
index 555367504..d243eebea 100644
--- a/src/cpu/inorder/resources/mult_div_unit.hh
+++ b/src/cpu/inorder/resources/mult_div_unit.hh
@@ -63,24 +63,24 @@ class MultDivUnit : public Resource {
     /** Override default Resource getSlot(). Will only getSlot if
      *  valid mult/div sequence is being maintained
      */
-    virtual int getSlot(DynInstPtr inst);
+    int getSlot(DynInstPtr inst);
 
-    virtual int findSlot(DynInstPtr inst);
+    int findSlot(DynInstPtr inst);
 
-    virtual void freeSlot(int slot_idx);
+    void freeSlot(int slot_idx);
     
-    virtual void init();
+    void init();
     
     /** Get Operand Size For A Division Operation */
     int getDivOpSize(DynInstPtr inst);
 
     /** Override default Resource execute */
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
     void exeMulDiv(int slot_num);    
     
     /** Register extra resource stats */
-    virtual void regStats();
+    void regStats();
 
     void requestAgain(DynInstPtr inst, bool &try_request);
 
@@ -130,10 +130,10 @@ class MDUEvent : public ResourceEvent
 {
   public:
     MDUEvent();
-    virtual ~MDUEvent() { }
+    ~MDUEvent() { }
     
 
-    virtual void process();    
+    void process();
 };
 
 
diff --git a/src/cpu/inorder/resources/use_def.hh b/src/cpu/inorder/resources/use_def.hh
index adfdd6ed3..d2cc55315 100644
--- a/src/cpu/inorder/resources/use_def.hh
+++ b/src/cpu/inorder/resources/use_def.hh
@@ -55,17 +55,16 @@ class UseDefUnit : public Resource {
   public:
     UseDefUnit(std::string res_name, int res_id, int res_width,
                int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~UseDefUnit() {}
 
-    virtual ResourceRequest* getRequest(DynInstPtr _inst, int stage_num,
+    ResourceRequest* getRequest(DynInstPtr _inst, int stage_num,
                                         int res_idx, int slot_num,
                                         unsigned cmd);
 
-    virtual ResReqPtr findRequest(DynInstPtr inst);
+    ResReqPtr findRequest(DynInstPtr inst);
 
-    virtual void execute(int slot_num);
+    void execute(int slot_num);
 
-    virtual void squash(DynInstPtr inst, int stage_num,
+    void squash(DynInstPtr inst, int stage_num,
                         InstSeqNum squash_seq_num, ThreadID tid);
 
     void updateAfterContextSwitch(DynInstPtr inst, ThreadID tid);