Skip to content

R
riscv-gcc-1
Commit 1de43f85 by David Edelsohn Committed by David Edelsohn
Options

spe.md (SPE_ACC_REGNO): Delete definition. 

        * config/rs6000/spe.md (SPE_ACC_REGNO): Delete definition.
        (SPEFSCR_REGNO): Delete definition.
        * config/rs6000/rs6000.c: LINK_REGISTER_REGNUM -> LR_REGNO.
        COUNT_REGISTER_REGNUM -> CTR_REGNO.
        * config/rs6000/rs6000.h: Do not define *_REGNO.
        LINK_REGISTER_REGNUM -> LR_REGNO.
        COUNT_REGISTER_REGNUM -> CTR_REGNO.
        * config/rs6000/predicates.md: LINK_REGISTER_REGNUM -> LR_REGNO.
        COUNT_REGISTER_REGNUM -> CTR_REGNO.
        * config/rs6000/linux-unwind.h: Define R_LR, R_CR2, R_VR0,
        R_VRSAVE, R_VSCR. Use them.
        * config/rs6000/darwin-fallback.c: Define R_LR, R_CTR, R_CR2,
        R_XER, R_VR0, R_VRSAVE, R_VSCR, R_SPEFSCR.  Use them.
        * config/rs6000/rs6000.md: Define REGNO constants.  Use them.
        * config/rs6000/aix.h: Define R_LR.  Use it.

