From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id 1B63B3858C52 for ; Sun, 12 Feb 2023 11:11:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B63B3858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x52b.google.com with SMTP id w3so2426749edc.2 for ; Sun, 12 Feb 2023 03:11:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ExvITH9csy6j84WPPsWCYjVch19Ibcxg7RVGXyO3gV0=; b=fySQMb/Z06Bxl6b1AketiAMciXguVb67cCVMhIoX77Lw0yc7SGvAQMoiIZFsKgoKcZ M4XB+jIzdbSm/oYodrOfx36VRiunoCzh0OEdb4D3w3uULdokKWAmDsiIn/MRJX6zcE3I Bsu1finG4DnRKh6VCmYrTjpXiefFpB+ZfZASSAAePUTS4vH6OW9K2rK0Jm9kFaCCa9y8 vV8LHJnV3aIYdynac2nJN8/JAgkYOUsXee4Q7l06VsO7wQ52xwWIcXGJHkw/W6Ko3qs9 QdennKTRJIj0qe5cWlJpiokTmyBSPV3olgHI5oohFksACO9IDOpb9GiAKFN7/MHqJ0t5 Acuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ExvITH9csy6j84WPPsWCYjVch19Ibcxg7RVGXyO3gV0=; b=3zKTQw/bshE8uBpBjEZSGmzOnymuLvd6inXm43GV0sWSoz8P9u/t9U7G0V2zSLYznL cFJKEpVJNlCOnrbRYn+w6UH7B6uk0QHuwjx+5nAj9VdOWrErjOE9j+DvE1d5xdzMF1P9 3+zF8UCh0/VdzRX+QhHXjALy+5zaEOv0gBMtTc4GIjgp14cRvyGeNB6pWFF+0vIGeP62 hnBOqoSxGx4DrQ+xEq9RX6VQqEUzCq6XewauSpiLgulMi9NMTYfTtvUs0e5G8ta9OhJ4 DN4RLKcgckUUJqHAnagLsDS7AuyMLg5wfS3pW8AEsxq6UXR45qi7Ls1ZGJdqI0SA1qlm /sKw== X-Gm-Message-State: AO0yUKWflKqd9c5dEK66CxH9ZZNBrenJ087utIPEMhp7LDAmepre/AP7 bH00q4RMNmnzR/kVoSI/2/M= X-Google-Smtp-Source: AK7set82kaPv5Adcp4zJn5rgT9SGy/hm5PvEZhduHQwBgD22Ia98O8VgEjgMiWr/jXxOJo+CERRmPA== X-Received: by 2002:a50:d79e:0:b0:4ab:499e:ae54 with SMTP id w30-20020a50d79e000000b004ab499eae54mr8258751edi.19.1676200275679; Sun, 12 Feb 2023 03:11:15 -0800 (PST) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:2186:c463:9ced:e6fe]) by smtp.gmail.com with ESMTPSA id c61-20020a509fc3000000b004acbe0b36d2sm1266910edf.6.2023.02.12.03.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 03:11:15 -0800 (PST) From: Sergey Bugaev To: bug-hurd@gnu.org, libc-alpha@sourceware.org Cc: =?UTF-8?q?Fl=C3=A1vio=20Cruz?= , Sergey Bugaev Subject: [RFC PATCH glibc 3/12] mach, hurd: Cast through uintptr_t Date: Sun, 12 Feb 2023 14:10:34 +0300 Message-Id: <20230212111044.610942-4-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230212111044.610942-1-bugaevc@gmail.com> References: <20230212111044.610942-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.9 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When casting between a pointer and an integer of a different size, GCC emits a warning (which is escalated to a build failure by -Werror). Indeed, if what you start with is a pointer, which you then cast to a shorter integer and then back again, you're going to cut off some bits of the pointer. But if you start with an integer (such as mach_port_t), then cast it to a longer pointer (void *), and then back to a shorter integer, you are fine. To keep GCC happy, cast through an intermediary uintptr_t, which is always the same size as a pointer. Signed-off-by: Sergey Bugaev --- htl/cthreads-compat.c | 5 +++-- hurd/fopenport.c | 15 ++++++++++----- hurd/hurd/port.h | 2 +- hurd/port-cleanup.c | 3 ++- hurd/vpprintf.c | 6 ++++-- mach/devstream.c | 9 +++++---- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/htl/cthreads-compat.c b/htl/cthreads-compat.c index 55043a8b..2a0a95b6 100644 --- a/htl/cthreads-compat.c +++ b/htl/cthreads-compat.c @@ -25,8 +25,9 @@ void __cthread_detach (__cthread_t thread) { int err; + pthread_t pthread = (pthread_t) (uintptr_t) thread; - err = __pthread_detach ((pthread_t) thread); + err = __pthread_detach (pthread); assert_perror (err); } weak_alias (__cthread_detach, cthread_detach) @@ -40,7 +41,7 @@ __cthread_fork (__cthread_fn_t func, void *arg) err = __pthread_create (&thread, NULL, func, arg); assert_perror (err); - return (__cthread_t) thread; + return (__cthread_t) (uintptr_t) thread; } weak_alias (__cthread_fork, cthread_fork) diff --git a/hurd/fopenport.c b/hurd/fopenport.c index 60afb445..be6aa30c 100644 --- a/hurd/fopenport.c +++ b/hurd/fopenport.c @@ -28,9 +28,10 @@ readio (void *cookie, char *buf, size_t n) mach_msg_type_number_t nread; error_t err; char *bufp = buf; + io_t io = (io_t) (uintptr_t) cookie; nread = n; - if (err = __io_read ((io_t) cookie, &bufp, &nread, -1, n)) + if (err = __io_read (io, &bufp, &nread, -1, n)) return __hurd_fail (err); if (bufp != buf) @@ -50,8 +51,9 @@ writeio (void *cookie, const char *buf, size_t n) { vm_size_t wrote; error_t err; + io_t io = (io_t) (uintptr_t) cookie; - if (err = __io_write ((io_t) cookie, buf, n, -1, &wrote)) + if (err = __io_write (io, buf, n, -1, &wrote)) return __hurd_fail (err); return wrote; @@ -65,7 +67,8 @@ seekio (void *cookie, off64_t *pos, int whence) { - error_t err = __io_seek ((file_t) cookie, *pos, whence, pos); + io_t io = (io_t) (uintptr_t) cookie; + error_t err = __io_seek (io, *pos, whence, pos); return err ? __hurd_fail (err) : 0; } @@ -74,8 +77,9 @@ seekio (void *cookie, static int closeio (void *cookie) { + io_t io = (io_t) (uintptr_t) cookie; error_t error = __mach_port_deallocate (__mach_task_self (), - (mach_port_t) cookie); + io); if (error) return __hurd_fail (error); return 0; @@ -127,6 +131,7 @@ __fopenport (mach_port_t port, const char *mode) return NULL; } - return fopencookie ((void *) port, mode, funcsio); + return fopencookie ((void *) (uintptr_t) port, + mode, funcsio); } weak_alias (__fopenport, fopenport) diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h index fdba8db5..1e473978 100644 --- a/hurd/hurd/port.h +++ b/hurd/hurd/port.h @@ -96,7 +96,7 @@ _hurd_port_locked_get (struct hurd_port *port, if (result != MACH_PORT_NULL) { link->cleanup = &_hurd_port_cleanup; - link->cleanup_data = (void *) result; + link->cleanup_data = (void *) (uintptr_t) result; _hurd_userlink_link (&port->users, link); } __spin_unlock (&port->lock); diff --git a/hurd/port-cleanup.c b/hurd/port-cleanup.c index 08ab3d47..ad43b830 100644 --- a/hurd/port-cleanup.c +++ b/hurd/port-cleanup.c @@ -26,7 +26,8 @@ void _hurd_port_cleanup (void *cleanup_data, jmp_buf env, int val) { - __mach_port_deallocate (__mach_task_self (), (mach_port_t) cleanup_data); + mach_port_t port = (mach_port_t) (uintptr_t) cleanup_data; + __mach_port_deallocate (__mach_task_self (), port); } /* We were cancelled while using a port, and called from the cleanup unwinding. diff --git a/hurd/vpprintf.c b/hurd/vpprintf.c index fe734946..010f04ca 100644 --- a/hurd/vpprintf.c +++ b/hurd/vpprintf.c @@ -25,8 +25,9 @@ static ssize_t do_write (void *cookie, const char *buf, size_t n) { + io_t io = (io_t) (uintptr_t) cookie; vm_size_t amount = n; - error_t error = __io_write ((io_t) cookie, buf, n, -1, &amount); + error_t error = __io_write (io, buf, n, -1, &amount); if (error) return __hurd_fail (error); return n; @@ -51,7 +52,8 @@ vpprintf (io_t port, const char *format, va_list arg) #endif _IO_cookie_init (&temp_f.cfile, _IO_NO_READS, - (void *) port, (cookie_io_functions_t) { write: do_write }); + (void *) (uintptr_t) port, + (cookie_io_functions_t) { write: do_write }); done = __vfprintf_internal (&temp_f.cfile.__fp.file, format, arg, 0); diff --git a/mach/devstream.c b/mach/devstream.c index 09272d10..cfa9a4f4 100644 --- a/mach/devstream.c +++ b/mach/devstream.c @@ -28,7 +28,7 @@ static ssize_t devstream_write (void *cookie, const char *buffer, size_t n) { - const device_t dev = (device_t) cookie; + const device_t dev = (device_t) (uintptr_t) cookie; int write_some (const char *p, size_t to_write) { @@ -83,7 +83,7 @@ devstream_write (void *cookie, const char *buffer, size_t n) static ssize_t devstream_read (void *cookie, char *buffer, size_t to_read) { - const device_t dev = (device_t) cookie; + const device_t dev = (device_t) (uintptr_t) cookie; kern_return_t err; mach_msg_type_number_t nread = to_read; @@ -112,7 +112,8 @@ devstream_read (void *cookie, char *buffer, size_t to_read) static int dealloc_ref (void *cookie) { - if (__mach_port_deallocate (mach_task_self (), (mach_port_t) cookie)) + const device_t dev = (device_t) (uintptr_t) cookie; + if (__mach_port_deallocate (mach_task_self (), dev)) { errno = EINVAL; return -1; @@ -131,7 +132,7 @@ mach_open_devstream (mach_port_t dev, const char *mode) return NULL; } - stream = _IO_fopencookie ((void *) dev, mode, + stream = _IO_fopencookie ((void *) (uintptr_t) dev, mode, (cookie_io_functions_t) { write: devstream_write, read: devstream_read, close: dealloc_ref }); -- 2.39.1