Make the Event::description() a const function

--HG--
extra : convert_revision : c7768d54d3f78685e93920069f5485083ca989c0

diff --git a/src/arch/mips/regfile/misc_regfile.cc b/src/arch/mips/regfile/misc_regfile.cc
index 5e4c803fc57f742d09c2d88991011b3d05949a01..dc6ae0baf6d34763a1ae5330be67f17b06765a22 100755 (executable)
--- a/src/arch/mips/regfile/misc_regfile.cc
+++ b/src/arch/mips/regfile/misc_regfile.cc
@@ -577,7 +577,7 @@ MiscRegFile::CP0Event::process()
 }
 
 const char *
-MiscRegFile::CP0Event::description()
+MiscRegFile::CP0Event::description() const
 {
     return "Coprocessor-0 event";
 }

diff --git a/src/arch/mips/regfile/misc_regfile.hh b/src/arch/mips/regfile/misc_regfile.hh
index a6f1a15c665ec73ffdaad234826efd3b5b094e05..5f19579b314e09945d07728db3d8dcdeabc6a300 100644 (file)
--- a/src/arch/mips/regfile/misc_regfile.hh
+++ b/src/arch/mips/regfile/misc_regfile.hh
@@ -139,7 +139,7 @@ namespace MipsISA
             virtual void process();
 
             /** Returns the description of this event. */
-            const char *description();
+            const char *description() const;
 
             /** Schedule This Event */
             void scheduleEvent(int delay);

diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 677152ce8701c65291990e284bf3e87f1878d3eb..23195f720f382d8fb02f35c33732e2ac8f7a4591 100644 (file)
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -88,7 +88,7 @@ CPUProgressEvent::process()
 }
 
 const char *
-CPUProgressEvent::description()
+CPUProgressEvent::description() const
 {
     return "CPU Progress";
 }

diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index e0d2340e965b0dace373720f4d7513eb5036954a..bdc7d7c8b4e6d5ff2560280ad3a1f2198e7c71e8 100644 (file)
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -68,7 +68,7 @@ class CPUProgressEvent : public Event
 
     void process();
 
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 class BaseCPU : public MemObject

diff --git a/src/cpu/memtest/memtest.hh b/src/cpu/memtest/memtest.hh
index 1a330319f77564dced5e20f8a8184021ce7985b5..ac2d0a05831f785f2f914bc8572c576c85e11c4b 100644 (file)
--- a/src/cpu/memtest/memtest.hh
+++ b/src/cpu/memtest/memtest.hh
@@ -77,7 +77,7 @@ class MemTest : public MemObject
         TickEvent(MemTest *c)
             : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c) {}
         void process() {cpu->tick();}
-        virtual const char *description() { return "MemTest tick"; }
+        virtual const char *description() const { return "MemTest tick"; }
     };
 
     TickEvent tickEvent;

diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index 27bdd20c510789a5529c30cd080df771186f096e..80e42fa8b977ccfe1b6400c33c32d42acf2f4d07 100644 (file)
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -97,7 +97,7 @@ class DefaultCommit
         TrapEvent(DefaultCommit<Impl> *_commit, unsigned _tid);
 
         void process();
-        const char *description();
+        const char *description() const;
     };
 
     /** Overall commit status. Used to determine if the CPU can deschedule

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 89df257e98b548e22cc092cb0e43f062ffedbe47..ee0f2bb59131e191174273cb84b84239ef538eef 100644 (file)
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -65,7 +65,7 @@ DefaultCommit<Impl>::TrapEvent::process()
 
 template <class Impl>
 const char *
-DefaultCommit<Impl>::TrapEvent::description()
+DefaultCommit<Impl>::TrapEvent::description() const
 {
     return "Trap";
 }

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 5908062aae2c8509a8eb7cedcf67cd540af88e45..8eb17d23b792a0f3fab7b9856433bcf96fe7e7b1 100644 (file)
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -80,7 +80,7 @@ FullO3CPU<Impl>::TickEvent::process()
 
 template <class Impl>
 const char *
-FullO3CPU<Impl>::TickEvent::description()
+FullO3CPU<Impl>::TickEvent::description() const
 {
     return "FullO3CPU tick";
 }
@@ -109,7 +109,7 @@ FullO3CPU<Impl>::ActivateThreadEvent::process()
 
 template <class Impl>
 const char *
-FullO3CPU<Impl>::ActivateThreadEvent::description()
+FullO3CPU<Impl>::ActivateThreadEvent::description() const
 {
     return "FullO3CPU \"Activate Thread\"";
 }
@@ -141,7 +141,7 @@ FullO3CPU<Impl>::DeallocateContextEvent::process()
 
 template <class Impl>
 const char *
-FullO3CPU<Impl>::DeallocateContextEvent::description()
+FullO3CPU<Impl>::DeallocateContextEvent::description() const
 {
     return "FullO3CPU \"Deallocate Context\"";
 }

diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 162e377e1affcf5d33250fa7dd6b5cb9e4533d1a..e902968c1fc9598c259381f5e712bd6b45ef2fde 100644 (file)
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -136,7 +136,7 @@ class FullO3CPU : public BaseO3CPU
         /** Processes a tick event, calling tick() on the CPU. */
         void process();
         /** Returns the description of the tick event. */
