[src/trunk]: src/sys/arch/powerpc/include Use lis@h/ori@l instead of lis@ha/a...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0bf764dcd38
branches:  trunk
changeset: 573221:b0bf764dcd38
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sun Jan 23 00:23:57 2005 +0000

description:
Use lis@h/ori@l instead of lis@ha/addi@l since we may use r0 and addi
is one of those funny instructions that treats r0 == 0 when used as the
first arg.

Fixes problems on ibm4xx.  Ok'd by matt@.

diffstat:

 sys/arch/powerpc/include/asm.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 0f30967652f9 -r b0bf764dcd38 sys/arch/powerpc/include/asm.h
--- a/sys/arch/powerpc/include/asm.h    Sat Jan 22 17:13:14 2005 +0000
+++ b/sys/arch/powerpc/include/asm.h    Sun Jan 23 00:23:57 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.16 2005/01/19 22:22:56 matt Exp $    */
+/*     $NetBSD: asm.h,v 1.17 2005/01/23 00:23:57 simonb Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -117,8 +117,8 @@
        stptr   er,CI_INTSTK(tmp1);                                     \
        stptr   er,CI_IDLE_PCB(tmp1);                                   \
        addi    er,er,USPACE;           /* space for idle_u */          \
-       lis     tmp2,_C_LABEL(emptyidlespin)@ha;                        \
-       addi    tmp2,tmp2,_C_LABEL(emptyidlespin)@l;                    \
+       lis     tmp2,_C_LABEL(emptyidlespin)@h;                         \
+       ori     tmp2,tmp2,_C_LABEL(emptyidlespin)@l;                    \
        stptr   tmp2,CI_IDLESPIN(tmp1);                                 \
        li      tmp2,-1;                                                \
        stint   tmp2,CI_INTRDEPTH(tmp1);                                \