[src/trunk]: src/sys/arch Correct last, ha+l uses lis+addi, so use h+l.

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

details:   https://anonhg.NetBSD.org/src/rev/193d5a08d888
branches:  trunk
changeset: 331081:193d5a08d888
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jul 30 23:15:23 2014 +0000

description:
Correct last, ha+l uses lis+addi, so use h+l.

diffstat:

 sys/arch/evbppc/mpc85xx/mpc85xx_start.S |  6 +++---
 sys/arch/powerpc/powerpc/locore_subr.S  |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 2c7513ee29d2 -r 193d5a08d888 sys/arch/evbppc/mpc85xx/mpc85xx_start.S
--- a/sys/arch/evbppc/mpc85xx/mpc85xx_start.S   Wed Jul 30 22:45:21 2014 +0000
+++ b/sys/arch/evbppc/mpc85xx/mpc85xx_start.S   Wed Jul 30 23:15:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $  */
+/*     $NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $  */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -37,7 +37,7 @@
 #include <sys/cdefs.h>
 #include <powerpc/asm.h>
 
-RCSID("$NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $")
+RCSID("$NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $")
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -86,7 +86,7 @@
        /*
         * Set all the registers we don't care about to a known junk value.
         */
-       lis     %r2,0xdeadbeef@ha
+       lis     %r2,0xdeadbeef@h
        ori     %r2,%r2,0xdeadbeef@l
        mr      %r9,%r2
        mr      %r10,%r9
diff -r 2c7513ee29d2 -r 193d5a08d888 sys/arch/powerpc/powerpc/locore_subr.S
--- a/sys/arch/powerpc/powerpc/locore_subr.S    Wed Jul 30 22:45:21 2014 +0000
+++ b/sys/arch/powerpc/powerpc/locore_subr.S    Wed Jul 30 23:15:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_subr.S,v 1.52 2014/07/30 22:45:21 joerg Exp $   */
+/*     $NetBSD: locore_subr.S,v 1.53 2014/07/30 23:15:23 joerg Exp $   */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -508,7 +508,7 @@
        blrl                            /* jump indirect to r31 */
        lwz     %r31, FRAME_SRR1(%r1)   /* trapexit wants srr1 in r31 */
 #ifdef PPC_BOOKE
-       lis     %r30, 0xbeeffeed@ha
+       lis     %r30, 0xbeeffeed@h
        ori     %r30, %r30, 0xbeeffeed@l
        andis.  %r0,%r31,PSL_CE@h
        tweqi   %r0,0