From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EJR+I6jpF2CeBAAAWB0awg (envelope-from ) for ; Mon, 01 Feb 2021 06:44:40 -0500 Received: by simark.ca (Postfix, from userid 112) id 8D6C81EF86; Mon, 1 Feb 2021 06:44:40 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 864091E965 for ; Mon, 1 Feb 2021 06:44:39 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA3B93836C67; Mon, 1 Feb 2021 11:44:38 +0000 (GMT) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id B91953836C67 for ; Mon, 1 Feb 2021 11:44:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B91953836C67 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x32b.google.com with SMTP id o10so11324149wmc.1 for ; Mon, 01 Feb 2021 03:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a9J/wHAvISQichnlfgihD3iq4AALoqyX75zzzfW/WWQ=; b=awXWNf9jyHCHk3BBllwp45TLzXY/XPjLHWLPO9JWlW/bRS1wfFjIAc2MtUfwlgTYzK jfuR0mg0xWfQoT8omTgVpK6KUllnW5uVBfZMVcIT4h7j+IxHvKMONXKzWWYeZoGp5a3G 3OvsMmQCrxFgaD2dtd84j9sDlCtI8mJLWd3LEH0evzW9xNaywCr56FIpyH0KLzSWK/cK jyc6AmUC/B/wO6kXhttsGBEw4CmwIqo8k1RN7Wqg9FTaHgyTCfJhaPaxmnexHZ78JO6D ln8z3QszledrjTEJw7owzgM7ggAc1LeK0sPkCONpTu/x9s/axzDOd0iiuqkAts3AUHzy A2wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a9J/wHAvISQichnlfgihD3iq4AALoqyX75zzzfW/WWQ=; b=CHO6aYeFn8uZFhKSXitMTa44rwVx0WJuyaFDLRe3aOuAoB/5fpOV11dpYO9ZComTxO 5JG/bbZSJCMuT5qtxuXgQwZ0+d+a9Q5BzuCfl3+Mx0AjJ421z+XbUiR3BmCHYDmEb7fS yeQ7UfOywnjnKSQEoa33Xlv4r3PN1OseMF73YrGgiJ0wSqoIzNxWg3HylS03aSLFksSF TtRTQIDP7tKL4/1yFMjXA/M4YlKuBmCvshNMvJZLa7uxBZwhuZ8Yhg0Mz5J0xvmTgWY2 zG13PjoTzGYM9yUK7GG6xRtGNke0ElaUTnjwL8l5vEb7cBIA1kMf7uiXyV6BJFfsRbZ/ 1S5Q== X-Gm-Message-State: AOAM533JQZc/p8qHoNLwxGgKIBdI5eT0i1L9oIC7tt8GWDi5MmdsZDan /1y5Ni0DZ8SW7G6Lr56+28f60jW/MVpAPw== X-Google-Smtp-Source: ABdhPJxq0QWkjsZ5UJEXAiP7ztngtNSzo+hV2oc8JnKZxS4Uvpht6oIlEYTALCVHvtL95co71tffPg== X-Received: by 2002:a1c:b643:: with SMTP id g64mr13969430wmf.89.1612179874677; Mon, 01 Feb 2021 03:44:34 -0800 (PST) Received: from localhost (host86-191-239-31.range86-191.btcentralplus.com. [86.191.239.31]) by smtp.gmail.com with ESMTPSA id c2sm20807690wmd.10.2021.02.01.03.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:44:34 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 10/11] sim/rx: avoid pointer arithmetic on void * pointers Date: Mon, 1 Feb 2021 11:44:13 +0000 Message-Id: <85706f6f0bfd109515063c4d9a0f224ad930d856.1612179773.git.andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Pointer arithmetic on void * pointers results in a GCC warning. Avoid the warning by casting the pointer to its actual type earlier in the function. sim/rx/ChangeLog: * mem.c (mem_put_blk): Rename parameter, add cast from parameter type to local type. Remove cast later in the function. (mem_get_blk): Likewise. * mem.h (mem_put_blk): Rename parameter to match definition. (mem_get_blk): Likewise. --- sim/rx/ChangeLog | 8 ++++++++ sim/rx/mem.c | 12 ++++++++---- sim/rx/mem.h | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/sim/rx/mem.c b/sim/rx/mem.c index fe8e08d1460..7e62bfb8953 100644 --- a/sim/rx/mem.c +++ b/sim/rx/mem.c @@ -434,13 +434,15 @@ mem_put_si (int address, unsigned long value) } void -mem_put_blk (int address, void *bufptr, int nbytes) +mem_put_blk (int address, void *bufptr_void, int nbytes) { + unsigned char *bufptr = (unsigned char *) bufptr_void; + S ("<="); if (enable_counting) mem_counters[1][1] += nbytes; while (nbytes--) - mem_put_byte (address++, *(unsigned char *) bufptr++); + mem_put_byte (address++, *bufptr++); E (); } @@ -567,13 +569,15 @@ mem_get_si (int address) } void -mem_get_blk (int address, void *bufptr, int nbytes) +mem_get_blk (int address, void *bufptr_void, int nbytes) { + char *bufptr = (char *) bufptr_void; + S ("=>"); if (enable_counting) mem_counters[0][1] += nbytes; while (nbytes--) - *(char *) bufptr++ = mem_get_byte (address++); + *bufptr++ = mem_get_byte (address++); E (); } diff --git a/sim/rx/mem.h b/sim/rx/mem.h index 21080f6e6e3..a4c7455a20d 100644 --- a/sim/rx/mem.h +++ b/sim/rx/mem.h @@ -53,7 +53,7 @@ void mem_put_hi (int address, unsigned short value); void mem_put_psi (int address, unsigned long value); void mem_put_si (int address, unsigned long value); -void mem_put_blk (int address, void *bufptr, int nbytes); +void mem_put_blk (int address, void *bufptr_void, int nbytes); unsigned char mem_get_pc (int address); @@ -62,7 +62,7 @@ unsigned short mem_get_hi (int address); unsigned long mem_get_psi (int address); unsigned long mem_get_si (int address); -void mem_get_blk (int address, void *bufptr, int nbytes); +void mem_get_blk (int address, void *bufptr_void, int nbytes); int sign_ext (int v, int bits); -- 2.25.4