From 1ce1d00db8d3d6457c0c838f77b4c1567c593722 Mon Sep 17 00:00:00 2001 From: pcpa Date: Mon, 25 May 2015 15:53:17 -0300 Subject: [PATCH] Move multiply defined macro to a single header file. --- include/lightning/jit_private.h | 3 +++ lib/jit_aarch64.c | 2 -- lib/jit_alpha.c | 2 -- lib/jit_arm.c | 2 -- lib/jit_hppa.c | 2 -- lib/jit_ia64.c | 2 -- lib/jit_mips.c | 3 --- lib/jit_ppc.c | 2 -- lib/jit_s390.c | 2 -- lib/jit_sparc.c | 2 -- lib/jit_x86.c | 2 -- 11 files changed, 3 insertions(+), 21 deletions(-) diff --git a/include/lightning/jit_private.h b/include/lightning/jit_private.h index 86e583dd1..953e361b0 100644 --- a/include/lightning/jit_private.h +++ b/include/lightning/jit_private.h @@ -47,6 +47,9 @@ # define HIDDEN /**/ #endif +#define rc(value) jit_class_##value +#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) + #if defined(__i386__) || defined(__x86_64__) # define JIT_SP _RSP # define JIT_RET _RAX diff --git a/lib/jit_aarch64.c b/lib/jit_aarch64.c index 0e1da0086..9273b455d 100644 --- a/lib/jit_aarch64.c +++ b/lib/jit_aarch64.c @@ -17,8 +17,6 @@ * Paulo Cesar Pereira de Andrade */ -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 8) #define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 8) diff --git a/lib/jit_alpha.c b/lib/jit_alpha.c index 02577d377..ea0abb160 100644 --- a/lib/jit_alpha.c +++ b/lib/jit_alpha.c @@ -17,8 +17,6 @@ * Paulo Cesar Pereira de Andrade */ -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 6) #define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 6) #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/lib/jit_arm.c b/lib/jit_arm.c index 60a8ff1ad..4da9c2504 100644 --- a/lib/jit_arm.c +++ b/lib/jit_arm.c @@ -21,8 +21,6 @@ # include #endif -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4) #define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 16) #define jit_arg_d_reg_p(i) ((i) >= 0 && (i) < 15) diff --git a/lib/jit_hppa.c b/lib/jit_hppa.c index d977aa79e..94e959597 100644 --- a/lib/jit_hppa.c +++ b/lib/jit_hppa.c @@ -20,8 +20,6 @@ #include #include -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) (i >= 0 && i < 4) #define PROTO 1 diff --git a/lib/jit_ia64.c b/lib/jit_ia64.c index 28a5d750f..b0b895407 100644 --- a/lib/jit_ia64.c +++ b/lib/jit_ia64.c @@ -20,8 +20,6 @@ #include #include -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 8) #if __BYTE_ORDER == __LITTLE_ENDIAN # define C_DISP 0 diff --git a/lib/jit_mips.c b/lib/jit_mips.c index ccf76641a..ffbeac67e 100644 --- a/lib/jit_mips.c +++ b/lib/jit_mips.c @@ -21,9 +21,6 @@ # include #endif -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) - /* FIXME Need to detect (from /proc on Linux?) if a Loongson or Godson, * because n32 and n64 mandate that float registers are 64 bit, and * on the later, registers are 32 bit. diff --git a/lib/jit_ppc.c b/lib/jit_ppc.c index 650f70f64..940dc06d4 100644 --- a/lib/jit_ppc.c +++ b/lib/jit_ppc.c @@ -17,8 +17,6 @@ * Paulo Cesar Pereira de Andrade */ -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 8) #define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 13) #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/lib/jit_s390.c b/lib/jit_s390.c index 7bd1f28e1..1f59745ce 100644 --- a/lib/jit_s390.c +++ b/lib/jit_s390.c @@ -20,8 +20,6 @@ #include #include -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #if __WORDSIZE == 32 # define NUM_FLOAT_REG_ARGS 2 #else diff --git a/lib/jit_sparc.c b/lib/jit_sparc.c index 101abfac6..c3c829701 100644 --- a/lib/jit_sparc.c +++ b/lib/jit_sparc.c @@ -17,8 +17,6 @@ * Paulo Cesar Pereira de Andrade */ -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #define jit_arg_reg_p(i) ((i) >= 0 && (i) < 6) #define jit_arg_d_reg_p(i) ((i) >= 0 && (i) < 5) diff --git a/lib/jit_x86.c b/lib/jit_x86.c index fadd9c59c..cbdf5a04a 100644 --- a/lib/jit_x86.c +++ b/lib/jit_x86.c @@ -20,8 +20,6 @@ #include #include -#define rc(value) jit_class_##value -#define rn(reg) (jit_regno(_rvs[jit_regno(reg)].spec)) #if __X32 # define jit_arg_reg_p(i) 0 # define jit_arg_f_reg_p(i) 0