Skip to content

Put br_if conditions last. #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 8 commits into from
Feb 8, 2016
Merged

Put br_if conditions last. #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10b32d6
Put br_if conditions last.
sunfishcode Jan 31, 2016
a5ab0ac
Make br_if return ().
sunfishcode Feb 4, 2016
3e02d68
Add another test.
sunfishcode Feb 5, 2016
81b1a30
Fix an unused variable.
sunfishcode Feb 5, 2016
e3d441e
Add the testcase from #227.
sunfishcode Feb 5, 2016
74cf378
Add more tests from related discussions.
sunfishcode Feb 5, 2016
6077e09
Use the desired evaluation order.
sunfishcode Feb 5, 2016
1f85c51
Change the position of the label operand, to be consistent with plain…
sunfishcode Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ml-proto/host/parser.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ expr1 :
| LOOP labeling1 labeling1 expr_list
{ fun c -> let c' = $2 c in let c'' = $3 c' in Loop ($4 c'') }
| BR var expr_opt { fun c -> Br ($2 c label, $3 c) }
| BR_IF expr var expr_opt { fun c -> Br_if ($2 c, $3 c label, $4 c) }
| BR_IF var expr { fun c -> Br_if ($2 c label, None, $3 c) }
| BR_IF var expr expr { fun c -> Br_if ($2 c label, Some ($3 c), $4 c) }
| RETURN expr_opt
{ let at1 = ati 1 in
fun c -> Return (label c ("return" @@ at1) @@ at1, $2 c) }
Expand Down
2 changes: 1 addition & 1 deletion ml-proto/spec/ast.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and expr' =
| Block of expr list
| Loop of expr list
| Br of var * expr option
| Br_if of expr * var * expr option
| Br_if of var * expr option * expr
| Return of var * expr option
| If of expr * expr
| If_else of expr * expr * expr
Expand Down
5 changes: 5 additions & 0 deletions ml-proto/spec/check.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ let rec check_expr c et e =
| Break (x, eo) ->
check_expr_opt c (label c x) eo e.at

| Br_if (x, eo, e) ->
check_expr_opt c (label c x) eo e.at;
check_expr c (Some Int32Type) e;
check_type None et e.at

| If (e1, e2, e3) ->
check_expr c (Some Int32Type) e1;
check_expr c et e2;
Expand Down
6 changes: 4 additions & 2 deletions ml-proto/spec/desugar.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ and shift' n = function
| Break (x, eo) ->
let x' = if x.it < n then x else (x.it + 1) @@ x.at in
Break (x', Lib.Option.map (shift n) eo)
| Br_if (x, eo, e) ->
let x' = if x.it < n then x else (x.it + 1) @@ x.at in
Br_if (x', Lib.Option.map (shift n) eo, shift n e)
| If (e1, e2, e3) -> If (shift n e1, shift n e2, shift n e3)
| Switch (e, xs, x, es) -> Switch (shift n e, xs, x, List.map (shift n) es)
| Call (x, es) -> Call (x, List.map (shift n) es)
Expand Down Expand Up @@ -53,8 +56,7 @@ and expr' at = function
| Ast.Block es -> Block (List.map expr es)
| Ast.Loop es -> Block [Loop (seq es) @@ at]
| Ast.Br (x, eo) -> Break (x, Lib.Option.map expr eo)
| Ast.Br_if (e, x, eo) ->
If (expr e, Break (x, Lib.Option.map expr eo) @@ at, opt eo)
| Ast.Br_if (x, eo, e) -> Br_if (x, Lib.Option.map expr eo, expr e)
| Ast.Return (x, eo) -> Break (x, Lib.Option.map expr eo)
| Ast.If (e1, e2) -> If (expr e1, expr e2, Nop @@ Source.after e2.at)
| Ast.If_else (e1, e2, e3) -> If (expr e1, expr e2, expr e3)
Expand Down
5 changes: 5 additions & 0 deletions ml-proto/spec/eval.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ let rec eval_expr (c : config) (e : expr) =
| Break (x, eo) ->
raise (label c x (eval_expr_opt c eo))

| Br_if (x, eo, e) ->
let v = eval_expr_opt c eo in
let i = int32 (eval_expr c e) e.at in
if i <> 0l then raise (label c x v) else None

| If (e1, e2, e3) ->
let i = int32 (eval_expr c e1) e1.at in
eval_expr c (if i <> 0l then e2 else e3)
Expand Down
1 change: 1 addition & 0 deletions ml-proto/spec/kernel.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ and expr' =
| Block of expr list (* execute in sequence *)
| Loop of expr (* loop header *)
| Break of var * expr option (* break to n-th surrounding label *)
| Br_if of var * expr option * expr (* conditional break *)
| If of expr * expr * expr (* conditional *)
| Switch of expr * var list * var * expr list (* table switch *)
| Call of var * expr list (* call function *)
Expand Down
4 changes: 2 additions & 2 deletions ml-proto/test/fac.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
(local i64)
(set_local 1 (i64.const 1))
(block
(br_if (i64.lt_s (get_local 0) (i64.const 2)) 0)
(br_if 0 (i64.lt_s (get_local 0) (i64.const 2)))
(loop
(set_local 1 (i64.mul (get_local 1) (get_local 0)))
(set_local 0 (i64.add (get_local 0) (i64.const -1)))
(br_if (i64.gt_s (get_local 0) (i64.const 1)) 0)
(br_if 0 (i64.gt_s (get_local 0) (i64.const 1)))
)
)
(get_local 1)
Expand Down
62 changes: 53 additions & 9 deletions ml-proto/test/labels.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,46 @@
)
)

