Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6-0]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) ...
details: https://anonhg.NetBSD.org/src/rev/625c626c9982
branches: netbsd-6-0
changeset: 775157:625c626c9982
user: bouyer <bouyer%NetBSD.org@localhost>
date: Sat Sep 24 13:19:09 2016 +0000
description:
Pull up following revision(s) (requested by nakayama in ticket #1408):
sys/arch/sparc64/sparc64/locore.s: revision 1.401
Fix RAS for 32-bit kernels. trapframe is always 64-bit.
diffstat:
sys/arch/sparc64/sparc64/locore.s | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (26 lines):
diff -r 139250775581 -r 625c626c9982 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Sat Sep 24 13:10:57 2016 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Sat Sep 24 13:19:09 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.338.8.2.4.2 2015/11/15 21:01:52 bouyer Exp $ */
+/* $NetBSD: locore.s,v 1.338.8.2.4.3 2016/09/24 13:19:09 bouyer Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -5203,12 +5203,12 @@
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:
Home |
Main Index |
Thread Index |
Old Index