Changeset 4f6368c in mainline

Timestamp:

2023-12-05T12:21:34Z (12 months ago)

Author:

GitHub <noreply@…>

Branches:

master, topic/simplify-dev-export

Children:

d53a5ab0

Parents:

10fc93c (diff), 56a3c29e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Vojtech Horky <vojtech.horky@…> (2023-12-05 12:21:34)

git-committer:

GitHub <noreply@…> (2023-12-05 12:21:34)

Message:

Update MSIM config file (see #228)

Switch to dr4kcpu device needed on MSIM >2.0.0.

Location:

tools

Files:

• conf/msim.conf (modified) (1 diff)
• ew.py (modified) (2 diffs)

tools/conf/msim.conf

@@ -3 +3 @@
 #
 
-add dcpu cpu0
-add dcpu cpu1
+add dr4kcpu cpu0
+add dr4kcpu cpu1
 
 add rwm mainmem 0x00000000

tools/ew.py

@@ -79 +79 @@
         for termemu in emus:
                 try:
-                        subprocess.check_output('which ' + termemu, shell = True)
+                        subprocess.check_output('which ' + termemu, shell = True, stderr = subprocess.STDOUT)
                         return termemu
                 except:
@@ -331 +331 @@
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -n -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):