diff options
| author | Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> | 2012-01-28 13:42:37 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-28 22:19:46 +0200 |
| commit | 9dfc6264e493267b174b731a62f0dc6c46f2894d (patch) | |
| tree | 347dd5de8aee2120cd1be91f8890cd142cc8ba9d | |
| parent | 863281a8a685a121bf85f2490500c9d4539066a5 (diff) | |
| download | jato-9dfc6264e493267b174b731a62f0dc6c46f2894d.tar.gz | |
x86-64: get rid of __emit64_mov_imm_reg(), always use the 64-bit one
We've been mistakenly using the 32-bit mov in a few cases, since it went
by the name of __emit_mov_imm_reg(). This removes the 32-bit version
altogether to avoid confusion.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
| -rw-r--r-- | arch/x86/emit_64.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/arch/x86/emit_64.c b/arch/x86/emit_64.c index 3791c9fe..f78bb665 100644 --- a/arch/x86/emit_64.c +++ b/arch/x86/emit_64.c @@ -317,12 +317,6 @@ static void __emit_jmp(struct buffer *buf, unsigned long addr) emit_imm32(buf, addr - current - BRANCH_INSN_SIZE); } -static void __emit_mov_imm_reg(struct buffer *buf, long imm, enum machine_reg reg) -{ - emit(buf, 0xb8 + x86_encode_reg(reg)); - emit_imm32(buf, imm); -} - static void fixup_branch_target(uint8_t *target_p, void *target) { long cur = (long) (target - (void *) target_p) - 4; @@ -847,9 +841,9 @@ static void emit_indirect_jump_reg(struct buffer *buf, enum machine_reg reg) emit(buf, x86_encode_mod_rm(0x3, 0x04, reg_num)); } -static void __emit64_mov_imm_reg(struct buffer *buf, - long imm, - enum machine_reg reg) +static void __emit_mov_imm_reg(struct buffer *buf, + long imm, + enum machine_reg reg) { __emit_reg(buf, 1, 0xb8, reg); emit_imm64(buf, imm); @@ -1354,7 +1348,7 @@ void emit_trampoline(struct compilation_unit *cu, */ emit_save_regparm(buf); - __emit64_mov_imm_reg(buf, (unsigned long) cu, MACH_REG_RDI); + __emit_mov_imm_reg(buf, (unsigned long) cu, MACH_REG_RDI); __emit_call(buf, call_target); /* @@ -1380,7 +1374,7 @@ void emit_trampoline(struct compilation_unit *cu, this_disp = -0x08; __emit_push_reg(buf, MACH_REG_RAX); - __emit64_mov_imm_reg(buf, (unsigned long) cu, MACH_REG_RDI); + __emit_mov_imm_reg(buf, (unsigned long) cu, MACH_REG_RDI); __emit64_mov_membase_reg(buf, MACH_REG_RBP, this_disp, MACH_REG_RSI); __emit_mov_reg_reg(buf, MACH_REG_RAX, MACH_REG_RDX); __emit_call(buf, fixup_vtable); @@ -1412,7 +1406,7 @@ void emit_lock(struct buffer *buf, struct vm_object *obj) { emit_save_regparm(buf); - __emit64_mov_imm_reg(buf, (unsigned long) obj, MACH_REG_RDI); + __emit_mov_imm_reg(buf, (unsigned long) obj, MACH_REG_RDI); __emit_call(buf, vm_object_lock); emit_restore_regparm(buf); @@ -1427,7 +1421,7 @@ void emit_unlock(struct buffer *buf, struct vm_object *obj) __emit_push_reg(buf, MACH_REG_RAX); emit_save_regparm(buf); - __emit64_mov_imm_reg(buf, (unsigned long) obj, MACH_REG_RDI); + __emit_mov_imm_reg(buf, (unsigned long) obj, MACH_REG_RDI); __emit_call(buf, vm_object_unlock); emit_exception_test(buf, MACH_REG_RAX); |