From 507c5206319beac12f2ba75121b4ac979c5a13f1 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 31 May 2024 13:02:19 +0200 Subject: [PATCH] Execute build/refresh.sh. --- build/cheri/ct_inverse_mod_256-armv8.S | 6 ++++-- build/cheri/ct_inverse_mod_384-armv8.S | 6 ++++-- build/coff/ct_inverse_mod_256-armv8.S | 6 ++++-- build/coff/ct_inverse_mod_384-armv8.S | 6 ++++-- build/elf/ct_inverse_mod_256-armv8.S | 6 ++++-- build/elf/ct_inverse_mod_384-armv8.S | 6 ++++-- build/mach-o/ct_inverse_mod_256-armv8.S | 6 ++++-- build/mach-o/ct_inverse_mod_384-armv8.S | 6 ++++-- build/win64/ct_inverse_mod_256-armv8.asm | 6 ++++-- build/win64/ct_inverse_mod_384-armv8.asm | 6 ++++-- 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/build/cheri/ct_inverse_mod_256-armv8.S b/build/cheri/ct_inverse_mod_256-armv8.S index 0b26c288..c451f941 100644 --- a/build/cheri/ct_inverse_mod_256-armv8.S +++ b/build/cheri/ct_inverse_mod_256-armv8.S @@ -17,10 +17,12 @@ ct_inverse_mod_256: ldp x4, x5, [c1,#8*0] ldp x6, x7, [c1,#8*2] +#ifdef __CHERI_PURE_CAPABILITY__ + add c1,csp,#16+511 + alignd c1,c1,#9 +#else add x1, sp, #16+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif str c0, [csp] // offload out_ptr diff --git a/build/cheri/ct_inverse_mod_384-armv8.S b/build/cheri/ct_inverse_mod_384-armv8.S index 7464dfae..8d132974 100644 --- a/build/cheri/ct_inverse_mod_384-armv8.S +++ b/build/cheri/ct_inverse_mod_384-armv8.S @@ -19,10 +19,12 @@ ct_inverse_mod_383: ldp x5, x6, [c1,#8*2] ldp x7, x8, [c1,#8*4] +#ifdef __CHERI_PURE_CAPABILITY__ + add c1,csp,#32+511 + alignd c1,c1,#9 +#else add x1, sp, #32+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif stp c0, c3, [csp] // offload out_ptr, nx_ptr diff --git a/build/coff/ct_inverse_mod_256-armv8.S b/build/coff/ct_inverse_mod_256-armv8.S index 57ca8370..b8ac9bf7 100644 --- a/build/coff/ct_inverse_mod_256-armv8.S +++ b/build/coff/ct_inverse_mod_256-armv8.S @@ -19,10 +19,12 @@ ct_inverse_mod_256: ldp x4, x5, [x1,#8*0] ldp x6, x7, [x1,#8*2] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#16+511 + alignd c1,c1,#9 +#else add x1, sp, #16+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif str x0, [sp] // offload out_ptr diff --git a/build/coff/ct_inverse_mod_384-armv8.S b/build/coff/ct_inverse_mod_384-armv8.S index 648a4048..aecb4ea7 100644 --- a/build/coff/ct_inverse_mod_384-armv8.S +++ b/build/coff/ct_inverse_mod_384-armv8.S @@ -21,10 +21,12 @@ ct_inverse_mod_383: ldp x5, x6, [x1,#8*2] ldp x7, x8, [x1,#8*4] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#32+511 + alignd c1,c1,#9 +#else add x1, sp, #32+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif stp x0, x3, [sp] // offload out_ptr, nx_ptr diff --git a/build/elf/ct_inverse_mod_256-armv8.S b/build/elf/ct_inverse_mod_256-armv8.S index 1ad921d7..7d4d2eb5 100644 --- a/build/elf/ct_inverse_mod_256-armv8.S +++ b/build/elf/ct_inverse_mod_256-armv8.S @@ -17,10 +17,12 @@ ct_inverse_mod_256: ldp x4, x5, [x1,#8*0] ldp x6, x7, [x1,#8*2] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#16+511 + alignd c1,c1,#9 +#else add x1, sp, #16+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif str x0, [sp] // offload out_ptr diff --git a/build/elf/ct_inverse_mod_384-armv8.S b/build/elf/ct_inverse_mod_384-armv8.S index 841ee3a6..daebd370 100644 --- a/build/elf/ct_inverse_mod_384-armv8.S +++ b/build/elf/ct_inverse_mod_384-armv8.S @@ -19,10 +19,12 @@ ct_inverse_mod_383: ldp x5, x6, [x1,#8*2] ldp x7, x8, [x1,#8*4] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#32+511 + alignd c1,c1,#9 +#else add x1, sp, #32+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif stp x0, x3, [sp] // offload out_ptr, nx_ptr diff --git a/build/mach-o/ct_inverse_mod_256-armv8.S b/build/mach-o/ct_inverse_mod_256-armv8.S index c0d0656b..48cebab2 100644 --- a/build/mach-o/ct_inverse_mod_256-armv8.S +++ b/build/mach-o/ct_inverse_mod_256-armv8.S @@ -17,10 +17,12 @@ _ct_inverse_mod_256: ldp x4, x5, [x1,#8*0] ldp x6, x7, [x1,#8*2] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#16+511 + alignd c1,c1,#9 +#else add x1, sp, #16+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif str x0, [sp] // offload out_ptr diff --git a/build/mach-o/ct_inverse_mod_384-armv8.S b/build/mach-o/ct_inverse_mod_384-armv8.S index 40766652..f1bb996f 100644 --- a/build/mach-o/ct_inverse_mod_384-armv8.S +++ b/build/mach-o/ct_inverse_mod_384-armv8.S @@ -19,10 +19,12 @@ _ct_inverse_mod_383: ldp x5, x6, [x1,#8*2] ldp x7, x8, [x1,#8*4] +#ifdef __CHERI_PURE_CAPABILITY__ + add x1,sp,#32+511 + alignd c1,c1,#9 +#else add x1, sp, #32+511 // find closest 512-byte-aligned spot and x1, x1, #-512 // in the frame... -#ifdef __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 #endif stp x0, x3, [sp] // offload out_ptr, nx_ptr diff --git a/build/win64/ct_inverse_mod_256-armv8.asm b/build/win64/ct_inverse_mod_256-armv8.asm index 4fea8d3f..fde83e0e 100644 --- a/build/win64/ct_inverse_mod_256-armv8.asm +++ b/build/win64/ct_inverse_mod_256-armv8.asm @@ -19,10 +19,12 @@ __SIZEOF_POINTER__ SETA 64/8 ldp x4, x5, [x1,#8*0] ldp x6, x7, [x1,#8*2] + if :def: __CHERI_PURE_CAPABILITY__ + add x1,sp,#16+511 + alignd c1,c1,#9 + else add x1, sp, #16+511 and x1, x1, #-512 - if :def: __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 endif str x0, [sp] diff --git a/build/win64/ct_inverse_mod_384-armv8.asm b/build/win64/ct_inverse_mod_384-armv8.asm index e2a9af2a..36fe37b0 100644 --- a/build/win64/ct_inverse_mod_384-armv8.asm +++ b/build/win64/ct_inverse_mod_384-armv8.asm @@ -21,10 +21,12 @@ __SIZEOF_POINTER__ SETA 64/8 ldp x5, x6, [x1,#8*2] ldp x7, x8, [x1,#8*4] + if :def: __CHERI_PURE_CAPABILITY__ + add x1,sp,#32+511 + alignd c1,c1,#9 + else add x1, sp, #32+511 and x1, x1, #-512 - if :def: __CHERI_PURE_CAPABILITY__ - scvalue c1,csp,x1 endif stp x0, x3, [sp]