aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2016-09-02 09:59:58 +0200
committerYvan Roux <yvan.roux@linaro.org>2016-09-07 22:08:26 +0200
commit4bfad27f94841635bc520b98feebc1e88a19f208 (patch)
tree98e2de84334fe280f637a2ce8105ff99794f91a1
parentb25a5b62d33a2632caaefd6f0fc8767b88b23ed8 (diff)
gcc/
Backport from trunk r237548. 2016-06-17 Szabolcs Nagy <szabolcs.nagy@arm.com> * config/aarch64/geniterators.sh: Handle parenthesised conditions. Change-Id: I3eb6902dd41933cd2f41d1740f84f63a1921e0b2
-rw-r--r--gcc/config/aarch64/geniterators.sh21
1 files changed, 15 insertions, 6 deletions
diff --git a/gcc/config/aarch64/geniterators.sh b/gcc/config/aarch64/geniterators.sh
index ec1b1ea539a..8baa244009c 100644
--- a/gcc/config/aarch64/geniterators.sh
+++ b/gcc/config/aarch64/geniterators.sh
@@ -23,10 +23,7 @@
# BUILTIN_<ITERATOR> macros, which expand to VAR<N> Macros covering the
# same set of modes as the iterator in iterators.md
#
-# Find the <ITERATOR> definitions (may span several lines), skip the ones
-# which does not have a simple format because it contains characters we
-# don't want to or can't handle (e.g P, PTR iterators change depending on
-# Pmode and ptr_mode).
+# Find the <ITERATOR> definitions (may span several lines).
LC_ALL=C awk '
BEGIN {
print "/* -*- buffer-read-only: t -*- */"
@@ -49,12 +46,24 @@ iterdef {
sub(/.*\(define_mode_iterator/, "", s)
}
-iterdef && s ~ /\)/ {
+iterdef {
+ # Count the parentheses, the iterator definition ends
+ # if there are more closing ones than opening ones.
+ nopen = gsub(/\(/, "(", s)
+ nclose = gsub(/\)/, ")", s)
+ if (nopen >= nclose)
+ next
+
iterdef = 0
gsub(/[ \t]+/, " ", s)
- sub(/ *\).*/, "", s)
+ sub(/ *\)[^)]*$/, "", s)
sub(/^ /, "", s)
+
+ # Drop the conditions.
+ gsub(/ *"[^"]*" *\)/, "", s)
+ gsub(/\( */, "", s)
+
if (s !~ /^[A-Za-z0-9_]+ \[[A-Z0-9 ]*\]$/)
next
sub(/\[ */, "", s)