From patchwork Thu Jan 11 03:37:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83816 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 EC1F6385DC30 for ; Thu, 11 Jan 2024 03:38:37 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id EF1DD3857B80 for ; Thu, 11 Jan 2024 03:37:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF1DD3857B80 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF1DD3857B80 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704944279; cv=none; b=FLWJGu5xfGnRmCwH2czyS9fJr5RuI+n1ZM7uZh/i9DP9gSXYGtLep1T9tReuBxJUt8AU1qVYf4w9FogNo0z+vniZh+s5ImHmoRd2IAGXRrz7YqM/TmozM6Kcfi0xhAkTFJdgqsrWW8SqSW6TMJRUtrwCWLaMCOaMFOHQA5b/6wc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704944279; c=relaxed/simple; bh=saCmrSWCI1dKjNatQkW8PoOVrNqvXFtJXv7e8S2b98Q=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=c5MeXhNpvbi7qEgSx/49rWyilVowSovrVYQtg2m8WKe48qxWvoAUl6EHn3cUPnuUX5ZnaZX+jSpuAdmPBd2JXBBvdRXljshguPO1pnjwnKJChlBeJ9OU3hcJ+6+nR4QKK1OePvhQ27AbLux/G1TLJ61RNikFul3gB/Kzo8I9/2A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id A023B343228; Thu, 11 Jan 2024 03:37:56 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 4/5] sim: m32r: fixup some of the int<->pointer casts Date: Wed, 10 Jan 2024 22:37:46 -0500 Message-ID: <20240111033747.17795-4-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111033747.17795-1-vapier@gentoo.org> References: <20240111033747.17795-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The m32r trap code was written for a 32-bit Linux host (and really, one whose Linux ABI matched pretty exactly). This has lead to conversions between integers and pointers which breaks down hard on 64-bit hosts. Clean up some of the functions where possible to avoid unnecessary conversions, use uintptr_t to cast 32-bit target pointers to host pointers in some places, and just stub out a few functions that can't easily be salvaged currently when sizeof(void*) is not 32-bits. This is a bit ugly, but lets us enable warnings for the whole file. --- sim/config.h.in | 3 ++ sim/configure | 39 +++++++++++++++++-- sim/m32r/traps.c | 81 +++++++++++++++++++++++++-------------- sim/m4/sim_ac_platform.m4 | 2 + 4 files changed, 94 insertions(+), 31 deletions(-) diff --git a/sim/m32r/traps.c b/sim/m32r/traps.c index 9ffa3bb15d94..d010863502db 100644 --- a/sim/m32r/traps.c +++ b/sim/m32r/traps.c @@ -436,7 +436,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_brk: - result = brk ((void *) arg1); + result = brk ((void *) (uintptr_t) arg1); errcode = errno; //result = arg1; break; @@ -582,51 +582,51 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) { int n; fd_set readfds; - fd_set *treadfdsp; + unsigned int treadfdsp; fd_set *hreadfdsp; fd_set writefds; - fd_set *twritefdsp; + unsigned int twritefdsp; fd_set *hwritefdsp; fd_set exceptfds; - fd_set *texceptfdsp; + unsigned int texceptfdsp; fd_set *hexceptfdsp; - struct timeval *ttimeoutp; + unsigned int ttimeoutp; struct timeval timeout; n = arg1; - treadfdsp = (fd_set *) arg2; - if (treadfdsp != NULL) + treadfdsp = arg2; + if (treadfdsp !=0) { - readfds = *((fd_set *) t2h_addr (cb, &s, (unsigned int) treadfdsp)); + readfds = *((fd_set *) t2h_addr (cb, &s, treadfdsp)); translate_endian_t2h (&readfds, sizeof(readfds)); hreadfdsp = &readfds; } else hreadfdsp = NULL; - twritefdsp = (fd_set *) arg3; - if (twritefdsp != NULL) + twritefdsp = arg3; + if (twritefdsp != 0) { - writefds = *((fd_set *) t2h_addr (cb, &s, (unsigned int) twritefdsp)); + writefds = *((fd_set *) t2h_addr (cb, &s, twritefdsp)); translate_endian_t2h (&writefds, sizeof(writefds)); hwritefdsp = &writefds; } else hwritefdsp = NULL; - texceptfdsp = (fd_set *) arg4; - if (texceptfdsp != NULL) + texceptfdsp = arg4; + if (texceptfdsp != 0) { - exceptfds = *((fd_set *) t2h_addr (cb, &s, (unsigned int) texceptfdsp)); + exceptfds = *((fd_set *) t2h_addr (cb, &s, texceptfdsp)); translate_endian_t2h (&exceptfds, sizeof(exceptfds)); hexceptfdsp = &exceptfds; } else hexceptfdsp = NULL; - ttimeoutp = (struct timeval *) arg5; - timeout = *((struct timeval *) t2h_addr (cb, &s, (unsigned int) ttimeoutp)); + ttimeoutp = arg5; + timeout = *((struct timeval *) t2h_addr (cb, &s, ttimeoutp)); translate_endian_t2h (&timeout, sizeof(timeout)); result = select (n, hreadfdsp, hwritefdsp, hexceptfdsp, &timeout); @@ -635,10 +635,10 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) if (result != 0) break; - if (treadfdsp != NULL) + if (treadfdsp != 0) { translate_endian_h2t (&readfds, sizeof(readfds)); - if ((s.write_mem) (cb, &s, (unsigned long) treadfdsp, + if ((s.write_mem) (cb, &s, treadfdsp, (char *) &readfds, sizeof(readfds)) != sizeof(readfds)) { result = -1; @@ -646,10 +646,10 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) } } - if (twritefdsp != NULL) + if (twritefdsp != 0) { translate_endian_h2t (&writefds, sizeof(writefds)); - if ((s.write_mem) (cb, &s, (unsigned long) twritefdsp, + if ((s.write_mem) (cb, &s, twritefdsp, (char *) &writefds, sizeof(writefds)) != sizeof(writefds)) { result = -1; @@ -657,10 +657,10 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) } } - if (texceptfdsp != NULL) + if (texceptfdsp != 0) { translate_endian_h2t (&exceptfds, sizeof(exceptfds)); - if ((s.write_mem) (cb, &s, (unsigned long) texceptfdsp, + if ((s.write_mem) (cb, &s, texceptfdsp, (char *) &exceptfds, sizeof(exceptfds)) != sizeof(exceptfds)) { result = -1; @@ -669,7 +669,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) } translate_endian_h2t (&timeout, sizeof(timeout)); - if ((s.write_mem) (cb, &s, (unsigned long) ttimeoutp, + if ((s.write_mem) (cb, &s, ttimeoutp, (char *) &timeout, sizeof(timeout)) != sizeof(timeout)) { result = -1; @@ -692,8 +692,13 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_readdir: +#if SIZEOF_VOID_P == 4 result = (int) readdir ((DIR *) t2h_addr (cb, &s, arg1)); errcode = errno; +#else + result = 0; + errcode = ENOSYS; +#endif break; #if 0 @@ -714,6 +719,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) #endif case TARGET_LINUX_SYS_mmap2: { +#if SIZEOF_VOID_P == 4 /* Code assumes m32r pointer size matches host. */ void *addr; size_t len; int prot, flags, fildes; @@ -736,11 +742,16 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) 0, access_read_write_exec, 0, result, len, 0, NULL, NULL); } +#else + result = 0; + errcode = ENOSYS; +#endif } break; case TARGET_LINUX_SYS_mmap: { +#if SIZEOF_VOID_P == 4 /* Code assumes m32r pointer size matches host. */ void *addr; size_t len; int prot, flags, fildes; @@ -773,11 +784,15 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) 0, access_read_write_exec, 0, result, len, 0, NULL, NULL); } +#else + result = 0; + errcode = ENOSYS; +#endif } break; case TARGET_LINUX_SYS_munmap: - result = munmap ((void *)arg1, arg2); + result = munmap ((void *) (uintptr_t) arg1, arg2); errcode = errno; if (result != -1) sim_core_detach (sd, NULL, 0, arg2, result); @@ -1078,7 +1093,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_mprotect: - result = mprotect ((void *) arg1, arg2, arg3); + result = mprotect ((void *) (uintptr_t) arg1, arg2, arg3); errcode = errno; break; @@ -1149,7 +1164,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_msync: - result = msync ((void *) arg1, arg2, arg3); + result = msync ((void *) (uintptr_t) arg1, arg2, arg3); errcode = errno; break; @@ -1216,8 +1231,13 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_mremap: /* FIXME */ +#if SIZEOF_VOID_P == 4 /* Code assumes m32r pointer size matches host. */ result = (int) mremap ((void *) t2h_addr (cb, &s, arg1), arg2, arg3, arg4); errcode = errno; +#else + result = -1; + errcode = ENOSYS; +#endif break; case TARGET_LINUX_SYS_getresuid32: @@ -1285,8 +1305,13 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num) break; case TARGET_LINUX_SYS_getcwd: - result = (int) getcwd ((char *) t2h_addr (cb, &s, arg1), arg2); - errcode = errno; + { + void *ret; + + ret = getcwd ((char *) t2h_addr (cb, &s, arg1), arg2); + result = ret == NULL ? 0 : arg1; + errcode = errno; + } break; case TARGET_LINUX_SYS_sendfile: diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index fd6daeefbd1c..fa099f23e211 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -133,6 +133,8 @@ AC_CHECK_TYPES(socklen_t, [], [], #include ]) +AC_CHECK_SIZEOF([void *]) + dnl Check for struct statfs. AC_CACHE_CHECK([for struct statfs], [sim_cv_struct_statfs],