[vlc-devel] [PATCH 2/3] deinterlace: add missing BTI's

RĂ©mi Denis-Courmont remi at remlab.net
Fri Nov 29 19:14:25 CET 2019


---
 modules/video_filter/deinterlace/merge_arm64.S | 2 ++
 modules/video_filter/deinterlace/merge_sve.S   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/video_filter/deinterlace/merge_arm64.S b/modules/video_filter/deinterlace/merge_arm64.S
index 1d2a022aa6..77c3dcc0fc 100644
--- a/modules/video_filter/deinterlace/merge_arm64.S
+++ b/modules/video_filter/deinterlace/merge_arm64.S
@@ -32,6 +32,7 @@
 	.align 2
 	// NOTE: Offset and pitch must be multiple of 16-bytes in VLC.
 function merge8_arm64_neon
+	bti		c
 	ands		x5, SIZE, #~63
 	b.eq		2f
 	mov		x10, #64
@@ -68,6 +69,7 @@ function merge8_arm64_neon
 
 	.align 2
 function merge16_arm64_neon
+	bti		c
 	ands		x5, SIZE, #~63
 	b.eq		2f
 1:
diff --git a/modules/video_filter/deinterlace/merge_sve.S b/modules/video_filter/deinterlace/merge_sve.S
index f73c5e2d6c..52888853d1 100644
--- a/modules/video_filter/deinterlace/merge_sve.S
+++ b/modules/video_filter/deinterlace/merge_sve.S
@@ -26,6 +26,7 @@
 
 	.text
 function merge8_arm_sve
+	bti	c
 	mov	x4, #0
 	b	2f
 1:	ld1b	{z0.h}, p0/z, [x1, x4]
@@ -39,6 +40,7 @@ function merge8_arm_sve
 	ret
 
 function merge16_arm_sve
+	bti	c
 	mov	x4, #0
 	b	2f
 1:	ld1h	{z0.s}, p0/z, [x1, x4, lsl #1]
-- 
2.24.0



More information about the vlc-devel mailing list