public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] aarch64: morello: update sysdep.h for purecap ABI
@ 2022-08-05 19:31 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:31 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=db037e48fb64e732294962135c928f5029659f72
commit db037e48fb64e732294962135c928f5029659f72
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Tue May 18 17:24:34 2021 -0300
aarch64: morello: update sysdep.h for purecap ABI
Add macro definitions for purecap ABI in sysdep.h.
Diff:
---
sysdeps/aarch64/sysdep.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
index 5c8e6d50c2..6575503c8b 100644
--- a/sysdeps/aarch64/sysdep.h
+++ b/sysdeps/aarch64/sysdep.h
@@ -21,12 +21,19 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define AARCH64_R(NAME) R_AARCH64_ ## NAME
# define PTR_REG(n) x##n
# define PTR_LOG_SIZE 3
# define PTR_ARG(n)
# define SIZE_ARG(n)
+# ifdef __CHERI_PURE_CAPABILITY__
+# define MORELLO_R(NAME) R_MORELLO_ ## NAME
+# undef PTR_REG
+# define PTR_REG(n) c##n
+# undef PTR_LOG_SIZE
+# define PTR_LOG_SIZE 4
+# endif
#else
# define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME
# define PTR_REG(n) w##n
@@ -145,6 +152,9 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
+# ifdef __CHERI_PURE_CAPABILITY__
+# error mcount profiling is not supported with purecap ABI
+# endif
# define CALL_MCOUNT \
str x30, [sp, #-80]!; \
cfi_adjust_cfa_offset (80); \
@@ -200,9 +210,15 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
OP PTR_REG (R), [x##T];
+#ifdef __CHERI_PURE_CAPABILITY__
+/* These are not used in purecap asm. */
+# undef LDST_PCREL
+# undef LDST_GLOBAL
+#endif
+
/* Load an immediate into R.
Note R is a register number and not a register name. */
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define MOVL(R, NAME) \
movz x##R, #:abs_g3:NAME; \
movk x##R, #:abs_g2_nc:NAME; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] aarch64: morello: update sysdep.h for purecap ABI
@ 2022-11-23 14:41 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-11-23 14:41 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c7f259679aed1eac4732b01279e04a301d5160df
commit c7f259679aed1eac4732b01279e04a301d5160df
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Tue May 18 17:24:34 2021 -0300
aarch64: morello: update sysdep.h for purecap ABI
Add macro definitions for purecap ABI in sysdep.h.
Diff:
---
sysdeps/aarch64/sysdep.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
index 5c8e6d50c2..6575503c8b 100644
--- a/sysdeps/aarch64/sysdep.h
+++ b/sysdeps/aarch64/sysdep.h
@@ -21,12 +21,19 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define AARCH64_R(NAME) R_AARCH64_ ## NAME
# define PTR_REG(n) x##n
# define PTR_LOG_SIZE 3
# define PTR_ARG(n)
# define SIZE_ARG(n)
+# ifdef __CHERI_PURE_CAPABILITY__
+# define MORELLO_R(NAME) R_MORELLO_ ## NAME
+# undef PTR_REG
+# define PTR_REG(n) c##n
+# undef PTR_LOG_SIZE
+# define PTR_LOG_SIZE 4
+# endif
#else
# define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME
# define PTR_REG(n) w##n
@@ -145,6 +152,9 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
+# ifdef __CHERI_PURE_CAPABILITY__
+# error mcount profiling is not supported with purecap ABI
+# endif
# define CALL_MCOUNT \
str x30, [sp, #-80]!; \
cfi_adjust_cfa_offset (80); \
@@ -200,9 +210,15 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
OP PTR_REG (R), [x##T];
+#ifdef __CHERI_PURE_CAPABILITY__
+/* These are not used in purecap asm. */
+# undef LDST_PCREL
+# undef LDST_GLOBAL
+#endif
+
/* Load an immediate into R.
Note R is a register number and not a register name. */
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define MOVL(R, NAME) \
movz x##R, #:abs_g3:NAME; \
movk x##R, #:abs_g2_nc:NAME; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] aarch64: morello: update sysdep.h for purecap ABI
@ 2022-10-27 13:51 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:51 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a5174f3d210020b940c6ed4c1222197e9a756c73
commit a5174f3d210020b940c6ed4c1222197e9a756c73
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Tue May 18 17:24:34 2021 -0300
aarch64: morello: update sysdep.h for purecap ABI
Add macro definitions for purecap ABI in sysdep.h.
Diff:
---
sysdeps/aarch64/sysdep.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
index 5c8e6d50c2..6575503c8b 100644
--- a/sysdeps/aarch64/sysdep.h
+++ b/sysdeps/aarch64/sysdep.h
@@ -21,12 +21,19 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define AARCH64_R(NAME) R_AARCH64_ ## NAME
# define PTR_REG(n) x##n
# define PTR_LOG_SIZE 3
# define PTR_ARG(n)
# define SIZE_ARG(n)
+# ifdef __CHERI_PURE_CAPABILITY__
+# define MORELLO_R(NAME) R_MORELLO_ ## NAME
+# undef PTR_REG
+# define PTR_REG(n) c##n
+# undef PTR_LOG_SIZE
+# define PTR_LOG_SIZE 4
+# endif
#else
# define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME
# define PTR_REG(n) w##n
@@ -145,6 +152,9 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
+# ifdef __CHERI_PURE_CAPABILITY__
+# error mcount profiling is not supported with purecap ABI
+# endif
# define CALL_MCOUNT \
str x30, [sp, #-80]!; \
cfi_adjust_cfa_offset (80); \
@@ -200,9 +210,15 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
OP PTR_REG (R), [x##T];
+#ifdef __CHERI_PURE_CAPABILITY__
+/* These are not used in purecap asm. */
+# undef LDST_PCREL
+# undef LDST_GLOBAL
+#endif
+
/* Load an immediate into R.
Note R is a register number and not a register name. */
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define MOVL(R, NAME) \
movz x##R, #:abs_g3:NAME; \
movk x##R, #:abs_g2_nc:NAME; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] aarch64: morello: update sysdep.h for purecap ABI
@ 2022-10-26 15:12 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:12 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3dc00776cd169d803fadb6b4a0520ffac5378578
commit 3dc00776cd169d803fadb6b4a0520ffac5378578
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Tue May 18 17:24:34 2021 -0300
aarch64: morello: update sysdep.h for purecap ABI
Add macro definitions for purecap ABI in sysdep.h.
Diff:
---
sysdeps/aarch64/sysdep.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
index 5c8e6d50c2..6575503c8b 100644
--- a/sysdeps/aarch64/sysdep.h
+++ b/sysdeps/aarch64/sysdep.h
@@ -21,12 +21,19 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define AARCH64_R(NAME) R_AARCH64_ ## NAME
# define PTR_REG(n) x##n
# define PTR_LOG_SIZE 3
# define PTR_ARG(n)
# define SIZE_ARG(n)
+# ifdef __CHERI_PURE_CAPABILITY__
+# define MORELLO_R(NAME) R_MORELLO_ ## NAME
+# undef PTR_REG
+# define PTR_REG(n) c##n
+# undef PTR_LOG_SIZE
+# define PTR_LOG_SIZE 4
+# endif
#else
# define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME
# define PTR_REG(n) w##n
@@ -145,6 +152,9 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
+# ifdef __CHERI_PURE_CAPABILITY__
+# error mcount profiling is not supported with purecap ABI
+# endif
# define CALL_MCOUNT \
str x30, [sp, #-80]!; \
cfi_adjust_cfa_offset (80); \
@@ -200,9 +210,15 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI)
ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
OP PTR_REG (R), [x##T];
+#ifdef __CHERI_PURE_CAPABILITY__
+/* These are not used in purecap asm. */
+# undef LDST_PCREL
+# undef LDST_GLOBAL
+#endif
+
/* Load an immediate into R.
Note R is a register number and not a register name. */
-#ifdef __LP64__
+#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__
# define MOVL(R, NAME) \
movz x##R, #:abs_g3:NAME; \
movk x##R, #:abs_g2_nc:NAME; \
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23 14:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:31 [glibc/arm/morello/main] aarch64: morello: update sysdep.h for purecap ABI Szabolcs Nagy
2022-10-26 15:12 Szabolcs Nagy
2022-10-27 13:51 Szabolcs Nagy
2022-11-23 14:41 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).