X-Git-Url: https://git.kengrimes.com/?p=watForth.git;a=blobdiff_plain;f=forth.wat;fp=forth.wat;h=a3a61e5cede20bfe3a5aa4f4dc0a63222eb2266b;hp=43dc195d1c71c44b5b0058577c16a8df32b8a22e;hb=b9be17929d350bf4ab9c747e29ae6c1203035111;hpb=a83e7e42d457eb562902eea8090c3f2b51351686 diff --git a/forth.wat b/forth.wat index 43dc195..a3a61e5 100644 --- a/forth.wat +++ b/forth.wat @@ -16,13 +16,13 @@ (type $FUNCSIGiii (func)) (type $FUNCSIGiv (func (param i32 i32) (result i32))) (type $FUNCSIG$v (func (param i32) (result i32))) - (type $FUNCSIG$vi (func (param i32 i32) (result i32))) + (type $FUNCSIG$vi (func (param i32 i32 i32) (result i32))) (import "env" "pop" (func $pop (result i32))) (import "env" "push" (func $push (param i32))) (import "env" "rinit" (func $rinit)) (import "env" "rpop" (func $rpop (result i32))) (import "env" "rpush" (func $rpush (param i32))) - (import "env" "sys_read" (func $sys_read (param i32 i32) (result i32))) + (import "env" "sys_read" (func $sys_read (param i32 i32 i32) (result i32))) (import "env" "sys_fetch" (func $sys_fetch (param i32 i32) (result i32))) (import "env" "sys_listen" (func $sys_listen (param i32) (result i32))) (import "env" "sys_write" (func $sys_write (param i32 i32 i32) (result i32))) @@ -43,7 +43,7 @@ (global $inbuf_size i32 (i32.const 12292)) (global $inbuf_data i32 (i32.const 12296)) (global $kvars i32 (i32.const 14336)) ;; 0x3800 Size: 2048 - (data (i32.const 12288) "\fc\07\00\00") ;; 2044 len + (data (i32.const 12288) "\f8\07\00\00") ;; 2040 len (data (i32.const 14336) "\28\41\00\00") ;; MODE (data (i32.const 14340) "\04\42\00\00") ;; HERE (data (i32.const 14344) "\00\40\00\00") ;; START @@ -129,14 +129,13 @@ (data (i32.const 16752) "\19\00\00\00") ;; BYE (; Do Backslash ;) (data (i32.const 16788) "\05\00\00\00") ;; KEY - (data (i32.const 16792) "\02\00\00\00") ;; LIT - (data (i32.const 16796) "\20\00\00\00") ;; 32 (space) - (data (i32.const 16800) "\25\00\00\00") ;; =? - (data (i32.const 16804) "\0f\00\00\00") ;; JNZ: - (data (i32.const 16808) "\bc\41\00\00") ;; addr of keypump - (data (i32.const 16812) "\cc\40\00\00") ;; WORDLOOP + 1 - (data (i32.const 16816) "\28\41\00\00") ;; EXECUTE-MODE - (data (i32.const 16820) "\01\00\00\00") ;; RET + (data (i32.const 16792) "\11\00\00\00") ;; WS? + (data (i32.const 16796) "\0f\00\00\00") ;; JNZ: + (data (i32.const 16800) "\c8\41\00\00") ;; addr of keypump + 3 + (data (i32.const 16804) "\cc\40\00\00") ;; WORDLOOP + 1 + (data (i32.const 16808) "\28\41\00\00") ;; EXECUTE-MODE + (data (i32.const 16812) "\01\00\00\00") ;; RET + (; Do Comment ;) (data (i32.const 16828) "\18\00\00\00") ;; j-1: <-- keypump (data (i32.const 16832) "\e0\41\00\00") ;; addr of end (data (i32.const 16836) "\05\00\00\00") ;; KEY @@ -188,9 +187,6 @@ set_local $channel block $bye loop $next - call $sys_stack - get_local $esi - call $sys_reflect get_local $esi get_local $esi i32.const 4 @@ -206,14 +202,106 @@ block $dictget block $parsenum block $wordfinish block $jneg1 block $swap block $words block $here block $dictset block $dup2 block $rot block $drop2 block $comma block $subtract block $keychan block $sethere block $eqbool - block $echostring + block $echostring block $strstart block $strput block $strend get_local $eax br_table $op0 $ret (;2;)$lit $rinit (;4;)$word $key (;6;)$dup $plus (;8;)$jmp $emit (;10;)$fetch $set (;12;)$execute $noop (;14;)$jz $jnz (;16;)$drop $wsbool (;18;)$jmp $wordputc (;20;)$wordstart $dictget (;22;)$parsenum $wordfinish (;24;)$jneg1 $bye (;26;)$swap $words (;28;)$here $dictset (;30;)$dup2 $rot (;32;)$drop2 $comma - (;34;)$subtract $keychan (;36;)$sethere $eqbool (;38;)$echostring $default + (;34;)$subtract $keychan (;36;)$sethere $eqbool (;38;)$echostring $strstart + (;40;)$strput $strend $default + end ;; strend + get_local $stringbelt_tail + get_local $stringbelt_head + get_local $stringbelt_tail + i32.const 4 + i32.add + i32.sub + tee_local $eax (; n bytes ;) + i32.store + (; align to 32-bit ;) + get_local $stringbelt_head + i32.const 3 + i32.add + i32.const 8188 + i32.and + set_local $stringbelt_head + (; /align ;) + get_local $stringbelt_tail + i32.const 4 + i32.add + call $push + get_local $eax + call $push + br $next + end ;; strput + block $sbhasspace2 + get_local $stringbelt_head + get_global $wordbelt + i32.lt_u + br_if $sbhasspace2 + i32.const 0 + tee_local $stringbelt_head + get_local $stringbelt_tail + i32.load + i32.store + get_local $stringbelt_head + i32.const 4 + i32.add + set_local $stringbelt_head + get_local $stringbelt_tail + i32.const 4 + i32.add + set_local $stringbelt_tail + loop $copystringtostart + get_local $stringbelt_head + get_local $stringbelt_tail + i32.load16_u + i32.store16 + get_local $stringbelt_head + i32.const 2 + i32.add + set_local $stringbelt_head + get_local $stringbelt_tail + i32.const 2 + i32.add + tee_local $stringbelt_tail + get_global $wordbelt + i32.le_u + br_if $copystringtostart + end + i32.const 0 + set_local $stringbelt_tail + end + get_local $stringbelt_head + call $pop + i32.store16 + get_local $stringbelt_head + i32.const 2 + i32.add + set_local $stringbelt_head + br $next + end ;; strstart + block $sbhasspace + get_local $stringbelt_head + get_global $wordbelt + i32.const 8 + i32.sub + i32.le_u + br_if $sbhasspace + i32.const 0 + set_local $stringbelt_head + end + get_local $stringbelt_head + get_local $stringbelt_head + tee_local $stringbelt_tail + i32.const 0 + i32.store + i32.const 4 + i32.add + set_local $stringbelt_head + br $next end ;; echostring get_local $channel call $pop @@ -463,7 +551,6 @@ get_local $eax call $push call $push - call $sys_stack br $next end ;; drop call $pop @@ -562,14 +649,20 @@ set_local $inbuf_head br $next end ;; key_read + get_global $inbuf_size get_local $channel + get_global $inbuf_data get_global $inbuf + i32.load call $sys_read + i32.store block $nullread get_global $inbuf_size i32.load i32.eqz br_if $nullread + get_global $inbuf_data + set_local $inbuf_head br $key_loop end ;; nullread i32.const -1 ;; <- keyval sent if sz == 0