Module Name: src
Committed By: joerg
Date: Wed Aug 6 15:38:07 UTC 2014
Modified Files:
src/sys/arch/rs6000/rs6000: locore.S
Log Message:
Use cmpwi.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/rs6000/rs6000/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.10 src/sys/arch/rs6000/rs6000/locore.S:1.11
--- src/sys/arch/rs6000/rs6000/locore.S:1.10 Mon Jun 20 19:56:13 2011
+++ src/sys/arch/rs6000/rs6000/locore.S Wed Aug 6 15:38:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.10 2011/06/20 19:56:13 matt Exp $ */
+/* $NetBSD: locore.S,v 1.11 2014/08/06 15:38:07 joerg Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -125,7 +125,7 @@ __start:
/* enable internal i/d-cache */
mfpvr 9
rlwinm 9,9,16,16,31
- cmpi 0,9,1
+ cmpwi %r9,1
beq 3f /* not needed for 601 */
mfspr 11,SPR_HID0
andi. 0,11,HID0_DCE
@@ -140,9 +140,9 @@ __start:
mtspr SPR_HID0,11 /* enable caches */
sync
isync
- cmpi 0,9,4 /* check for 604 */
- cmpi 1,9,9 /* or 604e */
- cmpi 2,9,10 /* or mach5 */
+ cmpwi %r9,4 /* check for 604 */
+ cmpwi %cr1,%r9,9 /* or 604e */
+ cmpwi %cr2,%r9,10 /* or mach5 */
cror 2,2,6
cror 2,2,10
bne 3f
