Merge pull request #101 from DvvCz/syscall-readint-32

Fix 32 bit mode reading long in readInt syscall
rarsm · Nov 29, 2024 · ef563eb · ef563eb
2 parents b0cb517 + 4716fa4
commit ef563eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/rars/riscv/syscalls/SyscallReadInt.java b/src/rars/riscv/syscalls/SyscallReadInt.java
@@ -1,6 +1,7 @@
 package rars.riscv.syscalls;
 
 import rars.*;
+import rars.riscv.InstructionSet;
 import rars.riscv.AbstractSyscall;
 import rars.riscv.hardware.RegisterFile;
 import rars.util.SystemIO;
@@ -12,7 +13,11 @@ public SyscallReadInt() {
 
     public void simulate(ProgramStatement statement) throws SimulationException {
         try {
-            RegisterFile.updateRegister("a0", SystemIO.readInteger(this.getNumber()));
+            if (InstructionSet.rv64) {
+                RegisterFile.updateRegister("a0", SystemIO.readLong(this.getNumber()));
+            } else {
+                RegisterFile.updateRegister("a0", SystemIO.readInteger(this.getNumber()));
+            }
         } catch (NumberFormatException e) {
             if (e.getMessage().equals("Cancel"))
                 throw new CancelException();

diff --git a/src/rars/util/SystemIO.java b/src/rars/util/SystemIO.java
@@ -64,7 +64,14 @@ public class SystemIO {
      * @return int value corresponding to user input
      */
 
-    public static long readInteger(int serviceNumber) throws CancelException {
+    public static int readInteger(int serviceNumber) throws CancelException {
+        String input = readStringInternal("0", "Enter an integer value (syscall " + serviceNumber + ")", -1);
+        // Client is responsible for catching NumberFormatException
+        if (input == null) throw new CancelException();
+        return Integer.parseInt(input.trim());
+    }
+
+    public static long readLong(int serviceNumber) throws CancelException {
         String input = readStringInternal("0", "Enter an integer value (syscall " + serviceNumber + ")", -1);
         // Client is responsible for catching NumberFormatException
         if (input == null) throw new CancelException();