(func $br_if (result i32)
(func $br_if0 (result i32)
(local $i i32)
(set_local $i (i32.const 0))
(block $outer
(block $inner
(br_if (i32.const 0) $inner)
(br_if $inner (i32.const 0))
(set_local $i (i32.or (get_local $i) (i32.const 0x1)))
(br_if (i32.const 1) $inner)
(br_if $inner (i32.const 1))
(set_local $i (i32.or (get_local $i) (i32.const 0x2)))
)
(br_if (i32.const 0) $outer (set_local $i (i32.or (get_local $i) (i32.const 0x4))))
(br_if $outer (set_local $i (i32.or (get_local $i) (i32.const 0x4))) (i32.const 0))
(set_local $i (i32.or (get_local $i) (i32.const 0x8)))
(br_if (i32.const 1) $outer (set_local $i (i32.or (get_local $i) (i32.const 0x10))))
(br_if $outer (set_local $i (i32.or (get_local $i) (i32.const 0x10))) (i32.const 1))
(set_local $i (i32.or (get_local $i) (i32.const 0x20)))
)
)

(func $br_if1 (result i32)
(block $l0
(br_if $l0 (block $l1 (br $l1 (i32.const 1))) (i32.const 1))
(i32.const 1)))

(func $br_if2 (result i32)
(block $l0
(if (i32.const 1)
(br $l0
(block $l1
(br $l1 (i32.const 1)))))
(i32.const 1)))

(func $br_if3 (result i32)
(local $i1 i32)
(i32.add (block $l0
(br_if $l0
(set_local $i1 (i32.const 1))
(set_local $i1 (i32.const 2)))
(i32.const 0))
(i32.const 0))
(get_local $i1))

(func $misc1 (result i32)
(block $l1 (i32.xor (br $l1 (i32.const 1)) (i32.const 2)))
)
Expand All @@ -123,7 +146,10 @@
(export "loop5" $loop5)
(export "switch" $switch)
(export "return" $return)
(export "br_if" $br_if)
(export "br_if0" $br_if0)
(export "br_if1" $br_if1)
(export "br_if2" $br_if2)
(export "br_if3" $br_if3)
(export "misc1" $misc1)
(export "misc2" $misc2)
)
Expand All @@ -143,11 +169,29 @@
(assert_return (invoke "return" (i32.const 0)) (i32.const 0))
(assert_return (invoke "return" (i32.const 1)) (i32.const 2))
(assert_return (invoke "return" (i32.const 2)) (i32.const 2))
(assert_return (invoke "br_if") (i32.const 0x1d))
(assert_return (invoke "br_if0") (i32.const 0x1d))
(assert_return (invoke "br_if1") (i32.const 1))
(assert_return (invoke "br_if2") (i32.const 1))
(assert_return (invoke "br_if3") (i32.const 2))
(assert_return (invoke "misc1") (i32.const 1))
(assert_return (invoke "misc2") (i32.const 1))

(assert_invalid (module (func (loop $l (br $l (i32.const 0))))) "arity mismatch")
(assert_invalid (module (func (block $l (f32.neg (br_if (i32.const 1) $l)) (nop)))) "type mismatch")
(assert_invalid (module (func (result f32) (block $l (br_if (i32.const 1) $l (f32.const 0))))) "type mismatch")
(assert_invalid (module (func (block $l (f32.neg (br_if $l (i32.const 1))) (nop)))) "type mismatch")

(assert_invalid (module (func (result f32) (block $l (br_if $l (f32.const 0) (i32.const 1))))) "type mismatch")
(assert_invalid (module (func (result i32) (block $l (br_if $l (f32.const 0) (i32.const 1))))) "type mismatch")
(assert_invalid (module (func (block $l (f32.neg (br_if $l (f32.const 0) (i32.const 1)))))) "arity mismatch")
(assert_invalid (module (func (param i32) (result i32) (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0)))))) "type mismatch")
(assert_invalid (module (func (param i32) (result f32)
(block $l (f32.neg (block $i (br_if $l (f32.const 3) (get_local 0)))))))
"type mismatch")
(assert_invalid (module (func (block $l0 (br_if $l0 (nop) (i32.const 1)))))
"arity mismatch")
(assert_invalid (module (func (result i32)
(block $l0
(if_else (i32.const 1)
(br $l0 (block $l1 (br $l1 (i32.const 1))))
(block (block $l1 (br $l1 (i32.const 1))) (nop))
)
(i32.const 1)))) "arity mismatch")