Module Name: src
Committed By: bouyer
Date: Sun Sep 25 12:13:54 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: locore.s
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1257):
sys/arch/sparc64/sparc64/locore.s: revision 1.401
Fix RAS for 32-bit kernels. trapframe is always 64-bit.
To generate a diff of this commit:
cvs rdiff -u -r1.369.2.2.2.1 -r1.369.2.2.2.2 \
src/sys/arch/sparc64/sparc64/locore.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/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2.2.1 src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2.2.2
--- src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2.2.1 Mon Nov 16 13:39:47 2015
+++ src/sys/arch/sparc64/sparc64/locore.s Sun Sep 25 12:13:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.369.2.2.2.1 2015/11/16 13:39:47 msaitoh Exp $ */
+/* $NetBSD: locore.s,v 1.369.2.2.2.2 2016/09/25 12:13:54 bouyer Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -5598,12 +5598,12 @@ ENTRY(cpu_switchto)
brz,pt %o1, Lsw_noras ! no, skip RAS check
LDPTR [%i1 + L_TF], %l3 ! pointer to trap frame
call _C_LABEL(ras_lookup)
- LDPTR [%l3 + TF_PC], %o1
+ ldx [%l3 + TF_PC], %o1
cmp %o0, -1
- be,pt %xcc, Lsw_noras
+ be,pt CCCR, Lsw_noras
add %o0, 4, %o1
- STPTR %o0, [%l3 + TF_PC] ! store rewound %pc
- STPTR %o1, [%l3 + TF_NPC] ! and %npc
+ stx %o0, [%l3 + TF_PC] ! store rewound %pc
+ stx %o1, [%l3 + TF_NPC] ! and %npc
Lsw_noras:
