From 8c45fa4af8aeeeec809d6265509d9d0ed57900b1 Mon Sep 17 00:00:00 2001
From: Able <abl3theabove@gmail.com>
Date: Tue, 19 Apr 2022 02:38:59 -0500
Subject: [PATCH] print SYSCALL works

---
 ableos/src/wasm_jumploader/host_functions.rs |  24 +++++++------------
 userland/root_fs/ext2.img                    | Bin 4194304 -> 4194304 bytes
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ableos/src/wasm_jumploader/host_functions.rs b/ableos/src/wasm_jumploader/host_functions.rs
index 81910eb..04c5055 100644
--- a/ableos/src/wasm_jumploader/host_functions.rs
+++ b/ableos/src/wasm_jumploader/host_functions.rs
@@ -8,7 +8,7 @@ const ADD_FUNC_INDEX: usize = 0;
 const GET_TIME_INDEX: usize = 2;
 const GET_RANDOM_INDEX: usize = 3;
 const GET_INPUT_INDEX: usize = 4;
-const PRINT_CLEVER_HACK: usize = 5;
+const PRINT_CHAR: usize = 6;
 const SEND_SIGNAL_INDEX: usize = 1;
 
 pub struct HostExternals;
@@ -100,8 +100,8 @@ impl HostExternals {
                 true
             }
 
