Skip to contentSkip to conversation

Compile asm-files to thumb2

PATCH In review Vladimir 'φ-coder/phcoder' Serbinenko 2 participants 2 messages Nov 14, 2013 – Nov 16, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Compile asm-files to thumb2

grub-core/kern/arm/cache.S +5 -0
index 8522d24..2ad774d 100644
@@ -21,7 +21,12 @@
 	.file	"cache.S"
 	.text
 	.syntax	unified
+#if !defined (__thumb2__) || !defined (ARMV7)
 	.arm
+#else
+	.thumb
+#endif
+
 #if !defined (ARMV6) && !defined (ARMV7)
 # error Unsupported architecture version!
 #endif
grub-core/kern/arm/cache_armv7.S +16 -5
index 0c16b10..aa42fad 100644
@@ -21,8 +21,13 @@
 	.file	"cache_armv7.S"
 	.text
 	.syntax	unified
-	.arm
+#if !defined (__thumb2__)
 	.arch	armv7a
+	.arm
+#else
+	.arch	armv7
+	.thumb
+#endif
 # define DMB	dmb
 # define DSB	dsb
 # define ISB	isb
@@ -58,11 +63,17 @@ clean_invalidate_dcache:
 	@ read current cache information
 	mrc	p15, 1, r8, c0, c0, 0	@ Read CCSIDR
 	lsr	r3, r8, #13		@ Number of sets -1
-	ldr	r9, =0x3fff
-	and	r3, r3, r9
+
+	@ Keep only 14 bits of r3
+	lsl     r3, r3, #18
+	lsr     r3, r3, #18
+
 	lsr	r4, r8, #3		@ Number of ways -1
-	ldr	r9, =0x1ff
-	and	r4, r4, r9
+
+	@ Keep only 9  bits of r4
+	lsl     r4, r4, #23
+	lsr     r4, r4, #23
+
 	and	r7, r8, #7		@ log2(line size in words) - 2
 	add	r7, r7, #2		@  adjust
 	mov	r8, #1
grub-core/lib/arm/setjmp.S +11 -3
index 4f15679..b6febfb 100644
@@ -24,7 +24,11 @@
 GRUB_MOD_LICENSE "GPLv3+"
 
 	.syntax	unified
+#if !defined (__thumb2__)
 	.arm
+#else
+	.thumb
+#endif
 
 	.text
 
@@ -32,7 +36,8 @@ GRUB_MOD_LICENSE "GPLv3+"
  * int grub_setjmp (grub_jmp_buf env)
  */
 FUNCTION(grub_setjmp)
