miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add import (only for functions for now) and call

Browse Source
This commit is contained in:
Nathan Braswell
2021-07-25 18:10:10 -04:00
parent 3ad51ce19d
commit 6cacd32c00
4 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
comp_wasm.kp
View File

@@ -5,6 +5,7 @@
true *ARGV*) true *ARGV*)
_ (println "out" out) _ (println "out" out)
wasm_code (module wasm_code (module
(import "wasi_unstable" "fd_write" (func $fd_write (param i32 i32 i32 i32) (result i32)))
(func $add (param $num i32) (result i32) (func $add (param $num i32) (result i32)
(local $tmp1 i32) (local $tmp1 i32)
(local $tmp2 i32) (local $tmp2 i32)
@@ -19,6 +20,14 @@
) )
(br $test) (br $test)
drop drop
(call $fd_write
(i32.const 0) ;; file descriptor
(i32.const 8) ;; *iovs
(i32.const 1) ;; iovs_len
(i32.const 4) ;; nwritten
)
drop
) )
(i32.const 11) (i32.const 11)
(local.get $tmp2) (local.get $tmp2)

2
k_prime.krak
View File

@@ -1064,7 +1064,7 @@ fun main(argc: int, argv: **char): int {
if params.size <= 1 { if params.size <= 1 {
return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("Need 2 or more params to <")))) return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("Need 2 or more params to <"))))
} }
if !params[0].is_int() { return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("called < with first not an int")))); } if !params[0].is_int() { return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("called < with first not an int ") + pr_str(params[0], true)))); }
for (var i = 0; i < params.size - 1; i++;) { for (var i = 0; i < params.size - 1; i++;) {
if !params[i+1].is_int() { return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("called < with param ") + (i+1) + " not an int " + pr_str(params[i+1], true)))); } if !params[i+1].is_int() { return make_pair(null<KPEnv>(), KPResult::Err(kpString(str("called < with param ") + (i+1) + " not an int " + pr_str(params[i+1], true)))); }
if !(params[i].get_int() < params[i+1].get_int()) { if !(params[i].get_int() < params[i+1].get_int()) {

2
prelude.kp
View File

@@ -64,7 +64,7 @@
(if (f i (idx l i)) (recurse f l (concat n (array (idx l i))) (+ i 1)) (if (f i (idx l i)) (recurse f l (concat n (array (idx l i))) (+ i 1))
(recurse f l n (+ i 1)))))) (recurse f l n (+ i 1))))))
(helper f l (array) 0))) (helper f l (array) 0)))
filter (lambda (f l) (filter_i (lambda (x i) (f x)) l)) filter (lambda (f l) (filter_i (lambda (i x) (f x)) l))
not (lambda (x) (if x false true)) not (lambda (x) (if x false true))

65
wasm.kp
View File

