PERFORCE change 88193 for review

[Olivier Houchard]

http://perforce.freebsd.org/chv.cgi?CH=88193

Change 88193 by cognet at cognet on 2005/12/14 20:36:33

	Of course Warner was right. We need to check the pc against 
	KERNPHYSADDR if KERNPHYSADDR > KERNVIRTADDR

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/locore.S#14 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/locore.S#14 (text+ko) ====

@@ -201,17 +201,19 @@
 	subs	r2, r2, #4
 	bgt	.L1
 
+	mov	r0, pc
+#if	KERNVIRTADDR > KERNPHYSADDR
 	ldr	r4, =KERNVIRTADDR
-	mov	r0, pc
 	cmp	r0, r4
-#if	KERNVIRTADDR > KERNPHYSADDR
 	bgt	virt_done
 	ldr	r5, =KERNPHYSADDR
 	sub	r4, r4, r5
 	add	pc, pc, r4
 #else
+	ldr	r5, =KERNPHYSADDR
+	cmp	r0, r4
 	blt	virt_done
-	ldr	r5, =KERNPHYSADDR
+	ldr	r4, =KERNVIRTADDR
 	sub	r5, r5, r4
 	sub	pc, pc, r5
 #endif