ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor: Move function calling into wasm builder (part 1)

Browse source
This commit is contained in:
Fabian 2020-12-31 19:14:31 -06:00
parent 5dd03792c2
commit e9cceb76bc
2 changed files with 106 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/rust/codegen.rs
View file

@ -9,7 +9,7 @@ use jit::JitContext;
use modrm;
use profiler;
use regs;
use wasmgen::wasm_builder::{FunctionType, WasmBuilder, WasmLocal, WasmLocalI64};
use wasmgen::wasm_builder::{WasmBuilder, WasmLocal, WasmLocalI64};
pub fn gen_add_cs_offset(ctx: &mut JitContext) {
ctx.builder
@ -276,153 +276,118 @@ pub fn sign_extend_i16(builder: &mut WasmBuilder) {
builder.shr_s_i32();
}
pub fn gen_fn0_const(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN0_TYPE_INDEX);
builder.call_fn(fn_idx);
}
pub fn gen_fn0_const(builder: &mut WasmBuilder, name: &str) { builder.call_fn0(name) }
pub fn gen_fn0_const_ret(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN0_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
}
pub fn gen_fn0_const_ret(builder: &mut WasmBuilder, name: &str) { builder.call_fn0_ret(name); }
pub fn gen_fn1_const(builder: &mut WasmBuilder, name: &str, arg0: u32) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_TYPE_INDEX);
builder.const_i32(arg0 as i32);
builder.call_fn(fn_idx);
builder.call_fn1(name);
}
pub fn gen_call_fn1_ret(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_ret(name);
}
pub fn gen_call_fn1_ret_f64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_RET_F64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_ret_f64(name);
}
pub fn gen_call_fn1_f64_ret_i32(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_F64_RET_I32_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_f64_ret(name);
}
pub fn gen_call_fn0_ret_i64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN0_RET_I64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn0_ret_i64(name);
}
pub fn gen_call_fn1_ret_i64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_RET_I64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_ret_i64(name);
}
pub fn gen_call_fn1_f64_ret_i64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_F64_RET_I64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_f64_ret_i64(name);
}
pub fn gen_fn2_const(builder: &mut WasmBuilder, name: &str, arg0: u32, arg1: u32) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_TYPE_INDEX);
builder.const_i32(arg0 as i32);
builder.const_i32(arg1 as i32);
builder.call_fn(fn_idx);
builder.call_fn2(name);
}
pub fn gen_call_fn1(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ ) where _ must be left on the stack before calling this
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1(name);
}
pub fn gen_call_fn2(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _, _ ) where _ must be left on the stack before calling this
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn2(name);
}
pub fn gen_call_fn2_i32_f64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _, _ ) where _ must be left on the stack before calling this
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_I32_F64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn2_i32_f64(name);
}
pub fn gen_call_fn2_i64_i32(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _, _ ) where _ must be left on the stack before calling this
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_I64_I32_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn2_i64_i32(name);
}
pub fn gen_call_fn3_i32_i64_i32_ret(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN3_I32_I64_I32_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn3_i32_i64_i32_ret(name);
}
pub fn gen_call_fn1_f64(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _, _ ) where _ must be left on the stack before calling this
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_F64_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn1_f64(name);
}
pub fn gen_call_fn2_ret(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _, _ ) where _ must be left on the stack before calling this, and fn returns a value
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn2_ret(name);
}
pub fn gen_call_fn3(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN3_TYPE_INDEX);
builder.call_fn(fn_idx);
}
pub fn gen_call_fn3(builder: &mut WasmBuilder, name: &str) { builder.call_fn3(name); }
pub fn gen_call_fn4_i32_i64_i64_i32_ret(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN4_I32_I64_I64_I32_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
builder.call_fn4_i32_i64_i64_i32_ret(name);
}
pub fn gen_call_fn3_ret(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN3_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
}
pub fn gen_call_fn3_ret(builder: &mut WasmBuilder, name: &str) { builder.call_fn3_ret(name); }
pub fn gen_fn3_const(builder: &mut WasmBuilder, name: &str, arg0: u32, arg1: u32, arg2: u32) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN3_TYPE_INDEX);
builder.const_i32(arg0 as i32);
builder.const_i32(arg1 as i32);
builder.const_i32(arg2 as i32);
builder.call_fn(fn_idx);
builder.call_fn3(name);
}
pub fn gen_call_fn4_ret(builder: &mut WasmBuilder, name: &str) {
let fn_idx = builder.get_fn_idx(name, FunctionType::FN4_RET_TYPE_INDEX);
builder.call_fn(fn_idx);
}
pub fn gen_call_fn4_ret(builder: &mut WasmBuilder, name: &str) { builder.call_fn4_ret(name); }
pub fn gen_modrm_fn0(builder: &mut WasmBuilder, name: &str) {
// generates: fn( _ )
let fn_idx = builder.get_fn_idx(name, FunctionType::FN1_TYPE_INDEX);
builder.call_fn(fn_idx);
gen_call_fn1(builder, name);
}
pub fn gen_modrm_fn1(builder: &mut WasmBuilder, name: &str, arg0: u32) {
// generates: fn( _, arg0 )
let fn_idx = builder.get_fn_idx(name, FunctionType::FN2_TYPE_INDEX);
builder.const_i32(arg0 as i32);
builder.call_fn(fn_idx);
gen_call_fn2(builder, name);
}
pub fn gen_modrm_fn2(builder: &mut WasmBuilder, name: &str, arg0: u32, arg1: u32) {
// generates: fn( _, arg0, arg1 )
let fn_idx = builder.get_fn_idx(name, FunctionType::FN3_TYPE_INDEX);
builder.const_i32(arg0 as i32);
builder.const_i32(arg1 as i32);
builder.call_fn(fn_idx);
gen_call_fn3(builder, name);
}
pub fn gen_modrm_resolve(ctx: &mut JitContext, modrm_byte: u8) { modrm::gen(ctx, modrm_byte) }

