T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code simplification; avoid an unneeded match.

Browse Source
This commit is contained in:
Dan Gohman
2018-09-12 16:06:03 -07:00
parent d0f703a6ff
commit 9e65b694bd
1 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
lib/simplejit/src/backend.rs
View File

@@ -350,53 +350,50 @@ impl<'simple_jit_backend> Backend for SimpleJITBackend {
) -> Self::FinalizedData { ) -> Self::FinalizedData {
use std::ptr::write_unaligned; use std::ptr::write_unaligned;
for record in &data.relocs { for &RelocRecord {
match *record { reloc,
RelocRecord { offset,
reloc, ref name,
offset, addend,
ref name, } in &data.relocs
addend, {
} => { let ptr = data.storage;
let ptr = data.storage; debug_assert!((offset as usize) < data.size);
debug_assert!((offset as usize) < data.size); let at = unsafe { ptr.offset(offset as isize) };
let at = unsafe { ptr.offset(offset as isize) }; let base = if namespace.is_function(name) {
let base = if namespace.is_function(name) { let (def, name_str, _signature) = namespace.get_function_definition(&name);
let (def, name_str, _signature) = namespace.get_function_definition(&name); match def {
match def { Some(compiled) => compiled.code,
Some(compiled) => compiled.code, None => self.lookup_symbol(name_str),
None => self.lookup_symbol(name_str),
}
} else {
let (def, name_str, _writable) = namespace.get_data_definition(&name);
match def {
Some(compiled) => compiled.storage,
None => self.lookup_symbol(name_str),
}
};
// TODO: Handle overflow.
let what = unsafe { base.offset(addend as isize) };
match reloc {
Reloc::Abs4 => {
// TODO: Handle overflow.
#[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))]
unsafe {
write_unaligned(at as *mut u32, what as u32)
};
}
Reloc::Abs8 => {
#[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))]
unsafe {
write_unaligned(at as *mut u64, what as u64)
};
}
Reloc::X86PCRel4
| Reloc::X86CallPCRel4
| Reloc::X86GOTPCRel4
| Reloc::X86CallPLTRel4 => panic!("unexpected text relocation in data"),
_ => unimplemented!(),
}
} }
} else {
let (def, name_str, _writable) = namespace.get_data_definition(&name);
match def {
Some(compiled) => compiled.storage,
None => self.lookup_symbol(name_str),
}
};
// TODO: Handle overflow.
let what = unsafe { base.offset(addend as isize) };
match reloc {
Reloc::Abs4 => {
// TODO: Handle overflow.
#[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))]
unsafe {
write_unaligned(at as *mut u32, what as u32)
};
}
Reloc::Abs8 => {
#[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))]
unsafe {
write_unaligned(at as *mut u64, what as u64)
};
}
Reloc::X86PCRel4
| Reloc::X86CallPCRel4
| Reloc::X86GOTPCRel4
| Reloc::X86CallPLTRel4 => panic!("unexpected text relocation in data"),
_ => unimplemented!(),
} }
} }
(data.storage, data.size) (data.storage, data.size)