From: Nathan Binkert <nate@binkert.org>
Date: Wed, 13 Apr 2011 16:32:18 +0000 (-0700)
Subject: main: separate out interact() so it can be used by other functions
X-Git-Tag: stable_2012_02_02~405
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d94d48a7d94ea0e18e35d5974ea70bb641e7640;p=gem5.git

main: separate out interact() so it can be used by other functions
---

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index dc8aab924..f932ec63a 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -128,6 +128,16 @@ if options_file:
 
 arguments = options.parse_args()
 
+def interact(scope):
+    banner = "M5 Interactive Console"
+    sys.argv = []
+    try:
+        from IPython.Shell import IPShellEmbed
+        ipshell = IPShellEmbed(banner=banner,user_ns=scope)
+        ipshell()
+    except ImportError:
+        code.InteractiveConsole(scope).interact(banner)
+
 def main():
     import core
     import debug
@@ -349,13 +359,7 @@ def main():
 
     # once the script is done
     if options.interactive:
-        banner = "M5 Interactive Console"
-        try:
-            from IPython.Shell import IPShellEmbed
-            ipshell = IPShellEmbed(banner=banner,user_ns=scope)
-            ipshell()
-        except ImportError:
-            code.InteractiveConsole(scope).interact(banner)
+        interact(scope)
 
 if __name__ == '__main__':
     from pprint import pprint