Module Name: src
Committed By: joerg
Date: Wed Jul 30 22:45:21 UTC 2014
Modified Files:
src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S
src/sys/arch/powerpc/powerpc: locore_subr.S
Log Message:
Build 32bit constant with lis+ori, not lis+addi. The instructions
differ on the sign extension handling of the immediate.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/locore_subr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.6 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.7
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.6 Sun Jul 29 21:36:27 2012
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Wed Jul 30 22:45:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mpc85xx_start.S,v 1.6 2012/07/29 21:36:27 matt Exp $ */
+/* $NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 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.6 2012/07/29 21:36:27 matt Exp $")
+RCSID("$NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $")
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -87,7 +87,7 @@ __start:
* Set all the registers we don't care about to a known junk value.
*/
lis %r2,0xdeadbeef@ha
- addi %r2,%r2,0xdeadbeef@l
+ ori %r2,%r2,0xdeadbeef@l
mr %r9,%r2
mr %r10,%r9
mr %r11,%r9
Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.51 src/sys/arch/powerpc/powerpc/locore_subr.S:1.52
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.51 Tue Jul 29 19:15:47 2014
+++ src/sys/arch/powerpc/powerpc/locore_subr.S Wed Jul 30 22:45:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.51 2014/07/29 19:15:47 joerg Exp $ */
+/* $NetBSD: locore_subr.S,v 1.52 2014/07/30 22:45:21 joerg Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -509,7 +509,7 @@ _ENTRY(cpu_lwp_bootstrap)
lwz %r31, FRAME_SRR1(%r1) /* trapexit wants srr1 in r31 */
#ifdef PPC_BOOKE
lis %r30, 0xbeeffeed@ha
- addi %r30, %r30, 0xbeeffeed@l
+ ori %r30, %r30, 0xbeeffeed@l
andis. %r0,%r31,PSL_CE@h
tweqi %r0,0
andi. %r0,%r31,PSL_DE@l
