| blob | 03fc47f192cdb899bc0d96d93c936fd8008ed20e |
1 Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
3 From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
4 From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
5 Date: Mon, 18 Jun 2012 20:18:13 +0200
6 Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
8 Changelog
10 2013-03-18 Edgar E. Iglesias <edgar.iglesias@xilinx.com>
11 David Holsgrove <david.holsgrove@xilinx.com>
13 * common/config/microblaze/microblaze-common.c: Remove
14 TARGET_EXCEPT_UNWIND_INFO definition.
15 * config/microblaze/microblaze-protos.h: Add
16 microblaze_eh_return prototype.
17 * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
18 microblaze_expand_epilogue, microblaze_return_addr): Handle
19 calls_eh_return
20 (microblaze_eh_return): New function.
21 * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
22 EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
23 ASM_PREFERRED_EH_DATA_FORMAT
24 * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
26 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
27 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
28 ---
29 gcc/common/config/microblaze/microblaze-common.c | 3 ---
30 gcc/config/microblaze/microblaze-protos.h | 1 +
31 gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++----
32 gcc/config/microblaze/microblaze.h | 15 ++++++++++++
33 gcc/config/microblaze/microblaze.md | 11 +++++++++
34 5 files changed, 52 insertions(+), 7 deletions(-)
36 Index: b/gcc/common/config/microblaze/microblaze-common.c
37 ===================================================================
38 --- a/gcc/common/config/microblaze/microblaze-common.c
39 +++ b/gcc/common/config/microblaze/microblaze-common.c
40 @@ -37,7 +37,4 @@
41 #undef TARGET_OPTION_OPTIMIZATION_TABLE
42 #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
44 -#undef TARGET_EXCEPT_UNWIND_INFO
45 -#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info
46 -
47 struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
48 Index: b/gcc/config/microblaze/microblaze-protos.h
49 ===================================================================
50 --- a/gcc/config/microblaze/microblaze-protos.h
51 +++ b/gcc/config/microblaze/microblaze-protos.h
52 @@ -54,6 +54,7 @@
53 extern int symbol_mentioned_p (rtx);
54 extern int label_mentioned_p (rtx);
55 extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx);
56 +extern void microblaze_eh_return (rtx op0);
57 #endif /* RTX_CODE */
59 /* Declare functions in microblaze-c.c. */
60 Index: b/gcc/config/microblaze/microblaze.c
61 ===================================================================
62 --- a/gcc/config/microblaze/microblaze.c
63 +++ b/gcc/config/microblaze/microblaze.c
64 @@ -1906,6 +1906,11 @@
65 if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
66 return 1;
68 + if (crtl->calls_eh_return
69 + && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
70 + return 1;
71 + }
72 +
73 if (!crtl->is_leaf)
74 {
75 if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
76 @@ -1933,6 +1938,13 @@
77 return 1;
78 }
80 + if (crtl->calls_eh_return
81 + && (regno == EH_RETURN_DATA_REGNO (0)
82 + || regno == EH_RETURN_DATA_REGNO (1)))
83 + {
84 + return 1;
85 + }
86 +
87 return 0;
88 }
90 @@ -2962,6 +2974,12 @@
91 emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
92 }
94 + if (crtl->calls_eh_return)
95 + emit_insn (gen_addsi3 (stack_pointer_rtx,
96 + stack_pointer_rtx,
97 + gen_rtx_raw_REG (SImode,
98 + MB_EH_STACKADJ_REGNUM)));
99 +
100 emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
101 MB_ABI_SUB_RETURN_ADDR_REGNUM)));
102 }
103 @@ -3256,10 +3274,13 @@
104 if (count != 0)
105 return NULL_RTX;
107 - return gen_rtx_PLUS (Pmode,
108 - get_hard_reg_initial_val (Pmode,
109 - MB_ABI_SUB_RETURN_ADDR_REGNUM),
110 - GEN_INT (8));
111 + return get_hard_reg_initial_val (Pmode,
112 + MB_ABI_SUB_RETURN_ADDR_REGNUM);
113 +}
114 +
115 +void microblaze_eh_return (rtx op0)
116 +{
117 + emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
118 }
120 /* Queue an .ident string in the queue of top-level asm statements.
121 Index: b/gcc/config/microblaze/microblaze.h
122 ===================================================================
123 --- a/gcc/config/microblaze/microblaze.h
124 +++ b/gcc/config/microblaze/microblaze.h
125 @@ -184,6 +184,21 @@
126 #define INCOMING_RETURN_ADDR_RTX \
127 gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
129 +/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */
130 +#define RETURN_ADDR_OFFSET (8)
131 +
132 +/* Describe how we implement __builtin_eh_return. */
133 +#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
134 +
135 +#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM
136 +#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
137 +
138 +/* Select a format to encode pointers in exception handling data. CODE
139 + is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is
140 + true if the symbol may be affected by dynamic relocations. */
141 +#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
142 + ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
143 +
144 /* Use DWARF 2 debugging information by default. */
145 #define DWARF2_DEBUGGING_INFO
146 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
147 Index: b/gcc/config/microblaze/microblaze.md
148 ===================================================================
149 --- a/gcc/config/microblaze/microblaze.md
150 +++ b/gcc/config/microblaze/microblaze.md
151 @@ -2261,4 +2261,15 @@
152 (set_attr "mode" "SI")
153 (set_attr "length" "4")])
155 +; This is used in compiling the unwind routines.
156 +(define_expand "eh_return"
157 + [(use (match_operand 0 "general_operand" ""))]
158 + ""
159 + "
160 +{
161 + microblaze_eh_return(operands[0]);
162 + DONE;
163 +}")
164 +
165 (include "sync.md")
166 +