diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs index f8fb82d26..f2af8d9c9 100644 --- a/lib/singlepass-backend/src/codegen_x64.rs +++ b/lib/singlepass-backend/src/codegen_x64.rs @@ -754,7 +754,7 @@ impl ModuleCodeGenerator Location::Memory(GPR::RAX, imported_func_addr as i32), Location::GPR(GPR::RAX), ); - a.emit_homomorphic_host_redirection(GPR::RAX); + a.emit_host_redirection(GPR::RAX); self.func_import_count += 1; @@ -5444,7 +5444,7 @@ impl FunctionCodeGenerator for X64FunctionCode { let after = a.get_label(); a.emit_jmp(Condition::None, after); a.emit_label(label); - a.emit_homomorphic_host_redirection(GPR::RAX); + a.emit_host_redirection(GPR::RAX); a.emit_label(after); a.emit_call_label(label); }, @@ -5489,7 +5489,7 @@ impl FunctionCodeGenerator for X64FunctionCode { let after = a.get_label(); a.emit_jmp(Condition::None, after); a.emit_label(label); - a.emit_homomorphic_host_redirection(GPR::RAX); + a.emit_host_redirection(GPR::RAX); a.emit_label(after); a.emit_call_label(label); }, diff --git a/lib/singlepass-backend/src/emitter_x64.rs b/lib/singlepass-backend/src/emitter_x64.rs index dee97c85f..e929f0f5c 100644 --- a/lib/singlepass-backend/src/emitter_x64.rs +++ b/lib/singlepass-backend/src/emitter_x64.rs @@ -189,7 +189,7 @@ pub trait Emitter { fn emit_bkpt(&mut self); - fn emit_homomorphic_host_redirection(&mut self, target: GPR); + fn emit_host_redirection(&mut self, target: GPR); fn emit_inline_breakpoint(&mut self, ty: InlineBreakpointType); fn arch_has_itruncf(&self) -> bool { @@ -1311,7 +1311,7 @@ impl Emitter for Assembler { dynasm!(self ; int 0x3); } - fn emit_homomorphic_host_redirection(&mut self, target: GPR) { + fn emit_host_redirection(&mut self, target: GPR) { self.emit_jmp_location(Location::GPR(target)); } diff --git a/lib/singlepass-backend/src/translator_aarch64.rs b/lib/singlepass-backend/src/translator_aarch64.rs index c0e62d4b4..971bbfdea 100644 --- a/lib/singlepass-backend/src/translator_aarch64.rs +++ b/lib/singlepass-backend/src/translator_aarch64.rs @@ -1637,7 +1637,7 @@ impl Emitter for Assembler { dynasm!(self ; .dword 0 ; .dword 1) } - fn emit_homomorphic_host_redirection(&mut self, target: GPR) { + fn emit_host_redirection(&mut self, target: GPR) { let target = map_gpr(target); dynasm!( self @@ -1716,7 +1716,7 @@ impl Emitter for Assembler { ; adr x_tmp1, >done ; str x_tmp1, [x_rsp] ); - self.emit_homomorphic_host_redirection(x); + self.emit_host_redirection(x); dynasm!(self ; done: ); } Location::Memory(base, disp) => { @@ -1734,7 +1734,7 @@ impl Emitter for Assembler { // Read memory. ; ldr X(map_gpr(GPR::RAX).x()), [x_tmp3] ); - self.emit_homomorphic_host_redirection(GPR::RAX); + self.emit_host_redirection(GPR::RAX); dynasm!(self ; done: ); } _ => unreachable!(),