From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1130) id 20A2C3856265; Wed, 15 Jun 2022 10:13:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20A2C3856265 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Sandiford To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1102] gen: Allow unspec numbers in .md attributes X-Act-Checkin: gcc X-Git-Author: Richard Sandiford X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 7bfb3f488a7ec58109a859c66bf4eddc6354065b X-Git-Newrev: 183a4f3829243b43a28fc70e59129521033b8f8a Message-Id: <20220615101302.20A2C3856265@sourceware.org> Date: Wed, 15 Jun 2022 10:13:02 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 10:13:02 -0000 https://gcc.gnu.org/g:183a4f3829243b43a28fc70e59129521033b8f8a commit r13-1102-g183a4f3829243b43a28fc70e59129521033b8f8a Author: Richard Sandiford Date: Wed Jun 15 11:12:51 2022 +0100 gen: Allow unspec numbers in .md attributes Tamar pointed out that: (unspec:M ... ) didn't work when a value of attribute FOO was defined by define_constant, such as in: (define_int_attribute FOO [(UNSPEC_A "UNSPEC_B") ...]) This is because symbolic constants are substituted during lexing and only apply to bare symbol names, not strings. One option would have been to extend this lexing substitution to define_*_attribute values as well. However, that would replace symbolic names with integer constants in the generated .cc code, making it less readable. This patch goes for the more localised approach of only applying define_constants when we want their integer value. I don't think any changes to the docs are needed. This isn't adding a new feature, it's just making an existing one work in the expected way. gcc/ * read-rtl.cc (find_int): Substitute symbolic constants before converting the string to an integer. Diff: --- gcc/read-rtl.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/read-rtl.cc b/gcc/read-rtl.cc index 798d2485991..62c7895af60 100644 --- a/gcc/read-rtl.cc +++ b/gcc/read-rtl.cc @@ -284,6 +284,12 @@ find_int (const char *name) { HOST_WIDE_INT tmp; + struct md_constant tmp_def; + tmp_def.name = const_cast (name); + auto htab = rtx_reader_ptr->get_md_constants (); + if (auto def = (struct md_constant *) htab_find (htab, &tmp_def)) + name = def->value; + validate_const_int (name); #if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT tmp = atoi (name);