[wasm] Binary 11: AST changes.

test/mjsunit/wasm/wasm-constants.js

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --expose-wasm
 
 function bytes() {
   var buffer = new ArrayBuffer(arguments.length);
   var view = new Uint8Array(buffer);
   for (var i = 0; i < arguments.length; i++) {
@@ skipping 47 matching lines @@
 var kDeclDataSegments = 0x04;
 var kDeclFunctionTable = 0x05;
 var kDeclEnd = 0x06;
 var kDeclStartFunction = 0x07;
 var kDeclImportTable = 0x08;
 var kDeclExportTable = 0x09;
 var kDeclFunctionSignatures = 0x0a;
 var kDeclFunctionBodies = 0x0b;
 var kDeclNames = 0x0c;
 
+var kArity0 = 0;
+var kArity1 = 1;
+var kArity2 = 2;
+var kArity3 = 3;
+
 var section_names = [
   "memory", "signatures", "functions", "globals", "data_segments",
   "function_table", "end", "start_function", "import_table", "export_table",
   "function_signatures", "function_bodies", "names"];
 
 // Function declaration flags
 var kDeclFunctionName   = 0x01;
 var kDeclFunctionImport = 0x02;
 var kDeclFunctionLocals = 0x04;
 var kDeclFunctionExport = 0x08;
 
 // Local types
 var kAstStmt = 0;
 var kAstI32 = 1;
 var kAstI64 = 2;
 var kAstF32 = 3;
 var kAstF64 = 4;
 
 // Opcodes
 var kExprNop = 0x00;
 var kExprBlock = 0x01;
 var kExprLoop = 0x02;
 var kExprIf = 0x03;
-var kExprIfElse = 0x04;
+var kExprElse = 0x04;
 var kExprSelect = 0x05;
 var kExprBr = 0x06;
 var kExprBrIf = 0x07;
-var kExprTableSwitch = 0x08;
-var kExprReturn = 0x14;
-var kExprUnreachable = 0x15;
+var kExprBrTable = 0x08;
+var kExprReturn = 0x09;
+var kExprUnreachable = 0x0a;
+var kExprEnd = 0x0f;
 
-var kExprI8Const = 0x09;
-var kExprI32Const = 0x0a;
-var kExprI64Const = 0x0b;
-var kExprF64Const = 0x0c;
-var kExprF32Const = 0x0d;
-var kExprGetLocal = 0x0e;
-var kExprSetLocal = 0x0f;
-var kExprLoadGlobal = 0x10;
-var kExprStoreGlobal = 0x11;
-var kExprCallFunction = 0x12;
-var kExprCallIndirect = 0x13;
-var kExprCallImport = 0x1F;
+var kExprI32Const = 0x10;
+var kExprI64Const = 0x11;
+var kExprF64Const = 0x12;
+var kExprF32Const = 0x13;
+var kExprGetLocal = 0x14;
+var kExprSetLocal = 0x15;
+var kExprCallFunction = 0x16;
+var kExprCallIndirect = 0x17;
+var kExprCallImport = 0x18;
+var kExprI8Const = 0xcb;
+var kExprLoadGlobal = 0xcc;
+var kExprStoreGlobal = 0xcd;
 
 var kExprI32LoadMem8S = 0x20;
 var kExprI32LoadMem8U = 0x21;
 var kExprI32LoadMem16S = 0x22;
 var kExprI32LoadMem16U = 0x23;
 var kExprI64LoadMem8S = 0x24;
 var kExprI64LoadMem8U = 0x25;
 var kExprI64LoadMem16S = 0x26;
 var kExprI64LoadMem16U = 0x27;
 var kExprI64LoadMem32S = 0x28;
@@ skipping 169 matching lines @@
       }
       threwException = false;
     } catch (e) {
       assertEquals("object", typeof e);
       assertEquals(kTrapMsgs[trap], e.message);
       // Success.
       return;
     }
     throw new MjsUnitAssertionError("Did not trap, expected: " + kTrapMsgs[trap]);
 }