| From 6140c2c0bb2b61e69d0da84315e0433ff3520aaa Mon Sep 17 00:00:00 2001 |
| From: "H.J. Lu" <hjl.tools@gmail.com> |
| Date: Sat, 6 Jan 2018 22:29:55 -0800 |
| Subject: [PATCH 04/12] x86: Add -mindirect-branch= |
| |
| Add -mindirect-branch= option to convert indirect call and jump to call |
| and return thunks. The default is 'keep', which keeps indirect call and |
| jump unmodified. 'thunk' converts indirect call and jump to call and |
| return thunk. 'thunk-inline' converts indirect call and jump to inlined |
| call and return thunk. 'thunk-extern' converts indirect call and jump to |
| external call and return thunk provided in a separate object file. You |
| can control this behavior for a specific function by using the function |
| attribute indirect_branch. |
| |
| 2 kinds of thunks are geneated. Memory thunk where the function address |
| is at the top of the stack: |
| |
| __x86_indirect_thunk: |
| call L2 |
| L1: |
| pause |
| lfence |
| jmp L1 |
| L2: |
| lea 8(%rsp), %rsp|lea 4(%esp), %esp |
| ret |
| |
| Indirect jmp via memory, "jmp mem", is converted to |
| |
| push memory |
| jmp __x86_indirect_thunk |
| |
| Indirect call via memory, "call mem", is converted to |
| |
| jmp L2 |
| L1: |
| push [mem] |
| jmp __x86_indirect_thunk |
| L2: |
| call L1 |
| |
| Register thunk where the function address is in a register, reg: |
| |
| __x86_indirect_thunk_reg: |
| call L2 |
| L1: |
| pause |
| lfence |
| jmp L1 |
| L2: |
| movq %reg, (%rsp)|movl %reg, (%esp) |
| ret |
| |
| where reg is one of (r|e)ax, (r|e)dx, (r|e)cx, (r|e)bx, (r|e)si, (r|e)di, |
| (r|e)bp, r8, r9, r10, r11, r12, r13, r14 and r15. |
| |
| Indirect jmp via register, "jmp reg", is converted to |
| |
| jmp __x86_indirect_thunk_reg |
| |
| Indirect call via register, "call reg", is converted to |
| |
| call __x86_indirect_thunk_reg |
| |
| gcc/ |
| |
| Backport from mainline |
| 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> |
| |
| * config/i386/i386-opts.h (indirect_branch): New. |
| * config/i386/i386-protos.h (ix86_output_indirect_jmp): Likewise. |
| * config/i386/i386.c (ix86_using_red_zone): Disallow red-zone |
| with local indirect jump when converting indirect call and jump. |
| (ix86_set_indirect_branch_type): New. |
| (ix86_set_current_function): Call ix86_set_indirect_branch_type. |
| (indirectlabelno): New. |
| (indirect_thunk_needed): Likewise. |
| (indirect_thunk_bnd_needed): Likewise. |
| (indirect_thunks_used): Likewise. |
| (indirect_thunks_bnd_used): Likewise. |
| (INDIRECT_LABEL): Likewise. |
| (indirect_thunk_name): Likewise. |
| (output_indirect_thunk): Likewise. |
| (output_indirect_thunk_function): Likewise. |
| (ix86_output_indirect_branch_via_reg): Likewise. |
| (ix86_output_indirect_branch_via_push): Likewise. |
| (ix86_output_indirect_branch): Likewise. |
| (ix86_output_indirect_jmp): Likewise. |
| (ix86_code_end): Call output_indirect_thunk_function if needed. |
| (ix86_output_call_insn): Call ix86_output_indirect_branch if |
| needed. |
| (ix86_handle_fndecl_attribute): Handle indirect_branch. |
| (ix86_attribute_table): Add indirect_branch. |
| * config/i386/i386.h (machine_function): Add indirect_branch_type |
| and has_local_indirect_jump. |
| * config/i386/i386.md (indirect_jump): Set has_local_indirect_jump |
| to true. |
| (tablejump): Likewise. |
| (*indirect_jump): Use ix86_output_indirect_jmp. |
| (*tablejump_1): Likewise. |
| (simple_return_indirect_internal): Likewise. |
| * config/i386/i386.opt (mindirect-branch=): New option. |
| (indirect_branch): New. |
| (keep): Likewise. |
| (thunk): Likewise. |
| (thunk-inline): Likewise. |
| (thunk-extern): Likewise. |
| * doc/extend.texi: Document indirect_branch function attribute. |
| * doc/invoke.texi: Document -mindirect-branch= option. |
| |
| gcc/testsuite/ |
| |
| Backport from mainline |
| 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> |
| |
| * gcc.target/i386/indirect-thunk-1.c: New test. |
| * gcc.target/i386/indirect-thunk-2.c: Likewise. |
| * gcc.target/i386/indirect-thunk-3.c: Likewise. |
| * gcc.target/i386/indirect-thunk-4.c: Likewise. |
| * gcc.target/i386/indirect-thunk-5.c: Likewise. |
| * gcc.target/i386/indirect-thunk-6.c: Likewise. |
| * gcc.target/i386/indirect-thunk-7.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-1.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-2.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-3.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-4.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-5.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-6.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-7.c: Likewise. |
| * gcc.target/i386/indirect-thunk-attr-8.c: Likewise. |
| * gcc.target/i386/indirect-thunk-bnd-1.c: Likewise. |
| * gcc.target/i386/indirect-thunk-bnd-2.c: Likewise. |
| * gcc.target/i386/indirect-thunk-bnd-3.c: Likewise. |
| * gcc.target/i386/indirect-thunk-bnd-4.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-1.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-2.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-3.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-4.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-5.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-6.c: Likewise. |
| * gcc.target/i386/indirect-thunk-extern-7.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-1.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-2.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-3.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-4.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-5.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-6.c: Likewise. |
| * gcc.target/i386/indirect-thunk-inline-7.c: Likewise. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> |
| |
| --- |
| gcc/config/i386/i386-opts.h | 13 + |
| gcc/config/i386/i386-protos.h | 1 + |
| gcc/config/i386/i386.c | 639 ++++++++++++++++++++- |
| gcc/config/i386/i386.h | 7 + |
| gcc/config/i386/i386.md | 26 +- |
| gcc/config/i386/i386.opt | 20 + |
| gcc/doc/extend.texi | 10 + |
| gcc/doc/invoke.texi | 13 +- |
| gcc/testsuite/gcc.target/i386/indirect-thunk-1.c | 20 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-2.c | 20 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-3.c | 21 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-4.c | 21 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-5.c | 17 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-6.c | 18 + |
| gcc/testsuite/gcc.target/i386/indirect-thunk-7.c | 44 ++ |
| .../gcc.target/i386/indirect-thunk-attr-1.c | 23 + |
| .../gcc.target/i386/indirect-thunk-attr-2.c | 21 + |
| .../gcc.target/i386/indirect-thunk-attr-3.c | 23 + |
| .../gcc.target/i386/indirect-thunk-attr-4.c | 22 + |
| .../gcc.target/i386/indirect-thunk-attr-5.c | 22 + |
| .../gcc.target/i386/indirect-thunk-attr-6.c | 21 + |
| .../gcc.target/i386/indirect-thunk-attr-7.c | 44 ++ |
| .../gcc.target/i386/indirect-thunk-attr-8.c | 42 ++ |
| .../gcc.target/i386/indirect-thunk-bnd-1.c | 20 + |
| .../gcc.target/i386/indirect-thunk-bnd-2.c | 21 + |
| .../gcc.target/i386/indirect-thunk-bnd-3.c | 19 + |
| .../gcc.target/i386/indirect-thunk-bnd-4.c | 20 + |
| .../gcc.target/i386/indirect-thunk-extern-1.c | 19 + |
| .../gcc.target/i386/indirect-thunk-extern-2.c | 19 + |
| .../gcc.target/i386/indirect-thunk-extern-3.c | 20 + |
| .../gcc.target/i386/indirect-thunk-extern-4.c | 20 + |
| .../gcc.target/i386/indirect-thunk-extern-5.c | 16 + |
| .../gcc.target/i386/indirect-thunk-extern-6.c | 17 + |
| .../gcc.target/i386/indirect-thunk-extern-7.c | 43 ++ |
| .../gcc.target/i386/indirect-thunk-inline-1.c | 20 + |
| .../gcc.target/i386/indirect-thunk-inline-2.c | 20 + |
| .../gcc.target/i386/indirect-thunk-inline-3.c | 21 + |
| .../gcc.target/i386/indirect-thunk-inline-4.c | 21 + |
| .../gcc.target/i386/indirect-thunk-inline-5.c | 17 + |
| .../gcc.target/i386/indirect-thunk-inline-6.c | 18 + |
| .../gcc.target/i386/indirect-thunk-inline-7.c | 44 ++ |
| 41 files changed, 1486 insertions(+), 17 deletions(-) |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-1.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-5.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-6.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c |
| create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
| |
| diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h |
| index b7f92e3..cc21152 100644 |
| --- a/gcc/config/i386/i386-opts.h |
| +++ b/gcc/config/i386/i386-opts.h |
| @@ -99,4 +99,17 @@ enum stack_protector_guard { |
| SSP_GLOBAL /* global canary */ |
| }; |
| |
| +/* This is used to mitigate variant #2 of the speculative execution |
| + vulnerabilities on x86 processors identified by CVE-2017-5715, aka |
| + Spectre. They convert indirect branches and function returns to |
| + call and return thunks to avoid speculative execution via indirect |
| + call, jmp and ret. */ |
| +enum indirect_branch { |
| + indirect_branch_unset = 0, |
| + indirect_branch_keep, |
| + indirect_branch_thunk, |
| + indirect_branch_thunk_inline, |
| + indirect_branch_thunk_extern |
| +}; |
| + |
| #endif |
| diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h |
| index ff47bc1..eca4cbf 100644 |
| --- a/gcc/config/i386/i386-protos.h |
| +++ b/gcc/config/i386/i386-protos.h |
| @@ -311,6 +311,7 @@ extern enum attr_cpu ix86_schedule; |
| #endif |
| |
| extern const char * ix86_output_call_insn (rtx_insn *insn, rtx call_op); |
| +extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p); |
| extern bool ix86_operands_ok_for_move_multiple (rtx *operands, bool load, |
| enum machine_mode mode); |
| |
| diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c |
| index 6c98f75..0b9fc4d 100644 |
| --- a/gcc/config/i386/i386.c |
| +++ b/gcc/config/i386/i386.c |
| @@ -3662,12 +3662,23 @@ make_pass_stv (gcc::context *ctxt) |
| return new pass_stv (ctxt); |
| } |
| |
| -/* Return true if a red-zone is in use. */ |
| +/* Return true if a red-zone is in use. We can't use red-zone when |
| + there are local indirect jumps, like "indirect_jump" or "tablejump", |
| + which jumps to another place in the function, since "call" in the |
| + indirect thunk pushes the return address onto stack, destroying |
| + red-zone. |
| + |
| + TODO: If we can reserve the first 2 WORDs, for PUSH and, another |
| + for CALL, in red-zone, we can allow local indirect jumps with |
| + indirect thunk. */ |
| |
| bool |
| ix86_using_red_zone (void) |
| { |
| - return TARGET_RED_ZONE && !TARGET_64BIT_MS_ABI; |
| + return (TARGET_RED_ZONE |
| + && !TARGET_64BIT_MS_ABI |
| + && (!cfun->machine->has_local_indirect_jump |
| + || cfun->machine->indirect_branch_type == indirect_branch_keep)); |
| } |
| |
| /* Return a string that documents the current -m options. The caller is |
| @@ -6350,6 +6361,37 @@ ix86_reset_previous_fndecl (void) |
| ix86_previous_fndecl = NULL_TREE; |
| } |
| |
| +/* Set the indirect_branch_type field from the function FNDECL. */ |
| + |
| +static void |
| +ix86_set_indirect_branch_type (tree fndecl) |
| +{ |
| + if (cfun->machine->indirect_branch_type == indirect_branch_unset) |
| + { |
| + tree attr = lookup_attribute ("indirect_branch", |
| + DECL_ATTRIBUTES (fndecl)); |
| + if (attr != NULL) |
| + { |
| + tree args = TREE_VALUE (attr); |
| + if (args == NULL) |
| + gcc_unreachable (); |
| + tree cst = TREE_VALUE (args); |
| + if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0) |
| + cfun->machine->indirect_branch_type = indirect_branch_keep; |
| + else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0) |
| + cfun->machine->indirect_branch_type = indirect_branch_thunk; |
| + else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0) |
| + cfun->machine->indirect_branch_type = indirect_branch_thunk_inline; |
| + else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0) |
| + cfun->machine->indirect_branch_type = indirect_branch_thunk_extern; |
| + else |
| + gcc_unreachable (); |
| + } |
| + else |
| + cfun->machine->indirect_branch_type = ix86_indirect_branch; |
| + } |
| +} |
| + |
| /* Establish appropriate back-end context for processing the function |
| FNDECL. The argument might be NULL to indicate processing at top |
| level, outside of any function scope. */ |
| @@ -6360,7 +6402,13 @@ ix86_set_current_function (tree fndecl) |
| several times in the course of compiling a function, and we don't want to |
| slow things down too much or call target_reinit when it isn't safe. */ |
| if (fndecl == ix86_previous_fndecl) |
| - return; |
| + { |
| + /* There may be 2 function bodies for the same function FNDECL, |
| + one is extern inline and one isn't. */ |
| + if (fndecl != NULL_TREE) |
| + ix86_set_indirect_branch_type (fndecl); |
| + return; |
| + } |
| |
| tree old_tree; |
| if (ix86_previous_fndecl == NULL_TREE) |
| @@ -6377,6 +6425,8 @@ ix86_set_current_function (tree fndecl) |
| return; |
| } |
| |
| + ix86_set_indirect_branch_type (fndecl); |
| + |
| tree new_tree = DECL_FUNCTION_SPECIFIC_TARGET (fndecl); |
| if (new_tree == NULL_TREE) |
| new_tree = target_option_default_node; |
| @@ -10962,6 +11012,220 @@ ix86_setup_frame_addresses (void) |
| # endif |
| #endif |
| |
| +/* Label count for call and return thunks. It is used to make unique |
| + labels in call and return thunks. */ |
| +static int indirectlabelno; |
| + |
| +/* True if call and return thunk functions are needed. */ |
| +static bool indirect_thunk_needed = false; |
| +/* True if call and return thunk functions with the BND prefix are |
| + needed. */ |
| +static bool indirect_thunk_bnd_needed = false; |
| + |
| +/* Bit masks of integer registers, which contain branch target, used |
| + by call and return thunks functions. */ |
| +static int indirect_thunks_used; |
| +/* Bit masks of integer registers, which contain branch target, used |
| + by call and return thunks functions with the BND prefix. */ |
| +static int indirect_thunks_bnd_used; |
| + |
| +#ifndef INDIRECT_LABEL |
| +# define INDIRECT_LABEL "LIND" |
| +#endif |
| + |
| +/* Fills in the label name that should be used for the indirect thunk. */ |
| + |
| +static void |
| +indirect_thunk_name (char name[32], int regno, bool need_bnd_p) |
| +{ |
| + if (USE_HIDDEN_LINKONCE) |
| + { |
| + const char *bnd = need_bnd_p ? "_bnd" : ""; |
| + if (regno >= 0) |
| + { |
| + const char *reg_prefix; |
| + if (LEGACY_INT_REGNO_P (regno)) |
| + reg_prefix = TARGET_64BIT ? "r" : "e"; |
| + else |
| + reg_prefix = ""; |
| + sprintf (name, "__x86_indirect_thunk%s_%s%s", |
| + bnd, reg_prefix, reg_names[regno]); |
| + } |
| + else |
| + sprintf (name, "__x86_indirect_thunk%s", bnd); |
| + } |
| + else |
| + { |
| + if (regno >= 0) |
| + { |
| + if (need_bnd_p) |
| + ASM_GENERATE_INTERNAL_LABEL (name, "LITBR", regno); |
| + else |
| + ASM_GENERATE_INTERNAL_LABEL (name, "LITR", regno); |
| + } |
| + else |
| + { |
| + if (need_bnd_p) |
| + ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0); |
| + else |
| + ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0); |
| + } |
| + } |
| +} |
| + |
| +/* Output a call and return thunk for indirect branch. If BND_P is |
| + true, the BND prefix is needed. If REGNO != -1, the function |
| + address is in REGNO and the call and return thunk looks like: |
| + |
| + call L2 |
| + L1: |
| + pause |
| + jmp L1 |
| + L2: |
| + mov %REG, (%sp) |
| + ret |
| + |
| + Otherwise, the function address is on the top of stack and the |
| + call and return thunk looks like: |
| + |
| + call L2 |
| + L1: |
| + pause |
| + jmp L1 |
| + L2: |
| + lea WORD_SIZE(%sp), %sp |
| + ret |
| + */ |
| + |
| +static void |
| +output_indirect_thunk (bool need_bnd_p, int regno) |
| +{ |
| + char indirectlabel1[32]; |
| + char indirectlabel2[32]; |
| + |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, INDIRECT_LABEL, |
| + indirectlabelno++); |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, INDIRECT_LABEL, |
| + indirectlabelno++); |
| + |
| + /* Call */ |
| + if (need_bnd_p) |
| + fputs ("\tbnd call\t", asm_out_file); |
| + else |
| + fputs ("\tcall\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel2); |
| + fputc ('\n', asm_out_file); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); |
| + |
| + /* Pause + lfence. */ |
| + fprintf (asm_out_file, "\tpause\n\tlfence\n"); |
| + |
| + /* Jump. */ |
| + fputs ("\tjmp\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel1); |
| + fputc ('\n', asm_out_file); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); |
| + |
| + if (regno >= 0) |
| + { |
| + /* MOV. */ |
| + rtx xops[2]; |
| + xops[0] = gen_rtx_MEM (word_mode, stack_pointer_rtx); |
| + xops[1] = gen_rtx_REG (word_mode, regno); |
| + output_asm_insn ("mov\t{%1, %0|%0, %1}", xops); |
| + } |
| + else |
| + { |
| + /* LEA. */ |
| + rtx xops[2]; |
| + xops[0] = stack_pointer_rtx; |
| + xops[1] = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD); |
| + output_asm_insn ("lea\t{%E1, %0|%0, %E1}", xops); |
| + } |
| + |
| + if (need_bnd_p) |
| + fputs ("\tbnd ret\n", asm_out_file); |
| + else |
| + fputs ("\tret\n", asm_out_file); |
| +} |
| + |
| +/* Output a funtion with a call and return thunk for indirect branch. |
| + If BND_P is true, the BND prefix is needed. If REGNO != -1, the |
| + function address is in REGNO. Otherwise, the function address is |
| + on the top of stack. */ |
| + |
| +static void |
| +output_indirect_thunk_function (bool need_bnd_p, int regno) |
| +{ |
| + char name[32]; |
| + tree decl; |
| + |
| + /* Create __x86_indirect_thunk/__x86_indirect_thunk_bnd. */ |
| + indirect_thunk_name (name, regno, need_bnd_p); |
| + decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL, |
| + get_identifier (name), |
| + build_function_type_list (void_type_node, NULL_TREE)); |
| + DECL_RESULT (decl) = build_decl (BUILTINS_LOCATION, RESULT_DECL, |
| + NULL_TREE, void_type_node); |
| + TREE_PUBLIC (decl) = 1; |
| + TREE_STATIC (decl) = 1; |
| + DECL_IGNORED_P (decl) = 1; |
| + |
| +#if TARGET_MACHO |
| + if (TARGET_MACHO) |
| + { |
| + switch_to_section (darwin_sections[picbase_thunk_section]); |
| + fputs ("\t.weak_definition\t", asm_out_file); |
| + assemble_name (asm_out_file, name); |
| + fputs ("\n\t.private_extern\t", asm_out_file); |
| + assemble_name (asm_out_file, name); |
| + putc ('\n', asm_out_file); |
| + ASM_OUTPUT_LABEL (asm_out_file, name); |
| + DECL_WEAK (decl) = 1; |
| + } |
| + else |
| +#endif |
| + if (USE_HIDDEN_LINKONCE) |
| + { |
| + cgraph_node::create (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); |
| + |
| + targetm.asm_out.unique_section (decl, 0); |
| + switch_to_section (get_named_section (decl, NULL, 0)); |
| + |
| + targetm.asm_out.globalize_label (asm_out_file, name); |
| + fputs ("\t.hidden\t", asm_out_file); |
| + assemble_name (asm_out_file, name); |
| + putc ('\n', asm_out_file); |
| + ASM_DECLARE_FUNCTION_NAME (asm_out_file, name, decl); |
| + } |
| + else |
| + { |
| + switch_to_section (text_section); |
| + ASM_OUTPUT_LABEL (asm_out_file, name); |
| + } |
| + |
| + DECL_INITIAL (decl) = make_node (BLOCK); |
| + current_function_decl = decl; |
| + allocate_struct_function (decl, false); |
| + init_function_start (decl); |
| + /* We're about to hide the function body from callees of final_* by |
| + emitting it directly; tell them we're a thunk, if they care. */ |
| + cfun->is_thunk = true; |
| + first_function_block_is_cold = false; |
| + /* Make sure unwind info is emitted for the thunk if needed. */ |
| + final_start_function (emit_barrier (), asm_out_file, 1); |
| + |
| + output_indirect_thunk (need_bnd_p, regno); |
| + |
| + final_end_function (); |
| + init_insn_lengths (); |
| + free_after_compilation (cfun); |
| + set_cfun (NULL); |
| + current_function_decl = NULL; |
| +} |
| + |
| static int pic_labels_used; |
| |
| /* Fills in the label name that should be used for a pc thunk for |
| @@ -10988,11 +11252,32 @@ ix86_code_end (void) |
| rtx xops[2]; |
| int regno; |
| |
| + if (indirect_thunk_needed) |
| + output_indirect_thunk_function (false, -1); |
| + if (indirect_thunk_bnd_needed) |
| + output_indirect_thunk_function (true, -1); |
| + |
| + for (regno = FIRST_REX_INT_REG; regno <= LAST_REX_INT_REG; regno++) |
| + { |
| + int i = regno - FIRST_REX_INT_REG + LAST_INT_REG + 1; |
| + if ((indirect_thunks_used & (1 << i))) |
| + output_indirect_thunk_function (false, regno); |
| + |
| + if ((indirect_thunks_bnd_used & (1 << i))) |
| + output_indirect_thunk_function (true, regno); |
| + } |
| + |
| for (regno = AX_REG; regno <= SP_REG; regno++) |
| { |
| char name[32]; |
| tree decl; |
| |
| + if ((indirect_thunks_used & (1 << regno))) |
| + output_indirect_thunk_function (false, regno); |
| + |
| + if ((indirect_thunks_bnd_used & (1 << regno))) |
| + output_indirect_thunk_function (true, regno); |
| + |
| if (!(pic_labels_used & (1 << regno))) |
| continue; |
| |
| @@ -27369,12 +27654,292 @@ ix86_nopic_noplt_attribute_p (rtx call_op) |
| return false; |
| } |
| |
| +/* Output indirect branch via a call and return thunk. CALL_OP is a |
| + register which contains the branch target. XASM is the assembly |
| + template for CALL_OP. Branch is a tail call if SIBCALL_P is true. |
| + A normal call is converted to: |
| + |
| + call __x86_indirect_thunk_reg |
| + |
| + and a tail call is converted to: |
| + |
| + jmp __x86_indirect_thunk_reg |
| + */ |
| + |
| +static void |
| +ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p) |
| +{ |
| + char thunk_name_buf[32]; |
| + char *thunk_name; |
| + bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn); |
| + int regno = REGNO (call_op); |
| + |
| + if (cfun->machine->indirect_branch_type |
| + != indirect_branch_thunk_inline) |
| + { |
| + if (cfun->machine->indirect_branch_type == indirect_branch_thunk) |
| + { |
| + int i = regno; |
| + if (i >= FIRST_REX_INT_REG) |
| + i -= (FIRST_REX_INT_REG - LAST_INT_REG - 1); |
| + if (need_bnd_p) |
| + indirect_thunks_bnd_used |= 1 << i; |
| + else |
| + indirect_thunks_used |= 1 << i; |
| + } |
| + indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); |
| + thunk_name = thunk_name_buf; |
| + } |
| + else |
| + thunk_name = NULL; |
| + |
| + if (sibcall_p) |
| + { |
| + if (thunk_name != NULL) |
| + { |
| + if (need_bnd_p) |
| + fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); |
| + else |
| + fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); |
| + } |
| + else |
| + output_indirect_thunk (need_bnd_p, regno); |
| + } |
| + else |
| + { |
| + if (thunk_name != NULL) |
| + { |
| + if (need_bnd_p) |
| + fprintf (asm_out_file, "\tbnd call\t%s\n", thunk_name); |
| + else |
| + fprintf (asm_out_file, "\tcall\t%s\n", thunk_name); |
| + return; |
| + } |
| + |
| + char indirectlabel1[32]; |
| + char indirectlabel2[32]; |
| + |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, |
| + INDIRECT_LABEL, |
| + indirectlabelno++); |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, |
| + INDIRECT_LABEL, |
| + indirectlabelno++); |
| + |
| + /* Jump. */ |
| + if (need_bnd_p) |
| + fputs ("\tbnd jmp\t", asm_out_file); |
| + else |
| + fputs ("\tjmp\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel2); |
| + fputc ('\n', asm_out_file); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); |
| + |
| + if (thunk_name != NULL) |
| + { |
| + if (need_bnd_p) |
| + fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); |
| + else |
| + fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); |
| + } |
| + else |
| + output_indirect_thunk (need_bnd_p, regno); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); |
| + |
| + /* Call. */ |
| + if (need_bnd_p) |
| + fputs ("\tbnd call\t", asm_out_file); |
| + else |
| + fputs ("\tcall\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel1); |
| + fputc ('\n', asm_out_file); |
| + } |
| +} |
| + |
| +/* Output indirect branch via a call and return thunk. CALL_OP is |
| + the branch target. XASM is the assembly template for CALL_OP. |
| + Branch is a tail call if SIBCALL_P is true. A normal call is |
| + converted to: |
| + |
| + jmp L2 |
| + L1: |
| + push CALL_OP |
| + jmp __x86_indirect_thunk |
| + L2: |
| + call L1 |
| + |
| + and a tail call is converted to: |
| + |
| + push CALL_OP |
| + jmp __x86_indirect_thunk |
| + */ |
| + |
| +static void |
| +ix86_output_indirect_branch_via_push (rtx call_op, const char *xasm, |
| + bool sibcall_p) |
| +{ |
| + char thunk_name_buf[32]; |
| + char *thunk_name; |
| + char push_buf[64]; |
| + bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn); |
| + int regno = -1; |
| + |
| + if (cfun->machine->indirect_branch_type |
| + != indirect_branch_thunk_inline) |
| + { |
| + if (cfun->machine->indirect_branch_type == indirect_branch_thunk) |
| + { |
| + if (need_bnd_p) |
| + indirect_thunk_bnd_needed = true; |
| + else |
| + indirect_thunk_needed = true; |
| + } |
| + indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); |
| + thunk_name = thunk_name_buf; |
| + } |
| + else |
| + thunk_name = NULL; |
| + |
| + snprintf (push_buf, sizeof (push_buf), "push{%c}\t%s", |
| + TARGET_64BIT ? 'q' : 'l', xasm); |
| + |
| + if (sibcall_p) |
| + { |
| + output_asm_insn (push_buf, &call_op); |
| + if (thunk_name != NULL) |
| + { |
| + if (need_bnd_p) |
| + fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); |
| + else |
| + fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); |
| + } |
| + else |
| + output_indirect_thunk (need_bnd_p, regno); |
| + } |
| + else |
| + { |
| + char indirectlabel1[32]; |
| + char indirectlabel2[32]; |
| + |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, |
| + INDIRECT_LABEL, |
| + indirectlabelno++); |
| + ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, |
| + INDIRECT_LABEL, |
| + indirectlabelno++); |
| + |
| + /* Jump. */ |
| + if (need_bnd_p) |
| + fputs ("\tbnd jmp\t", asm_out_file); |
| + else |
| + fputs ("\tjmp\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel2); |
| + fputc ('\n', asm_out_file); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); |
| + |
| + /* An external function may be called via GOT, instead of PLT. */ |
| + if (MEM_P (call_op)) |
| + { |
| + struct ix86_address parts; |
| + rtx addr = XEXP (call_op, 0); |
| + if (ix86_decompose_address (addr, &parts) |
| + && parts.base == stack_pointer_rtx) |
| + { |
| + /* Since call will adjust stack by -UNITS_PER_WORD, |
| + we must convert "disp(stack, index, scale)" to |
| + "disp+UNITS_PER_WORD(stack, index, scale)". */ |
| + if (parts.index) |
| + { |
| + addr = gen_rtx_MULT (Pmode, parts.index, |
| + GEN_INT (parts.scale)); |
| + addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx, |
| + addr); |
| + } |
| + else |
| + addr = stack_pointer_rtx; |
| + |
| + rtx disp; |
| + if (parts.disp != NULL_RTX) |
| + disp = plus_constant (Pmode, parts.disp, |
| + UNITS_PER_WORD); |
| + else |
| + disp = GEN_INT (UNITS_PER_WORD); |
| + |
| + addr = gen_rtx_PLUS (Pmode, addr, disp); |
| + call_op = gen_rtx_MEM (GET_MODE (call_op), addr); |
| + } |
| + } |
| + |
| + output_asm_insn (push_buf, &call_op); |
| + |
| + if (thunk_name != NULL) |
| + { |
| + if (need_bnd_p) |
| + fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); |
| + else |
| + fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); |
| + } |
| + else |
| + output_indirect_thunk (need_bnd_p, regno); |
| + |
| + ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); |
| + |
| + /* Call. */ |
| + if (need_bnd_p) |
| + fputs ("\tbnd call\t", asm_out_file); |
| + else |
| + fputs ("\tcall\t", asm_out_file); |
| + assemble_name_raw (asm_out_file, indirectlabel1); |
| + fputc ('\n', asm_out_file); |
| + } |
| +} |
| + |
| +/* Output indirect branch via a call and return thunk. CALL_OP is |
| + the branch target. XASM is the assembly template for CALL_OP. |
| + Branch is a tail call if SIBCALL_P is true. */ |
| + |
| +static void |
| +ix86_output_indirect_branch (rtx call_op, const char *xasm, |
| + bool sibcall_p) |
| +{ |
| + if (REG_P (call_op)) |
| + ix86_output_indirect_branch_via_reg (call_op, sibcall_p); |
| + else |
| + ix86_output_indirect_branch_via_push (call_op, xasm, sibcall_p); |
| +} |
| +/* Output indirect jump. CALL_OP is the jump target. Jump is a |
| + function return if RET_P is true. */ |
| + |
| +const char * |
| +ix86_output_indirect_jmp (rtx call_op, bool ret_p) |
| +{ |
| + if (cfun->machine->indirect_branch_type != indirect_branch_keep) |
| + { |
| + /* We can't have red-zone if this isn't a function return since |
| + "call" in the indirect thunk pushes the return address onto |
| + stack, destroying red-zone. */ |
| + if (!ret_p && ix86_red_zone_size != 0) |
| + gcc_unreachable (); |
| + |
| + ix86_output_indirect_branch (call_op, "%0", true); |
| + return ""; |
| + } |
| + else |
| + return "%!jmp\t%A0"; |
| +} |
| + |
| /* Output the assembly for a call instruction. */ |
| |
| const char * |
| ix86_output_call_insn (rtx_insn *insn, rtx call_op) |
| { |
| bool direct_p = constant_call_address_operand (call_op, VOIDmode); |
| + bool output_indirect_p |
| + = (!TARGET_SEH |
| + && cfun->machine->indirect_branch_type != indirect_branch_keep); |
| bool seh_nop_p = false; |
| const char *xasm; |
| |
| @@ -27383,7 +27948,13 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) |
| if (direct_p) |
| { |
| if (ix86_nopic_noplt_attribute_p (call_op)) |
| - xasm = "%!jmp\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + { |
| + direct_p = false; |
| + if (output_indirect_p) |
| + xasm = "{%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + else |
| + xasm = "%!jmp\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + } |
| else |
| xasm = "%!jmp\t%P0"; |
| } |
| @@ -27392,9 +27963,17 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) |
| else if (TARGET_SEH) |
| xasm = "%!rex.W jmp\t%A0"; |
| else |
| - xasm = "%!jmp\t%A0"; |
| + { |
| + if (output_indirect_p) |
| + xasm = "%0"; |
| + else |
| + xasm = "%!jmp\t%A0"; |
| + } |
| |
| - output_asm_insn (xasm, &call_op); |
| + if (output_indirect_p && !direct_p) |
| + ix86_output_indirect_branch (call_op, xasm, true); |
| + else |
| + output_asm_insn (xasm, &call_op); |
| return ""; |
| } |
| |
| @@ -27431,14 +28010,28 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) |
| if (direct_p) |
| { |
| if (ix86_nopic_noplt_attribute_p (call_op)) |
| - xasm = "%!call\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + { |
| + direct_p = false; |
| + if (output_indirect_p) |
| + xasm = "{%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + else |
| + xasm = "%!call\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; |
| + } |
| else |
| xasm = "%!call\t%P0"; |
| } |
| else |
| - xasm = "%!call\t%A0"; |
| + { |
| + if (output_indirect_p) |
| + xasm = "%0"; |
| + else |
| + xasm = "%!call\t%A0"; |
| + } |
| |
| - output_asm_insn (xasm, &call_op); |
| + if (output_indirect_p && !direct_p) |
| + ix86_output_indirect_branch (call_op, xasm, false); |
| + else |
| + output_asm_insn (xasm, &call_op); |
| |
| if (seh_nop_p) |
| return "nop"; |
| @@ -44836,7 +45429,7 @@ ix86_handle_struct_attribute (tree *node, tree name, tree, int, |
| } |
| |
| static tree |
| -ix86_handle_fndecl_attribute (tree *node, tree name, tree, int, |
| +ix86_handle_fndecl_attribute (tree *node, tree name, tree args, int, |
| bool *no_add_attrs) |
| { |
| if (TREE_CODE (*node) != FUNCTION_DECL) |
| @@ -44845,6 +45438,29 @@ ix86_handle_fndecl_attribute (tree *node, tree name, tree, int, |
| name); |
| *no_add_attrs = true; |
| } |
| + |
| + if (is_attribute_p ("indirect_branch", name)) |
| + { |
| + tree cst = TREE_VALUE (args); |
| + if (TREE_CODE (cst) != STRING_CST) |
| + { |
| + warning (OPT_Wattributes, |
| + "%qE attribute requires a string constant argument", |
| + name); |
| + *no_add_attrs = true; |
| + } |
| + else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0 |
| + && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0 |
| + && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0 |
| + && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0) |
| + { |
| + warning (OPT_Wattributes, |
| + "argument to %qE attribute is not " |
| + "(keep|thunk|thunk-inline|thunk-extern)", name); |
| + *no_add_attrs = true; |
| + } |
| + } |
| + |
| return NULL_TREE; |
| } |
| |
| @@ -49072,6 +49688,9 @@ static const struct attribute_spec ix86_attribute_table[] = |
| false }, |
| { "callee_pop_aggregate_return", 1, 1, false, true, true, |
| ix86_handle_callee_pop_aggregate_return, true }, |
| + { "indirect_branch", 1, 1, true, false, false, |
| + ix86_handle_fndecl_attribute, false }, |
| + |
| /* End element. */ |
| { NULL, 0, 0, false, false, false, NULL, false } |
| }; |
| diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h |
| index 5414416..9dccdb0 100644 |
| --- a/gcc/config/i386/i386.h |
| +++ b/gcc/config/i386/i386.h |
| @@ -2572,6 +2572,13 @@ struct GTY(()) machine_function { |
| /* If true, it is safe to not save/restore DRAP register. */ |
| BOOL_BITFIELD no_drap_save_restore : 1; |
| |
| + /* How to generate indirec branch. */ |
| + ENUM_BITFIELD(indirect_branch) indirect_branch_type : 3; |
| + |
| + /* If true, the current function has local indirect jumps, like |
| + "indirect_jump" or "tablejump". */ |
| + BOOL_BITFIELD has_local_indirect_jump : 1; |
| + |
| /* If true, there is register available for argument passing. This |
| is used only in ix86_function_ok_for_sibcall by 32-bit to determine |
| if there is scratch register available for indirect sibcall. In |
| diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md |
| index d2bfe31..153e162 100644 |
| --- a/gcc/config/i386/i386.md |
| +++ b/gcc/config/i386/i386.md |
| @@ -11807,13 +11807,18 @@ |
| { |
| if (TARGET_X32) |
| operands[0] = convert_memory_address (word_mode, operands[0]); |
| + cfun->machine->has_local_indirect_jump = true; |
| }) |
| |
| (define_insn "*indirect_jump" |
| [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw"))] |
| "" |
| - "%!jmp\t%A0" |
| - [(set_attr "type" "ibr") |
| + "* return ix86_output_indirect_jmp (operands[0], false);" |
| + [(set (attr "type") |
| + (if_then_else (match_test "(cfun->machine->indirect_branch_type |
| + != indirect_branch_keep)") |
| + (const_string "multi") |
| + (const_string "ibr"))) |
| (set_attr "length_immediate" "0") |
| (set_attr "maybe_prefix_bnd" "1")]) |
| |
| @@ -11856,14 +11861,19 @@ |
| |
| if (TARGET_X32) |
| operands[0] = convert_memory_address (word_mode, operands[0]); |
| + cfun->machine->has_local_indirect_jump = true; |
| }) |
| |
| (define_insn "*tablejump_1" |
| [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw")) |
| (use (label_ref (match_operand 1)))] |
| "" |
| - "%!jmp\t%A0" |
| - [(set_attr "type" "ibr") |
| + "* return ix86_output_indirect_jmp (operands[0], false);" |
| + [(set (attr "type") |
| + (if_then_else (match_test "(cfun->machine->indirect_branch_type |
| + != indirect_branch_keep)") |
| + (const_string "multi") |
| + (const_string "ibr"))) |
| (set_attr "length_immediate" "0") |
| (set_attr "maybe_prefix_bnd" "1")]) |
| |
| @@ -12520,8 +12530,12 @@ |
| [(simple_return) |
| (use (match_operand:SI 0 "register_operand" "r"))] |
| "reload_completed" |
| - "%!jmp\t%A0" |
| - [(set_attr "type" "ibr") |
| + "* return ix86_output_indirect_jmp (operands[0], true);" |
| + [(set (attr "type") |
| + (if_then_else (match_test "(cfun->machine->indirect_branch_type |
| + != indirect_branch_keep)") |
| + (const_string "multi") |
| + (const_string "ibr"))) |
| (set_attr "length_immediate" "0") |
| (set_attr "maybe_prefix_bnd" "1")]) |
| |
| diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt |
| index f304b62..5ffa334 100644 |
| --- a/gcc/config/i386/i386.opt |
| +++ b/gcc/config/i386/i386.opt |
| @@ -897,3 +897,23 @@ Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL) |
| mmitigate-rop |
| Target Var(flag_mitigate_rop) Init(0) |
| Attempt to avoid generating instruction sequences containing ret bytes. |
| + |
| +mindirect-branch= |
| +Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep) |
| +Convert indirect call and jump to call and return thunks. |
| + |
| +Enum |
| +Name(indirect_branch) Type(enum indirect_branch) |
| +Known indirect branch choices (for use with the -mindirect-branch= option): |
| + |
| +EnumValue |
| +Enum(indirect_branch) String(keep) Value(indirect_branch_keep) |
| + |
| +EnumValue |
| +Enum(indirect_branch) String(thunk) Value(indirect_branch_thunk) |
| + |
| +EnumValue |
| +Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) |
| + |
| +EnumValue |
| +Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) |
| diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi |
| index 8cc4f7e..8668dae 100644 |
| --- a/gcc/doc/extend.texi |
| +++ b/gcc/doc/extend.texi |
| @@ -5419,6 +5419,16 @@ Specify which floating-point unit to use. You must specify the |
| @code{target("fpmath=sse,387")} option as |
| @code{target("fpmath=sse+387")} because the comma would separate |
| different options. |
| + |
| +@item indirect_branch("@var{choice}") |
| +@cindex @code{indirect_branch} function attribute, x86 |
| +On x86 targets, the @code{indirect_branch} attribute causes the compiler |
| +to convert indirect call and jump with @var{choice}. @samp{keep} |
| +keeps indirect call and jump unmodified. @samp{thunk} converts indirect |
| +call and jump to call and return thunk. @samp{thunk-inline} converts |
| +indirect call and jump to inlined call and return thunk. |
| +@samp{thunk-extern} converts indirect call and jump to external call |
| +and return thunk provided in a separate object file. |
| @end table |
| |
| On the x86, the inliner does not inline a |
| diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi |
| index b066f7b..ff9a194 100644 |
| --- a/gcc/doc/invoke.texi |
| +++ b/gcc/doc/invoke.texi |
| @@ -1169,7 +1169,7 @@ See RS/6000 and PowerPC Options. |
| -msse2avx -mfentry -mrecord-mcount -mnop-mcount -m8bit-idiv @gol |
| -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol |
| -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol |
| --mmitigate-rop} |
| +-mmitigate-rop -mindirect-branch=@var{choice}} |
| |
| @emph{x86 Windows Options} |
| @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol |
| @@ -24218,6 +24218,17 @@ opcodes, to mitigate against certain forms of attack. At the moment, |
| this option is limited in what it can do and should not be relied |
| on to provide serious protection. |
| |
| +@item -mindirect-branch=@var{choice} |
| +@opindex -mindirect-branch |
| +Convert indirect call and jump with @var{choice}. The default is |
| +@samp{keep}, which keeps indirect call and jump unmodified. |
| +@samp{thunk} converts indirect call and jump to call and return thunk. |
| +@samp{thunk-inline} converts indirect call and jump to inlined call |
| +and return thunk. @samp{thunk-extern} converts indirect call and jump |
| +to external call and return thunk provided in a separate object file. |
| +You can control this behavior for a specific function by using the |
| +function attribute @code{indirect_branch}. @xref{Function Attributes}. |
| + |
| @end table |
| |
| These @samp{-m} switches are supported in addition to the above |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c |
| new file mode 100644 |
| index 0000000..d983e1c |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
| new file mode 100644 |
| index 0000000..58f09b4 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
| new file mode 100644 |
| index 0000000..f20d35c |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
| new file mode 100644 |
| index 0000000..0eff8fb |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-5.c |
| new file mode 100644 |
| index 0000000..a25b20d |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-5.c |
| @@ -0,0 +1,17 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk" } */ |
| + |
| +extern void bar (void); |
| + |
| +void |
| +foo (void) |
| +{ |
| + bar (); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-6.c |
| new file mode 100644 |
| index 0000000..cff114a |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-6.c |
| @@ -0,0 +1,18 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk" } */ |
| + |
| +extern void bar (void); |
| + |
| +int |
| +foo (void) |
| +{ |
| + bar (); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
| new file mode 100644 |
| index 0000000..afdb600 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
| @@ -0,0 +1,44 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +void func0 (void); |
| +void func1 (void); |
| +void func2 (void); |
| +void func3 (void); |
| +void func4 (void); |
| +void func4 (void); |
| +void func5 (void); |
| + |
| +void |
| +bar (int i) |
| +{ |
| + switch (i) |
| + { |
| + default: |
| + func0 (); |
| + break; |
| + case 1: |
| + func1 (); |
| + break; |
| + case 2: |
| + func2 (); |
| + break; |
| + case 3: |
| + func3 (); |
| + break; |
| + case 4: |
| + func4 (); |
| + break; |
| + case 5: |
| + func5 (); |
| + break; |
| + } |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
| new file mode 100644 |
| index 0000000..d64d978 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
| @@ -0,0 +1,23 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +extern void male_indirect_jump (long) |
| + __attribute__ ((indirect_branch("thunk"))); |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
| new file mode 100644 |
| index 0000000..9306745 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +__attribute__ ((indirect_branch("thunk"))) |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
| new file mode 100644 |
| index 0000000..97744d6 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
| @@ -0,0 +1,23 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| +extern int male_indirect_jump (long) |
| + __attribute__ ((indirect_branch("thunk-inline"))); |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
| new file mode 100644 |
| index 0000000..bfce3ea |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
| @@ -0,0 +1,22 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +__attribute__ ((indirect_branch("thunk-inline"))) |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
| new file mode 100644 |
| index 0000000..0833606 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
| @@ -0,0 +1,22 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| +extern int male_indirect_jump (long) |
| + __attribute__ ((indirect_branch("thunk-extern"))); |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
| new file mode 100644 |
| index 0000000..2eba0fb |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +__attribute__ ((indirect_branch("thunk-extern"))) |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
| new file mode 100644 |
| index 0000000..f58427e |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
| @@ -0,0 +1,44 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -fno-pic" } */ |
| + |
| +void func0 (void); |
| +void func1 (void); |
| +void func2 (void); |
| +void func3 (void); |
| +void func4 (void); |
| +void func4 (void); |
| +void func5 (void); |
| + |
| +__attribute__ ((indirect_branch("thunk-extern"))) |
| +void |
| +bar (int i) |
| +{ |
| + switch (i) |
| + { |
| + default: |
| + func0 (); |
| + break; |
| + case 1: |
| + func1 (); |
| + break; |
| + case 2: |
| + func2 (); |
| + break; |
| + case 3: |
| + func3 (); |
| + break; |
| + case 4: |
| + func4 (); |
| + break; |
| + case 5: |
| + func5 (); |
| + break; |
| + } |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c |
| new file mode 100644 |
| index 0000000..564ed39 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c |
| @@ -0,0 +1,42 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */ |
| + |
| +void func0 (void); |
| +void func1 (void); |
| +void func2 (void); |
| +void func3 (void); |
| +void func4 (void); |
| +void func4 (void); |
| +void func5 (void); |
| + |
| +__attribute__ ((indirect_branch("keep"))) |
| +void |
| +bar (int i) |
| +{ |
| + switch (i) |
| + { |
| + default: |
| + func0 (); |
| + break; |
| + case 1: |
| + func1 (); |
| + break; |
| + case 2: |
| + func2 (); |
| + break; |
| + case 3: |
| + func3 (); |
| + break; |
| + case 4: |
| + func4 (); |
| + break; |
| + case 5: |
| + func5 (); |
| + break; |
| + } |
| +} |
| + |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c |
| new file mode 100644 |
| index 0000000..50fbee2 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-1.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile { target { ! x32 } } } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */ |
| + |
| +void (*dispatch) (char *); |
| +char buf[10]; |
| + |
| +void |
| +foo (void) |
| +{ |
| + dispatch (buf); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd ret" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c |
| new file mode 100644 |
| index 0000000..2976e67 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-2.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile { target { ! x32 } } } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fno-pic" } */ |
| + |
| +void (*dispatch) (char *); |
| +char buf[10]; |
| + |
| +int |
| +foo (void) |
| +{ |
| + dispatch (buf); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "pushq\[ \t\]%rax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd ret" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c |
| new file mode 100644 |
| index 0000000..da4bc98 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-3.c |
| @@ -0,0 +1,19 @@ |
| +/* { dg-do compile { target { *-*-linux* && { ! x32 } } } } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fpic -fno-plt" } */ |
| + |
| +void bar (char *); |
| +char buf[10]; |
| + |
| +void |
| +foo (void) |
| +{ |
| + bar (buf); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk_bnd" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "bnd ret" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c |
| new file mode 100644 |
| index 0000000..c64d12e |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-bnd-4.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile { target { *-*-linux* && { ! x32 } } } } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk -fcheck-pointer-bounds -mmpx -fpic -fno-plt" } */ |
| + |
| +void bar (char *); |
| +char buf[10]; |
| + |
| +int |
| +foo (void) |
| +{ |
| + bar (buf); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler "bnd jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-times "bnd call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler "bnd ret" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
| new file mode 100644 |
| index 0000000..49f27b4 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
| @@ -0,0 +1,19 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
| new file mode 100644 |
| index 0000000..a1e3eb6 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
| @@ -0,0 +1,19 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
| new file mode 100644 |
| index 0000000..395634e |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
| new file mode 100644 |
| index 0000000..fd3f633 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c |
| new file mode 100644 |
| index 0000000..ba2f92b |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-5.c |
| @@ -0,0 +1,16 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk-extern" } */ |
| + |
| +extern void bar (void); |
| + |
| +void |
| +foo (void) |
| +{ |
| + bar (); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c |
| new file mode 100644 |
| index 0000000..0c5a2d4 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-6.c |
| @@ -0,0 +1,17 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk-extern" } */ |
| + |
| +extern void bar (void); |
| + |
| +int |
| +foo (void) |
| +{ |
| + bar (); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
| new file mode 100644 |
| index 0000000..6652523 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
| @@ -0,0 +1,43 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */ |
| + |
| +void func0 (void); |
| +void func1 (void); |
| +void func2 (void); |
| +void func3 (void); |
| +void func4 (void); |
| +void func4 (void); |
| +void func5 (void); |
| + |
| +void |
| +bar (int i) |
| +{ |
| + switch (i) |
| + { |
| + default: |
| + func0 (); |
| + break; |
| + case 1: |
| + func1 (); |
| + break; |
| + case 2: |
| + func2 (); |
| + break; |
| + case 3: |
| + func3 (); |
| + break; |
| + case 4: |
| + func4 (); |
| + break; |
| + case 5: |
| + func5 (); |
| + break; |
| + } |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */ |
| +/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
| new file mode 100644 |
| index 0000000..68c0ff7 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
| new file mode 100644 |
| index 0000000..e2da1fc |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
| @@ -0,0 +1,20 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +void |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
| new file mode 100644 |
| index 0000000..244fec7 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch(offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times {\tpause} 1 } } */ |
| +/* { dg-final { scan-assembler-times {\tlfence} 1 } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
| new file mode 100644 |
| index 0000000..107ebe3 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
| @@ -0,0 +1,21 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */ |
| + |
| +typedef void (*dispatch_t)(long offset); |
| + |
| +dispatch_t dispatch[256]; |
| + |
| +int |
| +male_indirect_jump (long offset) |
| +{ |
| + dispatch[offset](offset); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times {\tpause} 1 } } */ |
| +/* { dg-final { scan-assembler-times {\tlfence} 1 } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c |
| new file mode 100644 |
| index 0000000..17b04ef |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-5.c |
| @@ -0,0 +1,17 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk-inline" } */ |
| + |
| +extern void bar (void); |
| + |
| +void |
| +foo (void) |
| +{ |
| + bar (); |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c |
| new file mode 100644 |
| index 0000000..d9eb112 |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-6.c |
| @@ -0,0 +1,18 @@ |
| +/* { dg-do compile { target *-*-linux* } } */ |
| +/* { dg-options "-O2 -fpic -fno-plt -mindirect-branch=thunk-inline" } */ |
| + |
| +extern void bar (void); |
| + |
| +int |
| +foo (void) |
| +{ |
| + bar (); |
| + return 0; |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*bar@GOT" } } */ |
| +/* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */ |
| +/* { dg-final { scan-assembler-times {\tpause} 1 } } */ |
| +/* { dg-final { scan-assembler-times {\tlfence} 1 } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
| new file mode 100644 |
| index 0000000..d02b1dc |
| --- /dev/null |
| +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
| @@ -0,0 +1,44 @@ |
| +/* { dg-do compile } */ |
| +/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */ |
| + |
| +void func0 (void); |
| +void func1 (void); |
| +void func2 (void); |
| +void func3 (void); |
| +void func4 (void); |
| +void func4 (void); |
| +void func5 (void); |
| + |
| +void |
| +bar (int i) |
| +{ |
| + switch (i) |
| + { |
| + default: |
| + func0 (); |
| + break; |
| + case 1: |
| + func1 (); |
| + break; |
| + case 2: |
| + func2 (); |
| + break; |
| + case 3: |
| + func3 (); |
| + break; |
| + case 4: |
| + func4 (); |
| + break; |
| + case 5: |
| + func5 (); |
| + break; |
| + } |
| +} |
| + |
| +/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */ |
| +/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */ |
| +/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
| +/* { dg-final { scan-assembler {\tpause} } } */ |
| +/* { dg-final { scan-assembler {\tlfence} } } */ |
| +/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
| -- |
| 2.7.4 |
| |