diff options
| -rw-r--r-- | sys/arm/arm/fusu.S | 4 | ||||
| -rw-r--r-- | sys/libkern/arm/ffs.S | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S index b55f443..c845426 100644 --- a/sys/arm/arm/fusu.S +++ b/sys/arm/arm/fusu.S @@ -38,6 +38,8 @@ #include "assym.s" __FBSDID("$FreeBSD$"); + .syntax unified + #ifdef _ARM_ARCH_6 #define GET_PCB(tmp) \ mrc p15, 0, tmp, c13, c0, 4; \ @@ -83,7 +85,7 @@ EENTRY_NP(casuword32) ldrt r5, [r0] cmp r5, r1 movne r0, r5 - streqt r2, [r0] + strteq r2, [r0] #endif moveq r0, r1 2: diff --git a/sys/libkern/arm/ffs.S b/sys/libkern/arm/ffs.S index a43f2b6..1ddec95 100644 --- a/sys/libkern/arm/ffs.S +++ b/sys/libkern/arm/ffs.S @@ -31,6 +31,7 @@ #include <machine/asm.h> __FBSDID("$FreeBSD$"); + .syntax unified /* * ffs - find first set bit, this algorithm isolates the first set @@ -62,7 +63,7 @@ ENTRY(ffs) rsbne r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */ /* now lookup in table indexed on top 6 bits of r0 */ - ldrneb r0, [ r2, r0, lsr #26 ] + ldrbne r0, [ r2, r0, lsr #26 ] RET .text; |
