Bkpt* -> Breakpoint*

This commit is contained in:
losfair
2019-07-04 01:45:06 +08:00
parent 7f28a4dbef
commit f32b22d571
6 changed files with 18 additions and 18 deletions

View File

@ -148,7 +148,7 @@ pub struct X64FunctionCode {
breakpoints: Option<
HashMap<
AssemblyOffset,
Box<Fn(BkptInfo) -> Result<(), Box<dyn Any>> + Send + Sync + 'static>,
Box<Fn(BreakpointInfo) -> Result<(), Box<dyn Any>> + Send + Sync + 'static>,
>,
>,
returns: SmallVec<[WpType; 1]>,
@ -178,7 +178,7 @@ pub struct X64ExecutionContext {
function_pointers: Vec<FuncPtr>,
function_offsets: Vec<AssemblyOffset>,
signatures: Arc<Map<SigIndex, FuncSig>>,
breakpoints: BkptMap,
breakpoints: BreakpointMap,
func_import_count: usize,
msm: ModuleStateMap,
}
@ -216,7 +216,7 @@ impl RunnableModule for X64ExecutionContext {
Some(self.msm.clone())
}
fn get_breakpoints(&self) -> Option<BkptMap> {
fn get_breakpoints(&self) -> Option<BreakpointMap> {
Some(self.breakpoints.clone())
}

View File

@ -14,7 +14,7 @@ use std::cell::Cell;
use wasmer_runtime_core::fault::{
begin_unsafe_unwind, catch_unsafe_unwind, ensure_sighandler,
};
use wasmer_runtime_core::codegen::BkptMap;
use wasmer_runtime_core::codegen::BreakpointMap;
use wasmer_runtime_core::typed_func::WasmTrapInfo;
thread_local! {
@ -32,7 +32,7 @@ pub enum CallProtError {
pub fn call_protected<T>(
f: impl FnOnce() -> T,
breakpoints: Option<BkptMap>,
breakpoints: Option<BreakpointMap>,
) -> Result<T, CallProtError> {
ensure_sighandler();
unsafe {