You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
521 lines
23 KiB
521 lines
23 KiB
commit 94695137d1ea3c094dd37ab5b73d66b09639f3f4 |
|
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> |
|
Date: Tue Jan 16 11:17:49 2018 +0000 |
|
|
|
HJ patch #3 |
|
|
|
diff --git a/gcc/config/i386/constraints.md b/gcc/config/i386/constraints.md |
|
index d567fd7..43faabb 100644 |
|
--- a/gcc/config/i386/constraints.md |
|
+++ b/gcc/config/i386/constraints.md |
|
@@ -135,7 +135,8 @@ |
|
|
|
(define_constraint "w" |
|
"@internal Call memory operand." |
|
- (and (not (match_test "TARGET_X32")) |
|
+ (and (not (match_test "ix86_indirect_branch_register")) |
|
+ (not (match_test "TARGET_X32")) |
|
(match_operand 0 "memory_operand"))) |
|
|
|
;; Integer constant constraints. |
|
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md |
|
index ef16cf5..228f8f6 100644 |
|
--- a/gcc/config/i386/i386.md |
|
+++ b/gcc/config/i386/i386.md |
|
@@ -11274,7 +11274,7 @@ |
|
[(set (pc) (match_operand 0 "indirect_branch_operand"))] |
|
"" |
|
{ |
|
- if (TARGET_X32) |
|
+ if (TARGET_X32 || ix86_indirect_branch_register) |
|
operands[0] = convert_memory_address (word_mode, operands[0]); |
|
cfun->machine->has_local_indirect_jump = true; |
|
}) |
|
@@ -11327,7 +11327,7 @@ |
|
OPTAB_DIRECT); |
|
} |
|
|
|
- if (TARGET_X32) |
|
+ if (TARGET_X32 || ix86_indirect_branch_register) |
|
operands[0] = convert_memory_address (word_mode, operands[0]); |
|
cfun->machine->has_local_indirect_jump = true; |
|
}) |
|
@@ -11514,7 +11514,7 @@ |
|
}) |
|
|
|
(define_insn "*call_pop" |
|
- [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm")) |
|
+ [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lwz")) |
|
(match_operand 1)) |
|
(set (reg:SI SP_REG) |
|
(plus:SI (reg:SI SP_REG) |
|
@@ -11612,7 +11612,7 @@ |
|
|
|
(define_insn "*call_value_pop" |
|
[(set (match_operand 0) |
|
- (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm")) |
|
+ (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lwz")) |
|
(match_operand 2))) |
|
(set (reg:SI SP_REG) |
|
(plus:SI (reg:SI SP_REG) |
|
diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt |
|
index 9dfa2cb..0a8ae8f 100644 |
|
--- a/gcc/config/i386/i386.opt |
|
+++ b/gcc/config/i386/i386.opt |
|
@@ -654,3 +654,7 @@ Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) |
|
|
|
EnumValue |
|
Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) |
|
+ |
|
+mindirect-branch-register |
|
+Target Report Var(ix86_indirect_branch_register) Init(0) |
|
+Force indirect call and jump via register. |
|
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md |
|
index 61614e1..6c7a593 100644 |
|
--- a/gcc/config/i386/predicates.md |
|
+++ b/gcc/config/i386/predicates.md |
|
@@ -540,7 +540,8 @@ |
|
;; Test for a valid operand for indirect branch. |
|
(define_predicate "indirect_branch_operand" |
|
(ior (match_operand 0 "register_operand") |
|
- (and (not (match_test "TARGET_X32")) |
|
+ (and (not (match_test "ix86_indirect_branch_register")) |
|
+ (not (match_test "TARGET_X32")) |
|
(match_operand 0 "memory_operand")))) |
|
|
|
;; Test for a valid operand for a call instruction. |
|
@@ -549,8 +550,9 @@ |
|
(ior (match_test "constant_call_address_operand |
|
(op, mode == VOIDmode ? mode : Pmode)") |
|
(match_operand 0 "call_register_no_elim_operand") |
|
- (and (not (match_test "TARGET_X32")) |
|
- (match_operand 0 "memory_operand")))) |
|
+ (and (not (match_test "ix86_indirect_branch_register")) |
|
+ (and (not (match_test "TARGET_X32")) |
|
+ (match_operand 0 "memory_operand"))))) |
|
|
|
;; Similarly, but for tail calls, in which we cannot allow memory references. |
|
(define_special_predicate "sibcall_insn_operand" |
|
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi |
|
index 5acd23a..4a365c7 100644 |
|
--- a/gcc/doc/invoke.texi |
|
+++ b/gcc/doc/invoke.texi |
|
@@ -658,7 +658,8 @@ Objective-C and Objective-C++ Dialects}. |
|
-m32 -m64 -mx32 -mlarge-data-threshold=@var{num} @gol |
|
-msse2avx -mfentry -m8bit-idiv @gol |
|
-mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol |
|
--mindirect-branch=@var{choice} -mfunction-return==@var{choice}} |
|
+-mindirect-branch=@var{choice} -mfunction-return==@var{choice} |
|
+-mindirect-branch-register} |
|
|
|
@emph{i386 and x86-64 Windows Options} |
|
@gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol |
|
@@ -14669,6 +14670,10 @@ object file. You can control this behavior for a specific function by |
|
using the function attribute @code{function_return}. |
|
@xref{Function Attributes}. |
|
|
|
+@item -mindirect-branch-register |
|
+@opindex -mindirect-branch-register |
|
+Force indirect call and jump via register. |
|
+ |
|
@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 |
|
index 034b4cc..321db77 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
|
index e0c57cb..d584516 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
|
index 3c0d4c3..9e24a38 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
|
index 14d4ef6..127b5d9 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
|
index bc6b47a..17c2d0f 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
void func0 (void); |
|
void func1 (void); |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
|
index 7c45142..cd7e8d7 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
|
index 9eebc84..4dbd7a5 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
|
index f938db0..4aeec18 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
|
index 4e58599..ac0e599 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
|
index b8d5024..573cf1e 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
|
index 455adab..b2b37fc 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
|
index 4595b84..4a43e19 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic" } */ |
|
|
|
void func0 (void); |
|
void func1 (void); |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
|
index f424181..72de88e 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
|
index ac54868..d4137b3 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
|
index 06ebf1c..d9964c2 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
|
index 1c8f944..d4dca4d 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
|
index 86e9fd1..aece938 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
void func0 (void); |
|
void func1 (void); |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
|
index 4117a35..e3cea3f 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
|
index 650d55c..6222996 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
|
index 9540996..2eef6f3 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
|
index f3db6e2..e825a10 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
typedef void (*dispatch_t)(long offset); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
|
index 764a375..c67066c 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
void func0 (void); |
|
void func1 (void); |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c |
|
new file mode 100644 |
|
index 0000000..7d396a3 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-1.c |
|
@@ -0,0 +1,22 @@ |
|
+/* { dg-do compile } */ |
|
+/* { dg-options "-O2 -mindirect-branch=thunk -mindirect-branch-register -fno-pic" } */ |
|
+ |
|
+typedef void (*dispatch_t)(long offset); |
|
+ |
|
+dispatch_t dispatch; |
|
+ |
|
+void |
|
+male_indirect_jump (long offset) |
|
+{ |
|
+ dispatch(offset); |
|
+} |
|
+ |
|
+/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" } } */ |
|
+/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
|
+/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
|
+/* { dg-final { scan-assembler "mov\[ \t\](%eax|%rax), \\((%esp|%rsp)\\)" } } */ |
|
+/* { dg-final { scan-assembler {\tpause} } } */ |
|
+/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */ |
|
+/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */ |
|
+/* { dg-final { scan-assembler-not "__x86_indirect_thunk\n" } } */ |
|
+/* { dg-final { scan-assembler-not "__x86_indirect_thunk_bnd\n" } } */ |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c |
|
new file mode 100644 |
|
index 0000000..e7e616b |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-2.c |
|
@@ -0,0 +1,20 @@ |
|
+/* { dg-do compile } */ |
|
+/* { dg-options "-O2 -mindirect-branch=thunk-inline -mindirect-branch-register -fno-pic" } */ |
|
+ |
|
+typedef void (*dispatch_t)(long offset); |
|
+ |
|
+dispatch_t dispatch; |
|
+ |
|
+void |
|
+male_indirect_jump (long offset) |
|
+{ |
|
+ dispatch(offset); |
|
+} |
|
+ |
|
+/* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */ |
|
+/* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */ |
|
+/* { dg-final { scan-assembler "mov\[ \t\](%eax|%rax), \\((%esp|%rsp)\\)" } } */ |
|
+/* { dg-final { scan-assembler {\tpause} } } */ |
|
+/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */ |
|
+/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */ |
|
+/* { dg-final { scan-assembler-not "__x86_indirect_thunk" } } */ |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c |
|
new file mode 100644 |
|
index 0000000..5320e92 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-3.c |
|
@@ -0,0 +1,19 @@ |
|
+/* { dg-do compile } */ |
|
+/* { dg-options "-O2 -mindirect-branch=thunk-extern -mindirect-branch-register -fno-pic" } */ |
|
+ |
|
+typedef void (*dispatch_t)(long offset); |
|
+ |
|
+dispatch_t dispatch; |
|
+ |
|
+void |
|
+male_indirect_jump (long offset) |
|
+{ |
|
+ dispatch(offset); |
|
+} |
|
+ |
|
+/* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" } } */ |
|
+/* { dg-final { scan-assembler-not "push(?:l|q)\[ \t\]*_?dispatch" } } */ |
|
+/* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */ |
|
+/* { dg-final { scan-assembler-not {\t(pause|pause|nop)} } } */ |
|
+/* { dg-final { scan-assembler-not "jmp\[ \t\]*\.LIND" } } */ |
|
+/* { dg-final { scan-assembler-not "call\[ \t\]*\.LIND" } } */ |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-10.c b/gcc/testsuite/gcc.target/i386/ret-thunk-10.c |
|
index 3a6727b..e6fea84 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-10.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-10.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=thunk-inline -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk-inline -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-11.c b/gcc/testsuite/gcc.target/i386/ret-thunk-11.c |
|
index b8f6818..e239ec4 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-11.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-11.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=thunk-extern -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk-extern -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-12.c b/gcc/testsuite/gcc.target/i386/ret-thunk-12.c |
|
index 01b0a02..fa31813 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-12.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-12.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-13.c b/gcc/testsuite/gcc.target/i386/ret-thunk-13.c |
|
index 4b497b5..fd5b41f 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-13.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-13.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
extern int foo (void) __attribute__ ((function_return("thunk"))); |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-14.c b/gcc/testsuite/gcc.target/i386/ret-thunk-14.c |
|
index 4ae4c44..d606373 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-14.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-14.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-15.c b/gcc/testsuite/gcc.target/i386/ret-thunk-15.c |
|
index 5b5bc76..75e45e2 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-15.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-15.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=keep -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-9.c b/gcc/testsuite/gcc.target/i386/ret-thunk-9.c |
|
index fa24a1f..d1db41c 100644 |
|
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-9.c |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-9.c |
|
@@ -1,5 +1,5 @@ |
|
/* { dg-do compile } */ |
|
-/* { dg-options "-O2 -mfunction-return=thunk -mindirect-branch=thunk -fno-pic" } */ |
|
+/* { dg-options "-O2 -mno-indirect-branch-register -mno-indirect-branch-register -mfunction-return=thunk -mindirect-branch=thunk -fno-pic" } */ |
|
|
|
extern void (*bar) (void); |
|
|
|
|