---

yaml --- r: 165937 b: refs/heads/master c: 9002062 h: refs/heads/master i: 165935: a8c0295 v: v3
git-mirror · Sep 21, 2009 · feb48f8 · feb48f8
1 parent c53626d
commit feb48f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2622434ee0108c65808a63f067e72d0bbc75b372
+refs/heads/master: 9002062ff52696888847224a778a3279bc8c1cb5
diff --git a/trunk/arch/microblaze/kernel/head.S b/trunk/arch/microblaze/kernel/head.S
@@ -54,19 +54,16 @@ ENTRY(_start)
 	mfs	r1, rmsr
 	andi	r1, r1, ~2
 	mts	rmsr, r1
-
 /*
  * Here is checking mechanism which check if Microblaze has msr instructions
  * We load msr and compare it with previous r1 value - if is the same,
  * msr instructions works if not - cpu don't have them.
  */
-	or	r8, r0, r0 /* 0 - I have msr instr, 1 - I don't have */
-	or	r12, r0, r0
-	msrset	r12, 0	/* set nothing - just read msr for test */
-	cmpu	r12, r12, r1
-	beqi	r12, 1f
-	ori	r8, r0, 1 /* I don't have msr */
-1:
+	/* r8=0 - I have msr instr, 1 - I don't have them */
+	rsubi	r0, r0, 1	/* set the carry bit */
+	msrclr	r0, 0x4		/* try to clear it */
+	/* read the carry bit, r8 will be '0' if msrclr exists */
+	addik	r8, r0, 0
 
 /* r7 may point to an FDT, or there may be one linked in.
    if it's in r7, we've got to save it away ASAP.