83
src/rust/wasmgen/wasm_builder.rs
View file

@ -7,7 +7,7 @@ use wasmgen::wasm_opcodes as op;
#[derive(PartialEq)]
#[allow(non_camel_case_types)]
pub enum FunctionType {
enum FunctionType {
FN0_TYPE_INDEX,
FN1_TYPE_INDEX,
FN2_TYPE_INDEX,
@ -471,7 +471,7 @@ impl WasmBuilder {
write_fixed_leb16_at_idx(&mut self.output, next_op_idx, self.import_count - 1);
}
pub fn get_fn_idx(&mut self, fn_name: &str, type_index: FunctionType) -> u16 {
fn get_fn_idx(&mut self, fn_name: &str, type_index: FunctionType) -> u16 {
match self.get_import_index(fn_name) {
Some(idx) => idx,
None => {
@ -805,11 +805,88 @@ impl WasmBuilder {
write_leb_u32(&mut self.instruction_body, depth);
}
pub fn call_fn(&mut self, fn_idx: u16) {
fn call_fn(&mut self, fn_idx: u16) {
self.instruction_body.push(op::OP_CALL);
write_leb_u32(&mut self.instruction_body, fn_idx as u32);
}
pub fn call_fn0(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN0_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn0_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN0_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn0_ret_i64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN0_RET_I64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_ret_i64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_RET_I64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_ret_f64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_RET_F64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_f64_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_F64_RET_I32_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_f64_ret_i64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_F64_RET_I64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn1_f64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN1_F64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn2(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN2_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn2_i32_f64(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN2_I32_F64_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn2_i64_i32(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN2_I64_I32_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn2_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN2_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn3(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN3_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn3_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN3_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn3_i32_i64_i32_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN3_I32_I64_I32_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn4_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN4_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn call_fn4_i32_i64_i64_i32_ret(&mut self, name: &str) {
let i = self.get_fn_idx(name, FunctionType::FN4_I32_I64_I64_I32_RET_TYPE_INDEX);
self.call_fn(i);
}
pub fn unreachable(&mut self) { self.instruction_body.push(op::OP_UNREACHABLE); }
pub fn instruction_body_length(&self) -> u32 { self.instruction_body.len() as u32 }