-	stm	r0, { r4-r11, sp, lr }
+	stm	r0, { r4-r11, lr }
+	str     sp, [r0, #36 ]
 	mov	r0, #0
 	bx	lr
 
@@ -40,7 +45,10 @@ FUNCTION(grub_setjmp)
  * int grub_longjmp (grub_jmp_buf env, int val)
  */
 FUNCTION(grub_longjmp)
- 	ldm	r0, { r4-r11, sp, lr }
+	ldm	r0, { r4-r11, lr }
+	ldr     sp, [r0, #36 ]
 	movs	r0, r1
-	moveq	r0, #1
+	bne     1f
+	mov	r0, #1
+1:
 	bx	lr
#1 lore raw

Hi Vladimir,

The code looks/appears correct - a few comments inline.

Quoted 23 lines · Vladimir 'φ-coder/phcoder' Serbinenko
grub-core/kern/arm/cache.S +5 -0
index 8522d24..2ad774d 100644
@@ -21,7 +21,12 @@
 	.file	"cache.S"
 	.text
 	.syntax	unified
+#if !defined (__thumb2__) || !defined (ARMV7)
 	.arm
+#else
+	.thumb
+#endif
+
 #if !defined (ARMV6) && !defined (ARMV7)
 # error Unsupported architecture version!
 #endif
grub-core/kern/arm/cache_armv7.S +0 -0
index 0c16b10..aa42fad 100644
@@ -21,8 +21,13 @@
 	.file	"cache_armv7.S"

grub-core/kern/arm/cache_armv7.S line 30

Quoted 10 lines
grub-core/kern/arm/cache_armv7.S +6 -1
 	.text
 	.syntax	unified
-	.arm
+#if !defined (__thumb2__)
 	.arch	armv7a
+	.arm
+#else
+	.arch	armv7
+	.thumb
+#endif

I think ".arch armv7a" could be moved outside of the #if statement,
and the ".arch armv7" could be dropped.

Quoted 42 lines
grub-core/kern/arm/cache_armv7.S +10 -4
 # define DMB	dmb
 # define DSB	dsb
 # define ISB	isb
@@ -58,11 +63,17 @@ clean_invalidate_dcache:
 	@ read current cache information
 	mrc	p15, 1, r8, c0, c0, 0	@ Read CCSIDR
 	lsr	r3, r8, #13		@ Number of sets -1
-	ldr	r9, =0x3fff
-	and	r3, r3, r9
+
+	@ Keep only 14 bits of r3
+	lsl     r3, r3, #18
+	lsr     r3, r3, #18
+
 	lsr	r4, r8, #3		@ Number of ways -1
-	ldr	r9, =0x1ff
-	and	r4, r4, r9
+
+	@ Keep only 9  bits of r4
+	lsl     r4, r4, #23
+	lsr     r4, r4, #23
+
 	and	r7, r8, #7		@ log2(line size in words) - 2
 	add	r7, r7, #2		@  adjust
 	mov	r8, #1
grub-core/lib/arm/setjmp.S +4 -0
index 4f15679..b6febfb 100644
@@ -24,7 +24,11 @@
 GRUB_MOD_LICENSE "GPLv3+"
 
 	.syntax	unified
+#if !defined (__thumb2__)
 	.arm
+#else
+	.thumb
+#endif
 
 	.text
 

grub-core/lib/arm/setjmp.S GRUB_MOD_LICENSE "GPLv3+" · line 40

Quoted 6 lines
grub-core/lib/arm/setjmp.S +2 -1
@@ -32,7 +36,8 @@ GRUB_MOD_LICENSE "GPLv3+"
  * int grub_setjmp (grub_jmp_buf env)
  */
 FUNCTION(grub_setjmp)
-	stm	r0, { r4-r11, sp, lr }
+	stm	r0, { r4-r11, lr }
+	str     sp, [r0, #36 ]

I would lean towards writing this as

	mov	r12, sp
	stm	r0, { r4-r12, lr }

just to skip the manual arithmetic.

grub-core/lib/arm/setjmp.S FUNCTION(grub_setjmp) · line 49

Quoted 10 lines
grub-core/lib/arm/setjmp.S +2 -1
 	mov	r0, #0
 	bx	lr
 
@@ -40,7 +45,10 @@ FUNCTION(grub_setjmp)
  * int grub_longjmp (grub_jmp_buf env, int val)
  */
 FUNCTION(grub_longjmp)
- 	ldm	r0, { r4-r11, sp, lr }
+	ldm	r0, { r4-r11, lr }
+	ldr     sp, [r0, #36 ]

Same here:

	ldm	r0, { r4-r12, lr }
	mov	sp, r12

grub-core/lib/arm/setjmp.S FUNCTION(grub_setjmp) · line 53

Quoted 5 lines
grub-core/lib/arm/setjmp.S +3 -1
 	movs	r0, r1
-	moveq	r0, #1
+	bne     1f
+	mov	r0, #1
+1:

Alternatively we could (because we have .syntax unified) use

	it	eq
	moveq	r0, #1

grub-core/lib/arm/setjmp.S FUNCTION(grub_setjmp) · line 54

Quoted 2 lines
grub-core/lib/arm/setjmp.S +0 -0
 	bx	lr

/
Leif