From 0853604d4d5efeb29f42e59a09a2ec37239c9572 Mon Sep 17 00:00:00 2001 From: rsandifo Date: Thu, 28 Aug 2014 06:25:01 +0000 Subject: [PATCH] gcc/ * var-tracking.c (use_narrower_mode_test): Turn from being a for_each_rtx callback to being a function that examines each subrtx itself. (adjust_mems): Update accordingly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214663 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 ++++++ gcc/var-tracking.c | 62 +++++++++++++++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9c7a1495954..12006687b35 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2014-08-28 Richard Sandiford + * var-tracking.c (use_narrower_mode_test): Turn from being a + for_each_rtx callback to being a function that examines each + subrtx itself. + (adjust_mems): Update accordingly. + +2014-08-28 Richard Sandiford + * var-tracking.c (non_suitable_const): Turn from being a for_each_rtx callback to being a function that examines each subrtx itself. Remove handling of null rtxes. diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index da83e495c60..149d1aef625 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -952,41 +952,41 @@ struct adjust_mem_data rtx_expr_list *side_effects; }; -/* Helper for adjust_mems. Return 1 if *loc is unsuitable for - transformation of wider mode arithmetics to narrower mode, - -1 if it is suitable and subexpressions shouldn't be - traversed and 0 if it is suitable and subexpressions should - be traversed. Called through for_each_rtx. */ +/* Helper for adjust_mems. Return true if X is suitable for + transformation of wider mode arithmetics to narrower mode. */ -static int -use_narrower_mode_test (rtx *loc, void *data) +static bool +use_narrower_mode_test (rtx x, const_rtx subreg) { - rtx subreg = (rtx) data; - - if (CONSTANT_P (*loc)) - return -1; - switch (GET_CODE (*loc)) + subrtx_var_iterator::array_type array; + FOR_EACH_SUBRTX_VAR (iter, array, x, NONCONST) { - case REG: - if (cselib_lookup (*loc, GET_MODE (SUBREG_REG (subreg)), 0, VOIDmode)) - return 1; - if (!validate_subreg (GET_MODE (subreg), GET_MODE (*loc), - *loc, subreg_lowpart_offset (GET_MODE (subreg), - GET_MODE (*loc)))) - return 1; - return -1; - case PLUS: - case MINUS: - case MULT: - return 0; - case ASHIFT: - if (for_each_rtx (&XEXP (*loc, 0), use_narrower_mode_test, data)) - return 1; + rtx x = *iter; + if (CONSTANT_P (x)) + iter.skip_subrtxes (); else - return -1; - default: - return 1; + switch (GET_CODE (x)) + { + case REG: + if (cselib_lookup (x, GET_MODE (SUBREG_REG (subreg)), 0, VOIDmode)) + return false; + if (!validate_subreg (GET_MODE (subreg), GET_MODE (x), x, + subreg_lowpart_offset (GET_MODE (subreg), + GET_MODE (x)))) + return false; + break; + case PLUS: + case MINUS: + case MULT: + break; + case ASHIFT: + iter.substitute (XEXP (x, 0)); + break; + default: + return false; + } } + return true; } /* Transform X into narrower mode MODE from wider mode WMODE. */ @@ -1147,7 +1147,7 @@ adjust_mems (rtx loc, const_rtx old_rtx, void *data) && GET_MODE_SIZE (GET_MODE (tem)) < GET_MODE_SIZE (GET_MODE (SUBREG_REG (tem))) && subreg_lowpart_p (tem) - && !for_each_rtx (&SUBREG_REG (tem), use_narrower_mode_test, tem)) + && use_narrower_mode_test (SUBREG_REG (tem), tem)) return use_narrower_mode (SUBREG_REG (tem), GET_MODE (tem), GET_MODE (SUBREG_REG (tem))); return tem; -- 2.11.4.GIT