From patchwork Fri Jan 5 02:32:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 83344 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 7540938582B9 for ; Fri, 5 Jan 2024 02:32:55 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) by sourceware.org (Postfix) with ESMTPS id 193E03857C69 for ; Fri, 5 Jan 2024 02:32:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 193E03857C69 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 193E03857C69 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c2a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704421948; cv=none; b=WWYQ3uE1Z6KNk+GKzEay8ZH9X87/i9SlCr3N7whdu/yjccr9YCxr5fqb3HqpbWSxFL/CY6I1mQiqnI6FWOnGUSqumrXGUk06gJM4F9TDELo9QfuxGhw0doA3CfvFm2qemWZLOzXF1qYgyTWoWkxs3GRy6vpuvHxcqZXddplbp6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704421948; c=relaxed/simple; bh=nBqEyeEnmNhFqG7ItveGVcT5LHHDWrHNcxTLzYiyLBA=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=ks/b1BmNpfRYCvElf8z1KFPq5ipeYmHnTdp0f6//YmmBuhIUXWn0/pAECXgw6smZkuq9KrOg1NvHCQMG7hFo8i8V5Pyz0W1Hf9K3FnVzRIB7f1mw5LKWuj7XtEIuByPFmxiHAXTSddfWBA8ebsk63yP2hUJPXBHbDOAODglLaag= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-5962a1e530cso391274eaf.1 for ; Thu, 04 Jan 2024 18:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704421945; x=1705026745; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=Dko0oSABQZjwgGQXiW6cPL4ADpBIaG1X1Dln6GUpDos=; b=dlKK2JMAJz3AKgf6M02WxQPGzYdJ/4RWaF7o306FPUQCpGyHK4IWgm6i7qcRupsg+r XLTa6IrYEbjL5aH8QhK+oizD7AGRVY4NzqMNPNnwz/8h6XbYWhXWIcmIFQXwTO+Z5hdK EFIJu9MXUljkaG5gSiVw6F7lS31c/2/1IVMGHdUoCAiDmRJIzWi5dbzIoa4IxBpAQVhA C7vDdobWJlTrG78mak0Xjvjk0x8fvBC6WbLmkJwwIkFKwjNRXSzyJMcnb5AejEv9PzVy 23YFpWzo47Bi96tVOFb4kcxoZgmHRSRZ197k/0MoZtexu0ev99qcQZed01xVQUDfSYk2 s2aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704421945; x=1705026745; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Dko0oSABQZjwgGQXiW6cPL4ADpBIaG1X1Dln6GUpDos=; b=j/6CjLQKXt/rmxwSqhlS4kF8VZkvJUk03Y/d/sONQPp2j/PZMP7Wkx7ve2N6u3m2Ty iQMtg+LbYcFrPklWqf5eqqSRKeTTppIEIebh3zHbDQ4X9jvdh2Ngc5RshvPUrppDbCfF w7VzRP1vYkFMwTZI/rzYWgW0ttpYlqdiceTC5/8ThCdFM8F3dlMCtf9EOkWj/kxA79Uo TZcdCJ3cM/gCVu1e94ozabJY4eZQoemIq/JuhbjjA6kTAONfgOvVqkeM/1hxJiusRZG/ AULHc+h9zMf9nHu0Rob6s/jNZgiB2951K0wHKmAkKNmgpUGph4OjfX/Iv7BLfGo4Lylo X4jg== X-Gm-Message-State: AOJu0YxAMQKo6gti/pKBB/UTJ2yU2RwBo7mQgoofBzE+a91FvJM2Jp9m KOE0rOA/JlbYMqPdOfs1HvqU0pov9yQ= X-Google-Smtp-Source: AGHT+IFrmoXvfHFae8xmiblVb0FRisjoAp3MfaXC38kxR1nsqTP3fMzZ17JrPRrJMgjVkl0+SB+EpQ== X-Received: by 2002:a05:6358:3a1a:b0:174:b7d9:d058 with SMTP id g26-20020a0563583a1a00b00174b7d9d058mr1206974rwe.20.1704421945329; Thu, 04 Jan 2024 18:32:25 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:c77e:1671:940a:a5c1]) by smtp.gmail.com with ESMTPSA id n3-20020aa78a43000000b006d9b4171b20sm326343pfa.112.2024.01.04.18.32.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 18:32:24 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id B14941142383; Fri, 5 Jan 2024 13:02:21 +1030 (ACDT) Date: Fri, 5 Jan 2024 13:02:21 +1030 From: Alan Modra To: binutils@sourceware.org Subject: Tidy bfd_scan_vma Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3033.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 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 In commit 83c79df86bf4 I removed configure tests for strtoull among other library functions part of C99, but didn't remove what is now dead code. * bfd.c (bfd_scan_vma): Delete fall-back for strtoull. diff --git a/bfd/bfd.c b/bfd/bfd.c index c8e38b05c72..0776145af52 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -2257,86 +2257,21 @@ SYNOPSIS bfd_vma bfd_scan_vma (const char *string, const char **end, int base); DESCRIPTION - Convert, like <>, a numerical expression - @var{string} into a <> integer, and return that integer. - (Though without as many bells and whistles as <>.) - The expression is assumed to be unsigned (i.e., positive). - If given a @var{base}, it is used as the base for conversion. - A base of 0 causes the function to interpret the string - in hex if a leading "0x" or "0X" is found, otherwise - in octal if a leading zero is found, otherwise in decimal. - - If the value would overflow, the maximum <> value is - returned. + Convert, like <> or < depending on the size + of a <>, a numerical expression @var{string} into a + <> integer, and return that integer. */ bfd_vma bfd_scan_vma (const char *string, const char **end, int base) { - bfd_vma value; - bfd_vma cutoff; - unsigned int cutlim; - int overflow; - - /* Let the host do it if possible. */ if (sizeof (bfd_vma) <= sizeof (unsigned long)) return strtoul (string, (char **) end, base); if (sizeof (bfd_vma) <= sizeof (unsigned long long)) return strtoull (string, (char **) end, base); - if (base == 0) - { - if (string[0] == '0') - { - if ((string[1] == 'x') || (string[1] == 'X')) - base = 16; - else - base = 8; - } - } - - if ((base < 2) || (base > 36)) - base = 10; - - if (base == 16 - && string[0] == '0' - && (string[1] == 'x' || string[1] == 'X') - && ISXDIGIT (string[2])) - { - string += 2; - } - - cutoff = (~ (bfd_vma) 0) / (bfd_vma) base; - cutlim = (~ (bfd_vma) 0) % (bfd_vma) base; - value = 0; - overflow = 0; - while (1) - { - unsigned int digit; - - digit = *string; - if (ISDIGIT (digit)) - digit = digit - '0'; - else if (ISALPHA (digit)) - digit = TOUPPER (digit) - 'A' + 10; - else - break; - if (digit >= (unsigned int) base) - break; - if (value > cutoff || (value == cutoff && digit > cutlim)) - overflow = 1; - value = value * base + digit; - ++string; - } - - if (overflow) - value = ~ (bfd_vma) 0; - - if (end != NULL) - *end = string; - - return value; + abort (); } /*