-        const char *description();
+        const char *description() const;
     };
 
     /** The tick event used for scheduling CPU ticks. */
@@ -178,7 +178,7 @@ class FullO3CPU : public BaseO3CPU
         void process();
 
         /** Returns the description of the event. */
-        const char *description();
+        const char *description() const;
     };
 
     /** Schedule thread to activate , regardless of its current state. */
@@ -229,7 +229,7 @@ class FullO3CPU : public BaseO3CPU
         void setRemove(bool _remove) { remove = _remove; }
 
         /** Returns the description of the event. */
-        const char *description();
+        const char *description() const;
     };
 
     /** Schedule cpu to deallocate thread context.*/

diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 9d7c457ca7868ef48cea9aa3c5e69d5a565e03c4..d0f503977c4b67d941fc2e00e06d63603925033e 100644 (file)
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -105,7 +105,7 @@ class InstructionQueue
                      InstructionQueue<Impl> *iq_ptr);
 
         virtual void process();
-        virtual const char *description();
+        virtual const char *description() const;
         void setFreeFU() { freeFU = true; }
     };
 

diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index b14a63a17f940069229581e02a96c78b3bcbab44..fb06f20df735ab4f2e3c887e07ccc68e95c0d4c4 100644 (file)
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -58,7 +58,7 @@ InstructionQueue<Impl>::FUCompletion::process()
 
 template <class Impl>
 const char *
-InstructionQueue<Impl>::FUCompletion::description()
+InstructionQueue<Impl>::FUCompletion::description() const
 {
     return "Functional unit completion";
 }

diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index be9224099651253affc8667b0f6d238c0c7376d0..128a71dbcedef7a53da343d77169f2b3344adae6 100644 (file)
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -273,7 +273,7 @@ class LSQUnit {
         void process();
 
         /** Returns the description of this event. */
-        const char *description();
+        const char *description() const;
 
       private:
         /** Instruction whose results are being written back. */

diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 71b416c9c92141922618e657f870d0698ea48f07..e6ff5e93145f66f977eaef74a62ea4e7ecc60082 100644 (file)
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -67,7 +67,7 @@ LSQUnit<Impl>::WritebackEvent::process()
 
 template<class Impl>
 const char *
-LSQUnit<Impl>::WritebackEvent::description()
+LSQUnit<Impl>::WritebackEvent::description() const
 {
     return "Store writeback";
 }

diff --git a/src/cpu/ozone/back_end.hh b/src/cpu/ozone/back_end.hh
index 992f55c6e7898fd39292b2874216f2cf4361668b..4cdc86c3cced07fe34a8dc0854b90fda83ba1d3f 100644 (file)
--- a/src/cpu/ozone/back_end.hh
+++ b/src/cpu/ozone/back_end.hh
@@ -186,7 +186,7 @@ class BackEnd
         /** Processes writeback event. */
         virtual void process();
         /** Returns the description of the writeback event. */
-        virtual const char *description();
+        virtual const char *description() const;
     };
 
     BackEnd(Params *params);
@@ -309,7 +309,7 @@ class BackEnd
         DCacheCompletionEvent(BackEnd *_be);
 
         virtual void process();
-        virtual const char *description();
+        virtual const char *description() const;
     };
 
     friend class DCacheCompletionEvent;

