wasm: direct platform, wam memory

- Rename platform_os.wam to platform_direct.wam and update the direct
  interface to use printline instead of fputs/stdout.
- Update to wamp 1.0.7 and new memory/memoryBase semantics: in
  platform_direct and platform_libc, import memory and memoryBase
  rather than relying on wamp to add it because wamp add direct memory
  and memoryBase defintions (not imports) if the program doesn't
  already define or import memory/memoryBase.
- Simplify entry point logic by moving it into the platform files.

diff --git a/wasm/Makefile b/wasm/Makefile
index cd30392..dc92010 100644 (file)
--- a/wasm/Makefile
+++ b/wasm/Makefile
@@ -1,4 +1,4 @@
-MODE ?= $(if $(filter node js wace_fooboot warpy,$(wasm_MODE)),os,libc)
+MODE ?= $(if $(filter node js wace_fooboot warpy,$(wasm_MODE)),direct,libc)
 
 WASM_AS ?= wasm-as
 WAMP ?= node_modules/.bin/wamp

diff --git a/wasm/package.json b/wasm/package.json
index 3f19a29..2260256 100644 (file)
--- a/wasm/package.json
+++ b/wasm/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in WebAssembly",
     "dependencies": {
-        "@kanaka/wamp": "1.0.6",
+        "@kanaka/wamp": "1.0.7",
         "ffi-napi": "^2.4.4",
         "text-encoding": "0.6.4"
     }

diff --git a/wasm/platform_os.wam b/wasm/platform_direct.wam
similarity index 75%
rename from wasm/platform_os.wam
rename to wasm/platform_direct.wam
index cb76c7f..a8e92b5 100644 (file)
--- a/wasm/platform_os.wam
+++ b/wasm/platform_direct.wam
@@ -1,8 +1,10 @@
 (module $platform_os
 
+  (import "env" "memory" (memory 256))
+  (import "env" "memoryBase" (global $memoryBase i32))
+
   (import "env" "exit"        (func $lib_exit (param i32)))
-  (import "env" "stdout"      (global $lib_stdout i32))
-  (import "env" "fputs"       (func $lib_fputs (param i32 i32) (result i32)))
+  (import "env" "printline"   (func $lib_printline (param i32) (result i32)))
   (import "env" "readline"    (func $lib_readline (param i32 i32 i32) (result i32)))
   (import "env" "read_file"   (func $lib_read_file (param i32 i32) (result i32)))
   (import "env" "get_time_ms" (func $lib_get_time_ms (result i32)))
@@ -17,7 +19,8 @@
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
   (func $print (param $addr i32)
-    (drop ($lib_fputs $addr (global.get $lib_stdout))))
+    (drop ($lib_printline $addr))
+  )
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -42,4 +45,13 @@
     ($lib_get_time_ms)
   )
 
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+  (func $entry (param $argc i32 $argv i32)
+    ($init_memory)
+    ($lib_exit ($main $argc $argv))
+  )
+
+  (export "_main" (func $entry))
+
 )

diff --git a/wasm/platform_libc.wam b/wasm/platform_libc.wam
index 351f1f4..f1d0a71 100644 (file)
--- a/wasm/platform_libc.wam
+++ b/wasm/platform_libc.wam
@@ -1,12 +1,13 @@
 (module $platform_libc
 
-  (import "env" "exit" (func $lib_exit (param i32)))
-
-  (import "env" "stdout" (global $lib_stdout i32))
-  (import "env" "fputs" (func $lib_fputs (param i32 i32) (result i32)))
-
-  (import "env" "free" (func $lib_free (param i32)))
-  (import "env" "readline" (func $lib_readline (param i32) (result i32)))
+  (import "env" "memory" (memory 256))
+  (import "env" "memoryBase" (global $memoryBase i32))
+
+  (import "env" "exit"        (func $lib_exit (param i32)))
+  (import "env" "stdout"      (global $lib_stdout i32))
+  (import "env" "fputs"       (func $lib_fputs (param i32 i32) (result i32)))
+  (import "env" "readline"    (func $lib_readline (param i32) (result i32)))
+  (import "env" "free"        (func $lib_free (param i32)))
   (import "env" "add_history" (func $lib_add_history (param i32)))
 
   ;; read_file defintions / FFI information
@@ -97,4 +98,14 @@
                                (i32.div_u $usecs 1000)))
     $msecs
   )
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+  (func $entry (param $argc i32 $argv i32)
+    ($init_memory)
+    ($lib_exit ($main $argc $argv))
+  )
+
+  (export "_main" (func $entry))
+
 )

