epiphany: Emit config save register right after prologue

Emit gen_save_config instruction right after the prologue so that the save-register is initialized in all blocks of the function. Problem described further here: adapteva/epiphany-sdk#53 Fixes: FAIL: gcc.c-torture/execute/struct-ret-1.c -Os execution test gcc/ * config/epiphany/epiphany.c (emit_set_fp_mode): If gen_save_config is emitted, insert it right after prologue. Signed-off-by: Ola Jeppsson <[email protected]>
adapteva · Nov 4, 2015 · 601d548 · 601d548
1 parent e339894
commit 601d548
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/gcc/ChangeLog.epiphany b/gcc/ChangeLog.epiphany
@@ -1,3 +1,8 @@
+2015-11-02  Ola Jeppsson  <[email protected]>
+
+	* config/epiphany/epiphany.c (emit_set_fp_mode): If
+	gen_save_config is emitted, insert it right after prologue.
+
 2015-09-04  Ola Jeppsson  <[email protected]>
 
 	* testsuite/g++.dg/pr49718.C: Add special pattern for

diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
@@ -2751,11 +2751,27 @@ emit_set_fp_mode (int entity, int mode, int prev_mode ATTRIBUTE_UNUSED,
   else if (entity == EPIPHANY_MSW_ENTITY_CONFIG)
     {
       /* Mode switching optimization is done after emit_initial_value_sets,
-	 so we have to take care of CONFIG_REGNUM here.  */
+	 so we have to take care of CONFIG_REGNUM here.
+	 If we emit 'gen_save_config', insert it right after the prologue so
+	 there never can be an uninitialized load from the save-register.  */
+
+      edge entry_edge;
+      rtx_insn *insn, *seq;
+      rtx save;
+
       gcc_assert (mode >= 0 && mode <= 2);
-      rtx save = get_hard_reg_initial_val (SImode, CONFIG_REGNUM);
+
+      start_sequence ();
+      save = get_hard_reg_initial_val (SImode, CONFIG_REGNUM);
       if (mode == 1)
 	emit_insn (gen_save_config (save));
+      seq = get_insns ();
+      end_sequence ();
+
+      entry_edge = single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun));
+      insert_insn_on_edge (seq, entry_edge);
+      commit_one_edge_insertion (entry_edge);
+
       return;
     }
   fp_mode = (enum attr_fp_mode) mode;