diff -r 54a65799e4c1 -r eed89f692a62 src/mem/ruby/buffers/MessageBuffer.cc
--- a/src/mem/ruby/buffers/MessageBuffer.cc	Mon Apr 04 11:42:32 2011 -0500
+++ b/src/mem/ruby/buffers/MessageBuffer.cc	Fri Apr 15 13:34:02 2011 -0400
@@ -125,8 +125,7 @@
 const Message*
 MessageBuffer::peekAtHeadOfQueue() const
 {
-    DPRINTF(RubyQueue, "Peeking at head of queue time: %lld\n",
-            g_eventQueue_ptr->getTime());
+    DPRINTF(RubyQueue, "Peeking at head of queue.\n");
     assert(isReady());
 
     const Message* msg_ptr = m_prio_heap.front().m_msgptr.get();
@@ -195,8 +194,11 @@
         if (arrival_time < m_last_arrival_time) {
             panic("FIFO ordering violated: %s name: %s current time: %d "
                   "delta: %d arrival_time: %d last arrival_time: %d\n",
-                  *this, m_name, current_time, delta, arrival_time,
-                  m_last_arrival_time);
+                  *this, m_name,
+                  current_time * g_eventQueue_ptr->getClock(),
+                  delta * g_eventQueue_ptr->getClock(),
+                  arrival_time * g_eventQueue_ptr->getClock(),
+                  m_last_arrival_time * g_eventQueue_ptr->getClock());
         }
     }
     m_last_arrival_time = arrival_time;
@@ -219,8 +221,8 @@
     push_heap(m_prio_heap.begin(), m_prio_heap.end(),
         greater<MessageBufferNode>());
 
-    DPRINTF(RubyQueue, "Enqueue with arrival_time %lld (cur_time: %lld).\n",
-            arrival_time, g_eventQueue_ptr->getTime());
+    DPRINTF(RubyQueue, "Enqueue with arrival_time %lld.\n",
+            arrival_time * g_eventQueue_ptr->getClock());
     DPRINTF(RubyQueue, "Enqueue Message: %s.\n", (*(message.get())));
 
     // Schedule the wakeup
diff -r 54a65799e4c1 -r eed89f692a62 src/mem/ruby/network/simple/PerfectSwitch.cc
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc	Mon Apr 04 11:42:32 2011 -0500
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc	Fri Apr 15 13:34:02 2011 -0400
@@ -301,9 +301,8 @@
 
                         // Enqeue msg
                         DPRINTF(RubyNetwork, "Enqueuing net msg from "
-                                "inport[%d][%d] to outport [%d][%d] time: %lld.\n",
-                                incoming, vnet, outgoing, vnet,
-                                g_eventQueue_ptr->getTime());
+                                "inport[%d][%d] to outport [%d][%d].\n",
+                                incoming, vnet, outgoing, vnet);
 
                         m_out[outgoing][vnet]->enqueue(msg_ptr);
                     }
diff -r 54a65799e4c1 -r eed89f692a62 src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc	Mon Apr 04 11:42:32 2011 -0500
+++ b/src/mem/ruby/system/Sequencer.cc	Fri Apr 15 13:34:02 2011 -0400
@@ -497,10 +497,10 @@
                                                    g_eventQueue_ptr->getTime());
         }
 
-        DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %d cycles\n",
-            g_eventQueue_ptr->getTime(), m_version, "Seq",
-            success ? "Done" : "SC_Failed", "", "",
-            ruby_request.m_PhysicalAddress, miss_latency);
+        DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %d cycles\n",
+                 curTick(), m_version, "Seq",
+                 success ? "Done" : "SC_Failed", "", "",
+                 ruby_request.m_PhysicalAddress, miss_latency);
     }
 #if 0
     if (request.getPrefetch() == PrefetchBit_Yes) {
@@ -679,9 +679,9 @@
                                        ctype, amtype, request.pkt,
                                        PrefetchBit_No, proc_id);
 
-    DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %s\n",
-        g_eventQueue_ptr->getTime(), m_version, "Seq", "Begin", "", "",
-        request.m_PhysicalAddress, RubyRequestType_to_string(request.m_Type));
+    DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\n",
+            curTick(), m_version, "Seq", "Begin", "", "",
+            request.m_PhysicalAddress, RubyRequestType_to_string(request.m_Type));
 
     Time latency = 0;  // initialzed to an null value
 
diff -r 54a65799e4c1 -r eed89f692a62 src/mem/slicc/symbols/StateMachine.py
--- a/src/mem/slicc/symbols/StateMachine.py	Mon Apr 04 11:42:32 2011 -0500
+++ b/src/mem/slicc/symbols/StateMachine.py	Fri Apr 15 13:34:02 2011 -0400
@@ -1100,8 +1100,8 @@
         DPRINTF(RubyGenerated, "next_state: %s\\n",
                 ${ident}_State_to_string(next_state));
         m_profiler.countTransition(state, event);
-        DPRINTFR(ProtocolTrace, "%7d %3s %10s%20s %6s>%-6s %s %s\\n",
-            g_eventQueue_ptr->getTime(), m_version, "${ident}",
+        DPRINTFR(ProtocolTrace, "%15d %3s %10s%20s %6s>%-6s %s %s\\n",
+            curTick(), m_version, "${ident}",
             ${ident}_Event_to_string(event),
             ${ident}_State_to_string(state),
             ${ident}_State_to_string(next_state),
@@ -1122,16 +1122,16 @@
 
         code('''
     } else if (result == TransitionResult_ResourceStall) {
-        DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %s\\n",
-            g_eventQueue_ptr->getTime(), m_version, "${ident}",
+        DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
+            curTick(), m_version, "${ident}",
             ${ident}_Event_to_string(event),
             ${ident}_State_to_string(state),
             ${ident}_State_to_string(next_state),
             addr, "Resource Stall");
     } else if (result == TransitionResult_ProtocolStall) {
         DPRINTF(RubyGenerated, "stalling\\n");
-        DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %s\\n",
-            g_eventQueue_ptr->getTime(), m_version, "${ident}",
+        DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
+            curTick(), m_version, "${ident}",
             ${ident}_Event_to_string(event),
             ${ident}_State_to_string(state),
             ${ident}_State_to_string(next_state),
diff -r 54a65799e4c1 -r eed89f692a62 src/mem/slicc/symbols/Type.py
--- a/src/mem/slicc/symbols/Type.py	Mon Apr 04 11:42:32 2011 -0500
+++ b/src/mem/slicc/symbols/Type.py	Fri Apr 15 13:34:02 2011 -0400
@@ -415,7 +415,7 @@
             code('out << "${{dm.ident}} = " << m_${{dm.ident}} << " ";''')
 
         if self.isMessage:
-            code('out << "Time = " << getTime() << " ";')
+            code('out << "Time = " << getTime() * g_eventQueue_ptr->getClock() << " ";')
         code.dedent()
 
         # Trailer