@@ -50,6 +50,23 @@
encoded (encode_vector encode_function_type x) encoded (encode_vector encode_function_type x)
) (concat [0x01] (encode_u_LEB128 (len encoded)) encoded )) ) (concat [0x01] (encode_u_LEB128 (len encoded)) encoded ))
) )
encode_import (lambda (import)
(let (
(mod_name name type idx) import
) (concat (encode_name mod_name)
(encode_name name)
(cond (= type 'func) (concat [0x00] (encode_u_LEB128 idx))
(= type 'table) (concat [0x01] (error "can't encode table type"))
(= type 'mem) (concat [0x02] (error "can't encode mem type"))
(= type 'global) (concat [0x03] (error "can't encode global type"))
true (error (str "bad import type" type))))
)
)
encode_import_section (lambda (x)
(let (
encoded (encode_vector encode_import x)
) (concat [0x02] (encode_u_LEB128 (len encoded)) encoded ))
)
encode_memory_section (lambda (x) encode_memory_section (lambda (x)
(let ( (let (
encoded (encode_vector encode_limits x) encoded (encode_vector encode_limits x)
@@ -74,8 +91,11 @@
) )
encode_function_section (lambda (x) encode_function_section (lambda (x)
(let ( (let ( ; nil functions are placeholders for improted functions
encoded (encode_vector encode_u_LEB128 x) _ (println "encoding function section " x)
filtered (filter (lambda (i) (!= nil i)) x)
_ (println "post filtered " filtered)
encoded (encode_vector encode_u_LEB128 filtered)
) (concat [0x03] (encode_u_LEB128 (len encoded)) encoded )) ) (concat [0x03] (encode_u_LEB128 (len encoded)) encoded ))
) )
encode_blocktype (lambda (type) (cond (symbol? type) (encode_valtype type) encode_blocktype (lambda (type) (cond (symbol? type) (encode_valtype type)
@@ -91,7 +111,7 @@
(= op 'br) (concat [0x0C] (encode_u_LEB128 (idx ins 1))) (= op 'br) (concat [0x0C] (encode_u_LEB128 (idx ins 1)))
;... ;...
(= op 'return) [0x0F] (= op 'return) [0x0F]
(= op 'call) (condat [0x10] (encode_u_LEB128 (idx ins 1))) (= op 'call) (concat [0x10] (encode_u_LEB128 (idx ins 1)))
; call_indirect ; call_indirect
; skipping a bunch ; skipping a bunch
; Parametric Instructions ; Parametric Instructions
@@ -128,27 +148,28 @@
wasm_to_binary (lambda (wasm_code) wasm_to_binary (lambda (wasm_code)
(let ( (let (
(type_section function_section memory_section export_section code_section) wasm_code (type_section import_section function_section memory_section export_section code_section) wasm_code
_ (println "type_section" type_section "function_section" function_section "memory_section" memory_section "export_section" export_section "code_section" code_section) _ (println "type_section" type_section "import_section" import_section "function_section" function_section "memory_section" memory_section "export_section" export_section "code_section" code_section)
magic [ 0x00 0x61 0x73 0x6D ] magic [ 0x00 0x61 0x73 0x6D ]
version [ 0x01 0x00 0x00 0x00 ] version [ 0x01 0x00 0x00 0x00 ]
type (encode_type_section type_section) type (encode_type_section type_section)
import (encode_import_section import_section)
function (encode_function_section function_section) function (encode_function_section function_section)
memory (encode_memory_section memory_section) memory (encode_memory_section memory_section)
export (encode_export_section export_section) export (encode_export_section export_section)
code (encode_code_section code_section) code (encode_code_section code_section)
) (concat magic version type function memory export code)) ) (concat magic version type import function memory export code))
) )
module (lambda (& args) (let ( module (lambda (& args) (let (
helper (rec-lambda recurse (entries i name_dict type function memory export code) helper (rec-lambda recurse (entries i name_dict type import function memory export code)
(if (= i (len entries)) [ type function memory export code ] (if (= i (len entries)) [ type import function memory export code ]
(let ( (let (
(n_d t f m e c) ((idx entries i) name_dict type function memory export code) (n_d t im f m e c) ((idx entries i) name_dict type import function memory export code)
) (recurse entries (+ i 1) n_d t f m e c)))) ) (recurse entries (+ i 1) n_d t im f m e c))))
) (helper args 0 empty_dict [] [] [] [] []))) ) (helper args 0 empty_dict [] [] [] [] [] [])))
func (vau de (name & inside) (lambda (name_dict type function memory export code) func (vau de (name & inside) (lambda (name_dict type import function memory export code)
(let ( (let (
(params result locals body) ((rec-lambda recurse (i pe re) (params result locals body) ((rec-lambda recurse (i pe re)
(cond (and (= nil pe) (< i (len inside)) (array? (idx inside i)) (< 0 (len (idx inside i))) (= 'param (idx (idx inside i) 0))) (cond (and (= nil pe) (< i (len inside)) (array? (idx inside i)) (< 0 (len (idx inside i))) (= 'param (idx (idx inside i) 0)))
@@ -189,6 +210,8 @@
outer_name_dict outer_name_dict
; type ; type
(concat type [ our_type ]) (concat type [ our_type ])
; import
import
; function ; function
(concat function [ (len function) ]) (concat function [ (len function) ])
; memory ; memory
@@ -210,9 +233,21 @@
true (ins)))) inner)]])) true (ins)))) inner)]]))
br (vau de (b) (let (block (eval b de)) (if (int? block) [['br block]] br (vau de (b) (let (block (eval b de)) (if (int? block) [['br block]]
[['br (eval [- 'depth (idx block 0)] de)]]))) [['br (eval [- 'depth (idx block 0)] de)]])))
export (vau de (name t_v) (lambda (name_dict type function memory export code) call (lambda (f & flatten) (concat (flat_map (lambda (x) x) flatten) [['call f]]))
[ name_dict type function memory (concat export [ [ name (idx t_v 0) (get-value name_dict (idx t_v 1)) ] ]) code ] import (vau de (mod_name name t_idx_typ) (lambda (name_dict type import function memory export code) (let (
_ (if (!= 'func (idx t_idx_typ 0)) (error "only supporting importing functions rn"))
(import_type idx_name param_type result_type) t_idx_typ
actual_type_idx (len type)
actual_type [ (slice param_type 1 -1) (slice result_type 1 -1) ]
)
[ (put name_dict idx_name (len function)) (concat type [actual_type]) (concat import [ [mod_name name import_type actual_type_idx] ]) (concat function [nil]) memory export code ])
))
export (vau de (name t_v) (lambda (name_dict type import function memory export code)
[ name_dict type import function memory (concat export [ [ name (idx t_v 0) (get-value name_dict (idx t_v 1)) ] ]) code ]
)) ))
) )
(provide wasm_to_binary module func drop i32.const local.get i32.add block br export) (provide wasm_to_binary
module import func export
drop i32.const local.get i32.add block br call)
)) ))