diff --git a/src/cpu/ozone/back_end_impl.hh b/src/cpu/ozone/back_end_impl.hh
index 27146ecf002be93d1dc64006b9eccaeb82ac0c6a..415407c528e6425e65016f988522d50bd88a4774 100644 (file)
--- a/src/cpu/ozone/back_end_impl.hh
+++ b/src/cpu/ozone/back_end_impl.hh
@@ -581,7 +581,7 @@ BackEnd<Impl>::LdWritebackEvent::process()
 
 template<class Impl>
 const char *
-BackEnd<Impl>::LdWritebackEvent::description()
+BackEnd<Impl>::LdWritebackEvent::description() const
 {
     return "Load writeback";
 }
@@ -601,7 +601,7 @@ BackEnd<Impl>::DCacheCompletionEvent::process()
 
 template <class Impl>
 const char *
-BackEnd<Impl>::DCacheCompletionEvent::description()
+BackEnd<Impl>::DCacheCompletionEvent::description() const
 {
     return "Cache completion";
 }

diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh
index 036db13516f5392d023a47ee8d0bf7deab25bd55..61abae807af739c3c841ffb0d0da2c80d3c86058 100644 (file)
--- a/src/cpu/ozone/cpu.hh
+++ b/src/cpu/ozone/cpu.hh
@@ -306,7 +306,7 @@ class OzoneCPU : public BaseCPU
 
         TickEvent(OzoneCPU *c, int w);
         void process();
-        const char *description();
+        const char *description() const;
     };
 
     TickEvent tickEvent;

diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh
index 5080c54f65e4361ce9fb6bff0261879cc4e76856..0c7105382c54bd6abf51b5999de79233273a2794 100644 (file)
--- a/src/cpu/ozone/cpu_impl.hh
+++ b/src/cpu/ozone/cpu_impl.hh
@@ -82,7 +82,7 @@ OzoneCPU<Impl>::TickEvent::process()
 
 template <class Impl>
 const char *
-OzoneCPU<Impl>::TickEvent::description()
+OzoneCPU<Impl>::TickEvent::description() const
 {
     return "OzoneCPU tick";
 }

diff --git a/src/cpu/ozone/inorder_back_end.hh b/src/cpu/ozone/inorder_back_end.hh
index 4fd8e02f81e14810b3186ca93b7e6b1b177bf31f..aef29b1e21800b23e6ec8c14afee31f205cddcba 100644 (file)
--- a/src/cpu/ozone/inorder_back_end.hh
+++ b/src/cpu/ozone/inorder_back_end.hh
@@ -161,7 +161,7 @@ class InorderBackEnd
         DCacheCompletionEvent(InorderBackEnd *_be);
 
         virtual void process();
-        virtual const char *description();
+        virtual const char *description() const;
 
         DynInstPtr inst;
     };

diff --git a/src/cpu/ozone/inorder_back_end_impl.hh b/src/cpu/ozone/inorder_back_end_impl.hh
index c57fa0200666833bfdbbb847d41f7210a8eedfbb..cf8634a4231930c17f71ef4368e5a4f74de921d6 100644 (file)
--- a/src/cpu/ozone/inorder_back_end_impl.hh
+++ b/src/cpu/ozone/inorder_back_end_impl.hh
@@ -538,7 +538,7 @@ InorderBackEnd<Impl>::DCacheCompletionEvent::process()
 
 template <class Impl>
 const char *
-InorderBackEnd<Impl>::DCacheCompletionEvent::description()
+InorderBackEnd<Impl>::DCacheCompletionEvent::description() const
 {
     return "DCache completion";
 }

diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh
index 0158fd2d2290b25df78f54c3ed869e006da5f1d7..a11d5204bc060b4904e98466474db9db12d1a5bc 100644 (file)
--- a/src/cpu/ozone/inst_queue.hh
+++ b/src/cpu/ozone/inst_queue.hh
@@ -99,7 +99,7 @@ class InstQueue
                      InstQueue<Impl> *iq_ptr);
 
         virtual void process();
-        virtual const char *description();
+        virtual const char *description() const;
     };
 #endif
     /** Constructs an IQ. */

diff --git a/src/cpu/ozone/inst_queue_impl.hh b/src/cpu/ozone/inst_queue_impl.hh
index 461c7eb0f6751883c7f956f68ee6d70632acec0e..3c30847571facdf488296242e473f1129676634a 100644 (file)
--- a/src/cpu/ozone/inst_queue_impl.hh
+++ b/src/cpu/ozone/inst_queue_impl.hh
@@ -62,7 +62,7 @@ InstQueue<Impl>::FUCompletion::process()
 
 template <class Impl>
 const char *
