svn commit: r275520 - in head/sys: arm/arm libkern/arm

[Andrew Turner]

Author: andrew
Date: Fri Dec  5 19:08:36 2014
New Revision: 275520
URL: https://svnweb.freebsd.org/changeset/base/275520

Log:
  Use the unified syntax in a few more assembly files
  
  MFC after:	1 week
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/arm/fusu.S
  head/sys/libkern/arm/ffs.S

Modified: head/sys/arm/arm/fusu.S
==============================================================================
--- head/sys/arm/arm/fusu.S	Fri Dec  5 19:04:08 2014	(r275519)
+++ head/sys/arm/arm/fusu.S	Fri Dec  5 19:08:36 2014	(r275520)
@@ -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:

Modified: head/sys/libkern/arm/ffs.S
==============================================================================
--- head/sys/libkern/arm/ffs.S	Fri Dec  5 19:04:08 2014	(r275519)
+++ head/sys/libkern/arm/ffs.S	Fri Dec  5 19:08:36 2014	(r275520)
@@ -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;