1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-16 18:50:23 +02:00

Remove inconsistent, public jit_arg_reg_p macro

* include/lightning/jit_aarch64.h,
	include/lightning/jit_alpha.h,
	include/lightning/jit_arm.h,
	include/lightning/jit_hppa.h,
	include/lightning/jit_mips.h,
	 include/lightning/jit_ppc.h,
	include/lightning/jit_s390.h,
	include/lightning/jit_sparc.h,
	include/lightning/jit_x86.h,
	lib/jit_aarch64.c, lib/jit_alpha.c,
	lib/jit_arm.c, lib/jit_hppa.c,
	lib/jit_ia64.c, lib/jit_mips.c,
	lib/jit_ppc.c, lib/jit_s390.c,
	lib/jit_sparc.c, lib/jit_x86.c: Remove jit_arg_reg_p and
	jit_arg_f_reg_p from a public header, and define it only
	on port specific files where an integer offset is used
	to qualify an argument identifier. Exported code expects
	an opaque pointer (but of jit_node_t* type) to "qualify"
	an argument identifier.
	This patch, and the code review/simplification done during
	it also corrected some bugs:
	o Inconsistent jit_arg_d value of double argument after 3
	  integer arguments in arm for jit_functions; tested, C
	  functions were being properly called.
	o Inconsistent use of getarg_{f,d} and putarg*_{f,d} on
	  s390 (32-bit) that happened to not have a proper test
	  case, as it would only happen for jit functions, and
	  tested, called C functions had proper arguments.
	o Corrected a "last minute" correction that did not go
	  to the committed version, and would not compile on hppa,
	  due to bad _jit_putargi_d prototype definition.
This commit is contained in:
pcpa 2015-01-17 17:31:09 -02:00
parent 3695a2e99c
commit 73e520767f
20 changed files with 404 additions and 709 deletions

View file

@ -28,12 +28,10 @@
*/
#define JIT_FP _R29
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) < 8)
#define jit_r(i) (_R9 + (i))
#define jit_r_num() 7
#define jit_v(i) (_R19 + (i))
#define jit_v_num() 10
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 8)
#define jit_f(i) (_V8 + (i))
#define jit_f_num() 8
#define JIT_R0 _R9

View file

@ -28,12 +28,10 @@
*/
#define JIT_FP _FP
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) < 6)
#define jit_r(i) (_S0 + (i))
#define jit_r_num() 3
#define jit_v(i) (_S3 + (i))
#define jit_v_num() 3
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 6)
#define jit_f(i) (_F2 + (i))
#define jit_f_num() 8
/* Volatile - Assembly temporary register */

View file

@ -32,12 +32,10 @@
#define JIT_FP _R11
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4)
#define jit_r(i) (_R4 + (i))
#define jit_r_num() 3
#define jit_v(i) (_R7 + (i))
#define jit_v_num() 3
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 4)
#define jit_f(i) (jit_cpu.abi ? _D8 + ((i)<<1) : _D0 - ((i)<<1))
#define jit_f_num() 8
_R12, /* ip - temporary */

View file

@ -27,8 +27,6 @@
* Types
*/
typedef enum {
#define jit_arg_reg_p(i) (i >= 0 && i <= 4)
#define jit_arg_f_reg_p(i) (i >= 0 && i <= 4)
_R0, /* Always zero */
_R1, /* ADDIL implicit target */
_R2, /* B,L implicit target */

View file

@ -34,15 +34,12 @@
typedef enum {
#define jit_r(i) (_V0 + (i))
#if NEW_ABI
# define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4)
# define jit_r_num() 7
#else
# define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4)
# define jit_r_num() 11
#endif
#define jit_v(i) (_S0 + (i))
#define jit_v_num() 8
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 4)
#define jit_f(i) (_F0 + (i))
#if NEW_ABI
# define jit_f_num() 6

View file

@ -34,7 +34,6 @@
* Types
*/
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) < 8)
#if __ppc__
# define jit_r(i) (_R11 + (i))
#else
@ -48,7 +47,6 @@ typedef enum {
# define jit_v(i) (_R27 - (i))
# define jit_v_num() 14
#endif
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 13)
#define jit_f(i) (_F14 + (i))
#define jit_f_num() 8
_R0,

View file

@ -28,16 +28,10 @@
*/
#define JIT_FP _R13
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) <= 5)
#define jit_r(i) (_R12 + ((i) << 1))
#define jit_r_num() 3
#define jit_v(i) (_R11 + ((i) << 1))
#define jit_v_num() 3
#if __WORDSIZE == 32
# define jit_arg_f_reg_p(i) ((i) >= 0 && (i) <= 2)
#else
# define jit_arg_f_reg_p(i) ((i) >= 0 && (i) <= 4)
#endif
#define jit_f(i) (_F8 + (i))
#define jit_f_num() 6
#define JIT_R0 _R12

View file

@ -28,12 +28,10 @@
*/
#define JIT_FP _FP
typedef enum {
#define jit_arg_reg_p(i) ((i) >= 0 && (i) < 6)
#define jit_r(i) (_G2 + (i))
#define jit_r_num() 3
#define jit_v(i) (_L0 + (i))
#define jit_v_num() 8
#define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 6)
#define jit_f(i) (_F0 + ((i) << 1))
#define jit_f_num() 8
#define JIT_R0 _G2

View file

@ -42,12 +42,10 @@
#define JIT_FP _RBP
typedef enum {
#if __X32
# define jit_arg_reg_p(i) 0
# define jit_r(i) (_RAX + (i))
# define jit_r_num() 3
# define jit_v(i) (_RBX + (i))
# define jit_v_num() 3
# define jit_arg_f_reg_p(i) 0
# define jit_f(i) (jit_cpu.sse2 ? _XMM0 + (i) : _ST0 + (i))
# define jit_f_num() (jit_cpu.sse2 ? 8 : 6)
# define JIT_R0 _RAX
@ -71,12 +69,10 @@ typedef enum {
# define jit_sse_reg_p(reg) ((reg) >= _XMM0 && (reg) <= _XMM7)
#else
# if __CYGWIN__
# define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4)
# define jit_r(i) (_RAX + (i))
# define jit_r_num() 3
# define jit_v(i) (_RBX + (i))
# define jit_v_num() 7
# define jit_arg_f_reg_p(i) jit_arg_reg_p(i)
# define jit_f(index) (_XMM4 + (index))
# define jit_f_num() 12
# define JIT_R0 _RAX
@ -121,12 +117,10 @@ typedef enum {
_XMM3, _XMM2, _XMM1, _XMM0,
# define jit_sse_reg_p(reg) ((reg) >= _XMM4 && (reg) <= _XMM0)
# else
# define jit_arg_reg_p(i) ((i) >= 0 && (i) < 6)
# define jit_r(i) (_RAX + (i))
# define jit_r_num() 4
# define jit_v(i) (_RBX + (i))
# define jit_v_num() 4
# define jit_arg_f_reg_p(i) ((i) >= 0 && (i) < 8)
# define jit_f(index) (_XMM8 + (index))
# define jit_f_num() 8
# define JIT_R0 _RAX