Rebase SEH for aarch64-pe prototype

Author: eukarpov

.gitignore

@@ -20,6 +20,7 @@
 
 .deps
 .libs
+.vscode
 
 autom4te.cache
 config.cache

gcc/common/config/aarch64/aarch64-common.cc

@@ -446,6 +446,32 @@ aarch64_rewrite_mcpu (int argc, const char **argv)
   return aarch64_rewrite_selected_cpu (argv[argc - 1]);
 }
 
+/* Implement TARGET_EXCEPT_UNWIND_INFO.  */
+
+static enum unwind_info_type
+aarch64_except_unwind_info (struct gcc_options *opts)
+{
+  /* Honor the --enable-sjlj-exceptions configure switch.  */
+#ifdef CONFIG_SJLJ_EXCEPTIONS
+  if (CONFIG_SJLJ_EXCEPTIONS)
+    return UI_SJLJ;
+#endif
+
+  /* On windows 64, prefer SEH exceptions over anything else.  */
+#if defined (TARGET_AARCH64_MS_ABI)
+  if (opts->x_flag_unwind_tables)
+    return UI_SEH;
+#endif
+
+  if (DWARF2_UNWIND_INFO)
+    return UI_DWARF2;
+
+  return UI_SJLJ;
+}
+
+#undef  TARGET_EXCEPT_UNWIND_INFO
+#define TARGET_EXCEPT_UNWIND_INFO  aarch64_except_unwind_info
+
 struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
 
 #undef AARCH64_CPU_NAME_LENGTH

gcc/config.gcc

@@ -1288,11 +1288,13 @@ aarch64-*-mingw*)
 	target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt-dll.cc"
 	extra_options="${extra_options} mingw/cygming.opt mingw/mingw.opt"
 	extra_objs="${extra_objs} winnt.o winnt-dll.o"
-	c_target_objs="${c_target_objs} msformat-c.o"
-	cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
+	c_target_objs="${c_target_objs} winnt-c.o msformat-c.o"
+	cxx_target_objs="${cxx_target_objs} winnt-c.o winnt-cxx.o msformat-c.o"
 	d_target_objs="${d_target_objs} winnt-d.o"
-	tmake_file="${tmake_file} mingw/t-cygming"
-	aarch64_multilibs="lp64"
+	target_has_targetcm="yes"
+	target_has_targetdm="yes"
+	tmake_file="${tmake_file} t-winnt mingw/t-cygming"
+	aarch64_multilibs="llp64"
 	case ${enable_threads} in
 	  "" | yes | win32)
 	    thread_file='win32'
@@ -1304,7 +1306,7 @@ aarch64-*-mingw*)
 	default_use_cxa_atexit=yes
 	user_headers_inc_next_post="${user_headers_inc_next_post} float.h"
 	tm_defines="${tm_defines} TARGET_AARCH64_MS_ABI=1"
-	TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},lp64"
+	TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},llp64"
 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
 	;;
 aarch64*-wrs-vxworks*)

gcc/config/aarch64/aarch64-coff.h

@@ -35,6 +35,9 @@
 #undef LONG_TYPE_SIZE
 #define LONG_TYPE_SIZE 32
 
+#define TARGET_64BIT_MS_ABI 1
+#define TARGET_SEH 1
+
 #ifndef ASM_GENERATE_INTERNAL_LABEL
 # define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM)  \
   sprintf (STRING, "*%s%s%u", LOCAL_LABEL_PREFIX, PREFIX, (unsigned int)(NUM))
@@ -99,4 +102,14 @@
 #undef DTORS_SECTION_ASM_OP
 #define DTORS_SECTION_ASM_OP "\t.section\t.fini_array,\"aw\""
 
+// #undef STACK_CHECK_STATIC_BUILTIN
+// #define STACK_CHECK_STATIC_BUILTIN 1
+
+// #undef SUBTARGET_OVERRIDE_OPTIONS
+// #define SUBTARGET_OVERRIDE_OPTIONS AARCH64_PE_OVERRIDE_OPTIONS
+
+// #undef AARCH64_PE_OVERRIDE_OPTIONS
+// #define AARCH64_PE_OVERRIDE_OPTIONS aarch64_pe_override_options ()
+// extern void aarch64_pe_override_options (void);
+
 #endif

