26c26
< * $FreeBSD: head/sys/powerpc/booke/locore.S 222391 2011-05-27 23:09:12Z marcel $
---
> * $FreeBSD: head/sys/powerpc/booke/locore.S 222400 2011-05-28 04:10:44Z marcel $
86,90c86,90
< * r3-r27 : scratch registers
< * r28 : kernload
< * r29 : temp TLB1 entry
< * r30 : initial TLB1 entry we started in
< * r31 : metadata pointer
---
> * r3-r26 : scratch registers
> * r27 : kernload
> * r28 : temp TLB1 entry
> * r29 : initial TLB1 entry we started in
> * r30-r31 : arguments (metadata pointer)
94c94
< * Keep metadata ptr in r31 for later use.
---
> * Keep arguments in r30 & r31 for later use.
96c96,97
< mr %r31, %r3
---
> mr %r30, %r3
> mr %r31, %r4
123c124
< bl tlb1_find_current /* the entry number found is returned in r30 */
---
> bl tlb1_find_current /* the entry found is returned in r29 */
143c144
< mr %r3, %r30
---
> mr %r3, %r29
173c174
< mr %r28, %r4 /* Keep kernel load address */
---
> mr %r27, %r4 /* Keep kernel load address */
196c197
< mr %r3, %r29
---
> mr %r3, %r28
204c205
< stw %r28, 0(%r3)
---
> stw %r27, 0(%r3)
213c214
< stw %r28, 0(%r3)
---
> stw %r27, 0(%r3)
232,236c233,234
< lis %r3, kernel_text@ha
< addi %r3, %r3, kernel_text@l
< lis %r4, _end@ha
< addi %r4, %r4, _end@l
< mr %r5, %r31 /* metadata ptr */
---
> mr %r3, %r30
> mr %r4, %r31
239c237
< bl e500_init
---
> bl booke_init
293c291
< bl tlb1_find_current /* the entry number found is in r30 */
---
> bl tlb1_find_current /* the entry number found is in r29 */
313c311
< mr %r3, %r30
---
> mr %r3, %r29
376c374
< mr %r3, %r29
---
> mr %r3, %r28
428c426
< * expects address to look up in r3, returns entry number in r30
---
> * expects address to look up in r3, returns entry number in r29
440c438
< rlwinm %r30, %r17, 16, 20, 31 /* MAS0[ESEL] -> r30 */
---
> rlwinm %r29, %r17, 16, 20, 31 /* MAS0[ESEL] -> r29 */
473,474c471,472
< * r30 current entry number
< * r29 returned temp entry
---
> * r29 current entry number
> * r28 returned temp entry
480c478
< rlwimi %r3, %r30, 16, 12, 15 /* Select our current entry */
---
> rlwimi %r3, %r29, 16, 12, 15 /* Select our current entry */
492,493c490,491
< addi %r29, %r30, 1 /* Use next entry. */
< rlwimi %r3, %r29, 16, 12, 15 /* Select temp entry */
---
> addi %r28, %r29, 1 /* Use next entry. */
> rlwimi %r3, %r28, 16, 12, 15 /* Select temp entry */
513c511
< * r30 current entry
---
> * r29 current entry
527c525
< cmpw %r4, %r30 /* our current entry? */
---
> cmpw %r4, %r29 /* our current entry? */