Use %rX instead of X. (no function change).

This commit is contained in:
matt 2011-01-17 07:06:10 +00:00
parent 3cdfbf5853
commit 4fe8145a2c
1 changed files with 20 additions and 20 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.44 2010/03/10 18:06:57 kiyohara Exp $ */ /* $NetBSD: locore.S,v 1.45 2011/01/17 07:06:10 matt Exp $ */
/* /*
* Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -85,35 +85,35 @@ _C_LABEL(kernel_text):
__start: __start:
bl _C_LABEL(ofwinit) /* init our OF hooks */ bl _C_LABEL(ofwinit) /* init our OF hooks */
li 0,0 li %r0,0
mtmsr 0 /* Disable FPU/MMU/exceptions */ mtmsr %r0 /* Disable FPU/MMU/exceptions */
bl _C_LABEL(cpu_model_init) bl _C_LABEL(cpu_model_init)
lis 12,oeacpufeat@ha lis %r12,oeacpufeat@ha
lwz 12,oeacpufeat@l(12) lwz %r12,oeacpufeat@l(%r12)
andi. 12,12,OEACPU_64_BRIDGE /* Compare against OEACPU_64_BRIDGE */ andi. %r12,%r12,OEACPU_64_BRIDGE /* Compare against OEACPU_64_BRIDGE */
beq 2f /* skip if this is a 32bit part */ beq 2f /* skip if this is a 32bit part */
li 0,0 li %r0,0
sync sync
slbia /* invalidate the slb table */ slbia /* invalidate the slb table */
sync sync
clrldi 0,0,32 /* clear SF/ISF (high order bits) */ clrldi %r0,%r0,32 /* clear SF/ISF (high order bits) */
mtmsrd 0 mtmsrd %r0
mtspr 0x118,0 /* clear ASR[V] to enable segregs */ mtspr 0x118,0 /* clear ASR[V] to enable segregs */
2: 2:
isync isync
/* compute end of kernel memory */ /* compute end of kernel memory */
lis 4,_C_LABEL(end)@ha lis %r4,_C_LABEL(end)@ha
addi 4,4,_C_LABEL(end)@l addi %r4,%r4,_C_LABEL(end)@l
#if NKSYMS || defined(DDB) || defined(MODULAR) #if NKSYMS || defined(DDB) || defined(MODULAR)
/* skip symbol table */ /* skip symbol table */
cmpwi 6,0 cmpwi %r6,0
beq 1f beq 1f
add 9,6,7 /* r9 = args + l */ add %r9,%r6,%r7 /* r9 = args + l */
lwz 9,-8(9) /* esym */ lwz %r9,-8(%r9) /* esym */
cmpwi 9,0 cmpwi %r9,0
beq 1f beq 1f
mr 4,9 mr %r4,%r9
1: 1:
#endif #endif
@ -121,11 +121,11 @@ __start:
/* /*
* Initialize cpu_info[0] * Initialize cpu_info[0]
*/ */
INIT_CPUINFO(4,1,9,0) INIT_CPUINFO(%r4,%r1,%r9,%r0)
lis 3,__start@ha lis %r3,__start@ha
addi 3,3,__start@l addi %r3,%r3,__start@l
mr 5,6 /* args string */ mr %r5,%r6 /* args string */
bl _C_LABEL(initppc) bl _C_LABEL(initppc)
bl _C_LABEL(main) bl _C_LABEL(main)
b _C_LABEL(OF_exit) b _C_LABEL(OF_exit)