This patch replaces the use of aarch64_symbolic_constant_p with the
(very similar) aarch64_classify_symbolic_expression.
Tested on aarch64-none-elf. Committed.
/Marcus
2013-06-28 Marcus Shawcroft <marcus.shawcr...@arm.com>
* config/aarch64/aarch64-protos.h
(aarch64_classify_symbol_expression): Define.
(aarch64_symbolic_constant_p): Remove.
* config/aarch64/aarch64.c
(aarch64_classify_symbol_expression): Remove static. Fix
line length and white space.
(aarch64_symbolic_constant_p): Remove.
* config/aarch64/predicates.md (aarch64_valid_symref):
Use aarch64_classify_symbol_expression.diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index bdb6b04..7969920 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -137,6 +137,8 @@ struct tune_params
HOST_WIDE_INT aarch64_initial_elimination_offset (unsigned, unsigned);
bool aarch64_bitmask_imm (HOST_WIDE_INT val, enum machine_mode);
+enum aarch64_symbol_type
+aarch64_classify_symbolic_expression (rtx, enum aarch64_symbol_context);
bool aarch64_constant_address_p (rtx);
bool aarch64_float_const_zero_rtx_p (rtx);
bool aarch64_function_arg_regno_p (unsigned);
@@ -158,8 +160,6 @@ bool aarch64_simd_imm_zero_p (rtx, enum machine_mode);
bool aarch64_simd_scalar_immediate_valid_for_move (rtx, enum machine_mode);
bool aarch64_simd_shift_imm_p (rtx, enum machine_mode, bool);
bool aarch64_symbolic_address_p (rtx);
-bool aarch64_symbolic_constant_p (rtx, enum aarch64_symbol_context,
- enum aarch64_symbol_type *);
bool aarch64_uimm12_shift (HOST_WIDE_INT);
const char *aarch64_output_casesi (rtx *);
enum aarch64_symbol_type aarch64_classify_symbol (rtx,
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 9c77888..f9fea71 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -3082,10 +3082,13 @@ aarch64_symbolic_address_p (rtx x)
/* Classify the base of symbolic expression X, given that X appears in
context CONTEXT. */
-static enum aarch64_symbol_type
-aarch64_classify_symbolic_expression (rtx x, enum aarch64_symbol_context context)
+
+enum aarch64_symbol_type
+aarch64_classify_symbolic_expression (rtx x,
+ enum aarch64_symbol_context context)
{
rtx offset;
+
split_const (x, &x, &offset);
return aarch64_classify_symbol (x, context);
}
@@ -5082,24 +5085,6 @@ aarch64_classify_symbol (rtx x,
return SYMBOL_FORCE_TO_MEM;
}
-/* Return true if X is a symbolic constant that can be used in context
- CONTEXT. If it is, store the type of the symbol in *SYMBOL_TYPE. */
-
-bool
-aarch64_symbolic_constant_p (rtx x, enum aarch64_symbol_context context,
- enum aarch64_symbol_type *symbol_type)
-{
- rtx offset;
- split_const (x, &x, &offset);
- if (GET_CODE (x) == SYMBOL_REF || GET_CODE (x) == LABEL_REF)
- *symbol_type = aarch64_classify_symbol (x, context);
- else
- return false;
-
- /* No checking of offset at this point. */
- return true;
-}
-
bool
aarch64_constant_address_p (rtx x)
{
diff --git a/gcc/config/aarch64/predicates.md b/gcc/config/aarch64/predicates.md
index 3248f61..3e2b6b3 100644
--- a/gcc/config/aarch64/predicates.md
+++ b/gcc/config/aarch64/predicates.md
@@ -118,9 +118,8 @@
(define_predicate "aarch64_valid_symref"
(match_code "const, symbol_ref, label_ref")
{
- enum aarch64_symbol_type symbol_type;
- return (aarch64_symbolic_constant_p (op, SYMBOL_CONTEXT_ADR, &symbol_type)
- && symbol_type != SYMBOL_FORCE_TO_MEM);
+ return (aarch64_classify_symbolic_expression (op, SYMBOL_CONTEXT_ADR)
+ != SYMBOL_FORCE_TO_MEM);
})
(define_predicate "aarch64_tls_ie_symref"
