public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: malloc: avoid switch over uintptr_t
@ 2022-08-05 19:35 Szabolcs Nagy
  0 siblings, 0 replies; 3+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:35 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=257781e305b49b3fd4a9b23f8279ded07a395e29

commit 257781e305b49b3fd4a9b23f8279ded07a395e29
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Mar 28 13:57:10 2022 +0100

    cheri: malloc: avoid switch over uintptr_t
    
    We should use a type that guarantees to represent all address bits.
    In CHERI C this would be ptraddr_t, but we use unsigned long for now
    not to cause regressions on other targets where this type is missing.

Diff:
---
 malloc/mcheck-impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index 00b766219b..e908bfd062 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
+  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
     {
     default:
       status = MCHECK_HEAD;


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [glibc/arm/morello/main] cheri: malloc: avoid switch over uintptr_t
@ 2022-10-27 13:57 Szabolcs Nagy
  0 siblings, 0 replies; 3+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:57 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dc8f9560104f0803e53fa23bfd011aa9878d5a97

commit dc8f9560104f0803e53fa23bfd011aa9878d5a97
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Mar 28 13:57:10 2022 +0100

    cheri: malloc: avoid switch over uintptr_t
    
    We should use a type that guarantees to represent all address bits.
    In CHERI C this would be ptraddr_t, but we use unsigned long for now
    not to cause regressions on other targets where this type is missing.

Diff:
---
 malloc/mcheck-impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index 00b766219b..e908bfd062 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
+  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
     {
     default:
       status = MCHECK_HEAD;

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [glibc/arm/morello/main] cheri: malloc: avoid switch over uintptr_t
@ 2022-10-26 15:18 Szabolcs Nagy
  0 siblings, 0 replies; 3+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:18 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e7e937778da85d4fafc05f521c860a3037da541

commit 9e7e937778da85d4fafc05f521c860a3037da541
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Mar 28 13:57:10 2022 +0100

    cheri: malloc: avoid switch over uintptr_t
    
    We should use a type that guarantees to represent all address bits.
    In CHERI C this would be ptraddr_t, but we use unsigned long for now
    not to cause regressions on other targets where this type is missing.

Diff:
---
 malloc/mcheck-impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index 00b766219b..e908bfd062 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
+  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
     {
     default:
       status = MCHECK_HEAD;

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-27 13:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:35 [glibc/arm/morello/main] cheri: malloc: avoid switch over uintptr_t Szabolcs Nagy
2022-10-26 15:18 Szabolcs Nagy
2022-10-27 13:57 Szabolcs Nagy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).