From patchwork Wed May 3 06:01:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 89570 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1102262vqo; Tue, 2 May 2023 23:02:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7c0YhTG67iSi/U7XsGDHdzhTDSf0bGnEs3cCtgvl6NjDccnOWMtAgTq6M/TQikwP4ZMMoT X-Received: by 2002:a05:6402:48d:b0:50b:f859:1834 with SMTP id k13-20020a056402048d00b0050bf8591834mr257609edv.40.1683093724789; Tue, 02 May 2023 23:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683093724; cv=none; d=google.com; s=arc-20160816; b=gcUy6OQSVl02YmX82iMwtroDOyKlFc4myZDJbj2D5b7oXdy/vu4Du6BarcrO7UqmmM bTPZJlmNxU8RaLEBfK2rVoISu/zBVYrs1rkYa6jHz+VbwEn3oMt9GPUDMRhdoxBBjnJi E04IwdV/XTsdf0HSnIKvVRAYfEg96EwQ/J0nBURmpRIgNJ/hjBOcffOFTAoUPWKzAffu tlcioxBu5mQh3hzw+WNPjCXJeY40YMwW/PijmjBI5yC7g755YdNJojFGhukcBwzpeTqi P6/7fI8LOElRopuZIt4m3mZHwFYl3DkClAnfFOPiTsS4KQm2KRHFrwmllJhAZe76+Sqf Y9QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=WX5wj5JzJ4wf/EhQyJFmrxOE45Z6RqiPAJ3UdXxZ8eM=; b=kzpUwjRDcBJAErRL3NFnz567nqHgMlJ8EwQe9bgGdiPEIJdUTl1cVxRA17b1+87j39 efrHNqQI1LWRauQFNmYPRZ4r/e2Uu5KQgEgHiOho3jRcAxlKcil03s4gDZCTJjTTuLC6 UDSCyjjClDYUXiHGOPanbn4c+B4bO0ExW26l1bcGHF7MW9d+10QUdeGyebWeNOs0fCuh YUXKuMx4F5yOjbEvYCRPyvHr2Am8VfCTyC1M7uz6Z7B3pTLIhdpuow4FViCsh/QskQZs UIiasgh2bf5EHwTKg784UxyhHWtsmbH/m/fGOIGoExMm2xgxTD2R/mvmErMsv2qwSatq +3hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=f0PlIRkL; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id x6-20020aa7d6c6000000b0050bf633857asi477308edr.576.2023.05.02.23.02.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 23:02:04 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=f0PlIRkL; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8F20B385702F for ; Wed, 3 May 2023 06:01:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F20B385702F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683093714; bh=WX5wj5JzJ4wf/EhQyJFmrxOE45Z6RqiPAJ3UdXxZ8eM=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=f0PlIRkLbI2tbIGG03rFFOnvwHK/5DTyseZQJC1BgIGU4Tt20L5pt7uDD6usfveL/ AOEkvoTaf8g9u7+1aPwR3nsKkOF/6NtrpjHT5PSqfpLA3+IYjKG8bGyRHRYYeNLtA4 w0zkxxeBhzAzXyMqmwRk/5xU3dXNFdZ47LgYrNws= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id B425B3857342 for ; Wed, 3 May 2023 06:01:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B425B3857342 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-24e015fcf3dso2396635a91.3 for ; Tue, 02 May 2023 23:01:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683093705; x=1685685705; 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=WX5wj5JzJ4wf/EhQyJFmrxOE45Z6RqiPAJ3UdXxZ8eM=; b=gX8FJ4THwK0qN3O4tRuoseDEPbBAfWVwxC/+qzQPcyzZnFJwm2hVuvWEFeUQo+0d/i YwtFaS4PXtpGNuX3/2oMc0YxhaQqJLo6ylaGxlOdArmDBeEluRZgY9LMccl9zkQrAKxm jSBm8zQyx3r4g30CFg3A074qdbF0Yld1vGDve3HOyQMZEdez2vSbFcOi0oDl37tS0dUq +TLiwZlX8FZHfA7ctm1onD32H040gaoHWpxE91is5p91etcs/0mszU82oe4COSX/YAuC ZDTOer4kA87yekMSyHdSTm+bDZcgTAzRcygtSLtBSaGchtmUeh7AzHFLH829f8xuIdns 53ww== X-Gm-Message-State: AC+VfDzyiFzJv7LUIjBN5nTCbZkMtOLbYhQ0DDE3uOExmZ8Mhx70ov7n uhbMuzS43/hzxcd2E0t/RuYtYeyy/GA= X-Received: by 2002:a17:90b:3e82:b0:246:97d2:dc0d with SMTP id rj2-20020a17090b3e8200b0024697d2dc0dmr20761764pjb.39.1683093704982; Tue, 02 May 2023 23:01:44 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:e289:4864:2d83:727f]) by smtp.gmail.com with ESMTPSA id h24-20020a17090a9c1800b00247735d1463sm2431021pjp.39.2023.05.02.23.01.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 23:01:44 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 0D4731142C83; Wed, 3 May 2023 15:31:42 +0930 (ACST) Date: Wed, 3 May 2023 15:31:42 +0930 To: binutils@sourceware.org Subject: libbfc.c: Use stdint types for unsigned char and unsigned long Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.4 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.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764851685902503533?= X-GMAIL-MSGID: =?utf-8?q?1764851685902503533?= * libbfd.c (bfd_put_8): Use bfd_byte rather than unsigned char. (bfd_get_8, bfd_get_signed_8): Likewise. (_bfd_read_unsigned_leb128, _bfd_safe_read_leb128): Likewise. (_bfd_read_signed_leb128): Likewise. (bfd_getb24, bfd_getl24): Replace unsigned long with uint32_t. (bfd_getb32, bfd_getl32): Likewise. (bfd_getb_signed_32, bfd_getl_signed_32): Likewise. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index d695402b62f..c7bcd5f51fb 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -544,13 +544,13 @@ const char *bfd_set_filename (bfd *abfd, const char *filename); /* Byte swapping macros for user section data. */ #define bfd_put_8(abfd, val, ptr) \ - ((void) (*((unsigned char *) (ptr)) = (val) & 0xff)) + ((void) (*((bfd_byte *) (ptr)) = (val) & 0xff)) #define bfd_put_signed_8 \ bfd_put_8 #define bfd_get_8(abfd, ptr) \ - ((bfd_vma) *(const unsigned char *) (ptr) & 0xff) + ((bfd_vma) *(const bfd_byte *) (ptr) & 0xff) #define bfd_get_signed_8(abfd, ptr) \ - ((((bfd_signed_vma) *(const unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80) + ((((bfd_signed_vma) *(const bfd_byte *) (ptr) & 0xff) ^ 0x80) - 0x80) #define bfd_put_16(abfd, val, ptr) \ BFD_SEND (abfd, bfd_putx16, ((val),(ptr))) diff --git a/bfd/libbfd.c b/bfd/libbfd.c index d4f1478ec07..e21cd988208 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -477,13 +477,13 @@ DESCRIPTION .{* Byte swapping macros for user section data. *} . .#define bfd_put_8(abfd, val, ptr) \ -. ((void) (*((unsigned char *) (ptr)) = (val) & 0xff)) +. ((void) (*((bfd_byte *) (ptr)) = (val) & 0xff)) .#define bfd_put_signed_8 \ . bfd_put_8 .#define bfd_get_8(abfd, ptr) \ -. ((bfd_vma) *(const unsigned char *) (ptr) & 0xff) +. ((bfd_vma) *(const bfd_byte *) (ptr) & 0xff) .#define bfd_get_signed_8(abfd, ptr) \ -. ((((bfd_signed_vma) *(const unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80) +. ((((bfd_signed_vma) *(const bfd_byte *) (ptr) & 0xff) ^ 0x80) - 0x80) . .#define bfd_put_16(abfd, val, ptr) \ . BFD_SEND (abfd, bfd_putx16, ((val),(ptr))) @@ -685,11 +685,11 @@ bfd_vma bfd_getb24 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0] << 16; - v |= (unsigned long) addr[1] << 8; - v |= (unsigned long) addr[2]; + v = (uint32_t) addr[0] << 16; + v |= (uint32_t) addr[1] << 8; + v |= (uint32_t) addr[2]; return v; } @@ -697,11 +697,11 @@ bfd_vma bfd_getl24 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0]; - v |= (unsigned long) addr[1] << 8; - v |= (unsigned long) addr[2] << 16; + v = (uint32_t) addr[0]; + v |= (uint32_t) addr[1] << 8; + v |= (uint32_t) addr[2] << 16; return v; } @@ -709,12 +709,12 @@ bfd_vma bfd_getb32 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0] << 24; - v |= (unsigned long) addr[1] << 16; - v |= (unsigned long) addr[2] << 8; - v |= (unsigned long) addr[3]; + v = (uint32_t) addr[0] << 24; + v |= (uint32_t) addr[1] << 16; + v |= (uint32_t) addr[2] << 8; + v |= (uint32_t) addr[3]; return v; } @@ -722,12 +722,12 @@ bfd_vma bfd_getl32 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0]; - v |= (unsigned long) addr[1] << 8; - v |= (unsigned long) addr[2] << 16; - v |= (unsigned long) addr[3] << 24; + v = (uint32_t) addr[0]; + v |= (uint32_t) addr[1] << 8; + v |= (uint32_t) addr[2] << 16; + v |= (uint32_t) addr[3] << 24; return v; } @@ -735,12 +735,12 @@ bfd_signed_vma bfd_getb_signed_32 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0] << 24; - v |= (unsigned long) addr[1] << 16; - v |= (unsigned long) addr[2] << 8; - v |= (unsigned long) addr[3]; + v = (uint32_t) addr[0] << 24; + v |= (uint32_t) addr[1] << 16; + v |= (uint32_t) addr[2] << 8; + v |= (uint32_t) addr[3]; return COERCE32 (v); } @@ -748,12 +748,12 @@ bfd_signed_vma bfd_getl_signed_32 (const void *p) { const bfd_byte *addr = (const bfd_byte *) p; - unsigned long v; + uint32_t v; - v = (unsigned long) addr[0]; - v |= (unsigned long) addr[1] << 8; - v |= (unsigned long) addr[2] << 16; - v |= (unsigned long) addr[3] << 24; + v = (uint32_t) addr[0]; + v |= (uint32_t) addr[1] << 8; + v |= (uint32_t) addr[2] << 16; + v |= (uint32_t) addr[3] << 24; return COERCE32 (v); } @@ -1084,7 +1084,7 @@ _bfd_read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma result; unsigned int num_read; unsigned int shift; - unsigned char byte; + bfd_byte byte; result = 0; shift = 0; @@ -1118,7 +1118,7 @@ _bfd_safe_read_leb128 (bfd *abfd ATTRIBUTE_UNUSED, { bfd_vma result = 0; unsigned int shift = 0; - unsigned char byte = 0; + bfd_byte byte = 0; bfd_byte *data = *ptr; while (data < end) @@ -1152,7 +1152,7 @@ _bfd_read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma result; unsigned int shift; unsigned int num_read; - unsigned char byte; + bfd_byte byte; result = 0; shift = 0;