Merge pull request #44 from WebAssembly/integer-unary

Sync the integer unary operators with AstSemantics.md.
WebAssembly · Sep 3, 2015 · ce645d2 · ce645d2
2 parents d168abf + 85846ca
commit ce645d2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/ml-proto/README.md b/ml-proto/README.md
@@ -157,7 +157,7 @@ memtype: <type> | i8 | i16
 value: <int> | <float>
 var: <int> | $<name>
 
-unop:  neg | abs | not | ...
+unop:  ctz | clz | popcnt | ...
 binop: add | sub | mul | ...
 relop: eq | neq | lt | ...
 sign: s|u

diff --git a/ml-proto/src/arithmetic.ml b/ml-proto/src/arithmetic.ml
@@ -119,11 +119,9 @@ struct
 
   let unop op =
     let f = match op with
-      | Neg -> Int.neg
-      | Abs -> Int.abs
-      | Not -> Int.lognot
       | Clz -> fun i -> i  (* TODO *)
       | Ctz -> fun i -> i  (* TODO *)
+      | Popcnt -> fun i -> i  (* TODO *)
     in fun v -> Int.to_value (f (Int.of_value 1 v))
 
   let binop op =

diff --git a/ml-proto/src/ast.ml b/ml-proto/src/ast.ml
@@ -33,7 +33,7 @@ type value_type = Types.value_type Source.phrase
 
 module IntOp () =
 struct
-  type unop = Neg | Abs | Not | Clz | Ctz
+  type unop = Clz | Ctz | Popcnt
   type binop = Add | Sub | Mul | DivS | DivU | RemS | RemU
              | And | Or | Xor | Shl | Shr | Sar
   type relop = Eq | Neq | LtS | LtU | LeS | LeU | GtS | GtU | GeS | GeU

diff --git a/ml-proto/src/lexer.mll b/ml-proto/src/lexer.mll
@@ -154,11 +154,9 @@ rule token = parse
   | (nxx as t)".switch" { SWITCH (value_type t) }
   | (nxx as t)".const" { CONST (value_type t) }
 
-  | (ixx as t)".neg" { UNARY (intop t Int32Op.Neg Int64Op.Neg) }
-  | (ixx as t)".abs" { UNARY (intop t Int32Op.Abs Int64Op.Abs) }
-  | (ixx as t)".not" { UNARY (intop t Int32Op.Not Int64Op.Not) }
   | (ixx as t)".clz" { UNARY (intop t Int32Op.Clz Int64Op.Clz) }
   | (ixx as t)".ctz" { UNARY (intop t Int32Op.Ctz Int64Op.Ctz) }
+  | (ixx as t)".popcnt" { UNARY (intop t Int32Op.Popcnt Int64Op.Popcnt) }
   | (fxx as t)".neg" { UNARY (floatop t Float32Op.Neg Float64Op.Neg) }
   | (fxx as t)".abs" { UNARY (floatop t Float32Op.Abs Float64Op.Abs) }
   | (fxx as t)".sqrt" { UNARY (floatop t Float32Op.Sqrt Float64Op.Sqrt) }

diff --git a/ml-proto/test/switch.wasm b/ml-proto/test/switch.wasm
@@ -10,7 +10,7 @@
         (case 0 (return (get_local $i)))
         (case 1 (nop) fallthrough)
         (case 2)  ;; implicit fallthrough
-        (case 3 (set_local $j (i32.neg (get_local $i))) (break))
+        (case 3 (set_local $j (i32.sub (i32.const 0) (get_local $i))) (break))
         (case 4 (break))
         (case 5 (set_local $j (i32.const 101)))
         (case 6 (set_local $j (i32.const 101)) fallthrough)
@@ -30,7 +30,7 @@
           (case 0 (return (get_local $i)))
           (case 1 (nop) fallthrough)
           (case 2)  ;; implicit fallthrough
-          (case 3 (break $l (i64.neg (get_local $i))))
+          (case 3 (break $l (i64.sub (i64.const 0) (get_local $i))))
           (case 6 (set_local $j (i64.const 101)) fallthrough)
           (;default;) (get_local $j)
         )