Changes in / [d4d8255:dc0e41c] in mainline

File:

• tools/ew.py (modified) (7 diffs)

tools/ew.py

@@ -38 +38 @@
 import autotool
 import platform
-import thread
-import time
 
 overrides = {}
@@ -48 +46 @@
         return False
 
-def cfg_get(platform, machine, processor):
-        if machine == "" or emulators[platform].has_key("run"):
+def cfg_get(platform, machine):
+        if machine == "":
                 return emulators[platform]
-        elif processor == "" or emulators[platform][machine].has_key("run"):
+        else:
                 return emulators[platform][machine]
-        else:
-                return emulators[platform][machine][processor]
 
 def run_in_console(cmd, title):
@@ -146 +142 @@
         return ' -device intel-hda -device hda-duplex'
 
-def qemu_run(platform, machine, processor):
-        cfg = cfg_get(platform, machine, processor)
+def qemu_run(platform, machine):
+        cfg = cfg_get(platform, machine)
         suffix, options = platform_to_qemu_options(platform, machine)
         cmd = 'qemu-' + suffix
@@ -181 +177 @@
                         subprocess.call(cmdline, shell = True)
                 
-def ski_run(platform, machine, processor):
+def ski_run(platform, machine):
         run_in_console('ski -i contrib/conf/ski.conf', 'HelenOS/ia64 on ski')
 
-def msim_run(platform, machine, processor):
+def msim_run(platform, machine):
         hdisk_mk()
         run_in_console('msim -c contrib/conf/msim.conf', 'HelenOS/mips32 on msim')
 
-def gem5_console_thread():
-        # Wait a little bit so that gem5 can create the port
-        time.sleep(1)
-        term = os.environ['M5_PATH'] + '/gem5/util/term/m5term'
-        port = 3457
-        run_in_console(term + ' %d' % port, 'HelenOS/sun4v on gem5')
-
-def gem5_run(platform, machine, processor):
-        try:
-                gem5 = os.environ['M5_PATH'] + '/gem5/build/SPARC/gem5.fast'
-                if not os.path.exists(gem5):
-                        raise Exception
-        except:
-                print("Did you forget to set M5_PATH?")
-                raise
-
-        thread.start_new_thread(gem5_console_thread, ())
-
-        cmdline = gem5 + ' ' + os.environ['M5_PATH'] + '/configs/example/fs.py --disk-image=' + os.path.abspath('image.iso')
-
-        print(cmdline)
-        if not is_override('dry_run'):
-                subprocess.call(cmdline, shell = True)
 
 emulators = {
@@ -256 +229 @@
         'sparc64' : {
                 'generic' : {
-                        'us' : {
-                                'run' : qemu_run,
-                                'image' : 'image.iso',
-                                'audio' : False
-                        },
-                        'sun4v' : {
-                                'run' : gem5_run,
-                        }
+                        'run' : qemu_run,
+                        'image' : 'image.iso',
+                        'audio' : False
                 }
         },
@@ -279 +247 @@
         print("-nosnd\tDisable sound, if applicable.")
         print("-nousb\tDisable USB support, if applicable.")
-
-def fail(platform, machine):
-        print("Cannot start emulation for the chosen configuration. (%s/%s)" % (platform, machine))
-        
 
 def run():
@@ -337 +301 @@
                 mach = ''
 
-        if 'PROCESSOR' in config.keys():
-                processor = config['PROCESSOR']
-        else:
-                processor = ''
-
         try:
-                emu_run = cfg_get(platform, mach, processor)['run']
-                emu_run(platform, mach, processor)
+                emu_run = cfg_get(platform, mach)['run']
         except:
-                fail(platform, mach)
+                print("Cannot start emulation for the chosen configuration. (%s/%s)" % (platform, mach))
                 return
 
+        emu_run(platform, mach)
+
 run()