From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 03A6F3858D33 for ; Fri, 22 Dec 2023 11:26:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 03A6F3858D33 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 03A6F3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::329 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703244403; cv=none; b=ZvgzWWqE9sMdY600bmtfqfciyeFXW0ekDRibiRrIMjHDH4pV8tCuG1+9EyNyw5MXSP5NrDzXZH1NmAouBVYPWv/iQaWi56n7WhgqKPXqLpZ3ltMISoxm9MkxhsWcsl3aPo52Ap5CH3WIsBVluUt7ch3dG7SFbeEbFrTpgvJ3CSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703244403; c=relaxed/simple; bh=IvemcC0opHwJUdalxAIRVOdEcwNyMD1jf1EKH2Dpv5A=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=Cx+hvHfklde6pgk4dhRsBixacABTwsYjXTebLZ/ZPEVEj8VTHgWaDcndsHgxJw9uIS3vX7W9UWdu5hna1n1OUgOpBJ2v3bbx/tbd/p8I2qKQ5JKn/3ujP43iAmCKEaW2NII2MzlMk7IOUWaY9oMafmi8ZnBulNTwwGS69WRiiRM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40c2db2ee28so21246765e9.2 for ; Fri, 22 Dec 2023 03:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1703244401; x=1703849201; 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=PGmeimFMH15kVJYWWZGxlIxLizHgBcqXZ5UpU1+Tomk=; b=ULhvv2g1HlzklxZHLZ+QzSIS1f4XxRFmnhvdX9uTtqwB85sq/kL3Zs1iH4PFIXfkbj 6obWSAD53J7JLe/lf4L6APYB6uRbmd67RexJnBJeDeZvJ6nxDAP8veKWYY9yzZ/44CYP kw0/x1G3s7ONVXf1ZKwMefzhqmv+0H83EOtXxzfxQ1n2GeEaBu4J9tp6jfVlCzp9IH+C cWiWJT2ErupyV0laMLH+rJusy00id6pp2YzK/L7BPIMvralmAS77WzQIEj/w8sOyeyDy zYkajFkVqP41j9UagfOCpfk9uAxXfLpFTBGSpvAOQ0Tt73uMDnYNcbhaPV032UyBtdvI BM3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703244401; x=1703849201; 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=PGmeimFMH15kVJYWWZGxlIxLizHgBcqXZ5UpU1+Tomk=; b=RkznZg29/FQyn07A6XKqfRkU/kofwPvWzqdx/FUB7y30ucNG/SMknH2fRxFgmSjbUr m7nTp3Pgw5lJwmDUny2WoRnNCYuf3YUCPKcvlOnB8aTJJav6DxxAPcBQdOYqt/iFpDEh ECnJPrHjlfwiFuwi0Dij6CG+Ehes18PocrLZzb5ia9u4Nl2OgqpnYnSmSgQBes/N0P7B igBS03cmm/C2ERcH0fv+5V+XZ8bNMiqlTw0/PagpDNyiqDsu25bl3nFm4i8O+W2Wo63W Th+UKPF2PsZa/RecDtMEzGJwHZ7trKR/Sg4IBr2zDoFZtq5zSbh5xpHCkH/fZy1QxMGN 2/sA== X-Gm-Message-State: AOJu0Yyuh7H4a6aUwoQVpq9bu4PvyhVOxQOLqPq24rmH/kLWmMRuIYuR QEnxvoC0/IZuH/S0l3ZB/u+FSZg0HO5/coIlLoYx0Vp+oBnw X-Google-Smtp-Source: AGHT+IGZsahNeY3hGTnZCx2IPn3vWgq+CGhZbzdyc68ZcGqIVACydmQGcoeO8e0wJIkaIRyITueWBQ== X-Received: by 2002:a05:600c:520a:b0:40d:3b3f:604d with SMTP id fb10-20020a05600c520a00b0040d3b3f604dmr799574wmb.9.1703244400698; Fri, 22 Dec 2023 03:26:40 -0800 (PST) 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 k8-20020a05600c1c8800b0040d376ac369sm6605541wms.40.2023.12.22.03.26.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Dec 2023 03:26:40 -0800 (PST) Message-ID: Date: Fri, 22 Dec 2023 12:26:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "H.J. Lu" From: Jan Beulich Subject: [PATCH] x86: corrections to CPU attribute/flags splitting 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3026.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: There are a number of issues with 734dfd1cc966 ("x86: pack CPU flags in opcode table"): - the condition when two array slots need writing wasn't correct (with enough new Cpu* added an out of bounds array access would validly have been complained about by the compiler), - table generation didn't take into account CpuAttrUnused and CpuUnused being independent, and hence there not always (not) being an "unused" bitfield member in both structures, - cpu_flags_from_attr() wasn't ready for use on big-endian hosts, - there were two style violations. --- The big endian part of the change is untested; I hope it's at least getting close enough, but I have nowhere to test. Of course I'd more than welcome any suggestions towards removing the endianness dependency, as long as resulting code remains simple enough (no explicit dealing with individual .cpu* members) and compiles to a reasonably short sequence of insns (it's used on a hot path, after all). --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1689,21 +1689,34 @@ static i386_cpu_flags cpu_flags_from_att const unsigned int bps = sizeof (a.array[0]) * CHAR_BIT; i386_cpu_flags f = { .array[0] = 0 }; - switch (ARRAY_SIZE(a.array)) + switch (ARRAY_SIZE (a.array)) { case 1: f.array[CpuAttrEnums / bps] - |= (a.array[0] >> CpuIsaBits) << (CpuAttrEnums % bps); - if (CpuAttrEnums % bps > CpuIsaBits) +#ifndef WORDS_BIGENDIAN + |= (a.array[0] >> CpuIsaBits) << (CpuAttrEnums % bps); +#else + |= (a.array[0] << CpuIsaBits) >> (CpuAttrEnums % bps); +#endif + if (CpuMax / bps > CpuAttrEnums / bps) f.array[CpuAttrEnums / bps + 1] +#ifndef WORDS_BIGENDIAN = (a.array[0] >> CpuIsaBits) >> (bps - CpuAttrEnums % bps); +#else + = (a.array[0] << CpuIsaBits) << (bps - CpuAttrEnums % bps); +#endif break; + default: abort (); } if (a.bitfield.isa) +#ifndef WORDS_BIGENDIAN f.array[(a.bitfield.isa - 1) / bps] |= 1u << ((a.bitfield.isa - 1) % bps); +#else + f.array[(a.bitfield.isa - 1) / bps] |= 1u << (~(a.bitfield.isa - 1) % bps); +#endif return f; } --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -851,7 +851,16 @@ output_cpu_flags (FILE *table, bitfield active_cpu_flags.array[i / 32] |= 1U << (i % 32); } - fprintf (table, "%d } }%s\n", flags[i].value, comma); +#if defined(CpuAttrUnused) != defined(CpuUnused) + if (mode <= 0) +# ifdef CpuUnused + fprintf (table, " } }%s\n", comma); +# else + fprintf (table, "%d, 0 } }%s\n", flags[i].value, comma); +# endif + else +#endif + fprintf (table, "%d } }%s\n", flags[i].value, comma); } static void