diff options
Diffstat (limited to 'gcc/config/s390/s390.h')
| -rw-r--r-- | gcc/config/s390/s390.h | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h index f4d91fa13bb..05b8ea932d2 100644 --- a/gcc/config/s390/s390.h +++ b/gcc/config/s390/s390.h @@ -284,14 +284,14 @@ if (INTEGRAL_MODE_P (MODE) && \ Reg 33: Condition code Reg 34: Frame pointer */ -#define FIRST_PSEUDO_REGISTER 35 +#define FIRST_PSEUDO_REGISTER 36 /* Standard register usage. */ #define GENERAL_REGNO_P(N) ((int)(N) >= 0 && (N) < 16) #define ADDR_REGNO_P(N) ((N) >= 1 && (N) < 16) #define FP_REGNO_P(N) ((N) >= 16 && (N) < (TARGET_IEEE_FLOAT? 32 : 20)) #define CC_REGNO_P(N) ((N) == 33) -#define FRAME_REGNO_P(N) ((N) == 32 || (N) == 34) +#define FRAME_REGNO_P(N) ((N) == 32 || (N) == 34 || (N) == 35) #define GENERAL_REG_P(X) (REG_P (X) && GENERAL_REGNO_P (REGNO (X))) #define ADDR_REG_P(X) (REG_P (X) && ADDR_REGNO_P (REGNO (X))) @@ -327,7 +327,7 @@ if (INTEGRAL_MODE_P (MODE) && \ 0, 0, 0, 0, \ 0, 0, 0, 0, \ 0, 0, 0, 0, \ - 1, 1, 1 } + 1, 1, 1, 1 } #define CALL_USED_REGISTERS \ { 1, 1, 1, 1, \ @@ -338,7 +338,7 @@ if (INTEGRAL_MODE_P (MODE) && \ 1, 1, 1, 1, \ 1, 1, 1, 1, \ 1, 1, 1, 1, \ - 1, 1, 1 } + 1, 1, 1, 1 } #define CALL_REALLY_USED_REGISTERS \ { 1, 1, 1, 1, \ @@ -349,7 +349,7 @@ if (INTEGRAL_MODE_P (MODE) && \ 1, 1, 1, 1, \ 1, 1, 1, 1, \ 1, 1, 1, 1, \ - 1, 1, 1 } + 1, 1, 1, 1 } #define CONDITIONAL_REGISTER_USAGE s390_conditional_register_usage () @@ -358,7 +358,7 @@ if (INTEGRAL_MODE_P (MODE) && \ { 1, 2, 3, 4, 5, 0, 13, 12, 11, 10, 9, 8, 7, 6, 14, \ 16, 17, 18, 19, 20, 21, 22, 23, \ 24, 25, 26, 27, 28, 29, 30, 31, \ - 15, 32, 33, 34 } + 15, 32, 33, 34, 35 } /* Fitting values into registers. */ @@ -449,12 +449,12 @@ enum reg_class #define REG_CLASS_CONTENTS \ { \ { 0x00000000, 0x00000000 }, /* NO_REGS */ \ - { 0x0000fffe, 0x00000005 }, /* ADDR_REGS */ \ - { 0x0000ffff, 0x00000005 }, /* GENERAL_REGS */ \ + { 0x0000fffe, 0x0000000d }, /* ADDR_REGS */ \ + { 0x0000ffff, 0x0000000d }, /* GENERAL_REGS */ \ { 0xffff0000, 0x00000000 }, /* FP_REGS */ \ - { 0xfffffffe, 0x00000005 }, /* ADDR_FP_REGS */ \ - { 0xffffffff, 0x00000005 }, /* GENERAL_FP_REGS */ \ - { 0xffffffff, 0x00000007 }, /* ALL_REGS */ \ + { 0xfffffffe, 0x0000000d }, /* ADDR_FP_REGS */ \ + { 0xffffffff, 0x0000000d }, /* GENERAL_FP_REGS */ \ + { 0xffffffff, 0x0000000f }, /* ALL_REGS */ \ } /* Register -> class mapping. */ @@ -579,10 +579,8 @@ extern int current_function_outgoing_args_size; /* Describe how we implement __builtin_eh_return. */ #define EH_RETURN_DATA_REGNO(N) ((N) < 4 ? (N) + 6 : INVALID_REGNUM) -#define EH_RETURN_HANDLER_RTX \ - gen_rtx_MEM (Pmode, plus_constant (arg_pointer_rtx, \ - -STACK_POINTER_OFFSET + UNITS_PER_WORD*RETURN_REGNUM)) - +#define EH_RETURN_HANDLER_RTX gen_rtx_MEM (Pmode, return_address_pointer_rtx) + /* Select a format to encode pointers in exception handling data. */ #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL) \ (flag_pic \ @@ -596,6 +594,7 @@ extern int current_function_outgoing_args_size; #define FRAME_POINTER_REGNUM 34 #define HARD_FRAME_POINTER_REGNUM 11 #define ARG_POINTER_REGNUM 32 +#define RETURN_ADDRESS_POINTER_REGNUM 35 /* The static chain must be call-clobbered, but not used for function argument passing. As register 1 is clobbered by @@ -614,11 +613,13 @@ extern int current_function_outgoing_args_size; #define INITIAL_FRAME_POINTER_OFFSET(DEPTH) (DEPTH) = 0 -#define ELIMINABLE_REGS \ -{{ FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM}, \ - { FRAME_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}, \ - { ARG_POINTER_REGNUM, STACK_POINTER_REGNUM}, \ - { ARG_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}} +#define ELIMINABLE_REGS \ +{{ FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM}, \ + { FRAME_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}, \ + { ARG_POINTER_REGNUM, STACK_POINTER_REGNUM}, \ + { ARG_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}, \ + { RETURN_ADDRESS_POINTER_REGNUM, STACK_POINTER_REGNUM}, \ + { RETURN_ADDRESS_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}} #define CAN_ELIMINATE(FROM, TO) (1) @@ -633,6 +634,10 @@ extern int current_function_outgoing_args_size; { (OFFSET) = s390_arg_frame_offset (); } \ else if ((FROM) == ARG_POINTER_REGNUM && (TO) == STACK_POINTER_REGNUM) \ { (OFFSET) = s390_arg_frame_offset (); } \ + else if ((FROM) == RETURN_ADDRESS_POINTER_REGNUM \ + && ((TO) == STACK_POINTER_REGNUM \ + || (TO) == HARD_FRAME_POINTER_REGNUM)) \ + { (OFFSET) = s390_return_address_offset (); } \ else \ abort(); \ } @@ -914,10 +919,10 @@ extern int flag_pic; indexed by compiler's hard-register-number (see above). */ #define REGISTER_NAMES \ { "%r0", "%r1", "%r2", "%r3", "%r4", "%r5", "%r6", "%r7", \ - "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", \ + "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", \ "%f0", "%f2", "%f4", "%f6", "%f1", "%f3", "%f5", "%f7", \ - "%f8", "%f10", "%f12", "%f14", "%f9", "%f11", "%f13", "%f15", \ - "%ap", "%cc", "%fp" \ + "%f8", "%f10", "%f12", "%f14", "%f9", "%f11", "%f13", "%f15", \ + "%ap", "%cc", "%fp", "%rp" \ } /* Emit a dtp-relative reference to a TLS variable. */ |