Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1641504: Adapt to Cranelift API changes. r=bbouvier

Browse Source 
This is an updated version of Ben Bouvier's patch D77227.

Co-authored-by: Benjamin Bouvier <benj@benj.me>

Differential Revision: https://phabricator.services.mozilla.com/D78588
This commit is contained in:
Chris Fallin 2020-06-09 22:37:16 +00:00
parent 6944be383a
commit 70f7e999b3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/wasm/cranelift/src/compile.rs
View File

@ -516,7 +516,7 @@ impl TrapSink for Traps {
// entries, so we don't have to.
return;
}
HeapOutOfBounds | OutOfBounds | TableOutOfBounds => bindings::Trap::OutOfBounds,
HeapOutOfBounds | TableOutOfBounds => bindings::Trap::OutOfBounds,
IndirectCallToNull => bindings::Trap::IndirectCallToNull,
BadSignature => bindings::Trap::IndirectCallBadSig,
IntegerOverflow => bindings::Trap::IntegerOverflow,

18
js/src/wasm/cranelift/src/wasm2clif.rs
View File

@ -858,7 +858,7 @@ impl<'static_env, 'module_env> FuncEnvironment for TransEnv<'static_env, 'module
let oob = pos
.ins()
.icmp(IntCC::UnsignedGreaterThanOrEqual, callee, tlength);
pos.ins().trapnz(oob, ir::TrapCode::OutOfBounds);
pos.ins().trapnz(oob, ir::TrapCode::TableOutOfBounds);
// 3. Load the wtable base pointer from a global.
let tbase = pos.ins().global_value(POINTER_TYPE, base_gv);
@ -1084,11 +1084,11 @@ impl<'static_env, 'module_env> FuncEnvironment for TransEnv<'static_env, 'module
fn translate_table_grow(
&mut self,
mut pos: FuncCursor,
table_index: u32,
table_index: TableIndex,
delta: ir::Value,
init_value: ir::Value,
) -> WasmResult<ir::Value> {
let table_index = pos.ins().iconst(ir::types::I32, table_index as i64);
let table_index = pos.ins().iconst(ir::types::I32, table_index.index() as i64);
Ok(self
.instance_call(&mut pos, &FN_TABLE_GROW, &[init_value, delta, table_index])
.unwrap())
@ -1097,10 +1097,10 @@ impl<'static_env, 'module_env> FuncEnvironment for TransEnv<'static_env, 'module
fn translate_table_get(
&mut self,
mut pos: FuncCursor,
table_index: u32,
table_index: TableIndex,
index: ir::Value,
) -> WasmResult<ir::Value> {
let table_index = pos.ins().iconst(ir::types::I32, table_index as i64);
let table_index = pos.ins().iconst(ir::types::I32, table_index.index() as i64);
Ok(self
.instance_call(&mut pos, &FN_TABLE_GET, &[index, table_index])
.unwrap())
@ -1109,11 +1109,11 @@ impl<'static_env, 'module_env> FuncEnvironment for TransEnv<'static_env, 'module
fn translate_table_set(
&mut self,
mut pos: FuncCursor,
table_index: u32,
table_index: TableIndex,
value: ir::Value,
index: ir::Value,
) -> WasmResult<()> {
let table_index = pos.ins().iconst(ir::types::I32, table_index as i64);
let table_index = pos.ins().iconst(ir::types::I32, table_index.index() as i64);
self.instance_call(&mut pos, &FN_TABLE_SET, &[index, value, table_index]);
Ok(())
}
@ -1146,12 +1146,12 @@ impl<'static_env, 'module_env> FuncEnvironment for TransEnv<'static_env, 'module
fn translate_table_fill(
&mut self,
mut pos: FuncCursor,
table_index: u32,
table_index: TableIndex,
dst: ir::Value,
val: ir::Value,
len: ir::Value,
) -> WasmResult<()> {
let table_index = pos.ins().iconst(ir::types::I32, table_index as i64);
let table_index = pos.ins().iconst(ir::types::I32, table_index.index() as i64);
self.instance_call(&mut pos, &FN_TABLE_FILL, &[dst, val, len, table_index]);
Ok(())
}