diff options
| author | Richard Sandiford <richard.sandiford@arm.com> | 2014-11-02 20:00:12 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2014-11-02 20:00:12 +0000 |
| commit | 752ae22f507c89267df61846d3ed15cb1f6c7c47 (patch) | |
| tree | b4c43a01a4b57176b2ee2438287168133c18b82c | |
| parent | 6733978e462e7fe9d667caf979acfbea337c5caf (diff) | |
| download | gcc-752ae22f507c89267df61846d3ed15cb1f6c7c47.zip gcc-752ae22f507c89267df61846d3ed15cb1f6c7c47.tar.gz gcc-752ae22f507c89267df61846d3ed15cb1f6c7c47.tar.bz2 | |
arc.c (arc_rewrite_small_data_p): Constify argument.
gcc/
* config/arc/arc.c (arc_rewrite_small_data_p): Constify argument.
(small_data_pattern_1): Delete.
(small_data_pattern): Use FOR_EACH_SUBRTX.
From-SVN: r217017
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/arc/arc.c | 29 |
2 files changed, 20 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18b1e10..438c77b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2014-11-02 Richard Sandiford <richard.sandiford@arm.com> + * config/arc/arc.c (arc_rewrite_small_data_p): Constify argument. + (small_data_pattern_1): Delete. + (small_data_pattern): Use FOR_EACH_SUBRTX. + +2014-11-02 Richard Sandiford <richard.sandiford@arm.com> + * config/arc/arc.c: Include rtl-iter.h. (arc_rewrite_small_data_1): Delete. (arc_rewrite_small_data): Use FOR_EACH_SUBRTX_PTR. diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 1bc903b..48257f7 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -6355,7 +6355,7 @@ arc_in_small_data_p (const_tree decl) as a gp+symref. */ static bool -arc_rewrite_small_data_p (rtx x) +arc_rewrite_small_data_p (const_rtx x) { if (GET_CODE (x) == CONST) x = XEXP (x, 0); @@ -6405,26 +6405,25 @@ arc_rewrite_small_data (rtx op) return op; } -/* A for_each_rtx callback for small_data_pattern. */ - -static int -small_data_pattern_1 (rtx *loc, void *data ATTRIBUTE_UNUSED) -{ - if (GET_CODE (*loc) == PLUS - && rtx_equal_p (XEXP (*loc, 0), pic_offset_table_rtx)) - return -1; - - return arc_rewrite_small_data_p (*loc); -} - /* Return true if OP refers to small data symbols directly, not through a PLUS. */ bool small_data_pattern (rtx op, machine_mode) { - return (GET_CODE (op) != SEQUENCE - && for_each_rtx (&op, small_data_pattern_1, 0)); + if (GET_CODE (op) == SEQUENCE) + return false; + subrtx_iterator::array_type array; + FOR_EACH_SUBRTX (iter, array, op, ALL) + { + const_rtx x = *iter; + if (GET_CODE (x) == PLUS + && rtx_equal_p (XEXP (x, 0), pic_offset_table_rtx)) + iter.skip_subrtxes (); + else if (arc_rewrite_small_data_p (x)) + return true; + } + return false; } /* Return true if OP is an acceptable memory operand for ARCompact |