diff --git a/wasm/step0_repl.wam b/wasm/step0_repl.wam
index 354d46c..6814041 100644 (file)
--- a/wasm/step0_repl.wam
+++ b/wasm/step0_repl.wam
@@ -19,7 +19,7 @@
     ($PRINT ($EVAL ($READ $line) 0))
   )
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     ;; Constant location/value definitions
     (LET $line (STATIC_ARRAY 201))
 
@@ -40,8 +40,10 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_printf_mem))
+  ;; init_memory is provided by mem.wam in later steps but we just
+  ;; printf in step0 so provide init_memory that just calls that
+  (func $init_memory
+    ($init_printf_mem)
+  )
 )
 

diff --git a/wasm/step1_read_print.wam b/wasm/step1_read_print.wam
index a41d333..19e330d 100644 (file)
--- a/wasm/step1_read_print.wam
+++ b/wasm/step1_read_print.wam
@@ -34,7 +34,7 @@
     $ms
   )
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     (LET $line (STATIC_ARRAY 201)
          $res  0)
 
@@ -77,8 +77,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step2_eval.wam b/wasm/step2_eval.wam
index 0ce9712..fdf161a 100644 (file)
--- a/wasm/step2_eval.wam
+++ b/wasm/step2_eval.wam
@@ -185,7 +185,7 @@
       (i32.div_s ($VAL0 ($MEM_VAL1_ptr $args))
                  ($VAL0 ($MEM_VAL1_ptr ($MEM_VAL0_ptr $args))))))
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     (LET $line (STATIC_ARRAY 201)
          $res 0 $repl_env 0)
 
@@ -229,8 +229,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step3_env.wam b/wasm/step3_env.wam
index df04633..c756dff 100644 (file)
--- a/wasm/step3_env.wam
+++ b/wasm/step3_env.wam
@@ -233,7 +233,7 @@
     ($PR_MEMORY -1 -1)
     ($INC_REF (global.get $NIL)))
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     (LET $line (STATIC_ARRAY 201)
          $res 0 $repl_env 0)
 
@@ -277,8 +277,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step4_if_fn_do.wam b/wasm/step4_if_fn_do.wam
index da16f57..c984bf5 100644 (file)
--- a/wasm/step4_if_fn_do.wam
+++ b/wasm/step4_if_fn_do.wam
@@ -267,7 +267,7 @@
     $ms
   )
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     (LET $line (STATIC_ARRAY 201)
          $res 0 $repl_env 0 $ms 0)
 
@@ -321,8 +321,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step5_tco.wam b/wasm/step5_tco.wam
index 20d8fda..1268d46 100644 (file)
--- a/wasm/step5_tco.wam
+++ b/wasm/step5_tco.wam
@@ -316,7 +316,7 @@
     $ms
   )
 
-  (func $main (result i32)
+  (func $main (param $argc i32 $argv i32) (result i32)
     (LET $line (STATIC_ARRAY 201)
          $res 0 $repl_env 0 $ms 0)
 
@@ -370,8 +370,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step6_file.wam b/wasm/step6_file.wam
index e5b56a6..373f6ef 100644 (file)
--- a/wasm/step6_file.wam
+++ b/wasm/step6_file.wam
@@ -426,8 +426,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step7_quote.wam b/wasm/step7_quote.wam
index e609a56..41efd52 100644 (file)
--- a/wasm/step7_quote.wam
+++ b/wasm/step7_quote.wam
@@ -488,8 +488,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step8_macros.wam b/wasm/step8_macros.wam
index ff042d0..82fa716 100644 (file)
--- a/wasm/step8_macros.wam
+++ b/wasm/step8_macros.wam
@@ -573,8 +573,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/step9_try.wam b/wasm/step9_try.wam
index 31567f1..904f11e 100644 (file)
--- a/wasm/step9_try.wam
+++ b/wasm/step9_try.wam
@@ -620,8 +620,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )
 

diff --git a/wasm/stepA_mal.wam b/wasm/stepA_mal.wam
index 3437620..5dfb4bb 100644 (file)
--- a/wasm/stepA_mal.wam
+++ b/wasm/stepA_mal.wam
@@ -624,8 +624,5 @@
     0
   )
 
-
-  (export "_main" (func $main))
-  (export "__post_instantiate" (func $init_memory))
 )