Index: /branches/arm/lisp-kernel/arm-asmutils.s
===================================================================
--- /branches/arm/lisp-kernel/arm-asmutils.s	(revision 13724)
+++ /branches/arm/lisp-kernel/arm-asmutils.s	(revision 13725)
@@ -15,5 +15,6 @@
 
 
-	
+        .syntax unified
+        .arm	
 
 	include(lisp.s)
@@ -25,5 +26,5 @@
         __(mov r2,#0)           /* options.  Pass as 0 until we know better */
         __(mov r12,r7)          /* preserve r7 ;  r12 saved by syscall */
-        __(mov r7,0x0f0000)     /* __ARM_NR_cacheflush */
+        __(mov r7,#0x0f0000)     /* __ARM_NR_cacheflush */
         __(add r7,r7,#2)
 	__(svc #0)
@@ -33,5 +34,5 @@
                                 
 _exportfn(C(current_stack_pointer))
-	__(mr r0,sp)
+	__(mov r0,sp)
 	__(bx lr)
 _endfn
@@ -39,5 +40,5 @@
 _exportfn(C(count_leading_zeros))
         __(clz r0,r0)
-	__(bx lr
+	__(bx lr)
 _endfn
 
@@ -81,5 +82,6 @@
 
 _exportfn(C(atomic_swap))
-        __(swp r0,r1,[r0])
+        __(mov r2,r0)
+        __(swp r0,r1,[r2])
         __(bx lr)
 _endfn
@@ -89,12 +91,12 @@
         
 _exportfn(C(atomic_ior))
-        __(sync)
-1:	__(lrarx(r5,0,r3))
-        __(or r6,r4,r5)
-	__(strcx(r6,0,r3))
-	__(bne- 1b)
-	__(isync)
-	__(and r3,r4,r5)
-	__(blr)
+dnl         __(sync)
+dnl 1:	__(lrarx(r5,0,r3))
+dnl         __(or r6,r4,r5)
+dnl 	__(strcx(r6,0,r3))
+dnl 	__(bne- 1b)
+dnl 	__(isync)
+dnl 	__(and r3,r4,r5)
+dnl 	__(blr)
 _endfn
 
@@ -104,12 +106,12 @@
 
 _exportfn(C(atomic_and))
-        __(sync)
-1:	__(lrarx(r5,0,r3))
-        __(and r6,r4,r5)
-	__(strcx(r6,0,r3))
-	__(bne- 1b)
-	__(isync)
-	__(mr r3,r6)
-	__(blr)
+dnl         __(sync)
+dnl 1:	__(lrarx(r5,0,r3))
+dnl         __(and r6,r4,r5)
+dnl 	__(strcx(r6,0,r3))
+dnl 	__(bne- 1b)
+dnl 	__(isync)
+dnl 	__(mr r3,r6)
+dnl 	__(blr)
 _endfn
                 
@@ -133,5 +135,4 @@
 	
 	
-_endfn