From-SVN: r126631
parent 62760ffd
Showing with 99 additions and 86 deletions
gcc/ChangeLog
2007-07-13 David Edelsohn <edelsohn@gnu.org>
* config/rs6000/spe.md (SPE_ACC_REGNO): Delete definition.
(SPEFSCR_REGNO): Delete definition.
* config/rs6000/rs6000.c: LINK_REGISTER_REGNUM -> LR_REGNO.
COUNT_REGISTER_REGNUM -> CTR_REGNO.
* config/rs6000/rs6000.h: Do not define *_REGNO.
LINK_REGISTER_REGNUM -> LR_REGNO.
COUNT_REGISTER_REGNUM -> CTR_REGNO.
* config/rs6000/predicates.md: LINK_REGISTER_REGNUM -> LR_REGNO.
COUNT_REGISTER_REGNUM -> CTR_REGNO.
* config/rs6000/linux-unwind.h: Define R_LR, R_CR2, R_VR0,
R_VRSAVE, R_VSCR. Use them.
* config/rs6000/darwin-fallback.c: Define R_LR, R_CTR, R_CR2,
R_XER, R_VR0, R_VRSAVE, R_VSCR, R_SPEFSCR. Use them.
* config/rs6000/rs6000.md: Define REGNO constants. Use them.
* config/rs6000/aix.h: Define R_LR. Use it.
2007-07-13 Caroline Tice <ctice@apple.com> 2007-07-13 Caroline Tice <ctice@apple.com>
* toplev.c (process_options): Turn flag_var_tracking_uninit off when * toplev.c (process_options): Turn flag_var_tracking_uninit off when
......
gcc/config/rs6000/aix.h
...@@ -220,6 +220,8 @@ ...@@ -220,6 +220,8 @@
code that does the save/restore is generated by the linker, so code that does the save/restore is generated by the linker, so
we have no good way to determine at compile time what to do. */ we have no good way to determine at compile time what to do. */
#define R_LR 65
#ifdef __64BIT__ #ifdef __64BIT__
#define MD_FROB_UPDATE_CONTEXT(CTX, FS) \ #define MD_FROB_UPDATE_CONTEXT(CTX, FS) \
do { \ do { \
...@@ -227,7 +229,7 @@ ...@@ -227,7 +229,7 @@
{ \ { \
unsigned int *insn \ unsigned int *insn \
= (unsigned int *) \ = (unsigned int *) \
_Unwind_GetGR ((CTX), LINK_REGISTER_REGNUM); \ _Unwind_GetGR ((CTX), R_LR); \
if (*insn == 0xE8410028) \ if (*insn == 0xE8410028) \
_Unwind_SetGRPtr ((CTX), 2, (CTX)->cfa + 40); \ _Unwind_SetGRPtr ((CTX), 2, (CTX)->cfa + 40); \
} \ } \
...@@ -239,7 +241,7 @@ ...@@ -239,7 +241,7 @@
{ \ { \
unsigned int *insn \ unsigned int *insn \
= (unsigned int *) \ = (unsigned int *) \
_Unwind_GetGR ((CTX), LINK_REGISTER_REGNUM); \ _Unwind_GetGR ((CTX), R_LR); \
if (*insn == 0x80410014) \ if (*insn == 0x80410014) \
_Unwind_SetGRPtr ((CTX), 2, (CTX)->cfa + 20); \ _Unwind_SetGRPtr ((CTX), 2, (CTX)->cfa + 20); \
} \ } \
......
gcc/config/rs6000/darwin-fallback.c
...@@ -41,6 +41,15 @@ ...@@ -41,6 +41,15 @@
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
#define R_LR 65
#define R_CTR 66
#define R_CR2 70
#define R_XER 76
#define R_VR0 77
#define R_VRSAVE 109
#define R_VSCR 110
#define R_SPEFSCR 112
typedef unsigned long reg_unit; typedef unsigned long reg_unit;
/* Place in GPRS the parameters to the first 'sc' instruction that would /* Place in GPRS the parameters to the first 'sc' instruction that would
...@@ -383,14 +392,14 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32], ...@@ -383,14 +392,14 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32],
new_cfa = m64->gpr[1][1]; new_cfa = m64->gpr[1][1];
set_offset (CR2_REGNO, &m64->cr); set_offset (R_CR2, &m64->cr);
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
set_offset (i, m64->gpr[i] + 1); set_offset (i, m64->gpr[i] + 1);
set_offset (XER_REGNO, m64->xer + 1); set_offset (R_XER, m64->xer + 1);
set_offset (LINK_REGISTER_REGNUM, m64->lr + 1); set_offset (R_LR, m64->lr + 1);
set_offset (COUNT_REGISTER_REGNUM, m64->ctr + 1); set_offset (R_CTR, m64->ctr + 1);
if (is_vector) if (is_vector)
set_offset (VRSAVE_REGNO, &m64->vrsave); set_offset (R_VRSAVE, &m64->vrsave);
/* Sometimes, srr0 points to the instruction that caused the exception, /* Sometimes, srr0 points to the instruction that caused the exception,
and sometimes to the next instruction to be executed; we want and sometimes to the next instruction to be executed; we want
...@@ -411,15 +420,15 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32], ...@@ -411,15 +420,15 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32],
new_cfa = m->gpr[1]; new_cfa = m->gpr[1];
set_offset (CR2_REGNO, &m->cr); set_offset (R_CR2, &m->cr);
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
set_offset (i, m->gpr + i); set_offset (i, m->gpr + i);
set_offset (XER_REGNO, &m->xer); set_offset (R_XER, &m->xer);
set_offset (LINK_REGISTER_REGNUM, &m->lr); set_offset (R_LR, &m->lr);
set_offset (COUNT_REGISTER_REGNUM, &m->ctr); set_offset (R_CTR, &m->ctr);
if (is_vector) if (is_vector)
set_offset (VRSAVE_REGNO, &m->vrsave); set_offset (R_VRSAVE, &m->vrsave);
/* Sometimes, srr0 points to the instruction that caused the exception, /* Sometimes, srr0 points to the instruction that caused the exception,
and sometimes to the next instruction to be executed; we want and sometimes to the next instruction to be executed; we want
...@@ -449,13 +458,13 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32], ...@@ -449,13 +458,13 @@ handle_syscall (_Unwind_FrameState *fs, const reg_unit gprs[32],
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
set_offset (32 + i, float_vector_state->fpregs + i); set_offset (32 + i, float_vector_state->fpregs + i);
set_offset (SPEFSCR_REGNO, &float_vector_state->fpscr); set_offset (R_SPEFSCR, &float_vector_state->fpscr);
if (is_vector) if (is_vector)
{ {
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
set_offset (FIRST_ALTIVEC_REGNO + i, float_vector_state->save_vr + i); set_offset (R_VR0 + i, float_vector_state->save_vr + i);
set_offset (VSCR_REGNO, float_vector_state->save_vscr); set_offset (R_VSCR, float_vector_state->save_vscr);
} }
return true; return true;
......
gcc/config/rs6000/linux-unwind.h
/* DWARF2 EH unwinding support for PowerPC and PowerPC64 Linux. /* DWARF2 EH unwinding support for PowerPC and PowerPC64 Linux.
Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -32,6 +32,12 @@ ...@@ -32,6 +32,12 @@
these structs elsewhere; Many fields are missing, particularly these structs elsewhere; Many fields are missing, particularly
from the end of the structures. */ from the end of the structures. */
#define R_LR 65
#define R_CR2 70
#define R_VR0 77
#define R_VRSAVE 109
#define R_VSCR 110
struct gcc_vregs struct gcc_vregs
{ {
__attribute__ ((vector_size (16))) int vr[32]; __attribute__ ((vector_size (16))) int vr[32];
...@@ -243,11 +249,11 @@ ppc_fallback_frame_state (struct _Unwind_Context *context, ...@@ -243,11 +249,11 @@ ppc_fallback_frame_state (struct _Unwind_Context *context,
fs->regs.reg[i].loc.offset = (long) &regs->gpr[i] - new_cfa; fs->regs.reg[i].loc.offset = (long) &regs->gpr[i] - new_cfa;
} }
fs->regs.reg[CR2_REGNO].how = REG_SAVED_OFFSET; fs->regs.reg[R_CR2].how = REG_SAVED_OFFSET;
fs->regs.reg[CR2_REGNO].loc.offset = (long) &regs->ccr - new_cfa; fs->regs.reg[R_CR2].loc.offset = (long) &regs->ccr - new_cfa;
fs->regs.reg[LINK_REGISTER_REGNUM].how = REG_SAVED_OFFSET; fs->regs.reg[R_LR].how = REG_SAVED_OFFSET;
fs->regs.reg[LINK_REGISTER_REGNUM].loc.offset = (long) &regs->link - new_cfa; fs->regs.reg[R_LR].loc.offset = (long) &regs->link - new_cfa;
fs->regs.reg[ARG_POINTER_REGNUM].how = REG_SAVED_OFFSET; fs->regs.reg[ARG_POINTER_REGNUM].how = REG_SAVED_OFFSET;
fs->regs.reg[ARG_POINTER_REGNUM].loc.offset = (long) &regs->nip - new_cfa; fs->regs.reg[ARG_POINTER_REGNUM].loc.offset = (long) &regs->nip - new_cfa;
...@@ -288,17 +294,17 @@ ppc_fallback_frame_state (struct _Unwind_Context *context, ...@@ -288,17 +294,17 @@ ppc_fallback_frame_state (struct _Unwind_Context *context,
{ {
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
{ {
fs->regs.reg[i + FIRST_ALTIVEC_REGNO].how = REG_SAVED_OFFSET; fs->regs.reg[i + R_VR0].how = REG_SAVED_OFFSET;
fs->regs.reg[i + FIRST_ALTIVEC_REGNO].loc.offset fs->regs.reg[i + R_VR0].loc.offset
= (long) &vregs[i] - new_cfa; = (long) &vregs[i] - new_cfa;
} }
fs->regs.reg[VSCR_REGNO].how = REG_SAVED_OFFSET; fs->regs.reg[R_VSCR].how = REG_SAVED_OFFSET;
fs->regs.reg[VSCR_REGNO].loc.offset = (long) &vregs->vscr - new_cfa; fs->regs.reg[R_VSCR].loc.offset = (long) &vregs->vscr - new_cfa;
} }
fs->regs.reg[VRSAVE_REGNO].how = REG_SAVED_OFFSET; fs->regs.reg[R_VRSAVE].how = REG_SAVED_OFFSET;
fs->regs.reg[VRSAVE_REGNO].loc.offset = (long) &vregs->vsave - new_cfa; fs->regs.reg[R_VRSAVE].loc.offset = (long) &vregs->vsave - new_cfa;
} }
/* If we have SPE register high-parts... we check at compile-time to /* If we have SPE register high-parts... we check at compile-time to
...@@ -351,7 +357,7 @@ frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs ATT ...@@ -351,7 +357,7 @@ frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs ATT
code that does the save/restore is generated by the linker, so code that does the save/restore is generated by the linker, so
we have no good way to determine at compile time what to do. */ we have no good way to determine at compile time what to do. */
unsigned int *insn unsigned int *insn
= (unsigned int *) _Unwind_GetGR (context, LINK_REGISTER_REGNUM); = (unsigned int *) _Unwind_GetGR (context, R_LR);
if (*insn == 0xE8410028) if (*insn == 0xE8410028)
_Unwind_SetGRPtr (context, 2, context->cfa + 40); _Unwind_SetGRPtr (context, 2, context->cfa + 40);
} }
......
gcc/config/rs6000/predicates.md
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
;; Return 1 if op is COUNT register. ;; Return 1 if op is COUNT register.
(define_predicate "count_register_operand" (define_predicate "count_register_operand"
(and (match_code "reg") (and (match_code "reg")
(match_test "REGNO (op) == COUNT_REGISTER_REGNUM (match_test "REGNO (op) == CTR_REGNO
|| REGNO (op) > LAST_VIRTUAL_REGISTER"))) || REGNO (op) > LAST_VIRTUAL_REGISTER")))
;; Return 1 if op is an Altivec register. ;; Return 1 if op is an Altivec register.
...@@ -686,8 +686,8 @@ ...@@ -686,8 +686,8 @@
;; to CALL. This is a SYMBOL_REF, a pseudo-register, LR or CTR. ;; to CALL. This is a SYMBOL_REF, a pseudo-register, LR or CTR.
(define_predicate "call_operand" (define_predicate "call_operand"
(if_then_else (match_code "reg") (if_then_else (match_code "reg")
(match_test "REGNO (op) == LINK_REGISTER_REGNUM (match_test "REGNO (op) == LR_REGNO
|| REGNO (op) == COUNT_REGISTER_REGNUM || REGNO (op) == CTR_REGNO
|| REGNO (op) >= FIRST_PSEUDO_REGISTER") || REGNO (op) >= FIRST_PSEUDO_REGISTER")
(match_code "symbol_ref"))) (match_code "symbol_ref")))
......
gcc/config/rs6000/rs6000.c
...@@ -3493,7 +3493,7 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model) ...@@ -3493,7 +3493,7 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model)
first = emit_insn (gen_load_toc_v4_PIC_1b (gsym)); first = emit_insn (gen_load_toc_v4_PIC_1b (gsym));
emit_move_insn (tmp1, emit_move_insn (tmp1,
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
emit_move_insn (tmp2, mem); emit_move_insn (tmp2, mem);
emit_insn (gen_addsi3 (tmp3, tmp1, tmp2)); emit_insn (gen_addsi3 (tmp3, tmp1, tmp2));
last = emit_move_insn (got, tmp3); last = emit_move_insn (got, tmp3);
...@@ -11067,10 +11067,10 @@ print_operand (FILE *file, rtx x, int code) ...@@ -11067,10 +11067,10 @@ print_operand (FILE *file, rtx x, int code)
case 'T': case 'T':
/* Print the symbolic name of a branch target register. */ /* Print the symbolic name of a branch target register. */
if (GET_CODE (x) != REG || (REGNO (x) != LINK_REGISTER_REGNUM if (GET_CODE (x) != REG || (REGNO (x) != LR_REGNO
&& REGNO (x) != COUNT_REGISTER_REGNUM)) && REGNO (x) != CTR_REGNO))
output_operand_lossage ("invalid %%T value"); output_operand_lossage ("invalid %%T value");
else if (REGNO (x) == LINK_REGISTER_REGNUM) else if (REGNO (x) == LR_REGNO)
fputs (TARGET_NEW_MNEMONICS ? "lr" : "r", file); fputs (TARGET_NEW_MNEMONICS ? "lr" : "r", file);
else else
fputs ("ctr", file); fputs ("ctr", file);
...@@ -13532,7 +13532,7 @@ rs6000_stack_info (void) ...@@ -13532,7 +13532,7 @@ rs6000_stack_info (void)
|| rs6000_ra_ever_killed ()) || rs6000_ra_ever_killed ())
{ {
info_ptr->lr_save_p = 1; info_ptr->lr_save_p = 1;
df_set_regs_ever_live (LINK_REGISTER_REGNUM, true); df_set_regs_ever_live (LR_REGNO, true);
} }
/* Determine if we need to save the condition code registers. */ /* Determine if we need to save the condition code registers. */
...@@ -13956,7 +13956,7 @@ rs6000_return_addr (int count, rtx frame) ...@@ -13956,7 +13956,7 @@ rs6000_return_addr (int count, rtx frame)
} }
cfun->machine->ra_need_lr = 1; cfun->machine->ra_need_lr = 1;
return get_hard_reg_initial_val (Pmode, LINK_REGISTER_REGNUM); return get_hard_reg_initial_val (Pmode, LR_REGNO);
} }
/* Say whether a function is a candidate for sibcall handling or not. /* Say whether a function is a candidate for sibcall handling or not.
...@@ -14042,7 +14042,7 @@ rs6000_ra_ever_killed (void) ...@@ -14042,7 +14042,7 @@ rs6000_ra_ever_killed (void)
push_topmost_sequence (); push_topmost_sequence ();
top = get_insns (); top = get_insns ();
pop_topmost_sequence (); pop_topmost_sequence ();
reg = gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM); reg = gen_rtx_REG (Pmode, LR_REGNO);
for (insn = NEXT_INSN (top); insn != NULL_RTX; insn = NEXT_INSN (insn)) for (insn = NEXT_INSN (top); insn != NULL_RTX; insn = NEXT_INSN (insn))
{ {
...@@ -14053,7 +14053,7 @@ rs6000_ra_ever_killed (void) ...@@ -14053,7 +14053,7 @@ rs6000_ra_ever_killed (void)
if (!SIBLING_CALL_P (insn)) if (!SIBLING_CALL_P (insn))
return 1; return 1;
} }
else if (find_regno_note (insn, REG_INC, LINK_REGISTER_REGNUM)) else if (find_regno_note (insn, REG_INC, LR_REGNO))
return 1; return 1;
else if (set_of (reg, insn) != NULL_RTX else if (set_of (reg, insn) != NULL_RTX
&& !prologue_epilogue_contains (insn)) && !prologue_epilogue_contains (insn))
...@@ -14092,14 +14092,14 @@ rs6000_emit_load_toc_table (int fromprolog) ...@@ -14092,14 +14092,14 @@ rs6000_emit_load_toc_table (int fromprolog)
} }
emit_insn (gen_load_toc_v4_PIC_1 (lab)); emit_insn (gen_load_toc_v4_PIC_1 (lab));
emit_move_insn (tmp1, emit_move_insn (tmp1,
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
emit_insn (gen_load_toc_v4_PIC_3b (tmp2, tmp1, got, lab)); emit_insn (gen_load_toc_v4_PIC_3b (tmp2, tmp1, got, lab));
emit_insn (gen_load_toc_v4_PIC_3c (dest, tmp2, got, lab)); emit_insn (gen_load_toc_v4_PIC_3c (dest, tmp2, got, lab));
} }
else if (TARGET_ELF && DEFAULT_ABI == ABI_V4 && flag_pic == 1) else if (TARGET_ELF && DEFAULT_ABI == ABI_V4 && flag_pic == 1)
{ {
emit_insn (gen_load_toc_v4_pic_si ()); emit_insn (gen_load_toc_v4_pic_si ());
emit_move_insn (dest, gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); emit_move_insn (dest, gen_rtx_REG (Pmode, LR_REGNO));
} }
else if (TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2) else if (TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2)
{ {
...@@ -14120,7 +14120,7 @@ rs6000_emit_load_toc_table (int fromprolog) ...@@ -14120,7 +14120,7 @@ rs6000_emit_load_toc_table (int fromprolog)
emit_insn (gen_load_toc_v4_PIC_1 (symF)); emit_insn (gen_load_toc_v4_PIC_1 (symF));
emit_move_insn (dest, emit_move_insn (dest,
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
emit_insn (gen_load_toc_v4_PIC_2 (temp0, dest, symL, symF)); emit_insn (gen_load_toc_v4_PIC_2 (temp0, dest, symL, symF));
} }
else else
...@@ -14130,7 +14130,7 @@ rs6000_emit_load_toc_table (int fromprolog) ...@@ -14130,7 +14130,7 @@ rs6000_emit_load_toc_table (int fromprolog)
tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name); tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name);
emit_insn (gen_load_toc_v4_PIC_1b (tocsym)); emit_insn (gen_load_toc_v4_PIC_1b (tocsym));
emit_move_insn (dest, emit_move_insn (dest,
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
emit_move_insn (temp0, gen_rtx_MEM (Pmode, dest)); emit_move_insn (temp0, gen_rtx_MEM (Pmode, dest));
} }
emit_insn (gen_addsi3 (dest, temp0, dest)); emit_insn (gen_addsi3 (dest, temp0, dest));
...@@ -14191,7 +14191,7 @@ rs6000_emit_eh_reg_restore (rtx source, rtx scratch) ...@@ -14191,7 +14191,7 @@ rs6000_emit_eh_reg_restore (rtx source, rtx scratch)
emit_move_insn (tmp, operands[0]); emit_move_insn (tmp, operands[0]);
} }
else else
emit_move_insn (gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM), operands[0]); emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO), operands[0]);
} }
static GTY(()) int set = -1; static GTY(()) int set = -1;
...@@ -14773,7 +14773,7 @@ rs6000_emit_prologue (void) ...@@ -14773,7 +14773,7 @@ rs6000_emit_prologue (void)
if (info->lr_save_p) if (info->lr_save_p)
{ {
insn = emit_move_insn (reg0, insn = emit_move_insn (reg0,
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
RTX_FRAME_RELATED_P (insn) = 1; RTX_FRAME_RELATED_P (insn) = 1;
} }
...@@ -14806,7 +14806,7 @@ rs6000_emit_prologue (void) ...@@ -14806,7 +14806,7 @@ rs6000_emit_prologue (void)
j = 0; j = 0;
RTVEC_ELT (p, j++) = gen_rtx_CLOBBER (VOIDmode, RTVEC_ELT (p, j++) = gen_rtx_CLOBBER (VOIDmode,
gen_rtx_REG (SImode, gen_rtx_REG (SImode,
LINK_REGISTER_REGNUM)); LR_REGNO));
RTVEC_ELT (p, j++) = gen_rtx_USE (VOIDmode, RTVEC_ELT (p, j++) = gen_rtx_USE (VOIDmode,
gen_rtx_SYMBOL_REF (Pmode, gen_rtx_SYMBOL_REF (Pmode,
"*save_world")); "*save_world"));
...@@ -14881,7 +14881,7 @@ rs6000_emit_prologue (void) ...@@ -14881,7 +14881,7 @@ rs6000_emit_prologue (void)
rtx addr, reg, mem; rtx addr, reg, mem;
insn = emit_move_insn (gen_rtx_REG (Pmode, 0), insn = emit_move_insn (gen_rtx_REG (Pmode, 0),
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)); gen_rtx_REG (Pmode, LR_REGNO));
RTX_FRAME_RELATED_P (insn) = 1; RTX_FRAME_RELATED_P (insn) = 1;
addr = gen_rtx_PLUS (Pmode, frame_reg_rtx, addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
...@@ -14940,7 +14940,7 @@ rs6000_emit_prologue (void) ...@@ -14940,7 +14940,7 @@ rs6000_emit_prologue (void)
RTVEC_ELT (p, 0) = gen_rtx_CLOBBER (VOIDmode, RTVEC_ELT (p, 0) = gen_rtx_CLOBBER (VOIDmode,
gen_rtx_REG (Pmode, gen_rtx_REG (Pmode,
LINK_REGISTER_REGNUM)); LR_REGNO));
sprintf (rname, "%s%d%s", SAVE_FP_PREFIX, sprintf (rname, "%s%d%s", SAVE_FP_PREFIX,
info->first_fp_reg_save - 32, SAVE_FP_SUFFIX); info->first_fp_reg_save - 32, SAVE_FP_SUFFIX);
alloc_rname = ggc_strdup (rname); alloc_rname = ggc_strdup (rname);
...@@ -15261,7 +15261,7 @@ rs6000_emit_prologue (void) ...@@ -15261,7 +15261,7 @@ rs6000_emit_prologue (void)
&& EDGE_COUNT (EXIT_BLOCK_PTR->preds) > 0); && EDGE_COUNT (EXIT_BLOCK_PTR->preds) > 0);
if (save_LR_around_toc_setup) if (save_LR_around_toc_setup)
{ {
rtx lr = gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM); rtx lr = gen_rtx_REG (Pmode, LR_REGNO);
insn = emit_move_insn (frame_ptr_rtx, lr); insn = emit_move_insn (frame_ptr_rtx, lr);
RTX_FRAME_RELATED_P (insn) = 1; RTX_FRAME_RELATED_P (insn) = 1;
...@@ -15279,7 +15279,7 @@ rs6000_emit_prologue (void) ...@@ -15279,7 +15279,7 @@ rs6000_emit_prologue (void)
if (DEFAULT_ABI == ABI_DARWIN if (DEFAULT_ABI == ABI_DARWIN
&& flag_pic && current_function_uses_pic_offset_table) && flag_pic && current_function_uses_pic_offset_table)
{ {
rtx lr = gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM); rtx lr = gen_rtx_REG (Pmode, LR_REGNO);
rtx src = machopic_function_base_sym (); rtx src = machopic_function_base_sym ();
/* Save and restore LR locally around this call (in R0). */ /* Save and restore LR locally around this call (in R0). */
...@@ -15435,7 +15435,7 @@ rs6000_emit_epilogue (int sibcall) ...@@ -15435,7 +15435,7 @@ rs6000_emit_epilogue (int sibcall)
RTVEC_ELT (p, j++) = gen_rtx_RETURN (VOIDmode); RTVEC_ELT (p, j++) = gen_rtx_RETURN (VOIDmode);
RTVEC_ELT (p, j++) = gen_rtx_USE (VOIDmode, RTVEC_ELT (p, j++) = gen_rtx_USE (VOIDmode,
gen_rtx_REG (Pmode, gen_rtx_REG (Pmode,
LINK_REGISTER_REGNUM)); LR_REGNO));
RTVEC_ELT (p, j++) RTVEC_ELT (p, j++)
= gen_rtx_USE (VOIDmode, gen_rtx_SYMBOL_REF (Pmode, alloc_rname)); = gen_rtx_USE (VOIDmode, gen_rtx_SYMBOL_REF (Pmode, alloc_rname));
/* The instruction pattern requires a clobber here; /* The instruction pattern requires a clobber here;
...@@ -15592,7 +15592,7 @@ rs6000_emit_epilogue (int sibcall) ...@@ -15592,7 +15592,7 @@ rs6000_emit_epilogue (int sibcall)
/* Set LR here to try to overlap restores below. */ /* Set LR here to try to overlap restores below. */
if (info->lr_save_p) if (info->lr_save_p)
emit_move_insn (gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM), emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
gen_rtx_REG (Pmode, 0)); gen_rtx_REG (Pmode, 0));
/* Load exception handler data registers, if needed. */ /* Load exception handler data registers, if needed. */
...@@ -15814,7 +15814,7 @@ rs6000_emit_epilogue (int sibcall) ...@@ -15814,7 +15814,7 @@ rs6000_emit_epilogue (int sibcall)
RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode); RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode);
RTVEC_ELT (p, 1) = gen_rtx_USE (VOIDmode, RTVEC_ELT (p, 1) = gen_rtx_USE (VOIDmode,
gen_rtx_REG (Pmode, gen_rtx_REG (Pmode,
LINK_REGISTER_REGNUM)); LR_REGNO));
/* If we have to restore more than two FP registers, branch to the /* If we have to restore more than two FP registers, branch to the
restore function. It will return to our caller. */ restore function. It will return to our caller. */
...@@ -16255,7 +16255,7 @@ rs6000_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED, ...@@ -16255,7 +16255,7 @@ rs6000_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
gen_rtx_USE (VOIDmode, const0_rtx), gen_rtx_USE (VOIDmode, const0_rtx),
gen_rtx_USE (VOIDmode, gen_rtx_USE (VOIDmode,
gen_rtx_REG (SImode, gen_rtx_REG (SImode,
LINK_REGISTER_REGNUM)), LR_REGNO)),
gen_rtx_RETURN (VOIDmode)))); gen_rtx_RETURN (VOIDmode))));
SIBLING_CALL_P (insn) = 1; SIBLING_CALL_P (insn) = 1;
emit_barrier (); emit_barrier ();
...@@ -16904,7 +16904,7 @@ output_profile_hook (int labelno ATTRIBUTE_UNUSED) ...@@ -16904,7 +16904,7 @@ output_profile_hook (int labelno ATTRIBUTE_UNUSED)
else if (DEFAULT_ABI == ABI_DARWIN) else if (DEFAULT_ABI == ABI_DARWIN)
{ {
const char *mcount_name = RS6000_MCOUNT; const char *mcount_name = RS6000_MCOUNT;
int caller_addr_regno = LINK_REGISTER_REGNUM; int caller_addr_regno = LR_REGNO;
/* Be conservative and always set this, at least for now. */ /* Be conservative and always set this, at least for now. */
current_function_uses_pic_offset_table = 1; current_function_uses_pic_offset_table = 1;
...@@ -20903,9 +20903,9 @@ rs6000_dbx_register_number (unsigned int regno) ...@@ -20903,9 +20903,9 @@ rs6000_dbx_register_number (unsigned int regno)
return regno; return regno;
if (regno == MQ_REGNO) if (regno == MQ_REGNO)
return 100; return 100;
if (regno == LINK_REGISTER_REGNUM) if (regno == LR_REGNO)
return 108; return 108;
if (regno == COUNT_REGISTER_REGNUM) if (regno == CTR_REGNO)
return 109; return 109;
if (CR_REGNO_P (regno)) if (CR_REGNO_P (regno))
return regno - CR0_REGNO + 86; return regno - CR0_REGNO + 86;
......
gcc/config/rs6000/rs6000.h
...@@ -724,21 +724,7 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops; ...@@ -724,21 +724,7 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops;
, 0, 0, 0 \ , 0, 0, 0 \
} }
#define MQ_REGNO 64
#define CR0_REGNO 68
#define CR1_REGNO 69
#define CR2_REGNO 70
#define CR3_REGNO 71
#define CR4_REGNO 72
#define MAX_CR_REGNO 75
#define XER_REGNO 76
#define FIRST_ALTIVEC_REGNO 77
#define LAST_ALTIVEC_REGNO 108
#define TOTAL_ALTIVEC_REGS (LAST_ALTIVEC_REGNO - FIRST_ALTIVEC_REGNO + 1) #define TOTAL_ALTIVEC_REGS (LAST_ALTIVEC_REGNO - FIRST_ALTIVEC_REGNO + 1)
#define VRSAVE_REGNO 109
#define VSCR_REGNO 110
#define SPE_ACC_REGNO 111
#define SPEFSCR_REGNO 112
#define FIRST_SAVED_ALTIVEC_REGNO (FIRST_ALTIVEC_REGNO+20) #define FIRST_SAVED_ALTIVEC_REGNO (FIRST_ALTIVEC_REGNO+20)
#define FIRST_SAVED_FP_REGNO (14+32) #define FIRST_SAVED_FP_REGNO (14+32)
...@@ -812,10 +798,10 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops; ...@@ -812,10 +798,10 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops;
#define FP_REGNO_P(N) ((N) >= 32 && (N) <= 63) #define FP_REGNO_P(N) ((N) >= 32 && (N) <= 63)
/* True if register is a condition register. */ /* True if register is a condition register. */
#define CR_REGNO_P(N) ((N) >= 68 && (N) <= 75) #define CR_REGNO_P(N) ((N) >= CR0_REGNO && (N) <= CR7_REGNO)
/* True if register is a condition register, but not cr0. */ /* True if register is a condition register, but not cr0. */
#define CR_REGNO_NOT_CR0_P(N) ((N) >= 69 && (N) <= 75) #define CR_REGNO_NOT_CR0_P(N) ((N) >= CR1_REGNO && (N) <= CR7_REGNO)
/* True if register is an integer register. */ /* True if register is an integer register. */
#define INT_REGNO_P(N) \ #define INT_REGNO_P(N) \
...@@ -952,11 +938,6 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops; ...@@ -952,11 +938,6 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops;
/* Place to put static chain when calling a function that requires it. */ /* Place to put static chain when calling a function that requires it. */
#define STATIC_CHAIN_REGNUM 11 #define STATIC_CHAIN_REGNUM 11
/* Link register number. */
#define LINK_REGISTER_REGNUM 65
/* Count register number. */
#define COUNT_REGISTER_REGNUM 66
/* Define the classes of registers for register constraints in the /* Define the classes of registers for register constraints in the
machine description. Also define ranges of constants. machine description. Also define ranges of constants.
...@@ -1085,8 +1066,8 @@ enum reg_class ...@@ -1085,8 +1066,8 @@ enum reg_class
: (REGNO) == CR0_REGNO ? CR0_REGS \ : (REGNO) == CR0_REGNO ? CR0_REGS \
: CR_REGNO_P (REGNO) ? CR_REGS \ : CR_REGNO_P (REGNO) ? CR_REGS \
: (REGNO) == MQ_REGNO ? MQ_REGS \ : (REGNO) == MQ_REGNO ? MQ_REGS \
: (REGNO) == LINK_REGISTER_REGNUM ? LINK_REGS \ : (REGNO) == LR_REGNO ? LINK_REGS \
: (REGNO) == COUNT_REGISTER_REGNUM ? CTR_REGS \ : (REGNO) == CTR_REGNO ? CTR_REGS \
: (REGNO) == ARG_POINTER_REGNUM ? BASE_REGS \ : (REGNO) == ARG_POINTER_REGNUM ? BASE_REGS \
: (REGNO) == XER_REGNO ? XER_REGS \ : (REGNO) == XER_REGNO ? XER_REGS \
: (REGNO) == VRSAVE_REGNO ? VRSAVE_REGS \ : (REGNO) == VRSAVE_REGNO ? VRSAVE_REGS \
...@@ -1503,7 +1484,7 @@ typedef struct rs6000_args ...@@ -1503,7 +1484,7 @@ typedef struct rs6000_args
needed. */ needed. */
#define EPILOGUE_USES(REGNO) \ #define EPILOGUE_USES(REGNO) \
((reload_completed && (REGNO) == LINK_REGISTER_REGNUM) \ ((reload_completed && (REGNO) == LR_REGNO) \
|| (TARGET_ALTIVEC && (REGNO) == VRSAVE_REGNO) \ || (TARGET_ALTIVEC && (REGNO) == VRSAVE_REGNO) \
|| (current_function_calls_eh_return \ || (current_function_calls_eh_return \
&& TARGET_AIX \ && TARGET_AIX \
...@@ -2244,8 +2225,8 @@ extern char rs6000_reg_names[][8]; /* register names (0 vs. %r0). */ ...@@ -2244,8 +2225,8 @@ extern char rs6000_reg_names[][8]; /* register names (0 vs. %r0). */
dwarf2 unwind information. This also enables the table driven dwarf2 unwind information. This also enables the table driven
mechanism. */ mechanism. */
#define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM) #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, LR_REGNO)
#define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (LINK_REGISTER_REGNUM) #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (LR_REGNO)
/* Describe how we implement __builtin_eh_return. */ /* Describe how we implement __builtin_eh_return. */
#define EH_RETURN_DATA_REGNO(N) ((N) < 4 ? (N) + 3 : INVALID_REGNUM) #define EH_RETURN_DATA_REGNO(N) ((N) < 4 ? (N) + 3 : INVALID_REGNUM)
......
gcc/config/rs6000/spe.md
...@@ -21,10 +21,7 @@ ...@@ -21,10 +21,7 @@
;; MA 02110-1301, USA. ;; MA 02110-1301, USA.
(define_constants (define_constants
[(SPE_ACC_REGNO 111) [(CMPDFEQ_GPR 1006)
(SPEFSCR_REGNO 112)
(CMPDFEQ_GPR 1006)
(TSTDFEQ_GPR 1007) (TSTDFEQ_GPR 1007)
(CMPDFGT_GPR 1008) (CMPDFGT_GPR 1008)
(TSTDFGT_GPR 1009) (TSTDFGT_GPR 1009)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment