[src/trunk]: src/lib/libc/arch/mips/gen Restore the PC as well; also use mcon...

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

details:   https://anonhg.NetBSD.org/src/rev/fcf67d3c58c2
branches:  trunk
changeset: 559755:fcf67d3c58c2
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Mar 23 12:31:17 2004 +0000

description:
Restore the PC as well; also use mcontext register defines for accessing
the mcontext.

diffstat:

 lib/libc/arch/mips/gen/__longjmp14.c |  25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (39 lines):

diff -r 47b668e54e83 -r fcf67d3c58c2 lib/libc/arch/mips/gen/__longjmp14.c
--- a/lib/libc/arch/mips/gen/__longjmp14.c      Tue Mar 23 12:23:54 2004 +0000
+++ b/lib/libc/arch/mips/gen/__longjmp14.c      Tue Mar 23 12:31:17 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: __longjmp14.c,v 1.1 2004/03/23 02:21:49 simonb Exp $   */
+/*     $NetBSD: __longjmp14.c,v 1.2 2004/03/23 12:31:17 simonb Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -72,17 +72,18 @@
        uc.uc_mcontext.__gregs[_R_V0] = val;
 
        /* Copy saved registers */
-       uc.uc_mcontext.__gregs[_R_S0] = sc->sc_regs[_R_S0];
-       uc.uc_mcontext.__gregs[_R_S1] = sc->sc_regs[_R_S1];
-       uc.uc_mcontext.__gregs[_R_S2] = sc->sc_regs[_R_S2];
-       uc.uc_mcontext.__gregs[_R_S3] = sc->sc_regs[_R_S3];
-       uc.uc_mcontext.__gregs[_R_S4] = sc->sc_regs[_R_S4];
-       uc.uc_mcontext.__gregs[_R_S5] = sc->sc_regs[_R_S5];
-       uc.uc_mcontext.__gregs[_R_S6] = sc->sc_regs[_R_S6];
-       uc.uc_mcontext.__gregs[_R_S7] = sc->sc_regs[_R_S7];
-       uc.uc_mcontext.__gregs[_R_S8] = sc->sc_regs[_R_S8];
-       uc.uc_mcontext.__gregs[_R_SP] = sc->sc_regs[_R_SP];
-       uc.uc_mcontext.__gregs[_R_RA] = sc->sc_regs[_R_RA];
+       uc.uc_mcontext.__gregs[_REG_S0] = sc->sc_regs[_R_S0];
+       uc.uc_mcontext.__gregs[_REG_S1] = sc->sc_regs[_R_S1];
+       uc.uc_mcontext.__gregs[_REG_S2] = sc->sc_regs[_R_S2];
+       uc.uc_mcontext.__gregs[_REG_S3] = sc->sc_regs[_R_S3];
+       uc.uc_mcontext.__gregs[_REG_S4] = sc->sc_regs[_R_S4];
+       uc.uc_mcontext.__gregs[_REG_S5] = sc->sc_regs[_R_S5];
+       uc.uc_mcontext.__gregs[_REG_S6] = sc->sc_regs[_R_S6];
+       uc.uc_mcontext.__gregs[_REG_S7] = sc->sc_regs[_R_S7];
+       uc.uc_mcontext.__gregs[_REG_S8] = sc->sc_regs[_R_S8];
+       uc.uc_mcontext.__gregs[_REG_SP] = sc->sc_regs[_R_SP];
+       uc.uc_mcontext.__gregs[_REG_RA] = sc->sc_regs[_R_RA];
+       uc.uc_mcontext.__gregs[_REG_EPC] = sc->sc_pc;
 
        /* Copy FP state */
        if (sc->sc_fpused) {