feat: misc improvements

Author: rkm0959

library/panic_abort/src/zkvm.rs

@@ -12,13 +12,15 @@ pub(crate) unsafe fn zkvm_set_abort_message(payload: &mut dyn PanicPayload) {
             None => &[],
         },
     };
-    if msg.is_empty() {
-        return;
-    }
-
+    
     extern "C" {
+        fn syscall_halt(exit_code: u8) -> !;
         fn sys_panic(msg_ptr: *const u8, len: usize) -> !;
     }
 
+    if msg.is_empty() {
+        syscall_halt(1);
+    }
+
     sys_panic(msg.as_ptr(), msg.len());
 }

library/std/src/sys/pal/zkvm/abi.rs

@@ -20,35 +20,16 @@ pub mod fileno {
 
 extern "C" {
     // Wrappers around syscalls provided by sp1-zkvm-platform:
-    pub fn sys_halt();
-    pub fn sys_output(output_id: u32, output_value: u32);
-    pub fn sys_sha_compress(
-        out_state: *mut [u32; DIGEST_WORDS],
-        in_state: *const [u32; DIGEST_WORDS],
-        block1_ptr: *const [u32; DIGEST_WORDS],
-        block2_ptr: *const [u32; DIGEST_WORDS],
-    );
-    pub fn sys_sha_buffer(
-        out_state: *mut [u32; DIGEST_WORDS],
-        in_state: *const [u32; DIGEST_WORDS],
-        buf: *const u8,
-        count: u32,
-    );
     pub fn sys_rand(recv_buf: *mut u8, words: usize);
     pub fn sys_panic(msg_ptr: *const u8, len: usize) -> !;
-    pub fn sys_log(msg_ptr: *const u8, len: usize);
-    pub fn sys_cycle_count() -> usize;
-    pub fn sys_read(fd: u32, recv_buf: *mut u8, nrequested: usize) -> usize;
     pub fn sys_write(fd: u32, write_buf: *const u8, nbytes: usize);
     pub fn sys_getenv(
         recv_buf: *mut u32,
         words: usize,
         varname: *const u8,
         varname_len: usize,
     ) -> usize;
-    pub fn sys_argc() -> usize;
-    pub fn sys_argv(out_words: *mut u32, out_nwords: usize, arg_index: usize) -> usize;
-
+    
     // Allocate memory from global HEAP.
     pub fn sys_alloc_words(nwords: usize) -> *mut u32;
     pub fn sys_alloc_aligned(nwords: usize, align: usize) -> *mut u8;

library/std/src/sys/pal/zkvm/args.rs

@@ -11,30 +11,13 @@ pub struct Args {
 }
 
 pub fn args() -> Args {
-    let count = unsafe { abi::sys_argc() };
-    Args { i_forward: 0, i_back: 0, count }
+    Args { i_forward: 0, i_back: 0, count: 0 }
 }
 
 impl Args {
-    /// Use sys_argv to get the arg at the requested index. Does not check that i is less than argc
-    /// and will not return if the index is out of bounds.
+    /// Args::argv is currently not implemented.
     fn argv(i: usize) -> OsString {
-        let arg_len = unsafe { abi::sys_argv(crate::ptr::null_mut(), 0, i) };
-
-        let arg_len_words = (arg_len + WORD_SIZE - 1) / WORD_SIZE;
-        let words = unsafe { abi::sys_alloc_words(arg_len_words) };
-
-        let arg_len2 = unsafe { abi::sys_argv(words, arg_len_words, i) };
-        debug_assert_eq!(arg_len, arg_len2);
-
-        // Convert to OsString.
-        //
-        // FIXME: We can probably get rid of the extra copy here if we
-        // reimplement "os_str" instead of just using the generic unix
-        // "os_str".
-        let arg_bytes: &[u8] =
-            unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, arg_len) };
-        OsString::from_inner(os_str::Buf { inner: arg_bytes.to_vec() })
+        panic!("Args::argv is currently not implemented");
     }
 }
 

library/std/src/sys/pal/zkvm/stdio.rs

@@ -14,7 +14,10 @@ impl Stdin {
 
 impl io::Read for Stdin {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        Ok(unsafe { abi::sys_read(fileno::STDIN, buf.as_mut_ptr(), buf.len()) })
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
+            "io::Read for Stdin is currently not implemented",
+        ));
     }
 }