Use direct file read

Author: somnergy

qemu_runner/Makefile

@@ -118,21 +118,45 @@ rerun_ctest:
 # 		-monitor none \
 #   		-qmp unix:/tmp/qmp.sock,server=on,wait=off
 
+# rerun-qemu-eest:
+# 	which script;
+# 	@if [ -z "$(file-name)" ]; then echo "Usage: make rerun-qemu-eest file-name=path/to.json"; exit 1; fi
+# 	@N=$$(wc -c <"$(file-name)"); \
+# 	rm -f semihost.log; \
+# 	script -qefc "{ printf '123456789_123456789_123456789_123'; printf '1 %u\n' $$N; cat '$(file-name)'; } | \
+# 		qemu-system-riscv32 -M virt -m 2G -nographic \
+# 			-bios $(BUILD_DIR)/z6m_debug \
+# 			-chardev stdio,mux=on,id=stdio0,signal=off \
+# 			-serial chardev:stdio0 \
+# 			-semihosting-config enable=on,chardev=stdio0,target=native \
+# 			-monitor none" semihost.log
+
+# rerun-qemu-eest:
+# 	@if [ -z "$(file-name)" ]; then echo "Usage: make rerun-qemu-eest file-name=path/to.json"; exit 1; fi
+# 	@N=$$(wc -c <"$(file-name)"); \
+# 	rm -f semihost.log serial.log; \
+# 	{ printf "123456789_123456789_123456789_123"; printf "1 %u\n" $$N; cat "$(file-name)"; } | \
+# 	qemu-system-riscv32 -M virt -m 2G -display none \
+# 		-bios $(BUILD_DIR)/z6m_debug \
+# 		-chardev stdio,id=sh0,signal=off \
+# 		-semihosting-config enable=on,target=native,chardev=sh0 \
+# 		-serial none \
+# 		-monitor none 
+
+
 rerun-qemu-eest:
 	@if [ -z "$(file-name)" ]; then echo "Usage: make rerun-qemu-eest file-name=path/to.json"; exit 1; fi
 	@N=$$(wc -c <"$(file-name)"); \
-	set -e; \
-	rm -f semihost.log serial.log stdin_payload.bin; \
-	{ printf "123456789_123456789_123456789_123"; printf "1 %u\n" $$N; cat "$(file-name)"; } > stdin_payload.bin; \
-	script -qec "cat stdin_payload.bin | \
-		qemu-system-riscv32 -M virt -m 2G -nographic \
-			-bios $(BUILD_DIR)/z6m_debug \
-			-chardev stdio,mux=on,id=stdio0 \
-			-serial chardev:stdio0 \
-			-semihosting-config enable=on,chardev=stdio0 \
-			-monitor none" semihost.log
-
-# Clean build artifacts
+	rm -f semihost.log serial.log; \
+	{ printf "1 %u\n" $$N; cat "$(file-name)"; } > stdin_payload.bin; \
+	qemu-system-riscv32 -M virt -m 2G -display none \
+		-bios $(BUILD_DIR)/z6m_debug \
+		-chardev stdio,id=sh0,signal=off \
+		-semihosting-config enable=on,target=native,chardev=sh0 \
+		-serial none \
+		-monitor none
+
+# # Clean build artifacts
 .PHONY: clean
 clean:
 	rm -rf $(BUILD_DIR)

qemu_runner/src/include/semihosting.hpp

@@ -132,6 +132,19 @@ namespace sh
         return static_cast<int>(h); // -1 on failure
     }
 
+    inline int open_file_read(std::string path)
+    {
+        struct Args
+        {
+            const char* name;
+            int mode;
+            int name_len;
+        } a{ path.c_str(), 0, static_cast<int>(path.size()) };
+
+        long h = call(SYS_OPEN, &a);
+        return static_cast<int>(h);
+    }
+
     // =================  SYS_READ ==========================
     // SYS_READ (0x06) = “read N bytes from a file handle”
     // NOTE: Does not work without opening a file handle
@@ -166,6 +179,7 @@ namespace sh
         {
             std::size_t len = (n - off) >= block_size ? block_size : (n - off);
             std::size_t got = read_handle(handle, static_cast<char*>(buf) + off, len);
+
             // if (got == 0)
             // {
             //     sys_println("read_exact_tty - got 0, probable EOF");

qemu_runner/src/main.cpp

@@ -12,7 +12,7 @@ int main(int argc, char* argv[])
     std::uint32_t n = 0;
 
     // Open a handle
-    int h = sh::open_tty_read();
+    int h = sh::open_file_read("stdin_payload.bin");
     if (h < 0)
     {
         sys_println("Failed to open tty_read");