-            PRINT_CLEVER_HACK => {
-                let (params, ret_ty): (&[ValueType], Option<ValueType>) = (&[ValueType::I64], None);
+            PRINT_CHAR => {
+                let (params, ret_ty): (&[ValueType], Option<ValueType>) = (&[ValueType::I32], None);
                 if params.len() != signature.params().len() {
                     return false;
                 }
@@ -178,20 +178,12 @@ impl Externals for HostExternals {
                 Ok(Some(ret))
             }
 
-            PRINT_CLEVER_HACK => {
-                // println!("SYSCALL: print clever hack");
-
-                let combinated = args.nth_checked::<u64>(0).unwrap().to_le_bytes();
-
-                for x in combinated.iter() {
-                    let chr = *x as char;
-                    print!("{}", chr);
-                }
-
-                println!("\n");
+            PRINT_CHAR => {
+                let chr: u8 = args.nth_checked(0)?;
+                trace!("SYSCALL: print: {}", chr);
+                print!("{}", char::from(chr));
                 Ok(None)
             }
-
             _ => {
                 error!("Unimplemented function at {}", index);
                 Err(Trap::new(wasmi::TrapKind::Unreachable))
@@ -208,7 +200,7 @@ impl ModuleImportResolver for HostExternals {
             "get_time" => GET_TIME_INDEX,
             "get_random" => GET_RANDOM_INDEX,
             "get_input" => GET_INPUT_INDEX,
-            "print_clever_hack" => PRINT_CLEVER_HACK,
+            "print_char" => PRINT_CHAR,
             _ => {
                 return Err(Error::Instantiation(format!(
                     "Export {} not found",
diff --git a/userland/root_fs/ext2.img b/userland/root_fs/ext2.img
index 87b45adae6ef7d2b35d9a90a50d7bc7499e0a49e..6efcc1ef5dfde0ce3b33070802a310497ba06eac 100644
GIT binary patch
delta 1169
zcmdT?%}*0i5a0K9(WQOZ1*(=0?Scgn6-%{J3JO(BAeQ(M5&5bXO3(ww5HCiXteA`@
zTqxVH(UVcaRY;Y_=)sTi<4TP2pk4$cUW_4}Oi<qfZA{QVz?V$s_hx=G?>CdDX&TkI
zO)x3LZ4-nUJzFZs4EBb)A8@Nkc%_4c=GZ0)&=Hx5Zre=4CVT3MGe+ultx3|M(N7lj
zr;T+nMbf3F+L%(G(3%FRcw~{p$mN6<lqK<TPbe{TG%ATtdP2IjC2IP_P)n4U8Qt0%
z6`yfG)Vf%7FB0lbnZVDSNCj#Feq7w{#z>7md&*U0O8gg*&moMN#7LW3`kt2`;$8cA
z!5!|+PIDqjcP0FuMPtM-Wgph6V#J|qZBnkuYU@9qeu6)x8)usJNV~d}<GNSnX4_rM
z19n_m;*5<STg~ZM;dCx@{@SN=Onh$cqbph*=BiEQrkR@l+{a0N&oGrIBB4T>mYo`Q
zrOcEq1s}e9#77$m%eLv&%B7pFov(QMnijsUg-KEi)8X=@a)W*sM~A7hj37=SE<#*_
zcm~AROvTqaG-6NY+2t?JQMt@RyhfEzF0)%M44gZE@pRAG@PI%?tA&V!8vU|QHE#K2
z)wr#wZsViu^Y=|tOP3HJ0iy5^s0sPX)g>2rEhvK~3VclgbtSNn3e2Uz=M<Pvfpmme
zsbH0afblb^b{M0XzUEvo+X_}D9Jv4K?YB2SKFs$f*ZAd^BuRYoFYBo6C^0H!hm%!S
zpKyEp9<Sf+wM>!;alApk0w@D!0$KpAfDAATa2=oxPyx&a%mK^=v;(dO+yJ-{&;ghS
zm=9P0SO~ZYa5JD2Pz5XkEC$>H=mIPOES<uwo`(N-gD(iMGGN<)l>^%jYzMHNz$$?4
o0_Fx*3Csg*H?TdxyukJXs{-Z&Rt?M#tOi&uuzkSxkF&ak-<`X8`v3p{

delta 1027
zcmZ`&OH30{6n$@I3Il!8K??N4r-kyzf(2?VDxfaFXtX30DM-?Wpe~R^Oblq_5R!|L
zL@Co)mm0BdTu7SGjWL?sEn(x<umQ!ri3>IOrbQ4FUUKHmymQa}oR?8mRZuzJGRe?n
zB4k4=l<ax-#$e<NM{}w}I!A@Af)xtFlFY;=(?-f9d%Ed*jCN~kpQJ&rpYCWMd%I}9
zM*F(74}D#!2YqvbxU)lJ^j=E6C`;mnnqX?-N>mar*90}=KvdsT3j<NAGn#QQD)#ez
zVeq$eq#+o2l?-G+_}Uf)BIqxCm2<p|(N1mis>{iRhXxvX;IbY#Hsq*%&*f_`0+Dr&
z!RLX9o@ra8ds!*}rui}Im$u%_Uyo6XrVdGsXC*?0Ci)|vxeGe}s`znc=_(V?tOzmc
z)y6`O+7W)DH>KCnp@;onN050PZ8PM`8ZkVb>27&<-cN_9q^xRqS2Z%dSL>it2WJv;
zGPOpQ#h~u(wP;n6dwX!6eQyK2TLYiPpBfu26Erm}o4!@pBL6@u4PBDf?2lVA7KO6>
zPad<23_r6Jn&JGM8lG3fG_8h(#YTk@L2$bXDd9DmNi|J4Ws9}Qedl&~>c-7m<CDb3
ziFaa6hA37%?z`csiG6y7J`tZT3d&v{GY@wWYc`L5*A@;G?O8qbqyuI-DMDO;IDbkI
zH$XgRHJ)oxX>r<WmcLdS5?t|Yh5i!L)F<y4lfCl&*GjJ}0m^`Rfcbz%Kn8dOumI2m
zr~noM9tA7{Gy@g`mH?IlS^%wpHb6UI8DKeJ1z;th1JDUr1y~K}0;~b7UBx=j`Gi+-
z)QME2iOF`^kx&)KBilnEKbMHzj2MkYq=)uUh5wQ&u_?0&U!HF?F<0pLk=y3+c8ra;
zre|~NRT@(yVD-QnfHeYZ0@e)d7%(@m7GSNwjsx=mYXjB}tOJ-A*a=`hU?+k3fpr2q
N1?)7iGfCF<{SSa{7*+rP