-InstQueue<Impl>::FUCompletion::description()
+InstQueue<Impl>::FUCompletion::description() const
 {
     return "Functional unit completion";
 }

diff --git a/src/cpu/ozone/lsq_unit.hh b/src/cpu/ozone/lsq_unit.hh
index 056c79521991f7a4c5ad88dc982e79333414e7cf..981682c2658f020dfb8e2686a8c61d31e5ea1366 100644 (file)
--- a/src/cpu/ozone/lsq_unit.hh
+++ b/src/cpu/ozone/lsq_unit.hh
@@ -80,7 +80,7 @@ class OzoneLSQ {
         void process();
 
         /** Returns the description of this event. */
-        const char *description();
+        const char *description() const;
 
       private:
         /** The store index of the store being written back. */

diff --git a/src/cpu/ozone/lsq_unit_impl.hh b/src/cpu/ozone/lsq_unit_impl.hh
index e08e5483545555c2f0cf5cefd4da559de43e4044..84a90eede86adc5fcca44667d22bb2e5f9f79806 100644 (file)
--- a/src/cpu/ozone/lsq_unit_impl.hh
+++ b/src/cpu/ozone/lsq_unit_impl.hh
@@ -60,7 +60,7 @@ OzoneLSQ<Impl>::StoreCompletionEvent::process()
 
 template <class Impl>
 const char *
-OzoneLSQ<Impl>::StoreCompletionEvent::description()
+OzoneLSQ<Impl>::StoreCompletionEvent::description() const
 {
     return "LSQ store completion";
 }

diff --git a/src/cpu/ozone/lw_back_end.hh b/src/cpu/ozone/lw_back_end.hh
index 08a6863d0fb6ea0626e2eae28142934736176c8c..a335ab7dce4cc7207c604ee81a4d6dc54edec5f4 100644 (file)
--- a/src/cpu/ozone/lw_back_end.hh
+++ b/src/cpu/ozone/lw_back_end.hh
@@ -94,7 +94,7 @@ class LWBackEnd
         TrapEvent(LWBackEnd<Impl> *_be);
 
         void process();
-        const char *description();
+        const char *description() const;
     };
 
     LWBackEnd(Params *params);

diff --git a/src/cpu/ozone/lw_back_end_impl.hh b/src/cpu/ozone/lw_back_end_impl.hh
index 42788cee142693514a9dc6bd98d13a5e18d184cb..a5d79a7890b382c7db49238aabffac9f013fdd72 100644 (file)
--- a/src/cpu/ozone/lw_back_end_impl.hh
+++ b/src/cpu/ozone/lw_back_end_impl.hh
@@ -119,7 +119,7 @@ LWBackEnd<Impl>::TrapEvent::process()
 
 template <class Impl>
 const char *
-LWBackEnd<Impl>::TrapEvent::description()
+LWBackEnd<Impl>::TrapEvent::description() const
 {
     return "Trap";
 }

diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh
index ba40e9ce1c459e59d012d148ab3f5cb100b10074..7fc8b6307d1135f51f9d3d6092bb5a7d7b729c74 100644 (file)
--- a/src/cpu/ozone/lw_lsq.hh
+++ b/src/cpu/ozone/lw_lsq.hh
@@ -329,7 +329,7 @@ class OzoneLWLSQ {
         void process();
 
         /** Returns the description of this event. */
-        const char *description();
+        const char *description() const;
 
       private:
         /** Instruction whose results are being written back. */

diff --git a/src/cpu/ozone/lw_lsq_impl.hh b/src/cpu/ozone/lw_lsq_impl.hh
index 82191312ab2af071d26492b5649812fc7edabdcd..00e52e039a5d455a19d1824e50c777edf2624fdc 100644 (file)
--- a/src/cpu/ozone/lw_lsq_impl.hh
+++ b/src/cpu/ozone/lw_lsq_impl.hh
@@ -55,7 +55,7 @@ OzoneLWLSQ<Impl>::WritebackEvent::process()
 
 template<class Impl>
 const char *
-OzoneLWLSQ<Impl>::WritebackEvent::description()
+OzoneLWLSQ<Impl>::WritebackEvent::description() const
 {
     return "Store writeback";
 }

diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc
index 3495a0e523c50c573495124c7db0eb0c59744590..81384d529329c083de8c28f02b79bdc9e66b7f04 100644 (file)
--- a/src/cpu/quiesce_event.cc
+++ b/src/cpu/quiesce_event.cc
@@ -45,7 +45,7 @@ EndQuiesceEvent::process()
 }
 
 const char*
