From patchwork Mon Jan 27 16:28:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 105484 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 429623857B84 for ; Mon, 27 Jan 2025 16:31:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 429623857B84 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=EwF3BVhr X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 3B7FD385800F for ; Mon, 27 Jan 2025 16:28:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B7FD385800F 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 3B7FD385800F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737995303; cv=none; b=pbBXm2EQjw6NLUiu4S9OP4PJkV/yVHyBg72DZvFH5dgZcb9gH89t+NFbdqkJ9dJgY7BD9sEEwjLf4N/Gmm5LJU/zsjihTyFE9h5VCtxppTxa4mD44/5U3zhzDmVXQ2WszvYeXxVef0wmNGU51mP0oHgRwJJZuQBxYJ8k26rvukg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737995303; c=relaxed/simple; bh=CT302c+EEAZtKG0ItB7rRWoDgSKTfK6hSqiAv9sm7ac=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=AseoIFv4eN1fC3SaMq/SXeg6xOhTahool2KoyBNCvbfZBMa0daIOuCB1rDzSdAcFtS7/yoREVaqFevhgWq5cg2eDX4wHRcjzftFwIDHrKkFMyUngKyzIi28WehshqNjr7rOANqoIuxNUACBz9B3I3eP8Zm1C5cObqiKI6arpl18= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B7FD385800F Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-aa684b6d9c7so831619466b.2 for ; Mon, 27 Jan 2025 08:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1737995302; x=1738600102; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:cc:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=geBkaXBKEUkJcjt9F+gaAjgIgpWFObs8ZWV/D/uWrvY=; b=EwF3BVhr1LfusueS5G1wSzd5T7XggrxBU6yGs/ApMTTYlRiLjT2uSWv+/NqyivyBW2 7rA29a3MmovH6zD2kwT3jnTYwM3HICye5GIsRxe5m/qOMOvlug2OqG1+fLM6oBrAHHnL N48YUI382wy/ZwAyt0zKdhbRneflByvE+AXoQp33rH5O+9MxPI/CCmDSWT0p9sz9IUbS oTkd6MyDTHc8/SbbZTXJrdB69tgI1NDqySp+Dgi7S9Np6aNpFdWmmmHUfhCj8axXW5hx PqS8ZLF0GDU+MQorRTf9jI6mOvo21Vin+5BSYoAZggehOMM7fPNcAgWJun7mwf1IFQOy wKVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737995302; x=1738600102; h=content-transfer-encoding:in-reply-to:autocrypt:cc:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=geBkaXBKEUkJcjt9F+gaAjgIgpWFObs8ZWV/D/uWrvY=; b=C1J52wCA0f34XR2CDgGF7Vc9LgpPuDWpMzHux8nFQNhFhC66E8E8HKTSUVfOjVzE4y oPbLUB6n0/5UVtmsV3dwD2yqy3U3EhbboO/Hz/ByQJJa8Gwl4xQnyiDaRYzk/Z8hsWCg nwAS/lluQRKfz+sJrVi3wBha7i4xOQfrSoxi/A4iVhGWFjMABtMBkUEBvyNBMo/C86qY SZ3u3CU1cVShNAKUAxlVTfqVvYIHZilY/OsYE3OJknL5tsA11L9np4YjruLkcJsI++dr YvT1JWYVdVcmOV4w8+Z9V1Co+h4uCHvYQ05vOuOW2ioBY91hSnThiXvSnDJhw/mp6DMA oldw== X-Gm-Message-State: AOJu0YzC9lMRmrQrM6AtoOI2dNrcteZ7Dnq3wXNMVvXBmMphyEzLg9rs TWNkXWg+j0pn0wbtg2sLaEuyAFYj2ZPX5aTOcwpXJxSnt+SVAlz9u2h2lft895MbdFJx0GYD+6Q = X-Gm-Gg: ASbGncsti5eL4ja+F0Z6D/oSLYoqO20NED0z/n9hLroqfbFqAXbFgoqOtH3DZdtUFVu jEROrlzaSSDNlygUoKqOc+N6VyhFSB68z0OAQOM4te5FnkfzmZLIWaW1wIOfL4AHV7Sm4sfWhBV Yp0Ee3eod6/YRi8F/jxEe4FnQdGL34VhmInUPTiylvr6CbpIPPbZWPrX+YrRE4U5zymWcMxPtx7 UpMzqVyrwbHF41pmiRtAqM7W0AgRoY7Xp11jDLtg+tWOFThDr+6575javaqLwhSlDhvSsabbyML RWCXhMPR7+j6TYn+eJc3Rp53DDhCKFFn+Z9nmItuM5H1ZQyiZSF/TA4cMpGKht/4Tw== X-Google-Smtp-Source: AGHT+IFbZs9Y7mVjtdh7re4tuuOdLtSXZS6okZvDOAylAntFSWZyrvnrlQJWscx4bCsBseYeEYoKyw== X-Received: by 2002:a17:907:1c29:b0:aab:9430:40e9 with SMTP id a640c23a62f3a-ab38b19072fmr3855293866b.32.1737995301784; Mon, 27 Jan 2025 08:28:21 -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 a640c23a62f3a-ab675e11a1esm609535266b.33.2025.01.27.08.28.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Jan 2025 08:28:21 -0800 (PST) Message-ID: Date: Mon, 27 Jan 2025 17:28:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 31/65] MIPS: use is_whitespace() From: Jan Beulich To: Binutils References: <2316ac5c-7870-4b46-9c80-eaecaef93a31@suse.com> Content-Language: en-US Cc: "Maciej W. Rozycki" , Chenghua Xu 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 In-Reply-To: <2316ac5c-7870-4b46-9c80-eaecaef93a31@suse.com> X-Spam-Status: No, score=-3022.2 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, 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 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 ... for consistency of recognition of what is deemed whitespace. At the same time use is_end_of_stmt() instead of an open-coded nul char check, and check for statement end in the first place in parse_relocation(). --- v2: New. --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -45,7 +45,7 @@ typedef char static_assert2[sizeof (valu #define streq(a, b) (strcmp (a, b) == 0) #define SKIP_SPACE_TABS(S) \ - do { while (*(S) == ' ' || *(S) == '\t') ++(S); } while (0) + do { while (is_whitespace (*(S))) ++(S); } while (0) /* Clean up namespace so we can include obj-elf.h too. */ static int mips_output_flavor (void); @@ -14349,7 +14349,7 @@ mips_ip (char *str, struct mips_cl_insn opcode_extra = 0; /* We first try to match an instruction up to a space or to the end. */ - for (end = 0; str[end] != '\0' && !ISSPACE (str[end]); end++) + for (end = 0; !is_end_of_stmt (str[end]) && !is_whitespace (str[end]); end++) continue; first = mips_lookup_insn (hash, str, end, &opcode_extra); @@ -14388,7 +14388,7 @@ mips16_ip (char *str, struct mips_cl_ins struct mips_operand_token *tokens; unsigned int l; - for (s = str; *s != '\0' && *s != '.' && *s != ' '; ++s) + for (s = str; *s != '\0' && *s != '.' && !is_whitespace (*s); ++s) ; end = s; c = *end; @@ -14399,8 +14399,9 @@ mips16_ip (char *str, struct mips_cl_ins case '\0': break; - case ' ': - s++; + default: + if (is_whitespace (*s)) + s++; break; case '.': @@ -14417,7 +14418,7 @@ mips16_ip (char *str, struct mips_cl_ins } if (*s == '\0') break; - else if (*s++ == ' ') + else if (is_whitespace (*s++)) break; set_insn_error (0, _("unrecognized opcode")); return; @@ -14641,7 +14642,9 @@ parse_relocation (char **str, bfd_reloc_ { int len = strlen (percent_op[i].str); - if (!ISSPACE ((*str)[len]) && (*str)[len] != '(') + if (!is_end_of_stmt ((*str)[len]) + && !is_whitespace ((*str)[len]) + && (*str)[len] != '(') continue; *str += strlen (percent_op[i].str); @@ -14691,7 +14694,7 @@ my_getSmallExpression (expressionS *ep, /* Skip over whitespace and brackets, keeping count of the number of brackets. */ - while (*str == ' ' || *str == '\t' || *str == '(') + while (is_whitespace (*str) || *str == '(') if (*str++ == '(') str_depth++; } @@ -14703,7 +14706,7 @@ my_getSmallExpression (expressionS *ep, str = expr_parse_end; /* Match every open bracket. */ - while (crux_depth > 0 && (*str == ')' || *str == ' ' || *str == '\t')) + while (crux_depth > 0 && (*str == ')' || is_whitespace (*str))) if (*str++ == ')') crux_depth--;