>From 9b161d46a9b4e4e7a08a85897dbbf5a4f55f21b3 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Mon, 23 Aug 2010 19:42:55 -0300 Subject: [PATCH 6/6] Change jit_getarg_{c,uc,s,us,i,ui} to extr_l to sign extend on 64 bits. --- lightning/core-common.h | 10 +++++----- lightning/i386/asm-64.h | 16 ++++++++-------- lightning/i386/core-64.h | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lightning/core-common.h b/lightning/core-common.h index 370a529..73c6906 100644 --- a/lightning/core-common.h +++ b/lightning/core-common.h @@ -455,13 +455,13 @@ typedef union jit_code { #ifndef jit_getarg_c #ifndef JIT_AP -#define jit_getarg_c(reg, ofs) jit_extr_c_i ((reg), (ofs)) -#define jit_getarg_i(reg, ofs) jit_movr_i ((reg), (ofs)) +#define jit_getarg_c(reg, ofs) jit_extr_c_l ((reg), (ofs)) +#define jit_getarg_i(reg, ofs) jit_movr_l ((reg), (ofs)) #define jit_getarg_l(reg, ofs) jit_movr_l ((reg), (ofs)) #define jit_getarg_p(reg, ofs) jit_movr_p ((reg), (ofs)) -#define jit_getarg_s(reg, ofs) jit_extr_s_i ((reg), (ofs)) -#define jit_getarg_uc(reg, ofs) jit_extr_uc_ui((reg), (ofs)) -#define jit_getarg_ui(reg, ofs) jit_movr_ui ((reg), (ofs)) +#define jit_getarg_s(reg, ofs) jit_extr_s_l ((reg), (ofs)) +#define jit_getarg_uc(reg, ofs) jit_extr_uc_ul((reg), (ofs)) +#define jit_getarg_ui(reg, ofs) jit_movr_ul ((reg), (ofs)) #define jit_getarg_ul(reg, ofs) jit_movr_ul ((reg), (ofs)) #define jit_getarg_us(reg, ofs) jit_extr_us_ul((reg), (ofs)) #else diff --git a/lightning/i386/asm-64.h b/lightning/i386/asm-64.h index e8a57c4..deaf1a8 100644 --- a/lightning/i386/asm-64.h +++ b/lightning/i386/asm-64.h @@ -115,14 +115,14 @@ #define _RBP 0x55 #define _RSI 0x56 #define _RDI 0x57 -#define _R8 0x48 -#define _R9 0x49 -#define _R10 0x4A -#define _R11 0x4B -#define _R12 0x4C -#define _R13 0x4D -#define _R14 0x4E -#define _R15 0x4F +#define _R8 0x58 +#define _R9 0x59 +#define _R10 0x5A +#define _R11 0x5B +#define _R12 0x5C +#define _R13 0x5D +#define _R14 0x5E +#define _R15 0x5F #define _RIP -2 #if defined(_ASM_SAFETY) diff --git a/lightning/i386/core-64.h b/lightning/i386/core-64.h index cf8ec6f..83eccb9 100644 --- a/lightning/i386/core-64.h +++ b/lightning/i386/core-64.h @@ -36,7 +36,7 @@ /* Used to implement ldc, stc, ... */ #define JIT_CAN_16 0 -#define JIT_REXTMP _R11D +#define JIT_REXTMP _R11 /* Number or integer argument registers */ #define JIT_RA_NUM 6 @@ -45,9 +45,9 @@ #define JIT_FA_NUM 8 #define JIT_R_NUM 3 -#define JIT_R(i) ((i) == 0 ? _EAX : _R9D + (i)) +#define JIT_R(i) ((i) == 0 ? _RAX : _R9 + (i)) #define JIT_V_NUM 5 -#define JIT_V(i) ((i) == 0 ? _EBX : _R11D + (i)) +#define JIT_V(i) ((i) == 0 ? _RBX : _R11 + (i)) struct jit_local_state { int long_jumps; -- 1.7.2.1