Execute build/refresh.sh.

supranational · Jul 23, 2024 · 507c520 · 507c520
1 parent 16ee7fd
commit 507c520
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]