2.3.3: several minor updates

acaldero · Oct 6, 2024 · e053987 · e053987
2 parents 2203138 + b62fa24
commit e053987
Show file tree

Hide file tree

Showing 451 changed files with 557 additions and 484 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![codebeat badge](https://codebeat.co/badges/66773495-9967-4514-8c2c-916293f584b5)](https://codebeat.co/projects/github-com-acaldero-wepsim-master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/579e744cedde4dc78f8084d9db7abd32)](https://app.codacy.com/gh/acaldero/wepsim/dashboard)
 [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
-[![Release](https://img.shields.io/badge/Stable-2.3.2-green.svg)](https://github.com/acaldero/wepsim/releases/tag/v2.3.2)
+[![Release](https://img.shields.io/badge/Stable-2.3.3-green.svg)](https://github.com/acaldero/wepsim/releases/tag/v2.3.3)
 
 
 ## Table of contents
@@ -43,9 +43,9 @@
     ```
   * Get WepSIM by executing:
     ```bash
-    wget https://github.com/acaldero/wepsim/releases/download/v2.3.2/wepsim-2.3.2.zip
-    unzip wepsim-2.3.2.zip
-    cd wepsim-2.3.2
+    wget https://github.com/acaldero/wepsim/releases/download/v2.3.3/wepsim-2.3.3.zip
+    unzip wepsim-2.3.3.zip
+    cd wepsim-2.3.3
     npm install terser jq jshint yargs clear inquirer fuzzy inquirer-command-prompt inquirer-autocomplete-prompt
     ``` 
   * Execute wepsim.sh with the help flag in order to show the available command switches:
@@ -310,12 +310,12 @@ Micropc at 0x1.	Activated signals are: TA R BW M1 C1. Associated actions are: Co
 !echo "(1/4) Installing pre-requisites..."
 !npm install  terser jq jshint yargs clear inquirer >& /dev/null
 !echo "(2/4) Downloading WepSIM..."
-!wget https://github.com/acaldero/wepsim/releases/download/v2.3.2/wepsim-2.3.2.zip >& /dev/null
-!unzip -o wepsim-2.3.2.zip  >& /dev/null
-!rm -fr   wepsim-2.3.2.zip
+!wget https://github.com/acaldero/wepsim/releases/download/v2.3.3/wepsim-2.3.3.zip >& /dev/null
+!unzip -o wepsim-2.3.3.zip  >& /dev/null
+!rm -fr   wepsim-2.3.3.zip
 !echo "(3/4) Executing WepSIM..."
-!./wepsim-2.3.2/wepsim.sh -a stepbystep -m ep -f ./wepsim-2.3.2/repo/microcode/mips/ep_base.mc -s ./wepsim-2.3.2/repo/assembly/mips/s1e1.asm > ./result.csv
-!rm -fr   wepsim-2.3.2
+!./wepsim-2.3.3/wepsim.sh -a stepbystep -m ep -f ./wepsim-2.3.3/repo/microcode/mips/ep_base.mc -s ./wepsim-2.3.3/repo/assembly/mips/s1e1.asm > ./result.csv
+!rm -fr   wepsim-2.3.3
 !echo "(4/4) Showing execution trace as table..."
 
 import pandas as pd
@@ -544,3 +544,4 @@ cordova run android
 adb -d install -r ./platforms/android/app/build/outputs/apk/debug/app-debug.apk
 ```
 
+
diff --git a/devel/mk_cordova.sh b/devel/mk_cordova.sh
@@ -3,7 +3,7 @@
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*

diff --git a/devel/mk_dist.sh b/devel/mk_dist.sh
@@ -3,7 +3,7 @@
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*

diff --git a/devel/mk_i18nlang.py b/devel/mk_i18nlang.py
@@ -2,7 +2,7 @@
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*
@@ -620,7 +620,7 @@ def print_content(L_D, C_N):
 
     # + print header
     f.write("/*\n") ;
-    f.write(" *  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve\n") ;
+    f.write(" *  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve\n") ;
     f.write(" *\n") ;
     f.write(" *  This file is part of WepSIM.\n") ;
     f.write(" *\n") ;

diff --git a/devel/mk_zip.sh b/devel/mk_zip.sh
@@ -3,7 +3,7 @@
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*

diff --git a/devel/output/0.txt.gz b/devel/output/0.txt.gz
diff --git a/devel/output/1.txt.gz b/devel/output/1.txt.gz
diff --git a/devel/output/10.txt.gz b/devel/output/10.txt.gz
diff --git a/devel/output/100.txt.gz b/devel/output/100.txt.gz
diff --git a/devel/output/101.txt.gz b/devel/output/101.txt.gz
diff --git a/devel/output/102.txt.gz b/devel/output/102.txt.gz
diff --git a/devel/output/103.txt.gz b/devel/output/103.txt.gz
diff --git a/devel/output/104.txt.gz b/devel/output/104.txt.gz
diff --git a/devel/output/105.txt.gz b/devel/output/105.txt.gz
diff --git a/devel/output/106.txt.gz b/devel/output/106.txt.gz
diff --git a/devel/output/107.txt.gz b/devel/output/107.txt.gz
diff --git a/devel/output/108.txt.gz b/devel/output/108.txt.gz
diff --git a/devel/output/109.txt.gz b/devel/output/109.txt.gz
diff --git a/devel/output/11.txt.gz b/devel/output/11.txt.gz
diff --git a/devel/output/110.txt.gz b/devel/output/110.txt.gz
diff --git a/devel/output/111.txt.gz b/devel/output/111.txt.gz
diff --git a/devel/output/12.txt.gz b/devel/output/12.txt.gz
diff --git a/devel/output/13.txt.gz b/devel/output/13.txt.gz
diff --git a/devel/output/14.txt.gz b/devel/output/14.txt.gz
diff --git a/devel/output/15.txt.gz b/devel/output/15.txt.gz
diff --git a/devel/output/16.txt.gz b/devel/output/16.txt.gz
diff --git a/devel/output/17.txt.gz b/devel/output/17.txt.gz
diff --git a/devel/output/18.txt.gz b/devel/output/18.txt.gz
diff --git a/devel/output/19.txt.gz b/devel/output/19.txt.gz
diff --git a/devel/output/2.txt.gz b/devel/output/2.txt.gz
diff --git a/devel/output/20.txt.gz b/devel/output/20.txt.gz
diff --git a/devel/output/21.txt.gz b/devel/output/21.txt.gz
diff --git a/devel/output/22.txt.gz b/devel/output/22.txt.gz
diff --git a/devel/output/23.txt.gz b/devel/output/23.txt.gz
diff --git a/devel/output/24.txt.gz b/devel/output/24.txt.gz
diff --git a/devel/output/25.txt.gz b/devel/output/25.txt.gz
diff --git a/devel/output/26.txt.gz b/devel/output/26.txt.gz
diff --git a/devel/output/27.txt.gz b/devel/output/27.txt.gz
diff --git a/devel/output/28.txt.gz b/devel/output/28.txt.gz
diff --git a/devel/output/29.txt.gz b/devel/output/29.txt.gz
diff --git a/devel/output/3.txt.gz b/devel/output/3.txt.gz
diff --git a/devel/output/30.txt.gz b/devel/output/30.txt.gz
diff --git a/devel/output/31.txt.gz b/devel/output/31.txt.gz
diff --git a/devel/output/32.txt.gz b/devel/output/32.txt.gz
diff --git a/devel/output/33.txt.gz b/devel/output/33.txt.gz
diff --git a/devel/output/34.txt.gz b/devel/output/34.txt.gz
diff --git a/devel/output/35.txt.gz b/devel/output/35.txt.gz
diff --git a/devel/output/36.txt.gz b/devel/output/36.txt.gz
diff --git a/devel/output/37.txt.gz b/devel/output/37.txt.gz
diff --git a/devel/output/38.txt.gz b/devel/output/38.txt.gz
diff --git a/devel/output/39.txt.gz b/devel/output/39.txt.gz
diff --git a/devel/output/4.txt.gz b/devel/output/4.txt.gz
diff --git a/devel/output/40.txt.gz b/devel/output/40.txt.gz
diff --git a/devel/output/41.txt.gz b/devel/output/41.txt.gz
diff --git a/devel/output/42.txt.gz b/devel/output/42.txt.gz
diff --git a/devel/output/43.txt.gz b/devel/output/43.txt.gz
diff --git a/devel/output/44.txt.gz b/devel/output/44.txt.gz
diff --git a/devel/output/45.txt.gz b/devel/output/45.txt.gz
diff --git a/devel/output/46.txt.gz b/devel/output/46.txt.gz
diff --git a/devel/output/47.txt.gz b/devel/output/47.txt.gz
diff --git a/devel/output/48.txt.gz b/devel/output/48.txt.gz
diff --git a/devel/output/49.txt.gz b/devel/output/49.txt.gz
diff --git a/devel/output/5.txt.gz b/devel/output/5.txt.gz
diff --git a/devel/output/50.txt.gz b/devel/output/50.txt.gz
diff --git a/devel/output/51.txt.gz b/devel/output/51.txt.gz
diff --git a/devel/output/52.txt.gz b/devel/output/52.txt.gz
diff --git a/devel/output/53.txt.gz b/devel/output/53.txt.gz
diff --git a/devel/output/54.txt.gz b/devel/output/54.txt.gz
diff --git a/devel/output/55.txt.gz b/devel/output/55.txt.gz
diff --git a/devel/output/56.txt.gz b/devel/output/56.txt.gz
diff --git a/devel/output/57.txt.gz b/devel/output/57.txt.gz
diff --git a/devel/output/58.txt.gz b/devel/output/58.txt.gz
diff --git a/devel/output/59.txt.gz b/devel/output/59.txt.gz
diff --git a/devel/output/6.txt.gz b/devel/output/6.txt.gz
diff --git a/devel/output/60.txt.gz b/devel/output/60.txt.gz
diff --git a/devel/output/61.txt.gz b/devel/output/61.txt.gz
diff --git a/devel/output/62.txt.gz b/devel/output/62.txt.gz
diff --git a/devel/output/63.txt.gz b/devel/output/63.txt.gz
diff --git a/devel/output/64.txt.gz b/devel/output/64.txt.gz
diff --git a/devel/output/65.txt.gz b/devel/output/65.txt.gz
diff --git a/devel/output/66.txt.gz b/devel/output/66.txt.gz
diff --git a/devel/output/67.txt.gz b/devel/output/67.txt.gz
diff --git a/devel/output/68.txt.gz b/devel/output/68.txt.gz
diff --git a/devel/output/69.txt.gz b/devel/output/69.txt.gz
diff --git a/devel/output/7.txt.gz b/devel/output/7.txt.gz
diff --git a/devel/output/70.txt.gz b/devel/output/70.txt.gz
diff --git a/devel/output/71.txt.gz b/devel/output/71.txt.gz
diff --git a/devel/output/72.txt.gz b/devel/output/72.txt.gz
diff --git a/devel/output/73.txt.gz b/devel/output/73.txt.gz
diff --git a/devel/output/74.txt.gz b/devel/output/74.txt.gz
diff --git a/devel/output/75.txt.gz b/devel/output/75.txt.gz
diff --git a/devel/output/76.txt.gz b/devel/output/76.txt.gz
diff --git a/devel/output/77.txt.gz b/devel/output/77.txt.gz
diff --git a/devel/output/78.txt.gz b/devel/output/78.txt.gz
diff --git a/devel/output/79.txt.gz b/devel/output/79.txt.gz
diff --git a/devel/output/8.txt.gz b/devel/output/8.txt.gz
diff --git a/devel/output/80.txt.gz b/devel/output/80.txt.gz
diff --git a/devel/output/81.txt.gz b/devel/output/81.txt.gz
diff --git a/devel/output/82.txt.gz b/devel/output/82.txt.gz
diff --git a/devel/output/83.txt.gz b/devel/output/83.txt.gz
diff --git a/devel/output/84.txt.gz b/devel/output/84.txt.gz
diff --git a/devel/output/85.txt.gz b/devel/output/85.txt.gz
diff --git a/devel/output/86.txt.gz b/devel/output/86.txt.gz
diff --git a/devel/output/87.txt.gz b/devel/output/87.txt.gz
diff --git a/devel/output/88.txt.gz b/devel/output/88.txt.gz
diff --git a/devel/output/89.txt.gz b/devel/output/89.txt.gz
diff --git a/devel/output/9.txt.gz b/devel/output/9.txt.gz
diff --git a/devel/output/90.txt.gz b/devel/output/90.txt.gz
diff --git a/devel/output/91.txt.gz b/devel/output/91.txt.gz
diff --git a/devel/output/92.txt.gz b/devel/output/92.txt.gz
diff --git a/devel/output/93.txt.gz b/devel/output/93.txt.gz
diff --git a/devel/output/94.txt.gz b/devel/output/94.txt.gz
diff --git a/devel/output/95.txt.gz b/devel/output/95.txt.gz
diff --git a/devel/output/96.txt.gz b/devel/output/96.txt.gz
diff --git a/devel/output/97.txt.gz b/devel/output/97.txt.gz
diff --git a/devel/output/98.txt.gz b/devel/output/98.txt.gz
diff --git a/devel/output/99.txt.gz b/devel/output/99.txt.gz
diff --git a/devel/test_jshint.sh b/devel/test_jshint.sh
@@ -3,7 +3,7 @@ set -x
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*

diff --git a/devel/test_wepsim.sh b/devel/test_wepsim.sh
@@ -3,7 +3,7 @@
 
 
 #*
-#*  Copyright 2015-2024 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
+#*  Copyright 2015-2025 Felix Garcia Carballeira, Alejandro Calderon Mateos, Javier Prieto Cepeda, Saul Alonso Monsalve
 #*
 #*  This file is part of WepSIM.
 #*

diff --git a/docs/WS_CHANGELOG.md b/docs/WS_CHANGELOG.md
@@ -1,14 +1,26 @@
 
 # Changelog
 
+## 2.3.2 -> 2.3.3:
+* Main improvements:
+  * Several minor improvements:
+    * More flexible assembler error dialog box
+    * Faster loading in microcode editor
+
 ## 2.3.1 -> 2.3.2:
 * Main improvements:
   * Several minor improvements in the new default assembler:
     * Relative branches offset can be now in bytes, words (MIPS), and half-words (RV)
     * Support for alternative definitions of pseudo-instructions, ordered from most restrictive to least restrictive
-    * Support for binary segment
+    * Support for binary segment:
+      <code>
+      .binary
+         main:
+           0x000x8000   0x69400003
+   	   ...
+      </code>
   * Several minor updates to the firmware syntax v2:
-    * saveFirmware(...) now support v2
+    * Save Firmware from control memory now supports firmware version 2
     * Firmware metadata updated:
       <html>
        <table>

diff --git a/images/author_jprieto.png b/images/author_jprieto.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "inquirer-command-prompt": "^0.1.0",
     "optionator": "^0.9.1",
     "readline-sync": "^1.4.10",
-    "rollup": "^3.25.1",
+    "rollup": "^3.29.5",
     "vue": "^2.6.12",
     "vuex": "^3.6.0",
     "winston": "^2.4.7",

diff --git a/repo/assembly/mips/s6e5.asm b/repo/assembly/mips/s6e5.asm
@@ -21,11 +21,11 @@
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
 
-                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,0,1, 0,0,1,0,0,0,0,0,
-                 0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,1, 0,0,1,0,0,0,0,0,
+                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
+                 0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,0, 0,0,1,0,0,0,0,0,
                  0,1,1,1,0,1,0,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                  0,1,0,0,0,1,0,1, 0,1,0,0,0,0,0,1, 0,0,0,0,0,0,0,0,
-                 0,1,1,1,0,1,1,1, 0,1,1,1,0,0,0,1, 0,0,1,0,0,0,0,0,
+                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,

diff --git a/repo/assembly/mips/s6e5_help.asm b/repo/assembly/mips/s6e5_help.asm
@@ -21,11 +21,11 @@
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
 
-                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,0,1, 0,0,1,0,0,0,0,0,
-                 0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,1, 0,0,1,0,0,0,0,0,
+                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
+                 0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,0, 0,0,1,0,0,0,0,0,
                  0,1,1,1,0,1,0,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                  0,1,0,0,0,1,0,1, 0,1,0,0,0,0,0,1, 0,0,0,0,0,0,0,0,
-                 0,1,1,1,0,1,1,1, 0,1,1,1,0,0,0,1, 0,0,1,0,0,0,0,0,
+                 0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                  0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,

diff --git a/repo/assembly/mips/s6e6.asm b/repo/assembly/mips/s6e6.asm
@@ -41,11 +41,11 @@
                0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
 
-               0,1,1,1,0,1,1,1, 0,1,1,1,0,1,0,1, 0,0,1,0,0,0,0,0,
-               0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,1, 0,0,1,0,0,0,0,0,
+               0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
+               0,0,0,1,0,1,0,1, 0,0,0,1,0,1,0,0, 0,0,1,0,0,0,0,0,
                0,1,1,1,0,1,0,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                0,1,0,0,0,1,0,1, 0,1,0,0,0,0,0,1, 0,0,0,0,0,0,0,0,
-               0,1,1,1,0,1,1,1, 0,1,1,1,0,0,0,1, 0,0,1,0,0,0,0,0,
+               0,1,1,1,0,1,1,1, 0,1,1,1,0,1,1,1, 0,0,1,0,0,0,0,0,
                0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,
                0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,

diff --git a/repo/assembly/rv32/s2e5_help.asm b/repo/assembly/rv32/s2e5_help.asm
@@ -9,8 +9,9 @@
             .word rt_sys
 
 .ktext
-sys_prt_str: li   x1  1
-             li   x0  0
+sys_prt_str: li   x0  0
+             li   x1  1
+             add  x26 a0 x0
              beq  x26 x0 end1
          b5: lb   x27 0(x26)
              beq  x27 x0 end1
@@ -20,6 +21,7 @@ sys_prt_str: li   x1  1
        end1: sret
 
 sys_prt_int: li   x1 1
+             add  x26 a0 x0
              # push_byte('\0')
              sb   x0 0(sp)
              sub  sp sp x1
@@ -48,7 +50,6 @@ sys_prt_int: li   x1 1
          f2: sret
 
    rt_sys:   # 1.- syscall
-             add  x26 a0 x0
              li   x27 4
              beq  a7 x27 sys_prt_str
              li   x27 1

diff --git a/repo/assembly/rv32/s2e6.asm b/repo/assembly/rv32/s2e6.asm
@@ -9,8 +9,9 @@
             .word rt_sys
 
 .ktext
-sys_prt_str: li   x1  1
-             li   x0  0
+sys_prt_str: li   x0  0
+             li   x1  1
+             add  x26 a0 x0
              beq  x26 x0 end1
          b5: lb   x27 0(x26)
              beq  x27 x0 end1
@@ -20,6 +21,7 @@ sys_prt_str: li   x1  1
        end1: sret
 
 sys_prt_int: li   x1 1
+             add  x26 a0 x0
              # push_byte('\0')
              sb   x0 0(sp)
              sub  sp sp x1
@@ -48,7 +50,6 @@ sys_prt_int: li   x1 1
          f2: sret
 
    rt_sys:   # 1.- syscall
-             add  x26 a0 x0
              li   x27 4
              beq  a7 x27 sys_prt_str
              li   x27 1

diff --git a/repo/assembly/rv32/s2e6_help.asm b/repo/assembly/rv32/s2e6_help.asm
@@ -9,8 +9,9 @@
             .word rt_sys
 
 .ktext
-sys_prt_str: li   x1  1
-             li   x0  0
+sys_prt_str: li   x0  0
+             li   x1  1
+             add  x26 a0 x0
              beq  x26 x0 end1
          b5: lb   x27 0(x26)
              beq  x27 x0 end1
@@ -20,6 +21,7 @@ sys_prt_str: li   x1  1
        end1: sret
 
 sys_prt_int: li   x1 1
+             add  x26 a0 x0
              # push_byte('\0')
              sb   x0 0(sp)
              sub  sp sp x1
@@ -48,7 +50,6 @@ sys_prt_int: li   x1 1
          f2: sret
 
    rt_sys:   # 1.- syscall
-             add  x26 a0 x0
              li   x27 4
              beq  a7 x27 sys_prt_str
              li   x27 1

diff --git a/repo/assembly/rv32/s4e2.asm b/repo/assembly/rv32/s4e2.asm
@@ -13,7 +13,8 @@
 
 .ktext
 sys_prt_str: li   zero 0
-             beq  t3 zero end1
+             beq  a0 zero end1
+             mv   t3 a0
          b5: lb   t4 0(t3)
              beq  t4 zero end1
              out  t4 0x1000
@@ -22,6 +23,7 @@ sys_prt_str: li   zero 0
        end1: sret
 
 sys_prt_int: li   t1 1
+             mv   t3 a0
              # push_byte('\0')
              sb   zero 0(sp)
              sub  sp sp t1
@@ -74,7 +76,7 @@ sys_rd_str:  li   zero  0
              sret
 
 sys_rd_int:  li   zero  0
-             li   a7 0
+             li   a0 0
   notready2: # ch = get_char()
              in   t4 0x0104
              beq  t4 zero notready2
@@ -85,24 +87,23 @@ sys_rd_int:  li   zero  0
              bgt  t4 t1 eos2
              li   t1  48
              blt  t4 t1 eos2
-             # a7 = a7*10 + (ch-48)
+             # a0 = a0*10 + (ch-48)
              sub  t4 t4 t1
              li   t1  10
-             mul  a7 a7 t1
-             add  a7 a7 t4
+             mul  a0 a0 t1
+             add  a0 a0 t4
              beq  zero zero notready2
        eos2: sret
 
 sys_rd_ch:   li   zero  0
   notready3: # ch=get_char()
              in   t4 0x0104
              beq  t4 zero notready3
-             in   a7 0x0100
-             out  a7 0x1000 # echo
+             in   a0 0x0100
+             out  a0 0x1000 # echo
              sret
 
    rt_sys:   # 1.- ecall
-             mv   t3 a0
              li   t4 4
              beq  a7 t4 sys_prt_str
              li   t4 1