Skip to content

R
riscv-gcc-1
Commit 20b71b17 by Alan Modra Committed by Alan Modra
Options

rs6000.c (rs6000_emit_load_toc_table): Remove "if" nesting. 

	* config/rs6000/rs6000.c (rs6000_emit_load_toc_table): Remove "if"
	nesting.  Correct test for non-PowerPC64 ELF ABI_AIX.
	* config/rs6000/rs6000.md (load_toc_v4_PIC*): Disable when ABI_AIX.

From-SVN: r57086
parent 00a17e31
Showing with 78 additions and 75 deletions
gcc/ChangeLog
2002-09-13 Alan Modra <amodra@bigpond.net.au>
* config/rs6000/rs6000.c (rs6000_emit_load_toc_table): Remove "if"
nesting. Correct test for non-PowerPC64 ELF ABI_AIX.
* config/rs6000/rs6000.md (load_toc_v4_PIC*): Disable when ABI_AIX.
2002-09-12 Zack Weinberg <zack@codesourcery.com> 2002-09-12 Zack Weinberg <zack@codesourcery.com>
* toplev.c: Move default definition of USER_LABEL_PREFIX... * toplev.c: Move default definition of USER_LABEL_PREFIX...
......
gcc/config/rs6000/rs6000.c
...@@ -9495,91 +9495,88 @@ rs6000_emit_load_toc_table (fromprolog) ...@@ -9495,91 +9495,88 @@ rs6000_emit_load_toc_table (fromprolog)
rtx dest; rtx dest;
dest = gen_rtx_REG (Pmode, RS6000_PIC_OFFSET_TABLE_REGNUM); dest = gen_rtx_REG (Pmode, RS6000_PIC_OFFSET_TABLE_REGNUM);
if (TARGET_ELF && DEFAULT_ABI != ABI_AIX) if (TARGET_ELF && DEFAULT_ABI == ABI_V4 && flag_pic == 1)
{ {
if (DEFAULT_ABI == ABI_V4 && flag_pic == 1) rtx temp = (fromprolog
? gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)
: gen_reg_rtx (Pmode));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_pic_si (temp)));
rs6000_maybe_dead (emit_move_insn (dest, temp));
}
else if (TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2)
{
char buf[30];
rtx tempLR = (fromprolog
? gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)
: gen_reg_rtx (Pmode));
rtx temp0 = (fromprolog
? gen_rtx_REG (Pmode, 0)
: gen_reg_rtx (Pmode));
rtx symF;
/* possibly create the toc section */
if (! toc_initialized)
{ {
rtx temp = (fromprolog toc_section ();
? gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM) function_section (current_function_decl);
: gen_reg_rtx (Pmode));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_pic_si (temp)));
rs6000_maybe_dead (emit_move_insn (dest, temp));
} }
else if (flag_pic == 2)
{
char buf[30];
rtx tempLR = (fromprolog
? gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM)
: gen_reg_rtx (Pmode));
rtx temp0 = (fromprolog
? gen_rtx_REG (Pmode, 0)
: gen_reg_rtx (Pmode));
rtx symF;
/* possibly create the toc section */
if (! toc_initialized)
{
toc_section ();
function_section (current_function_decl);
}
if (fromprolog)
{
rtx symL;
ASM_GENERATE_INTERNAL_LABEL (buf, "LCF", rs6000_pic_labelno);
symF = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
ASM_GENERATE_INTERNAL_LABEL (buf, "LCL", rs6000_pic_labelno);
symL = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_1 (tempLR,
symF)));
rs6000_maybe_dead (emit_move_insn (dest, tempLR));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_2 (temp0, dest,
symL,
symF)));
}
else
{
rtx tocsym;
static int reload_toc_labelno = 0;
tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name); if (fromprolog)
{
rtx symL;
ASM_GENERATE_INTERNAL_LABEL (buf, "LCG", reload_toc_labelno++); ASM_GENERATE_INTERNAL_LABEL (buf, "LCF", rs6000_pic_labelno);
symF = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf)); symF = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_1b (tempLR, ASM_GENERATE_INTERNAL_LABEL (buf, "LCL", rs6000_pic_labelno);
symF, symL = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
tocsym)));
rs6000_maybe_dead (emit_move_insn (dest, tempLR)); rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_1 (tempLR,
rs6000_maybe_dead (emit_move_insn (temp0, symF)));
gen_rtx_MEM (Pmode, dest))); rs6000_maybe_dead (emit_move_insn (dest, tempLR));
} rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_2 (temp0, dest,
rs6000_maybe_dead (emit_insn (gen_addsi3 (dest, temp0, dest))); symL,
} symF)));
else if (flag_pic == 0 && TARGET_MINIMAL_TOC)
{
/* This is for AIX code running in non-PIC ELF. */
char buf[30];
rtx realsym;
ASM_GENERATE_INTERNAL_LABEL (buf, "LCTOC", 1);
realsym = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
rs6000_maybe_dead (emit_insn (gen_elf_high (dest, realsym)));
rs6000_maybe_dead (emit_insn (gen_elf_low (dest, dest, realsym)));
} }
else else
abort (); {
rtx tocsym;
static int reload_toc_labelno = 0;
tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name);
ASM_GENERATE_INTERNAL_LABEL (buf, "LCG", reload_toc_labelno++);
symF = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
rs6000_maybe_dead (emit_insn (gen_load_toc_v4_PIC_1b (tempLR,
symF,
tocsym)));
rs6000_maybe_dead (emit_move_insn (dest, tempLR));
rs6000_maybe_dead (emit_move_insn (temp0,
gen_rtx_MEM (Pmode, dest)));
}
rs6000_maybe_dead (emit_insn (gen_addsi3 (dest, temp0, dest)));
} }
else else if (TARGET_ELF && !TARGET_AIX && flag_pic == 0 && TARGET_MINIMAL_TOC)
{
/* This is for AIX code running in non-PIC ELF32. */
char buf[30];
rtx realsym;
ASM_GENERATE_INTERNAL_LABEL (buf, "LCTOC", 1);
realsym = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
rs6000_maybe_dead (emit_insn (gen_elf_high (dest, realsym)));
rs6000_maybe_dead (emit_insn (gen_elf_low (dest, dest, realsym)));
}
else if (DEFAULT_ABI == ABI_AIX)
{ {
if (TARGET_32BIT) if (TARGET_32BIT)
rs6000_maybe_dead (emit_insn (gen_load_toc_aix_si (dest))); rs6000_maybe_dead (emit_insn (gen_load_toc_aix_si (dest)));
else else
rs6000_maybe_dead (emit_insn (gen_load_toc_aix_di (dest))); rs6000_maybe_dead (emit_insn (gen_load_toc_aix_di (dest)));
} }
else
abort ();
} }
int int
......
gcc/config/rs6000/rs6000.md
...@@ -10151,7 +10151,7 @@ ...@@ -10151,7 +10151,7 @@
[(set (match_operand:SI 0 "register_operand" "=l") [(set (match_operand:SI 0 "register_operand" "=l")
(match_operand:SI 1 "immediate_operand" "s")) (match_operand:SI 1 "immediate_operand" "s"))
(unspec [(match_dup 1)] 7)] (unspec [(match_dup 1)] 7)]
"TARGET_ELF && flag_pic == 2" "TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2"
"bl %1\\n%1:" "bl %1\\n%1:"
[(set_attr "type" "branch") [(set_attr "type" "branch")
(set_attr "length" "4")]) (set_attr "length" "4")])
...@@ -10160,7 +10160,7 @@ ...@@ -10160,7 +10160,7 @@
[(set (match_operand:SI 0 "register_operand" "=l") [(set (match_operand:SI 0 "register_operand" "=l")
(match_operand:SI 1 "immediate_operand" "s")) (match_operand:SI 1 "immediate_operand" "s"))
(unspec [(match_dup 1) (match_operand 2 "immediate_operand" "s")] 6)] (unspec [(match_dup 1) (match_operand 2 "immediate_operand" "s")] 6)]
"TARGET_ELF && flag_pic == 2" "TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2"
"bl %1\\n\\t.long %2-%1+4\\n%1:" "bl %1\\n\\t.long %2-%1+4\\n%1:"
[(set_attr "type" "branch") [(set_attr "type" "branch")
(set_attr "length" "8")]) (set_attr "length" "8")])
...@@ -10170,7 +10170,7 @@ ...@@ -10170,7 +10170,7 @@
(mem:SI (plus:SI (match_operand:SI 1 "gpc_reg_operand" "r") (mem:SI (plus:SI (match_operand:SI 1 "gpc_reg_operand" "r")
(minus:SI (match_operand:SI 2 "immediate_operand" "s") (minus:SI (match_operand:SI 2 "immediate_operand" "s")
(match_operand:SI 3 "immediate_operand" "s")))))] (match_operand:SI 3 "immediate_operand" "s")))))]
"TARGET_ELF && flag_pic == 2" "TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2"
"{l|lwz} %0,%2-%3(%1)" "{l|lwz} %0,%2-%3(%1)"
[(set_attr "type" "load")]) [(set_attr "type" "load")])
......
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