gcc/config/aarch64/aarch64.cc

@@ -12724,6 +12724,12 @@ aarch64_label_mentioned_p (rtx x)
   return 0;
 }
 
+void
+aarch64_print_reg (rtx x, int code, FILE *file)
+{
+  aarch64_print_operand (file, x, code);
+}
+
 /* Implement REGNO_REG_CLASS.  */
 
 enum reg_class
@@ -18383,6 +18389,10 @@ aarch64_override_options_after_change_1 (struct gcc_options *opts)
      intermediary step for the former.  */
   if (flag_mlow_precision_sqrt)
     flag_mrecip_low_precision_sqrt = true;
+
+  /* Enable unwind tables for MS */
+  if (TARGET_64BIT_MS_ABI && opts->x_flag_unwind_tables == 0)
+    opts->x_flag_unwind_tables = 1;
 }
 
 /* 'Unpack' up the internal tuning structs and update the options
@@ -24667,6 +24677,9 @@ aarch64_declare_function_name (FILE *stream, const char* name,
   /* Don't forget the type directive for ELF.  */
 #ifdef ASM_OUTPUT_TYPE_DIRECTIVE
   ASM_OUTPUT_TYPE_DIRECTIVE (stream, name, "function");
+#endif
+#ifdef SUBTARGET_ASM_UNWIND_INIT
+  SUBTARGET_ASM_UNWIND_INIT (stream);
 #endif
   ASM_OUTPUT_FUNCTION_LABEL (stream, name, fndecl);
 

gcc/config/aarch64/cygming.h

@@ -40,14 +40,9 @@ along with GCC; see the file COPYING3.  If not see
 #define SYMBOL_REF_STUBVAR_P(X) \
 	((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_STUBVAR) != 0)
 
-/* Disable SEH and declare the required SEH-related macros that are
-still needed for compilation.  */
-#undef TARGET_SEH
-#define TARGET_SEH 0
-
 #define SSE_REGNO_P(N) (gcc_unreachable (), 0)
 #define GENERAL_REGNO_P(N) (gcc_unreachable (), 0)
-#define SEH_MAX_FRAME_SIZE (gcc_unreachable (), 0)
+//#define SEH_MAX_FRAME_SIZE (gcc_unreachable (), 0)
 
 #undef TARGET_PECOFF
 #define TARGET_PECOFF 1
@@ -57,6 +52,35 @@ still needed for compilation.  */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
+
+/* Support hooks for SEH.  */
+#undef  TARGET_ASM_UNWIND_EMIT
+#define TARGET_ASM_UNWIND_EMIT  i386_pe_seh_unwind_emit
+#undef  TARGET_ASM_UNWIND_EMIT_BEFORE_INSN
+#define TARGET_ASM_UNWIND_EMIT_BEFORE_INSN  false
+// #undef  TARGET_ASM_FUNCTION_PROLOGUE
+// #define TARGET_ASM_FUNCTION_PROLOGUE aarch64_pe_seh_function_prologue
+#undef  TARGET_ASM_FUNCTION_END_PROLOGUE
+#define TARGET_ASM_FUNCTION_END_PROLOGUE  i386_pe_seh_end_prologue
+#undef  TARGET_ASM_EMIT_EXCEPT_PERSONALITY
+#define TARGET_ASM_EMIT_EXCEPT_PERSONALITY i386_pe_seh_emit_except_personality
+#undef  TARGET_ASM_INIT_SECTIONS
+#define TARGET_ASM_INIT_SECTIONS  i386_pe_seh_init_sections
+#undef  SUBTARGET_ASM_UNWIND_INIT
+#define SUBTARGET_ASM_UNWIND_INIT  i386_pe_seh_init
+// #undef  TARGET_ASM_FINAL_POSTSCAN_INSN
+// #define TARGET_ASM_FINAL_POSTSCAN_INSN aarch64_pe_seh_asm_final_postscan_insn
+
+#undef TARGET_PECOFF
+#define TARGET_PECOFF 1
+
+// #if ! defined (USE_MINGW64_LEADING_UNDERSCORES)
+// #undef USER_LABEL_PREFIX
+// #define USER_LABEL_PREFIX (TARGET_64BIT ? "" : "_")
+
+// #undef LOCAL_LABEL_PREFIX
+// #define LOCAL_LABEL_PREFIX (TARGET_64BIT ? "." : "")
+
 #include <stdbool.h>
 #ifdef __MINGW32__
 #include <stdio.h>