-EndQuiesceEvent::description()
+EndQuiesceEvent::description() const
 {
     return "End Quiesce";
 }

diff --git a/src/cpu/quiesce_event.hh b/src/cpu/quiesce_event.hh
index 3de40f97ea5c10ea2ee2bc41963d9808813a8fa9..85c88ab32cc8cf00bf050bd457b139b799ee1572 100644 (file)
--- a/src/cpu/quiesce_event.hh
+++ b/src/cpu/quiesce_event.hh
@@ -47,7 +47,7 @@ struct EndQuiesceEvent : public Event
     virtual void process();
 
     /** Event description */
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 #endif // __CPU_QUIESCE_EVENT_HH__

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index aa548b46fe2267a01849a0fa8284a76749d5d1a4..2254d44d5b9d5e361ed251815fbc131bd684c87a 100644 (file)
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -55,7 +55,7 @@ AtomicSimpleCPU::TickEvent::process()
 }
 
 const char *
-AtomicSimpleCPU::TickEvent::description()
+AtomicSimpleCPU::TickEvent::description() const
 {
     return "AtomicSimpleCPU tick";
 }

diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index f14dd6f99278fceb56afae01630d61d9d048d027..19bc0e13b9e77e80b338845aa80f6b2245bc673d 100644 (file)
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -68,7 +68,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU
 
         TickEvent(AtomicSimpleCPU *c);
         void process();
-        const char *description();
+        const char *description() const;
     };
 
     TickEvent tickEvent;

diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index e1fc6882ff8f27e2900b8e6275d008d4d870c0e6..9fe3d2fffec5e0b36b017b5fe1fad4d586cdcc3f 100644 (file)
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -822,7 +822,7 @@ TimingSimpleCPU::IprEvent::process()
 }
 
 const char *
-TimingSimpleCPU::IprEvent::description()
+TimingSimpleCPU::IprEvent::description() const
 {
     return "Timing Simple CPU Delay IPR event";
 }

diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh
index 79fbe0f5f6cae0ade5058d2fbcca8870469c1907..f8b77604a3ac44ae3b0909b2d45a42ecc2cb8945 100644 (file)
--- a/src/cpu/simple/timing.hh
+++ b/src/cpu/simple/timing.hh
@@ -101,7 +101,7 @@ class TimingSimpleCPU : public BaseSimpleCPU
 
             TickEvent(TimingSimpleCPU *_cpu)
                 :Event(&mainEventQueue), cpu(_cpu) {}
-            const char *description() { return "Timing CPU tick"; }
+            const char *description() const { return "Timing CPU tick"; }
             void schedule(PacketPtr _pkt, Tick t);
         };
 
@@ -127,7 +127,7 @@ class TimingSimpleCPU : public BaseSimpleCPU
             ITickEvent(TimingSimpleCPU *_cpu)
                 : TickEvent(_cpu) {}
             void process();
-            const char *description() { return "Timing CPU icache tick"; }
+            const char *description() const { return "Timing CPU icache tick"; }
         };
 
         ITickEvent tickEvent;
@@ -155,7 +155,7 @@ class TimingSimpleCPU : public BaseSimpleCPU
             DTickEvent(TimingSimpleCPU *_cpu)
                 : TickEvent(_cpu) {}
             void process();
-            const char *description() { return "Timing CPU dcache tick"; }
+            const char *description() const { return "Timing CPU dcache tick"; }
         };
 
         DTickEvent tickEvent;
@@ -219,7 +219,7 @@ class TimingSimpleCPU : public BaseSimpleCPU
         TimingSimpleCPU *cpu;
         IprEvent(Packet *_pkt, TimingSimpleCPU *_cpu, Tick t);
         virtual void process();
-        virtual const char *description();
+        virtual const char *description() const;
     };
 
     void completeDrain();

diff --git a/src/cpu/trace/opt_cpu.cc b/src/cpu/trace/opt_cpu.cc
index 33da3d870ca1056ddd381a64d4d8473a81bf7c1d..10e71db7b1fec9d80f3b55145dd667cfb7acc8b5 100644 (file)
--- a/src/cpu/trace/opt_cpu.cc
+++ b/src/cpu/trace/opt_cpu.cc
@@ -204,7 +204,7 @@ OptCPU::TickEvent::process()
 }
 
 const char *
