From 5fc7adcba05dd3c732758d18f03db090ac17fbb9 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 14 Jun 2010 23:24:46 -0700
Subject: python: use ipython in --interactive if it is available

---
 src/python/m5/main.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/python/m5/main.py')

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index fd58ce500..cd139ccb3 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -360,8 +360,13 @@ def main():
 
     # once the script is done
     if options.interactive:
-        interact = code.InteractiveConsole(scope)
-        interact.interact("M5 Interactive Console")
+        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)
 
 if __name__ == '__main__':
     from pprint import pprint
-- 
cgit v1.2.3