@@ -70,6 +94,26 @@ still needed for compilation.  */
 #define TARGET_ASM_UNIQUE_SECTION mingw_pe_unique_section
 #define TARGET_ENCODE_SECTION_INFO  mingw_pe_encode_section_info
 
+#undef TARGET_SEH
+#define TARGET_SEH  1
+
+/* SEH support */
+extern void i386_pe_seh_init (FILE *);
+extern void i386_pe_seh_end_prologue (FILE *);
+// extern void aarch64_pe_seh_function_prologue (FILE *);
+// extern void aarch64_pe_seh_cold_init (FILE *, const char *);
+extern void i386_pe_seh_unwind_emit (FILE *, rtx_insn *);
+extern void i386_pe_seh_emit_except_personality (rtx);
+extern void i386_pe_seh_init_sections (void);
+// extern void aarch64_pe_seh_asm_final_postscan_insn (FILE *stream, rtx_insn *insn, rtx*, int);
+ 
+/* In winnt */
+// extern void aarch64_print_reg (rtx, int, FILE*);
+extern void i386_pe_end_function (FILE *f, const char *, tree);
+extern void i386_pe_end_cold_function (FILE *f, const char *, tree);
+// extern void aarch64_pe_end_epilogue (FILE *file);
+// extern void aarch64_pe_begin_epilogue (FILE *file);
+
 #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P mingw_pe_valid_dllimport_attribute_p
 
 /* Output function declarations at the end of the file.  */
@@ -86,6 +130,7 @@ still needed for compilation.  */
       builtin_define ("__MSVCRT__");					\
       builtin_define ("__MINGW32__");					\
       builtin_define ("_WIN32");					\
+      builtin_define ("__SEH__");                               \
       builtin_define_std ("WIN32");					\
       builtin_define_std ("WINNT");					\
       builtin_define_with_int_value ("_INTEGRAL_MAX_BITS",		\
@@ -217,6 +262,17 @@ still needed for compilation.  */
       }								\
   } while(0)
 
+#undef ASM_DECLARE_FUNCTION_SIZE
+#define ASM_DECLARE_FUNCTION_SIZE(FILE,NAME,DECL) \
+  i386_pe_end_function (FILE, NAME, DECL)
+
+#undef ASM_DECLARE_COLD_FUNCTION_SIZE
+#define ASM_DECLARE_COLD_FUNCTION_SIZE(FILE,NAME,DECL) \
+  i386_pe_end_cold_function (FILE, NAME, DECL)
+
+// #undef  TARGET_ASM_FUNCTION_BEGIN_EPILOGUE
+// #define TARGET_ASM_FUNCTION_BEGIN_EPILOGUE aarch64_pe_begin_epilogue
+
 #define SUBTARGET_ATTRIBUTE_TABLE \
   { "selectany", 0, 0, true, false, false, false, \
     mingw_handle_selectany_attribute, NULL }
@@ -231,6 +287,10 @@ still needed for compilation.  */
 
 #define HAVE_GAS_ALIGNED_COMM 1
 
+#undef DWARF2_UNWIND_INFO
+#define DWARF2_UNWIND_INFO 0
+
+
 #undef MAX_OFILE_ALIGNMENT
 #define MAX_OFILE_ALIGNMENT (8192 * 8)
 
@@ -241,4 +301,16 @@ still needed for compilation.  */
 
 #define HAVE_64BIT_POINTERS 1
 
+/* According to Windows x64 software convention, the maximum stack allocatable
+   in the prologue is 4G - 8 bytes.  Furthermore, there is a limited set of
+   instructions allowed to adjust the stack pointer in the epilog, forcing the
+   use of frame pointer for frames larger than 2 GB.  This theorical limit
+   is reduced by 256, an over-estimated upper bound for the stack use by the
+   prologue.
+   We define only one threshold for both the prolog and the epilog.  When the
+   frame size is larger than this threshold, we allocate the area to save SSE
+   regs, then save them, and then allocate the remaining.  There is no SEH
+   unwind info for this later allocation.  */
+#define SEH_MAX_FRAME_SIZE ((2U << 30) - 256)
+
 #endif