-OptCPU::TickEvent::description()
+OptCPU::TickEvent::description() const
 {
     return "OptCPU tick";
 }

diff --git a/src/cpu/trace/opt_cpu.hh b/src/cpu/trace/opt_cpu.hh
index dfb1223192085e063debec9f2e8421de3ab02bf2..9d98eebc6c9543734cd34f67beb7e394b6dccf52 100644 (file)
--- a/src/cpu/trace/opt_cpu.hh
+++ b/src/cpu/trace/opt_cpu.hh
@@ -81,7 +81,7 @@ class OptCPU : public SimObject
         /**
          * Return a string description of this event.
          */
-        const char *description();
+        const char *description() const;
     };
 
     TickEvent tickEvent;

diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc
index d3cf34e9d86faaef78efb8d50c2910a67d40cd3a..ab00b3093c60192d589af218fa0cffa666fceb09 100644 (file)
--- a/src/cpu/trace/trace_cpu.cc
+++ b/src/cpu/trace/trace_cpu.cc
@@ -129,7 +129,7 @@ TraceCompleteEvent::process()
 }
 
 const char *
-TraceCompleteEvent::description()
+TraceCompleteEvent::description() const
 {
     return "trace access complete";
 }
@@ -146,7 +146,7 @@ TraceCPU::TickEvent::process()
 }
 
 const char *
-TraceCPU::TickEvent::description()
+TraceCPU::TickEvent::description() const
 {
     return "TraceCPU tick";
 }

diff --git a/src/cpu/trace/trace_cpu.hh b/src/cpu/trace/trace_cpu.hh
index b88c7072e23083700856ea01f87d62e14ee4cc4a..a1ae4dc807e7b3eb6d30dc955ca1903c44ec81ad 100644 (file)
--- a/src/cpu/trace/trace_cpu.hh
+++ b/src/cpu/trace/trace_cpu.hh
@@ -93,7 +93,7 @@ class TraceCPU : public SimObject
         /**
          * Return a string description of this event.
          */
-        const char *description();
+        const char *description() const;
     };
 
     TickEvent tickEvent;
@@ -135,7 +135,7 @@ class TraceCompleteEvent : public Event
 
     void process();
 
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 #endif // __CPU_TRACE_TRACE_CPU_HH__

diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index e1ca1c84cc1ccb6cbe5a3df923f87a6bcdcaa3c3..710aca48df307c06048284cbc619b251fa942ab3 100644 (file)
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -205,7 +205,7 @@ TsunamiIO::RTC::RTCEvent::process()
 }
 
 const char *
-TsunamiIO::RTC::RTCEvent::description()
+TsunamiIO::RTC::RTCEvent::description() const
 {
     return "tsunami RTC interrupt";
 }
@@ -429,7 +429,7 @@ TsunamiIO::PITimer::Counter::CounterEvent::process()
 }
 
 const char *
-TsunamiIO::PITimer::Counter::CounterEvent::description()
+TsunamiIO::PITimer::Counter::CounterEvent::description() const
 {
     return "tsunami 8254 Interval timer";
 }

diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh
index 5083604f89fe82fe91d72623fd7b532141f4ddf4..05c4ee910e5f5725f2e6500cc26287c3e695e42b 100644 (file)
--- a/src/dev/alpha/tsunami_io.hh
+++ b/src/dev/alpha/tsunami_io.hh
@@ -73,7 +73,7 @@ class TsunamiIO : public BasicPioDevice
             virtual void process();
 
             /** Event description */
-            virtual const char *description();
+            virtual const char *description() const;
         };
 
       private:
@@ -161,7 +161,7 @@ class TsunamiIO : public BasicPioDevice
                 virtual void process();
 
                 /** Event description */
-                virtual const char *description();
+                virtual const char *description() const;
 
                 friend class Counter;
             };

diff --git a/src/dev/etherbus.hh b/src/dev/etherbus.hh
index 4deb7fccc91b0a87c0c54a6ee3cbe0b561f5ca2a..624ceb81a2f679689d3661f4a0278f2428bbd564 100644 (file)
--- a/src/dev/etherbus.hh
+++ b/src/dev/etherbus.hh
@@ -62,7 +62,8 @@ class EtherBus : public EtherObject
         DoneEvent(EventQueue *q, EtherBus *b)
             : Event(q), bus(b) {}
         virtual void process() { bus->txDone(); }
