OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/10901 (non-local goto's don't work on darwin) 

gcc:

	PR target/10901
	* config/darwin-protos.h (machopic_get_function_picbase): New.
	* config/darwin.c (machopic_get_function_picbase): New.
	* config/rs6000/darwin.md (load_macho_picbase_si): Update picbase
	label for a new func.  (load_macho_picbase_di): Likewise.
	(reload_macho_picbase): New expand.
	(reload_macho_picbase_si): New insn.
	(reload_macho_picbase_di): New insn.
	(nonlocal_goto_receiver): New define and split.
	* config/rs6000/rs6000.md (unspec enum): Add UNSPEC_RELD_MPIC.
	(unspecv enum): Add UNSPECV_NLGR.

From-SVN: r203019
This commit is contained in:
Iain Sandoe 2013-09-29 20:14:39 +00:00 committed by Iain Sandoe
parent 749278c58d
commit e1c5c87790
5 changed files with 121 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ChangeLog
View File

@ -1,3 +1,17 @@
2013-09-29 Iain Sandoe <iain@codesourcery.com>
PR target/10901
* config/darwin-protos.h (machopic_get_function_picbase): New.
* config/darwin.c (machopic_get_function_picbase): New.
* config/rs6000/darwin.md (load_macho_picbase_si): Update picbase
label for a new func. (load_macho_picbase_di): Likewise.
(reload_macho_picbase): New expand.
(reload_macho_picbase_si): New insn.
(reload_macho_picbase_di): New insn.
(nonlocal_goto_receiver): New define and split.
* config/rs6000/rs6000.md (unspec enum): Add UNSPEC_RELD_MPIC.
(unspecv enum): Add UNSPECV_NLGR.
2013-09-29 Iain Sandoe <iain@codesourcery.com>
* config/rs6000/rs6000.c (rs6000_init_dwarf_reg_sizes_extra): Ensure

1
gcc/config/darwin-protos.h
View File

@ -26,6 +26,7 @@ extern void machopic_output_function_base_name (FILE *);
extern const char *machopic_indirection_name (rtx, bool);
extern const char *machopic_mcount_stub_name (void);
extern bool machopic_should_output_picbase_label (void);
extern const char *machopic_get_function_picbase (void);
#ifdef RTX_CODE

13
gcc/config/darwin.c
View File

