Skip to content

Commit

Permalink
trying again
Browse files Browse the repository at this point in the history
  • Loading branch information
@willemneal
willemneal committed Jan 2, 2019
1 parent fbce899 commit c0d206f
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 174 deletions.
17 changes: 14 additions & 3 deletions lib/parse/assembly/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,20 @@ export class Parser {
this.module = new Module(buf);
}

parseString(): String {
return String.fromUTF8(this.buf.off,this.buf.readVaruint(32));
}
/** Reads a LEB128-encoded signed integer from memory. */
function readVarint(size: u32): i32 {
var val: u32 = 0;
var shl: u32 = 0;
var byt: u32;
var pos = off;
do {
byt = load<u8>(pos++);
val |= (byt & 0x7F) << shl;
shl += 7;
} while (byt & 0x80);
off = pos;
return select<u32>(val | (~0 << shl), val, shl < size && (byt & 0x40) != 0);
}

readVaruint(len: usize): u32 {
return this.buf.readVaruint(len);
Expand Down
8 changes: 4 additions & 4 deletions lib/parse/assembly/module/instructions/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Opcode
} from "../../src/common";

import {Buffer} from "../buffer";
import {readVaruint, readUint} from "..";


// export function parseExpr(): Instruction[] {
Expand All @@ -23,8 +23,8 @@ export class Instruction {
constructor(public opcode: Opcode){
}

static parse(buf: Buffer): Instruction {
let byte: u8 = changetype<u8>(buf.readUint<u8>());
static parse(): Instruction {
let byte: u8 = changetype<u8>(readUint<u8>());
switch(byte){
case Opcode.unreachable:
case Opcode.nop:
Expand All @@ -39,7 +39,7 @@ export class Instruction {
case Opcode.return_:
case Opcode.call:
case Opcode.call_indirect: {
return ControlInstruction.parse(byte);
return new ControlInstruction(byte);
}
case Opcode.drop:
case Opcode.select:
Expand Down
334 changes: 167 additions & 167 deletions lib/parse/src/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,178 +50,178 @@ export const MAX_ELEMS = 0xffffffff;

/** WebAssembly opcodes. */
export enum Opcode { // just a few of these are actually used
unreachable = 0x00,
nop = 0x01,
block = 0x02,
loop = 0x03,
if_ = 0x04,
else_ = 0x05,
// unreachable = 0x00,
// nop = 0x01,
// block = 0x02,
// loop = 0x03,
// if_ = 0x04,
// else_ = 0x05,
end = 0x0b,
br = 0x0c,
br_if = 0x0d,
br_table = 0x0e,
return_ = 0x0f,
call = 0x10,
call_indirect = 0x11,
drop = 0x1a,
select = 0x1b,
get_local = 0x20,
set_local = 0x21,
tee_local = 0x22,
// br = 0x0c,
// br_if = 0x0d,
// br_table = 0x0e,
// return_ = 0x0f,
// call = 0x10,
// call_indirect = 0x11,
// drop = 0x1a,
// select = 0x1b,
// get_local = 0x20,
// set_local = 0x21,
// tee_local = 0x22,
get_global = 0x23,
set_global = 0x24,
i32_load = 0x28,
i64_load = 0x29,
f32_load = 0x2a,
f64_load = 0x2b,
i32_load8_s = 0x2c,
i32_load8_u = 0x2d,
i32_load16_s = 0x2e,
i32_load16_u = 0x2f,
i64_load8_s = 0x30,
i64_load8_u = 0x31,
i64_load16_s = 0x32,
i64_load16_u = 0x33,
i64_load32_s = 0x34,
i64_load32_u = 0x35,
i32_store = 0x36,
i64_store = 0x37,
f32_store = 0x38,
f64_store = 0x39,
i32_store8 = 0x3a,
i32_store16 = 0x3b,
i64_store8 = 0x3c,
i64_store16 = 0x3d,
i64_store32 = 0x3e,
current_memory = 0x3f,
grow_memory = 0x40,
// set_global = 0x24,
// i32_load = 0x28,
// i64_load = 0x29,
// f32_load = 0x2a,
// f64_load = 0x2b,
// i32_load8_s = 0x2c,
// i32_load8_u = 0x2d,
// i32_load16_s = 0x2e,
// i32_load16_u = 0x2f,
// i64_load8_s = 0x30,
// i64_load8_u = 0x31,
// i64_load16_s = 0x32,
// i64_load16_u = 0x33,
// i64_load32_s = 0x34,
// i64_load32_u = 0x35,
// i32_store = 0x36,
// i64_store = 0x37,
// f32_store = 0x38,
// f64_store = 0x39,
// i32_store8 = 0x3a,
// i32_store16 = 0x3b,
// i64_store8 = 0x3c,
// i64_store16 = 0x3d,
// i64_store32 = 0x3e,
// current_memory = 0x3f,
// grow_memory = 0x40,
i32_const = 0x41,
i64_const = 0x42,
f32_const = 0x43,
f64_const = 0x44,
i32_eqz = 0x45,
i32_eq = 0x46,
i32_ne = 0x47,
i32_lt_s = 0x48,
i32_lt_u = 0x49,
i32_gt_s = 0x4a,
i32_gt_u = 0x4b,
i32_le_s = 0x4c,
i32_le_u = 0x4d,
i32_ge_s = 0x4e,
i32_ge_u = 0x4f,
i64_eqz = 0x50,
i64_eq = 0x51,
i64_ne = 0x52,
i64_lt_s = 0x53,
i64_lt_u = 0x54,
i64_gt_s = 0x55,
i64_gt_u = 0x56,
i64_le_s = 0x57,
i64_le_u = 0x58,
i64_ge_s = 0x59,
i64_ge_u = 0x5a,
f32_eq = 0x5b,
f32_ne = 0x5c,
f32_lt = 0x5d,
f32_gt = 0x5e,
f32_le = 0x5f,
f32_ge = 0x60,
f64_eq = 0x61,
f64_ne = 0x62,
f64_lt = 0x63,
f64_gt = 0x64,
f64_le = 0x65,
f64_ge = 0x66,
i32_clz = 0x67,
i32_ctz = 0x68,
i32_popcnt = 0x69,
i32_add = 0x6a,
i32_sub = 0x6b,
i32_mul = 0x6c,
i32_div_s = 0x6d,
i32_div_u = 0x6e,
i32_rem_s = 0x6f,
i32_rem_u = 0x70,
i32_and = 0x71,
i32_or = 0x72,
i32_xor = 0x73,
i32_shl = 0x74,
i32_shr_s = 0x75,
i32_shr_u = 0x76,
i32_rotl = 0x77,
i32_rotr = 0x78,
i64_clz = 0x79,
i64_ctz = 0x7a,
i64_popcnt = 0x7b,
i64_add = 0x7c,
i64_sub = 0x7d,
i64_mul = 0x7e,
i64_div_s = 0x7f,
i64_div_u = 0x80,
i64_rem_s = 0x81,
i64_rem_u = 0x82,
i64_and = 0x83,
i64_or = 0x84,
i64_xor = 0x85,
i64_shl = 0x86,
i64_shr_s = 0x87,
i64_shr_u = 0x88,
i64_rotl = 0x89,
i64_rotr = 0x8a,
f32_abs = 0x8b,
f32_neg = 0x8c,
f32_ceil = 0x8d,
f32_floor = 0x8e,
f32_trunc = 0x8f,
f32_nearest = 0x90,
f32_sqrt = 0x91,
f32_add = 0x92,
f32_sub = 0x93,
f32_mul = 0x94,
f32_div = 0x95,
f32_min = 0x96,
f32_max = 0x97,
f32_copysign = 0x98,
f64_abs = 0x99,
f64_neg = 0x9a,
f64_ceil = 0x9b,
f64_floor = 0x9c,
f64_trunc = 0x9d,
f64_nearest = 0x9e,
f64_sqrt = 0x9f,
f64_add = 0xa0,
f64_sub = 0xa1,
f64_mul = 0xa2,
f64_div = 0xa3,
f64_min = 0xa4,
f64_max = 0xa5,
f64_copysign = 0xa6,
i32_wrap_i64 = 0xa7,
i32_trunc_s_f32 = 0xa8,
i32_trunc_u_f32 = 0xa9,
i32_trunc_s_f64 = 0xaa,
i32_trunc_u_f64 = 0xab,
i64_extend_s_i32 = 0xac,
i64_extend_u_i32 = 0xad,
i64_trunc_s_f32 = 0xae,
i64_trunc_u_f32 = 0xaf,
i64_trunc_s_f64 = 0xb0,
i64_trunc_u_f64 = 0xb1,
f32_convert_s_i32 = 0xb2,
f32_convert_u_i32 = 0xb3,
f32_convert_s_i64 = 0xb4,
f32_convert_u_i64 = 0xb5,
f32_demote_f64 = 0xb6,
f64_convert_s_i32 = 0xb7,
f64_convert_u_i32 = 0xb8,
f64_convert_s_i64 = 0xb9,
f64_convert_u_i64 = 0xba,
f64_promote_f32 = 0xbb,
i32_reinterpret_f32 = 0xbc,
i64_reinterpret_f64 = 0xbd,
f32_reinterpret_i32 = 0xbe,
f64_reinterpret_i64 = 0xbf
f64_const = 0x44
// i32_eqz = 0x45,
// i32_eq = 0x46,
// i32_ne = 0x47,
// i32_lt_s = 0x48,
// i32_lt_u = 0x49,
// i32_gt_s = 0x4a,
// i32_gt_u = 0x4b,
// i32_le_s = 0x4c,
// i32_le_u = 0x4d,
// i32_ge_s = 0x4e,
// i32_ge_u = 0x4f,
// i64_eqz = 0x50,
// i64_eq = 0x51,
// i64_ne = 0x52,
// i64_lt_s = 0x53,
// i64_lt_u = 0x54,
// i64_gt_s = 0x55,
// i64_gt_u = 0x56,
// i64_le_s = 0x57,
// i64_le_u = 0x58,
// i64_ge_s = 0x59,
// i64_ge_u = 0x5a,
// f32_eq = 0x5b,
// f32_ne = 0x5c,
// f32_lt = 0x5d,
// f32_gt = 0x5e,
// f32_le = 0x5f,
// f32_ge = 0x60,
// f64_eq = 0x61,
// f64_ne = 0x62,
// f64_lt = 0x63,
// f64_gt = 0x64,
// f64_le = 0x65,
// f64_ge = 0x66,
// i32_clz = 0x67,
// i32_ctz = 0x68,
// i32_popcnt = 0x69,
// i32_add = 0x6a,
// i32_sub = 0x6b,
// i32_mul = 0x6c,
// i32_div_s = 0x6d,
// i32_div_u = 0x6e,
// i32_rem_s = 0x6f,
// i32_rem_u = 0x70,
// i32_and = 0x71,
// i32_or = 0x72,
// i32_xor = 0x73,
// i32_shl = 0x74,
// i32_shr_s = 0x75,
// i32_shr_u = 0x76,
// i32_rotl = 0x77,
// i32_rotr = 0x78,
// i64_clz = 0x79,
// i64_ctz = 0x7a,
// i64_popcnt = 0x7b,
// i64_add = 0x7c,
// i64_sub = 0x7d,
// i64_mul = 0x7e,
// i64_div_s = 0x7f,
// i64_div_u = 0x80,
// i64_rem_s = 0x81,
// i64_rem_u = 0x82,
// i64_and = 0x83,
// i64_or = 0x84,
// i64_xor = 0x85,
// i64_shl = 0x86,
// i64_shr_s = 0x87,
// i64_shr_u = 0x88,
// i64_rotl = 0x89,
// i64_rotr = 0x8a,
// f32_abs = 0x8b,
// f32_neg = 0x8c,
// f32_ceil = 0x8d,
// f32_floor = 0x8e,
// f32_trunc = 0x8f,
// f32_nearest = 0x90,
// f32_sqrt = 0x91,
// f32_add = 0x92,
// f32_sub = 0x93,
// f32_mul = 0x94,
// f32_div = 0x95,
// f32_min = 0x96,
// f32_max = 0x97,
// f32_copysign = 0x98,
// f64_abs = 0x99,
// f64_neg = 0x9a,
// f64_ceil = 0x9b,
// f64_floor = 0x9c,
// f64_trunc = 0x9d,
// f64_nearest = 0x9e,
// f64_sqrt = 0x9f,
// f64_add = 0xa0,
// f64_sub = 0xa1,
// f64_mul = 0xa2,
// f64_div = 0xa3,
// f64_min = 0xa4,
// f64_max = 0xa5,
// f64_copysign = 0xa6,
// i32_wrap_i64 = 0xa7,
// i32_trunc_s_f32 = 0xa8,
// i32_trunc_u_f32 = 0xa9,
// i32_trunc_s_f64 = 0xaa,
// i32_trunc_u_f64 = 0xab,
// i64_extend_s_i32 = 0xac,
// i64_extend_u_i32 = 0xad,
// i64_trunc_s_f32 = 0xae,
// i64_trunc_u_f32 = 0xaf,
// i64_trunc_s_f64 = 0xb0,
// i64_trunc_u_f64 = 0xb1,
// f32_convert_s_i32 = 0xb2,
// f32_convert_u_i32 = 0xb3,
// f32_convert_s_i64 = 0xb4,
// f32_convert_u_i64 = 0xb5,
// f32_demote_f64 = 0xb6,
// f64_convert_s_i32 = 0xb7,
// f64_convert_u_i32 = 0xb8,
// f64_convert_s_i64 = 0xb9,
// f64_convert_u_i64 = 0xba,
// f64_promote_f32 = 0xbb,
// i32_reinterpret_f32 = 0xbc,
// i64_reinterpret_f64 = 0xbd,
// f32_reinterpret_i32 = 0xbe,
// f64_reinterpret_i64 = 0xbf
}

export declare function parse(p: any): number;
Expand Down

0 comments on commit c0d206f

Please sign in to comment.