* refactor .data and .rodata address computations in tests to use HI2…

…1/LO12 * refactor bounce tests to work with huge framebuffers
blu · Sep 7, 2021 · ed99335 · ed99335
1 parent 842d6d4
commit ed99335
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 32 deletions.
diff --git a/test_bounce.s b/test_bounce.s
@@ -13,6 +13,12 @@
 	// symbols supplied by CLI
 .endif
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	// clear screen
@@ -35,8 +41,8 @@ _start:
 	svc	0
 
 	// access to fb: addr & len as per SYS_write
-	mov	x2, fb_len
-	adr	x1, fb
+	ldr	w2, =fb_len
+	adrf	x1, fb
 
 	// plot blip in fb
 	mov	w3, 0x5d5b
@@ -78,7 +84,6 @@ _start:
 	mov	x0, xzr
 	svc	0
 
-	.section .rodata
 fb_clear_cmd:
 	.ascii "\033[2J"
 fb_clear_len = . - fb_clear_cmd

diff --git a/test_bounce_neon.s b/test_bounce_neon.s
@@ -44,7 +44,7 @@ _start:
 	svc	0
 
 	// access to fb: addr & len as per SYS_write
-	mov	x2, fb_len
+	ldr	x2, =fb_len
 	adr	x1, fb
 
 	// plot blips in fb

diff --git a/test_bounce_neon_aosoa.s b/test_bounce_neon_aosoa.s
@@ -13,6 +13,12 @@
 	// symbols supplied by CLI
 .endif
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	// clear screen
@@ -38,12 +44,12 @@ _start:
 	svc	0
 
 	// access to fb: addr & len as per SYS_write
-	mov	x2, fb_len
-	adr	x1, fb
+	ldr	w2, =fb_len
+	adrf	x1, fb
 
 	// plot blips in fb
-	adr	x10, blip
-	adr	x11, blip_end
+	adrf	x10, blip
+	adrf	x11, blip_end
 	mov	x12, x11
 .Lpack_plot:
 	// four Q-form regs hold SoA { pos_x, pos_y, step_x, step_y }
@@ -93,8 +99,8 @@ _start:
 	svc	0
 
 	// erase blips from fb
-	adr	x10, blip_end
-	adr	x11, erase_end
+	adrf	x10, blip_end
+	adrf	x11, erase_end
 .Lpack_erase:
 	ldp	w4, w5, [x10], 8
 	ldp	w6, w7, [x10], 8
@@ -121,7 +127,6 @@ _start:
 	mov	x0, xzr
 	svc	0
 
-	.section .rodata
 fb_clear_cmd:
 	.ascii "\033[2J"
 fb_clear_len = . - fb_clear_cmd

diff --git a/test_bounce_neon_aosoa_bg.s b/test_bounce_neon_aosoa_bg.s
@@ -25,6 +25,12 @@
 	.equ GRID_STEP_Y_2, 0
 	.equ GRID_STEP_Y_3, 1
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	// clear screen
@@ -51,10 +57,8 @@ _start:
 	adr	x12, grid_step_xxx0
 	adr	x13, grid_step_1234
 
-	adrp	x7, grid
-	add	x7, x7, :lo12:grid
-	adrp	x8, grid_end
-	add	x8, x8, :lo12:grid_end
+	adrf	x7, grid
+	adrf	x8, grid_end
 	mov	w9, wzr
 .Lgen_grid:
 	// how many x-coords exceed end-of-line - 2?
@@ -139,14 +143,12 @@ _start:
 	svc	0
 
 	// access to fb: addr & len as per SYS_write
-	mov	x2, fb_len
-	adr	x1, fb
+	ldr	w2, =fb_len
+	adrf	x1, fb
 
 	// plot grid in fb
-	adrp	x10, grid
-	add	x10, x10, :lo12:grid
-	adrp	x11, grid_end
-	add	x11, x11, :lo12:grid_end
+	adrf	x10, grid
+	adrf	x11, grid_end
 	mov	x12, x11
 .Lgrid_plot:
 	// four Q-form regs hold SoA { pos_x, pos_y, step_x, step_y }
@@ -192,8 +194,8 @@ _start:
 	bne	.Lgrid_plot
 
 	// plot blips in fb
-	adr	x10, blip
-	adr	x11, blip_end
+	adrf	x10, blip
+	adrf	x11, blip_end
 	mov	x12, x11
 .Lpack_plot:
 	// four Q-form regs hold SoA { pos_x, pos_y, step_x, step_y }
@@ -243,10 +245,8 @@ _start:
 	svc	0
 
 	// erase grid from fb
-	adrp	x10, grid_end
-	add	x10, x10, :lo12:grid_end
-	adrp	x11, grid_erase_end
-	add	x11, x11, :lo12:grid_erase_end
+	adrf	x10, grid_end
+	adrf	x11, grid_erase_end
 .Lgrid_erase:
 	ldp	w4, w5, [x10], 8
 	ldp	w6, w7, [x10], 8
@@ -261,8 +261,8 @@ _start:
 	bne	.Lgrid_erase
 
 	// erase blips from fb
-	adr	x10, blip_end
-	adr	x11, erase_end
+	adrf	x10, blip_end
+	adrf	x11, erase_end
 .Lpack_erase:
 	ldp	w4, w5, [x10], 8
 	ldp	w6, w7, [x10], 8

diff --git a/test_cross_1.s b/test_cross_1.s
@@ -4,10 +4,16 @@
 	.equ SYS_exit, 93
 	.equ STDOUT_FILENO, 1
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	mov	x8, SYS_write
-	adr	x1, buf
+	adrf	x1, buf
 	ldrb	w2, [x1, -1]
 	mov	x0, STDOUT_FILENO
 	svc	0

diff --git a/test_data.s b/test_data.s
@@ -4,11 +4,17 @@
 	.equ SYS_exit, 93
 	.equ STDOUT_FILENO, 1
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	mov	x8, SYS_write
 	mov	x2, len
-	adr	x1, buf
+	adrf	x1, buf
 	ldr	w3, =0x4c45525f
 	str	w3, [x1, 13]
 	mov	x0, STDOUT_FILENO

diff --git a/test_rodata.s b/test_rodata.s
@@ -4,11 +4,17 @@
 	.equ SYS_exit, 93
 	.equ STDOUT_FILENO, 1
 
+// load 'far' address as a +/-4GB offset from PC
+.macro adrf Xn, addr:req
+	adrp	\Xn, \addr
+	add	\Xn, \Xn, :lo12:\addr
+.endm
+
 	.text
 _start:
 	mov	x8, SYS_write
 	mov	x2, len
-	adr	x1, buf
+	adrf	x1, buf
 	mov	x0, STDOUT_FILENO
 	svc	0