-        virtual const char *description() { return "ethernet bus completion"; }
+        virtual const char *description() const
+            { return "ethernet bus completion"; }
     };
 
     DoneEvent event;

diff --git a/src/dev/ethertap.hh b/src/dev/ethertap.hh
index 5c24be460fd64428f8393a2f083b1a72dbb44e87..be3d73a2427e35ca46deb1c5793364642c424832 100644 (file)
--- a/src/dev/ethertap.hh
+++ b/src/dev/ethertap.hh
@@ -93,7 +93,8 @@ class EtherTap : public EtherObject
         TxEvent(EtherTap *_tap)
             : Event(&mainEventQueue), tap(_tap) {}
         void process() { tap->retransmit(); }
-        virtual const char *description() { return "EtherTap retransmit"; }
+        virtual const char *description() const
+            { return "EtherTap retransmit"; }
     };
 
     friend class TxEvent;

diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index bf7afa63b73678e3f6afcb4dd4fc957f394b441a..b56694f1e6472c247b0544081c60e21f7fa8fc38 100755 (executable)
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -208,7 +208,7 @@ MaltaIO::RTC::RTCEvent::process()
 }
 
 const char *
-MaltaIO::RTC::RTCEvent::description()
+MaltaIO::RTC::RTCEvent::description() const
 {
     return "malta RTC interrupt";
 }
@@ -461,7 +461,7 @@ MaltaIO::PITimer::Counter::CounterEvent::process()
 }
 
 const char *
-MaltaIO::PITimer::Counter::CounterEvent::description()
+MaltaIO::PITimer::Counter::CounterEvent::description() const
 {
     return "malta 8254 Interval timer";
 }

diff --git a/src/dev/mips/malta_io.hh b/src/dev/mips/malta_io.hh
index 791d49d60ed21d2b6edfd7cd303e59c53d0aa8b7..e24a1d8cb253414201470abb5b51f081d6bbe738 100755 (executable)
--- a/src/dev/mips/malta_io.hh
+++ b/src/dev/mips/malta_io.hh
@@ -79,7 +79,7 @@ class MaltaIO : public BasicPioDevice
             virtual void process();
 
             /** Event description */
-            virtual const char *description();
+            virtual const char *description() const;
         };
 
       private:
@@ -171,7 +171,7 @@ class MaltaIO : public BasicPioDevice
                 virtual void process();
 
                 /** Event description */
-                virtual const char *description();
+                virtual const char *description() const;
 
                 friend class Counter;
             };

diff --git a/src/dev/uart8250.cc b/src/dev/uart8250.cc
index e14b0871e8cc2244668acabba89f492fc0e93451..b4dc93645bf3ee2b0ac9e88e6fa4e4bd7031fdfe 100644 (file)
--- a/src/dev/uart8250.cc
+++ b/src/dev/uart8250.cc
@@ -55,7 +55,7 @@ Uart8250::IntrEvent::IntrEvent(Uart8250 *u, int bit)
 }
 
 const char *
-Uart8250::IntrEvent::description()
+Uart8250::IntrEvent::description() const
 {
     return "uart interrupt delay";
 }

diff --git a/src/dev/uart8250.hh b/src/dev/uart8250.hh
index 32b16c17cf016265c24bc755a493bd40758f9c72..2c69667e1c4ab0565818e6fab6a2c435bad73684 100644 (file)
--- a/src/dev/uart8250.hh
+++ b/src/dev/uart8250.hh
@@ -82,7 +82,7 @@ class Uart8250 : public Uart
         public:
             IntrEvent(Uart8250 *u, int bit);
             virtual void process();
-            virtual const char *description();
+            virtual const char *description() const;
             void scheduleIntr();
     };
 

diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index df48eb8c54595b1bd2ade5ded27174a58f5bd478..1331a45f934790bb41b3d7b0cc4519024316bd83 100644 (file)
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -150,7 +150,7 @@ class Bridge : public MemObject
 
             virtual void process() { port->trySend(); }
 
