Module Name: src Committed By: nakayama Date: Tue Sep 20 08:56:34 UTC 2016
Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Fix RAS for 32-bit kernels. trapframe is always 64-bit. To generate a diff of this commit: cvs rdiff -u -r1.400 -r1.401 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.400 src/sys/arch/sparc64/sparc64/locore.s:1.401 --- src/sys/arch/sparc64/sparc64/locore.s:1.400 Tue Aug 23 19:57:01 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Tue Sep 20 08:56:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.400 2016/08/23 19:57:01 palle Exp $ */ +/* $NetBSD: locore.s,v 1.401 2016/09/20 08:56:34 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -6060,12 +6060,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: