Skip to content

Commit 81ac698

Browse files
author
hjl
committed
i386: Rename to ix86_indirect_branch_register
Rename the variable for -mindirect-branch-register to ix86_indirect_branch_register to match the command-line option name. * config/i386/constraints.md (Bs): Replace ix86_indirect_branch_thunk_register with ix86_indirect_branch_register. (Bw): Likewise. * config/i386/i386.md (indirect_jump): Likewise. (tablejump): Likewise. (*sibcall_memory): Likewise. (*sibcall_value_memory): Likewise. Peepholes of indirect call and jump via memory: Likewise. * config/i386/i386.opt: Likewise. * config/i386/predicates.md (indirect_branch_operand): Likewise. (GOT_memory_operand): Likewise. (call_insn_operand): Likewise. (sibcall_insn_operand): Likewise. (GOT32_symbol_operand): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@256712 138bc75d-0d04-0410-961f-82ee72b054a4
1 parent 3f4a414 commit 81ac698

File tree

5 files changed

+39
-21
lines changed

5 files changed

+39
-21
lines changed

‎gcc/ChangeLog‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2018-01-15 H.J. Lu <[email protected]>
2+
3+
* config/i386/constraints.md (Bs): Replace
4+
ix86_indirect_branch_thunk_register with
5+
ix86_indirect_branch_register.
6+
(Bw): Likewise.
7+
* config/i386/i386.md (indirect_jump): Likewise.
8+
(tablejump): Likewise.
9+
(*sibcall_memory): Likewise.
10+
(*sibcall_value_memory): Likewise.
11+
Peepholes of indirect call and jump via memory: Likewise.
12+
* config/i386/i386.opt: Likewise.
13+
* config/i386/predicates.md (indirect_branch_operand): Likewise.
14+
(GOT_memory_operand): Likewise.
15+
(call_insn_operand): Likewise.
16+
(sibcall_insn_operand): Likewise.
17+
(GOT32_symbol_operand): Likewise.
18+
119
2018-01-15 Jakub Jelinek <[email protected]>
220

321
PR middle-end/83837

‎gcc/config/i386/constraints.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,19 +226,19 @@
226226
(define_constraint "Bs"
227227
"@internal Sibcall memory operand."
228228
(ior (and (not (match_test "TARGET_X32
229-
|| ix86_indirect_branch_thunk_register"))
229+
|| ix86_indirect_branch_register"))
230230
(match_operand 0 "sibcall_memory_operand"))
231231
(and (match_test "TARGET_X32 && Pmode == DImode
232-
&& !ix86_indirect_branch_thunk_register")
232+
&& !ix86_indirect_branch_register")
233233
(match_operand 0 "GOT_memory_operand"))))
234234

235235
(define_constraint "Bw"
236236
"@internal Call memory operand."
237237
(ior (and (not (match_test "TARGET_X32
238-
|| ix86_indirect_branch_thunk_register"))
238+
|| ix86_indirect_branch_register"))
239239
(match_operand 0 "memory_operand"))
240240
(and (match_test "TARGET_X32 && Pmode == DImode
241-
&& !ix86_indirect_branch_thunk_register")
241+
&& !ix86_indirect_branch_register")
242242
(match_operand 0 "GOT_memory_operand"))))
243243

244244
(define_constraint "Bz"

‎gcc/config/i386/i386.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12311,7 +12311,7 @@
1231112311
[(set (pc) (match_operand 0 "indirect_branch_operand"))]
1231212312
""
1231312313
{
12314-
if (TARGET_X32 || ix86_indirect_branch_thunk_register)
12314+
if (TARGET_X32 || ix86_indirect_branch_register)
1231512315
operands[0] = convert_memory_address (word_mode, operands[0]);
1231612316
cfun->machine->has_local_indirect_jump = true;
1231712317
})
@@ -12365,7 +12365,7 @@
1236512365
OPTAB_DIRECT);
1236612366
}
1236712367

12368-
if (TARGET_X32 || ix86_indirect_branch_thunk_register)
12368+
if (TARGET_X32 || ix86_indirect_branch_register)
1236912369
operands[0] = convert_memory_address (word_mode, operands[0]);
1237012370
cfun->machine->has_local_indirect_jump = true;
1237112371
})
@@ -12614,7 +12614,7 @@
1261412614
[(call (mem:QI (match_operand:W 0 "memory_operand" "m"))
1261512615
(match_operand 1))
1261612616
(unspec [(const_int 0)] UNSPEC_PEEPSIB)]
12617-
"!TARGET_X32 && !ix86_indirect_branch_thunk_register"
12617+
"!TARGET_X32 && !ix86_indirect_branch_register"
1261812618
"* return ix86_output_call_insn (insn, operands[0]);"
1261912619
[(set_attr "type" "call")])
1262012620

@@ -12624,7 +12624,7 @@
1262412624
(call (mem:QI (match_dup 0))
1262512625
(match_operand 3))]
1262612626
"!TARGET_X32
12627-
&& !ix86_indirect_branch_thunk_register
12627+
&& !ix86_indirect_branch_register
1262812628
&& SIBLING_CALL_P (peep2_next_insn (1))
1262912629
&& !reg_mentioned_p (operands[0],
1263012630
CALL_INSN_FUNCTION_USAGE (peep2_next_insn (1)))"
@@ -12639,7 +12639,7 @@
1263912639
(call (mem:QI (match_dup 0))
1264012640
(match_operand 3))]
1264112641
"!TARGET_X32
12642-
&& !ix86_indirect_branch_thunk_register
12642+
&& !ix86_indirect_branch_register
1264312643
&& SIBLING_CALL_P (peep2_next_insn (2))
1264412644
&& !reg_mentioned_p (operands[0],
1264512645
CALL_INSN_FUNCTION_USAGE (peep2_next_insn (2)))"
@@ -12737,7 +12737,7 @@
1273712737
(match_operand:W 1 "memory_operand"))
1273812738
(set (pc) (match_dup 0))]
1273912739
"!TARGET_X32
12740-
&& !ix86_indirect_branch_thunk_register
12740+
&& !ix86_indirect_branch_register
1274112741
&& peep2_reg_dead_p (2, operands[0])"
1274212742
[(set (pc) (match_dup 1))])
1274312743

@@ -12819,7 +12819,7 @@
1281912819
(call (mem:QI (match_operand:W 1 "memory_operand" "m"))
1282012820
(match_operand 2)))
1282112821
(unspec [(const_int 0)] UNSPEC_PEEPSIB)]
12822-
"!TARGET_X32 && !ix86_indirect_branch_thunk_register"
12822+
"!TARGET_X32 && !ix86_indirect_branch_register"
1282312823
"* return ix86_output_call_insn (insn, operands[1]);"
1282412824
[(set_attr "type" "callv")])
1282512825

@@ -12830,7 +12830,7 @@
1283012830
(call (mem:QI (match_dup 0))
1283112831
(match_operand 3)))]
1283212832
"!TARGET_X32
12833-
&& !ix86_indirect_branch_thunk_register
12833+
&& !ix86_indirect_branch_register
1283412834
&& SIBLING_CALL_P (peep2_next_insn (1))
1283512835
&& !reg_mentioned_p (operands[0],
1283612836
CALL_INSN_FUNCTION_USAGE (peep2_next_insn (1)))"
@@ -12847,7 +12847,7 @@
1284712847
(call (mem:QI (match_dup 0))
1284812848
(match_operand 3)))]
1284912849
"!TARGET_X32
12850-
&& !ix86_indirect_branch_thunk_register
12850+
&& !ix86_indirect_branch_register
1285112851
&& SIBLING_CALL_P (peep2_next_insn (2))
1285212852
&& !reg_mentioned_p (operands[0],
1285312853
CALL_INSN_FUNCTION_USAGE (peep2_next_insn (2)))"

‎gcc/config/i386/i386.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,5 +1047,5 @@ EnumValue
10471047
Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
10481048

10491049
mindirect-branch-register
1050-
Target Report Var(ix86_indirect_branch_thunk_register) Init(0)
1050+
Target Report Var(ix86_indirect_branch_register) Init(0)
10511051
Force indirect call and jump via register.

‎gcc/config/i386/predicates.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
(define_predicate "indirect_branch_operand"
667667
(ior (match_operand 0 "register_operand")
668668
(and (not (match_test "TARGET_X32
669-
|| ix86_indirect_branch_thunk_register"))
669+
|| ix86_indirect_branch_register"))
670670
(match_operand 0 "memory_operand"))))
671671

672672
;; Return true if OP is a memory operands that can be used in sibcalls.
@@ -695,7 +695,7 @@
695695

696696
;; Return true if OP is a GOT memory operand.
697697
(define_predicate "GOT_memory_operand"
698-
(and (match_test "!ix86_indirect_branch_thunk_register")
698+
(and (match_test "!ix86_indirect_branch_register")
699699
(match_operand 0 "memory_operand"))
700700
{
701701
op = XEXP (op, 0);
@@ -711,10 +711,10 @@
711711
(op, mode == VOIDmode ? mode : Pmode)")
712712
(match_operand 0 "call_register_no_elim_operand")
713713
(ior (and (not (match_test "TARGET_X32
714-
|| ix86_indirect_branch_thunk_register"))
714+
|| ix86_indirect_branch_register"))
715715
(match_operand 0 "memory_operand"))
716716
(and (match_test "TARGET_X32 && Pmode == DImode
717-
&& !ix86_indirect_branch_thunk_register")
717+
&& !ix86_indirect_branch_register")
718718
(match_operand 0 "GOT_memory_operand")))))
719719

720720
;; Similarly, but for tail calls, in which we cannot allow memory references.
@@ -723,15 +723,15 @@
723723
(op, mode == VOIDmode ? mode : Pmode)")
724724
(match_operand 0 "register_no_elim_operand")
725725
(ior (and (not (match_test "TARGET_X32
726-
|| ix86_indirect_branch_thunk_register"))
726+
|| ix86_indirect_branch_register"))
727727
(match_operand 0 "sibcall_memory_operand"))
728728
(and (match_test "TARGET_X32 && Pmode == DImode
729-
&& !ix86_indirect_branch_thunk_register")
729+
&& !ix86_indirect_branch_register")
730730
(match_operand 0 "GOT_memory_operand")))))
731731

732732
;; Return true if OP is a 32-bit GOT symbol operand.
733733
(define_predicate "GOT32_symbol_operand"
734-
(match_test "!ix86_indirect_branch_thunk_register
734+
(match_test "!ix86_indirect_branch_register
735735
&& GET_CODE (op) == CONST
736736
&& GET_CODE (XEXP (op, 0)) == UNSPEC
737737
&& XINT (XEXP (op, 0), 1) == UNSPEC_GOT"))

0 commit comments

Comments
 (0)