-            virtual const char *description() { return "bridge send"; }
+            virtual const char *description() const { return "bridge send"; }
         };
 
         SendEvent sendEvent;

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index cfddfff12eff64d62e23ed1f123d9c865dd0d755..66b20703f406b4405b9f252c6924379b06f15a28 100644 (file)
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -105,7 +105,7 @@ void Bus::BusFreeEvent::process()
     bus->recvRetry(-1);
 }
 
-const char * Bus::BusFreeEvent::description()
+const char * Bus::BusFreeEvent::description() const
 {
     return "bus became available";
 }

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 9ba43c79d8aa7661eb47444875fa647659432068..0c23175f135cf54df0370092ca7a7d6169c8bbaf 100644 (file)
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -131,7 +131,7 @@ class Bus : public MemObject
       public:
         BusFreeEvent(Bus * _bus);
         void process();
-        const char *description();
+        const char *description() const;
     };
 
     /** a globally unique id for this bus. */

diff --git a/src/sim/debug.cc b/src/sim/debug.cc
index c189117bddb20546e67d1fec54bd5fdc3f211fe5..b4f4cd9dc32b252c18c22409ccf0e42ed0bee6ed 100644 (file)
--- a/src/sim/debug.cc
+++ b/src/sim/debug.cc
@@ -63,7 +63,7 @@ class DebugBreakEvent : public Event
     DebugBreakEvent(EventQueue *q, Tick _when);
 
     void process();    // process event
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 //
@@ -87,7 +87,7 @@ DebugBreakEvent::process()
 
 
 const char *
-DebugBreakEvent::description()
+DebugBreakEvent::description() const
 {
     return "debug break";
 }

diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index 65e115256e8c992144830b23be858cb971c0bbe3..2c679be1ee1d9a6d32d137122e727098f168b217 100644 (file)
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -230,7 +230,7 @@ dumpMainQueue()
 
 
 const char *
-Event::description()
+Event::description() const
 {
     return "generic";
 }

diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 6fbba46d578560f84eedd97a25d9df68ff61ef3b..a454e5d64f884f3fce6853f753b0147670b895aa 100644 (file)
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -219,7 +219,7 @@ class Event : public Serializable, public FastAlloc
     /// Return a C string describing the event.  This string should
     /// *not* be dynamically allocated; just a const char array
     /// describing the event class.
-    virtual const char *description();
+    virtual const char *description() const;
 
     /// Dump the current event data
     void dump();
@@ -280,7 +280,7 @@ DelayFunction(Tick when, T *object)
             : Event(&mainEventQueue), object(o)
             { setFlags(this->AutoDestroy); schedule(when); }
         void process() { (object->*F)(); }
-        const char *description() { return "delay"; }
+        const char *description() const { return "delay"; }
     };
 
     new DelayEvent(when, object);

diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc
index 1949e88dd93197fa02bfc60ceaccb5c82a37e316..09087ef8428b7df46f55a3cee6708c0cf941ceb6 100644 (file)
--- a/src/sim/sim_events.cc
+++ b/src/sim/sim_events.cc
@@ -65,7 +65,7 @@ SimLoopExitEvent::process()
 
 
 const char *
-SimLoopExitEvent::description()
+SimLoopExitEvent::description() const
 {
     return "simulation loop exit";
 }
@@ -123,7 +123,7 @@ CountedExitEvent::process()
 
 
 const char *
-CountedExitEvent::description()
+CountedExitEvent::description() const
 {
     return "counted exit";
 }
@@ -153,7 +153,7 @@ CheckSwapEvent::process()
 }
 
 const char *
-CheckSwapEvent::description()
+CheckSwapEvent::description() const
 {
     return "check swap";
 }

diff --git a/src/sim/sim_events.hh b/src/sim/sim_events.hh
index 94e2540b1abe345f3a56c94a3587bcb5cdf5b1c3..58ec963c0aec121af9a212058401eada1e6c75dd 100644 (file)
--- a/src/sim/sim_events.hh
+++ b/src/sim/sim_events.hh
@@ -68,7 +68,7 @@ class SimLoopExitEvent : public Event
 
     void process();    // process event
 
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 class CountedDrainEvent : public SimLoopExitEvent
@@ -104,7 +104,7 @@ class CountedExitEvent : public Event
 
     void process();    // process event
 
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 //
@@ -122,7 +122,7 @@ class CheckSwapEvent : public Event
 
     void process();    // process event
 
-    virtual const char *description();
+    virtual const char *description() const;
 };
 
 #endif  // __SIM_SIM_EVENTS_HH__