Simplified code

This commit is contained in:
Syrus
2019-12-20 20:48:56 -08:00
parent 7efda4da66
commit a7764a6fd6

View File

@ -289,9 +289,8 @@ extern "C" fn signal_trap_handler(
CURRENT_CODE_VERSIONS.with(|versions| { CURRENT_CODE_VERSIONS.with(|versions| {
let versions = versions.borrow(); let versions = versions.borrow();
for v in versions.iter() { for v in versions.iter() {
let runnable_module = &v.runnable_module;
let magic_size = let magic_size =
if let Some(x) = runnable_module.get_inline_breakpoint_size(ARCH) { if let Some(x) = v.runnable_module.get_inline_breakpoint_size(ARCH) {
x x
} else { } else {
continue; continue;
@ -299,7 +298,7 @@ extern "C" fn signal_trap_handler(
let ip = fault.ip.get(); let ip = fault.ip.get();
let end = v.base + v.msm.total_size; let end = v.base + v.msm.total_size;
if ip >= v.base && ip < end && ip + magic_size <= end { if ip >= v.base && ip < end && ip + magic_size <= end {
if let Some(ib) = runnable_module.read_inline_breakpoint( if let Some(ib) = v.runnable_module.read_inline_breakpoint(
ARCH, ARCH,
std::slice::from_raw_parts(ip as *const u8, magic_size), std::slice::from_raw_parts(ip as *const u8, magic_size),
) { ) {