From 2a67f2b08cb2d478c3b425d778a75bb2ce46a813 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Wed, 21 Feb 2007 14:08:13 -0800
Subject: Fix tracing so it starts right away if --trace-start is not
 specified.

--HG--
extra : convert_revision : 49c1ea0b8c313949124aed84b1055db0b3c55bd8
---
 src/python/m5/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/python/m5')

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 48c75434f..37df884d0 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -297,7 +297,7 @@ def main():
             internal.trace.cvar.enabled = True
         internal.event.create(enable_trace, int(options.trace_start))
     else:
-        internal.trace.enabled = True
+        internal.trace.cvar.enabled = True
 
     internal.trace.output(options.trace_file)
 
-- 
cgit v1.2.3


From fa4c3d74fe7eb9627119d17542fbde18eb10423e Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Wed, 21 Feb 2007 22:14:11 -0800
Subject: Get rid of the ConsoleListener SimObject and just fold the relevant
 code directly into the SimConsole object.  Now, you can easily turn off the
 listen port by just specifying 0 as the port.

--HG--
extra : convert_revision : c8937fa45b429d8a0728e6c720a599e38972aaf0
---
 src/python/m5/objects/SimConsole.py | 5 +----
 src/python/m5/objects/T1000.py      | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/python/m5')

diff --git a/src/python/m5/objects/SimConsole.py b/src/python/m5/objects/SimConsole.py
index bdd7f246d..dfad18eb6 100644
--- a/src/python/m5/objects/SimConsole.py
+++ b/src/python/m5/objects/SimConsole.py
@@ -1,14 +1,11 @@
 from m5.SimObject import SimObject
 from m5.params import *
 from m5.proxy import *
-class ConsoleListener(SimObject):
-    type = 'ConsoleListener'
-    port = Param.TcpPort(3456, "listen port")
 
 class SimConsole(SimObject):
     type = 'SimConsole'
     append_name = Param.Bool(True, "append name() to filename")
     intr_control = Param.IntrControl(Parent.any, "interrupt controller")
-    listener = Param.ConsoleListener("console listener")
+    port = Param.TcpPort(3456, "listen port")
     number = Param.Int(0, "console number")
     output = Param.String('console', "file to dump output to")
diff --git a/src/python/m5/objects/T1000.py b/src/python/m5/objects/T1000.py
index 3ab6d4283..aeca491c4 100644
--- a/src/python/m5/objects/T1000.py
+++ b/src/python/m5/objects/T1000.py
@@ -3,7 +3,7 @@ from m5.proxy import *
 from Device import BasicPioDevice, IsaFake, BadAddr
 from Uart import Uart8250
 from Platform import Platform
-from SimConsole import SimConsole, ConsoleListener
+from SimConsole import SimConsole
 
 
 class MmDisk(BasicPioDevice):
@@ -69,11 +69,11 @@ class T1000(Platform):
     fake_ssi = IsaFake(pio_addr=0xff00000000, pio_size=0x10000000)
             #warn_access="Accessing SSI -- Unimplemented!")
 
-    hconsole = SimConsole(listener = ConsoleListener())
+    hconsole = SimConsole()
     hvuart = Uart8250(pio_addr=0xfff0c2c000)
     htod = DumbTOD()
 
-    pconsole = SimConsole(listener = ConsoleListener())
+    pconsole = SimConsole()
     puart0 = Uart8250(pio_addr=0x1f10000000)
 
     # Attach I/O devices to specified bus object.  Can't do this
-- 
cgit v1.2.3