From patchwork Tue Oct 8 10:28:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 98533 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71945385DDC0 for ; Tue, 8 Oct 2024 10:29:09 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 0649F3858D29 for ; Tue, 8 Oct 2024 10:28:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0649F3858D29 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0649F3858D29 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728383319; cv=none; b=oGw9rpCEJW7LBGzMNNQd+eqwHXidu40F1I/1K6TlB9lIdgegPGZUDuHiamV4nNivW3A8HIg7Iti5ENj1sL0fVm9jKZ7N0VzO+qytqzXSNdZVf0r8e2vWP6Ed6NZ3ovcCoCq60YnPKmXw3YeMoSAvJ5ARTzhnB0eGz2eoL5zIoUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728383319; c=relaxed/simple; bh=RagDEFWMw6+W1qdpijYu9/sJwc2pcyxPxsIxzG7exMo=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=hvrdq28zDN8UBNcutDkQHN7maBXAmxvnmlrc1DMsHLLSikoaBiLzmENfK5VeMygMpnPJepBGCPLtHrlDM220JkzS74LieTfx1/7z7gyYKvnrY0yGYSrPtDC42hXxFX9SvvtfKy74dkxVMB8KQoR92ZL/vaI0f8Od4dRspSh3/5k= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a9951fba3b4so313811966b.1 for ; Tue, 08 Oct 2024 03:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1728383315; x=1728988115; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=IE4AqSfy+QolfwbYsh1JjRoMbNdD1P0LDU7yibLX5z0=; b=Qj6EzhqC871+g9hjXU8u3KLlhgBFPPQxM1IuFTyskMR8wgK5hU/90ItliRc+eqZycS s1ZSBMRtkVQVejME7M8+bTkNjFN3cgxMsXu1u2T9mc7V6QxLwv6bQxgOjpE8ovyWwHMe C42KgULmhGcIEEhSZ8DLgcIxhXa1TGizbnADJh/ppj2+wObuC78Pt7ntuDS0fou1r+v3 RtJ73aiIT8jDThhg9KixsWlLuN0dMfrGDpKUhRT/6TzzhFEcEsnVUlfw7Zjj1Hnhgb1d zjYviI46XRNymaufj9/ol2Sx9zawBIAkmCvj04tN3ULHHyuL0N4DgFI9ySKsC/Cc86+f sS0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728383315; x=1728988115; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IE4AqSfy+QolfwbYsh1JjRoMbNdD1P0LDU7yibLX5z0=; b=WCb03ccwP268WXU+MNFjrP88ZlAXmxBsCgfcYESjGTOvNLMMzkuLu84oFiNaRMfDCA Vh4KK2oKSpJIR0aDXyQHG8p/TiXtdoxo1hUe4O/I0Ib1wwnex+Q9q9e3N2/KFa7MfqXs 5p+TWXNmyWNcsbtp9WMPTSILYbFPK40f72IIZQYEgB8kMD7MxBgLuRjechTi582IBwvZ fNK86dF9bkGVaqHMwHJFR34FjzB1hPZWJFGR8gQE2PUvTK/6x5+E9rzWv/D8LLZ52fsf Trx+MdY9dvHXoI3GFeUcepW+r7UR2d40dUSriXG32wxPm6ilcZMBUMIVmp9+HigVoMlu SIAw== X-Gm-Message-State: AOJu0Ywu9/mcvD7yW6eea3bMEx2WvaMvwVTCUVlCwVJ3wnG57lDWW6G2 wU3RcN7vla+9Bm4g/w7uHpiM38gu5H/0zN3zRkwSVP7kFIgPuXYbR6qANvAv74ap2Oa+7iqpVo4 = X-Google-Smtp-Source: AGHT+IHasNqL4w0RLzAFUOGQvaMzted6XEeQW0PS6IgqEpgVlW3dNF9MIyMG8M/uxRGUWPs+w/Vz7A== X-Received: by 2002:a17:907:cca3:b0:a99:4c5e:1b01 with SMTP id a640c23a62f3a-a994c5e1c56mr586831366b.45.1728383315584; Tue, 08 Oct 2024 03:28:35 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99431f247bsm387928466b.168.2024.10.08.03.28.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Oct 2024 03:28:35 -0700 (PDT) Message-ID: <61689246-5031-4ad0-ace2-8e31f244af11@suse.com> Date: Tue, 8 Oct 2024 12:28:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "Jiang, Haochen" , "H.J. Lu" From: Jan Beulich Subject: [PATCH] x86: also template-expand trailing mnemonic part Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL X-Spam-Status: No, score=-3023.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org So far template expansion was limited to fields other than the insn mnemonic. In order to be able to use also for AVX10.2 we want the trailing mnemonic part to also be expanded. Split out the respective piece of code into a helper function, which is then invoked twice. --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -1672,6 +1672,69 @@ parse_template (char *buf, int lineno) return true; } +static void +expand_template (const struct template *tmpl, + const struct template_instance *inst, + char *dst, const char *src, int lineno) +{ + while (*src) + { + const char *ident = tmpl->name, *end; + const struct template_param *param; + const struct template_arg *arg; + + if ((*dst = *src++) != '<') + { + ++dst; + continue; + } + while (ISSPACE(*src)) + ++src; + while (*ident && *src == *ident) + ++src, ++ident; + while (ISSPACE(*src)) + ++src; + if (*src != ':' || *ident != '\0') + { + memcpy (++dst, tmpl->name, ident - tmpl->name); + dst += ident - tmpl->name; + continue; + } + while (ISSPACE(*++src)) + ; + + end = src; + while (*end != '\0' && !ISSPACE(*end) && *end != '>') + ++end; + + for (param = tmpl->params, arg = inst->args; param; + param = param->next, arg = arg->next) + { + if (end - src == strlen (param->name) + && !memcmp (src, param->name, end - src)) + { + src = end; + break; + } + } + + if (param == NULL) + fail ("template '%s' has no parameter '%.*s'\n", + tmpl->name, (int)(end - src), src); + + while (ISSPACE(*src)) + ++src; + if (*src != '>') + fail ("%s: %d: missing '>'\n", filename, lineno); + + memcpy(dst, arg->val, strlen(arg->val)); + dst += strlen(arg->val); + ++src; + } + + *dst = '\0'; +} + static unsigned int expand_templates (char *name, const char *str, htab_t opcode_hash_table, struct opcode_hash_entry ***opcode_array_p, int lineno) @@ -1746,71 +1809,20 @@ expand_templates (char *name, const char for (inst = tmpl->instances; inst; inst = inst->next) { - char *name2 = xmalloc(strlen(name) + strlen(inst->name) + strlen(ptr2) + 1); + char *name2 = xmalloc(strlen(name) + strlen(inst->name) + + 2 * strlen(ptr2) + 1); char *str2 = xmalloc(2 * strlen(str)); - const char *src; - strcpy (name2, name); - strcat (name2, inst->name); - strcat (name2, ptr2); + ptr1 = stpcpy (name2, name); + ptr1 = stpcpy (ptr1, inst->name); - for (ptr1 = str2, src = str; *src; ) - { - const char *ident = tmpl->name, *end; - const struct template_param *param; - const struct template_arg *arg; - - if ((*ptr1 = *src++) != '<') - { - ++ptr1; - continue; - } - while (ISSPACE(*src)) - ++src; - while (*ident && *src == *ident) - ++src, ++ident; - while (ISSPACE(*src)) - ++src; - if (*src != ':' || *ident != '\0') - { - memcpy (++ptr1, tmpl->name, ident - tmpl->name); - ptr1 += ident - tmpl->name; - continue; - } - while (ISSPACE(*++src)) - ; - - end = src; - while (*end != '\0' && !ISSPACE(*end) && *end != '>') - ++end; - - for (param = tmpl->params, arg = inst->args; param; - param = param->next, arg = arg->next) - { - if (end - src == strlen (param->name) - && !memcmp (src, param->name, end - src)) - { - src = end; - break; - } - } - - if (param == NULL) - fail ("template '%s' has no parameter '%.*s'\n", - tmpl->name, (int)(end - src), src); - - while (ISSPACE(*src)) - ++src; - if (*src != '>') - fail ("%s: %d: missing '>'\n", filename, lineno); - - memcpy(ptr1, arg->val, strlen(arg->val)); - ptr1 += strlen(arg->val); - ++src; - } + /* Expand this template in trailing portion of mnemonic. */ + expand_template (tmpl, inst, ptr1, ptr2, lineno); - *ptr1 = '\0'; + /* Expand this template in attributes and operands. */ + expand_template (tmpl, inst, str2, str, lineno); + /* Expand further templates, if any. */ expand_templates (name2, str2, opcode_hash_table, opcode_array_p, lineno);