@ -405,6 +405,19 @@ machopic_output_function_base_name (FILE *file)
fprintf (file, "L%d$pb", current_pic_label_num);
}
char curr_picbasename[32];
const char *
machopic_get_function_picbase (void)
{
/* If dynamic-no-pic is on, we should not get here. */
gcc_assert (!MACHO_DYNAMIC_NO_PIC_P);
update_pic_label_number_if_needed ();
snprintf (curr_picbasename, 32, "L%d$pb", current_pic_label_num);
return (const char *) curr_picbasename;
}
bool
machopic_should_output_picbase_label (void)
{

93
gcc/config/rs6000/darwin.md
View File

@ -260,7 +260,10 @@ You should have received a copy of the GNU General Public License
(unspec:SI [(match_operand:SI 0 "immediate_operand" "s")
(pc)] UNSPEC_LD_MPIC))]
"(DEFAULT_ABI == ABI_DARWIN) && flag_pic"
"bcl 20,31,%0\\n%0:"
{
machopic_should_output_picbase_label (); /* Update for new func. */
return "bcl 20,31,%0\\n%0:";
}
[(set_attr "type" "branch")
(set_attr "length" "4")])
@ -269,7 +272,10 @@ You should have received a copy of the GNU General Public License
(unspec:DI [(match_operand:DI 0 "immediate_operand" "s")
(pc)] UNSPEC_LD_MPIC))]
"(DEFAULT_ABI == ABI_DARWIN) && flag_pic && TARGET_64BIT"
"bcl 20,31,%0\\n%0:"
{
machopic_should_output_picbase_label (); /* Update for new func. */
return "bcl 20,31,%0\\n%0:";
}
[(set_attr "type" "branch")
(set_attr "length" "4")])
@ -370,3 +376,86 @@ You should have received a copy of the GNU General Public License
}
[(set_attr "type" "branch,branch")
(set_attr "length" "4,8")])
(define_expand "reload_macho_picbase"
[(set (reg:SI 65)
(unspec [(match_operand 0 "" "")]
UNSPEC_RELD_MPIC))]
"(DEFAULT_ABI == ABI_DARWIN) && flag_pic"
{
if (TARGET_32BIT)
emit_insn (gen_reload_macho_picbase_si (operands[0]));
else
emit_insn (gen_reload_macho_picbase_di (operands[0]));
DONE;
})
(define_insn "reload_macho_picbase_si"
[(set (reg:SI 65)
(unspec:SI [(match_operand:SI 0 "immediate_operand" "s")
(pc)] UNSPEC_RELD_MPIC))]
"(DEFAULT_ABI == ABI_DARWIN) && flag_pic"
{
if (machopic_should_output_picbase_label ())
{
static char tmp[64];
const char *cnam = machopic_get_function_picbase ();
snprintf (tmp, 64, "bcl 20,31,%s\\n%s:\\n%%0:", cnam, cnam);
return tmp;
}
else
return "bcl 20,31,%0\\n%0:";
}
[(set_attr "type" "branch")
(set_attr "length" "4")])
(define_insn "reload_macho_picbase_di"
[(set (reg:DI 65)
(unspec:DI [(match_operand:DI 0 "immediate_operand" "s")
(pc)] UNSPEC_RELD_MPIC))]
"(DEFAULT_ABI == ABI_DARWIN) && flag_pic && TARGET_64BIT"
{
if (machopic_should_output_picbase_label ())
{
static char tmp[64];
const char *cnam = machopic_get_function_picbase ();
snprintf (tmp, 64, "bcl 20,31,%s\\n%s:\\n%%0:", cnam, cnam);
return tmp;
}
else
return "bcl 20,31,%0\\n%0:";
}
[(set_attr "type" "branch")
(set_attr "length" "4")])
;; We need to restore the PIC register, at the site of nonlocal label.
(define_insn_and_split "nonlocal_goto_receiver"
[(unspec_volatile [(const_int 0)] UNSPECV_NLGR)]
"TARGET_MACHO && flag_pic"
"#"
"&& reload_completed"
[(const_int 0)]
{
if (crtl->uses_pic_offset_table)
{
static unsigned n = 0;
rtx picrtx = gen_rtx_SYMBOL_REF (Pmode, MACHOPIC_FUNCTION_BASE_NAME);
rtx picreg = gen_rtx_REG (Pmode, RS6000_PIC_OFFSET_TABLE_REGNUM);
rtx tmplrtx;
char tmplab[20];
ASM_GENERATE_INTERNAL_LABEL(tmplab, "Lnlgr", ++n);
tmplrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (tmplab));
emit_insn (gen_reload_macho_picbase (tmplrtx));
emit_move_insn (picreg, gen_rtx_REG (Pmode, LR_REGNO));
emit_insn (gen_macho_correct_pic (picreg, picreg, picrtx, tmplrtx));
}
else
/* Not using PIC reg, no reload needed. */
emit_note (NOTE_INSN_DELETED);
DONE;
})

2
gcc/config/rs6000/rs6000.md
View File

@ -87,6 +87,7 @@
UNSPEC_FRIP
UNSPEC_FRIZ
UNSPEC_LD_MPIC ; load_macho_picbase
UNSPEC_RELD_MPIC ; re-load_macho_picbase
UNSPEC_MPIC_CORRECT ; macho_correct_pic
UNSPEC_TLSGD
UNSPEC_TLSLD
@ -150,6 +151,7 @@
UNSPECV_EH_RR ; eh_reg_restore
UNSPECV_ISYNC ; isync instruction
UNSPECV_MFTB ; move from time base
UNSPECV_NLGR ; non-local goto receiver
])