Skip to content

Commit

Permalink
Merge branch 'funcref'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rossberg
rossberg committed Apr 23, 2024
2 parents cd543fa + fa6ff17 commit 273c2ac
Show file tree
Hide file tree
Showing 4 changed files with 350 additions and 4 deletions.
2 changes: 1 addition & 1 deletion document/core/binary/modules.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ It decodes into a vector of :ref:`element segments <syntax-elem>` that represent
&\Rightarrow& \\&&&\quad
\{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EDECLARATIVE \} \\
\production{element kind} & \Belemkind &::=&
\hex{00} &\Rightarrow& \FUNCREF \\
\hex{00} &\Rightarrow& (\REF~\FUNC) \\
\end{array}
.. note::
Expand Down
2 changes: 1 addition & 1 deletion interpreter/binary/decode.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ let elem s =
| 0x04l ->
let emode = at active_zero s in
let einit = vec const s in
{etype = (NoNull, FuncHT); einit; emode}
{etype = (Null, FuncHT); einit; emode}
| 0x05l ->
let emode = at passive s in
let etype = ref_type s in
Expand Down
4 changes: 2 additions & 2 deletions interpreter/binary/encode.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ struct
match emode.it with
| Passive ->
u32 0x01l; elem_kind etype; vec elem_index einit
| Active {index; offset} when index.it = 0l && is_elem_kind etype ->
| Active {index; offset} when index.it = 0l ->
u32 0x00l; const offset; vec elem_index einit
| Active {index; offset} ->
u32 0x02l;
Expand All @@ -1003,7 +1003,7 @@ struct
match emode.it with
| Passive ->
u32 0x05l; ref_type etype; vec const einit
| Active {index; offset} when index.it = 0l && is_elem_kind etype ->
| Active {index; offset} when index.it = 0l && etype = (Null, FuncHT) ->
u32 0x04l; const offset; vec const einit
| Active {index; offset} ->
u32 0x06l; var index; const offset; ref_type etype; vec const einit
Expand Down
346 changes: 346 additions & 0 deletions test/core/elem.wast
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,352 @@
)


;; Binary format variations

(module
(func)
(table 1 funcref)
(elem (i32.const 0) func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\07\01" ;; Elem section: 1 element segment
"\00\41\00\0b\01\00" ;; Segment 0: (i32.const 0) func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\05\01" ;; Elem section: 1 element segment
"\01\00\01\00" ;; Segment 0: func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem (table 0) (i32.const 0) func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\09\01" ;; Elem section: 1 element segment
"\02\00\41\00\0b\00\01\00" ;; Segment 0: (table 0) (i32.const 0) func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem declare func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\05\01" ;; Elem section: 1 element segment
"\03\00\01\00" ;; Segment 0: declare func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem (i32.const 0) (;;)(ref func) (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\09\01" ;; Elem section: 1 element segment
"\04\41\00\0b\01\d2\00\0b" ;; Segment 0: (i32.const 0) (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)
(module
(func)
(table 1 funcref)
(elem (i32.const 0) funcref (ref.null func))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\09\01" ;; Elem section: 1 element segment
"\04\41\00\0b\01\d0\70\0b" ;; Segment 0: (i32.const 0) (ref.null func)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem (i32.const 0) funcref (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\07\01" ;; Elem section: 1 element segment
"\05\70\01\d2\00\0b" ;; Segment 0: funcref (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)
(module
(func)
(table 1 funcref)
(elem (i32.const 0) funcref (ref.null func))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\07\01" ;; Elem section: 1 element segment
"\05\70\01\d0\70\0b" ;; Segment 0: funcref (ref.null func)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem (table 0) (i32.const 0) funcref (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\0b\01" ;; Elem section: 1 element segment
"\06\00\41\00\0b\70\01\d2\00\0b" ;; Segment 0: (table 0) (i32.const 0) funcref (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)
(module
(func)
(table 1 funcref)
(elem (table 0) (i32.const 0) funcref (ref.null func))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\0b\01" ;; Elem section: 1 element segment
"\06\00\41\00\0b\70\01\d0\70\0b" ;; Segment 0: (table 0) (i32.const 0) funcref (ref.null func)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 funcref)
(elem declare funcref (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\07\01" ;; Elem section: 1 element segment
"\07\70\01\d2\00\0b" ;; Segment 0: declare funcref (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)
(module
(func)
(table 1 funcref)
(elem declare funcref (ref.null func))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\04\01" ;; Table section: 1 table
"\70\00\01" ;; Table 0: [1..] funcref
"\09\07\01" ;; Elem section: 1 element segment
"\07\70\01\d0\70\0b" ;; Segment 0: declare funcref (ref.null func)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)


(module
(func)
(table 1 (ref func) (ref.func 0))
(elem (i32.const 0) func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\07\01" ;; Elem section: 1 element segment
"\00\41\00\0b\01\00" ;; Segment 0: (i32.const 0) func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\05\01" ;; Elem section: 1 element segment
"\01\00\01\00" ;; Segment 0: func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem (table 0) (i32.const 0) func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\09\01" ;; Elem section: 1 element segment
"\02\00\41\00\0b\00\01\00" ;; Segment 0: (table 0) (i32.const 0) func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem declare func 0)
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\05\01" ;; Elem section: 1 element segment
"\03\00\01\00" ;; Segment 0: declare func 0
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(assert_invalid
(module
(func)
(table 1 (ref func) (ref.func 0))
(elem (i32.const 0) funcref (ref.func 0))
)
"type mismatch"
)
(assert_invalid
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\09\01" ;; Elem section: 1 element segment
"\04\41\00\0b\01\d2\00\0b" ;; Segment 0: (i32.const 0) (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)
"type mismatch"
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem (ref func) (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\08\01" ;; Elem section: 1 element segment
"\05\64\70\01\d2\00\0b" ;; Segment 0: (ref func) (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem (table 0) (i32.const 0) (ref func) (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\0c\01" ;; Elem section: 1 element segment
"\06\00\41\00\0b\64\70\01\d2\00\0b" ;; Segment 0: (table 0) (i32.const 0) (ref func) (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)

(module
(func)
(table 1 (ref func) (ref.func 0))
(elem declare (ref func) (ref.func 0))
)
(module binary
"\00asm" "\01\00\00\00" ;; Magic
"\01\04\01\60\00\00" ;; Type section: 1 type
"\03\02\01\00" ;; Function section: 1 function
"\04\0a\01" ;; Table section: 1 table
"\40\00\64\70\00\01\d2\00\0b" ;; Table 0: [1..] (ref func) (ref.func 0)
"\09\08\01" ;; Elem section: 1 element segment
"\07\64\70\01\d2\00\0b" ;; Segment 0: declare (ref func) (ref.func 0)
"\0a\04\01" ;; Code section: 1 function
"\02\00\0b" ;; Function 0: empty
)


;; Invalid bounds for elements

(assert_trap
Expand Down

0 comments on commit 273c2ac

Please sign in to comment.