Commit 9002062f authored by Michal Simek's avatar Michal Simek

microblaze: Improve checking mechanism for MSR instruction

It is more safe to use clear instead of msrset.
We save some instructions too.
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 2622434e
...@@ -54,19 +54,16 @@ ENTRY(_start) ...@@ -54,19 +54,16 @@ ENTRY(_start)
mfs r1, rmsr mfs r1, rmsr
andi r1, r1, ~2 andi r1, r1, ~2
mts rmsr, r1 mts rmsr, r1
/* /*
* Here is checking mechanism which check if Microblaze has msr instructions * 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, * We load msr and compare it with previous r1 value - if is the same,
* msr instructions works if not - cpu don't have them. * msr instructions works if not - cpu don't have them.
*/ */
or r8, r0, r0 /* 0 - I have msr instr, 1 - I don't have */ /* r8=0 - I have msr instr, 1 - I don't have them */
or r12, r0, r0 rsubi r0, r0, 1 /* set the carry bit */
msrset r12, 0 /* set nothing - just read msr for test */ msrclr r0, 0x4 /* try to clear it */
cmpu r12, r12, r1 /* read the carry bit, r8 will be '0' if msrclr exists */
beqi r12, 1f addik r8, r0, 0
ori r8, r0, 1 /* I don't have msr */
1:
/* r7 may point to an FDT, or there may be one linked in. /* 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. if it's in r7, we've got to save it away ASAP.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment