CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Fri Apr 29 08:03:55 UTC 2011 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: _lwp.c Log Message: Both N32/N64 use 64-bit stack slots. To generate a diff of this commit: cvs rdiff -u -r1.5.14.1 -r1.5.14.2 src/lib/libc/arch/mips/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/_lwp.c diff -u src/lib/libc/arch/mips/gen/_lwp.c:1.5.14.1 src/lib/libc/arch/mips/gen/_lwp.c:1.5.14.2 --- src/lib/libc/arch/mips/gen/_lwp.c:1.5.14.1 Fri Apr 29 08:01:50 2011 +++ src/lib/libc/arch/mips/gen/_lwp.c Fri Apr 29 08:03:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.5.14.1 2011/04/29 08:01:50 matt Exp $ */ +/* $NetBSD: _lwp.c,v 1.5.14.2 2011/04/29 08:03:55 matt Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: _lwp.c,v 1.5.14.1 2011/04/29 08:01:50 matt Exp $); +__RCSID($NetBSD: _lwp.c,v 1.5.14.2 2011/04/29 08:03:55 matt Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -43,7 +43,7 @@ #if defined(__mips_o32) || defined(__mips_o64) #define CALLFRAME_SIZ (6 * sizeof(void *)) #else -#define CALLFRAME_SIZ (4 * sizeof(void *)) +#define CALLFRAME_SIZ (4 * sizeof(uint64_t)) #endif void
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Fri Apr 30 14:27:46 UTC 2010 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: longjmp.c Log Message: For N32/N64, GP is callee-saved To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.14.1 src/lib/libc/arch/mips/gen/longjmp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/longjmp.c diff -u src/lib/libc/arch/mips/gen/longjmp.c:1.2 src/lib/libc/arch/mips/gen/longjmp.c:1.2.14.1 --- src/lib/libc/arch/mips/gen/longjmp.c:1.2 Mon Apr 28 20:22:56 2008 +++ src/lib/libc/arch/mips/gen/longjmp.c Fri Apr 30 14:27:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: longjmp.c,v 1.2 2008/04/28 20:22:56 martin Exp $ */ +/* $NetBSD: longjmp.c,v 1.2.14.1 2010/04/30 14:27:46 matt Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -82,6 +82,9 @@ 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]; +#if defined(__mips_n32) || defined(__mips_n64) + uc.uc_mcontext.__gregs[_REG_GP] = sc-sc_regs[_R_GP]; +#endif 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;
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Fri Apr 30 16:12:41 UTC 2010 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: setjmp.S Log Message: When .set reorder, the move goes before the jump, not after. To generate a diff of this commit: cvs rdiff -u -r1.17.34.6 -r1.17.34.7 src/lib/libc/arch/mips/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/setjmp.S diff -u src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.6 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.7 --- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.6 Wed Feb 3 23:51:40 2010 +++ src/lib/libc/arch/mips/gen/setjmp.S Fri Apr 30 16:12:41 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.S,v 1.17.34.6 2010/02/03 23:51:40 matt Exp $ */ +/* $NetBSD: setjmp.S,v 1.17.34.7 2010/04/30 16:12:41 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ #if 0 RCSID(from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: setjmp.S,v 1.17.34.6 2010/02/03 23:51:40 matt Exp $) + RCSID($NetBSD: setjmp.S,v 1.17.34.7 2010/04/30 16:12:41 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -140,8 +140,8 @@ #endif #endif /* SOFTFLOAT_FOR_GCC */ REG_EPILOGUE - j ra move v0, zero + j ra botch: jal _C_LABEL(abort)
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Fri Apr 30 16:23:23 UTC 2010 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: longjmp.c Log Message: Semantic change: Use _REG_x with gregs, no binary difference To generate a diff of this commit: cvs rdiff -u -r1.2.14.1 -r1.2.14.2 src/lib/libc/arch/mips/gen/longjmp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/longjmp.c diff -u src/lib/libc/arch/mips/gen/longjmp.c:1.2.14.1 src/lib/libc/arch/mips/gen/longjmp.c:1.2.14.2 --- src/lib/libc/arch/mips/gen/longjmp.c:1.2.14.1 Fri Apr 30 14:27:46 2010 +++ src/lib/libc/arch/mips/gen/longjmp.c Fri Apr 30 16:23:23 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: longjmp.c,v 1.2.14.1 2010/04/30 14:27:46 matt Exp $ */ +/* $NetBSD: longjmp.c,v 1.2.14.2 2010/04/30 16:23:23 matt Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ uc.uc_link = 0; /* Save return value in context */ - uc.uc_mcontext.__gregs[_R_V0] = val; + uc.uc_mcontext.__gregs[_REG_V0] = val; /* Copy saved registers */ uc.uc_mcontext.__gregs[_REG_S0] = sc-sc_regs[_R_S0];
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Wed Feb 3 23:46:47 UTC 2010 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: _setjmp.S setjmp.S Log Message: Fix setjmp/longjmp (longjmp(a,v) was not returning v) Fix __setjmp14 to not mark fp as used when running softfloat. To generate a diff of this commit: cvs rdiff -u -r1.20.34.4 -r1.20.34.5 src/lib/libc/arch/mips/gen/_setjmp.S cvs rdiff -u -r1.17.34.4 -r1.17.34.5 src/lib/libc/arch/mips/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/_setjmp.S diff -u src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.4 src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.5 --- src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.4 Wed Jan 27 06:55:25 2010 +++ src/lib/libc/arch/mips/gen/_setjmp.S Wed Feb 3 23:46:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.20.34.4 2010/01/27 06:55:25 matt Exp $ */ +/* $NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -46,7 +46,7 @@ #if 0 RCSID(from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: _setjmp.S,v 1.20.34.4 2010/01/27 06:55:25 matt Exp $) + RCSID($NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -68,7 +68,6 @@ REG_LI v0, 0xACEDBADE # sigcontext magic number REG_S ra, _OFFSETOF_SC_PC(a0) # sc_pc = return address REG_S v0, _OFFSETOF_SC_REGS(a0) # saved in sc_regs[0] - REG_S a1, _OFFSETOF_SC_REGS_V0(a0) # save return value REG_S s0, _OFFSETOF_SC_REGS_S0(a0) REG_S s1, _OFFSETOF_SC_REGS_S1(a0) REG_S s2, _OFFSETOF_SC_REGS_S2(a0) @@ -128,6 +127,7 @@ REG_LI t0, 0xACEDBADE bne v0, t0, botch # jump if error PTR_ADDU sp, sp, CALLFRAME_SIZ # does not matter, sanity + REG_S a1, _OFFSETOF_SC_REGS_V0(a0) # save return value REG_L s0, _OFFSETOF_SC_REGS_S0(a0) REG_L s1, _OFFSETOF_SC_REGS_S1(a0) REG_L s2, _OFFSETOF_SC_REGS_S2(a0) @@ -173,7 +173,7 @@ #endif /* SOFTFLOAT_FOR_GCC */ REG_EPILOGUE - REG_L v0, _OFFSETOF_SC_REGS_V0(a0) + move v0, a1 # get return value in 1st arg j ra nop Index: src/lib/libc/arch/mips/gen/setjmp.S diff -u src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.4 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.5 --- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.4 Wed Jan 27 06:55:25 2010 +++ src/lib/libc/arch/mips/gen/setjmp.S Wed Feb 3 23:46:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.S,v 1.17.34.4 2010/01/27 06:55:25 matt Exp $ */ +/* $NetBSD: setjmp.S,v 1.17.34.5 2010/02/03 23:46:47 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ #if 0 RCSID(from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: setjmp.S,v 1.17.34.4 2010/01/27 06:55:25 matt Exp $) + RCSID($NetBSD: setjmp.S,v 1.17.34.5 2010/02/03 23:46:47 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -111,8 +111,12 @@ REG_S gp, _OFFSETOF_SC_REGS_GP(a0) REG_S sp, _OFFSETOF_SC_REGS_SP(a0) REG_S s8, _OFFSETOF_SC_REGS_S8(a0) +#ifndef SOFTFLOAT_FOR_GCC li v0, 1# be nice if we could tell INT_S v0, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 1 +#else + INT_S zero, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 0 +#endif #ifndef SOFTFLOAT_FOR_GCC cfc1 v0, $31 INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: cliff Date: Sat Dec 12 19:08:57 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: _setjmp.S setjmp.S Log Message: #ifndef SOFTFLOAT_FOR_GCC around blocks of FP code. To generate a diff of this commit: cvs rdiff -u -r1.20.34.2 -r1.20.34.3 src/lib/libc/arch/mips/gen/_setjmp.S cvs rdiff -u -r1.17.34.2 -r1.17.34.3 src/lib/libc/arch/mips/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/_setjmp.S diff -u src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.2 src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.3 --- src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.2 Tue Aug 18 06:49:17 2009 +++ src/lib/libc/arch/mips/gen/_setjmp.S Sat Dec 12 19:08:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.20.34.2 2009/08/18 06:49:17 matt Exp $ */ +/* $NetBSD: _setjmp.S,v 1.20.34.3 2009/12/12 19:08:57 cliff Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -46,7 +46,7 @@ #if 0 RCSID(from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: _setjmp.S,v 1.20.34.2 2009/08/18 06:49:17 matt Exp $) + RCSID($NetBSD: _setjmp.S,v 1.20.34.3 2009/12/12 19:08:57 cliff Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -88,6 +88,7 @@ * In N64, FP registers F23 .. F31 are callee-saved. * In O32, FP registers F20 .. F23 are callee-saved. */ +#ifndef SOFTFLOAT_FOR_GCC #if defined(__mips_n64) || defined(__mips_n32) FP_S $f30, _OFFSETOF_SC_FPREGS_F30(a0) FP_S $f28, _OFFSETOF_SC_FPREGS_F28(a0) @@ -108,6 +109,7 @@ FP_S $f29, _OFFSETOF_SC_FPREGS_F29(a0) FP_S $f31, _OFFSETOF_SC_FPREGS_F31(a0) #endif +#endif /* SOFTFLOAT_FOR_GCC */ INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0) REG_EPILOGUE @@ -147,6 +149,7 @@ * In N64, FP registers F23 .. F31 are callee-saved. * In O32, FP registers F20 .. F23 are callee-saved. */ +#ifndef SOFTFLOAT_FOR_GCC #if defined(__mips_n64) || defined(__mips_n32) FP_L $f30, _OFFSETOF_SC_FPREGS_F30(a0) FP_L $f28, _OFFSETOF_SC_FPREGS_F28(a0) @@ -167,6 +170,7 @@ FP_L $f29, _OFFSETOF_SC_FPREGS_F29(a0) FP_L $f31, _OFFSETOF_SC_FPREGS_F31(a0) #endif +#endif /* SOFTFLOAT_FOR_GCC */ REG_EPILOGUE REG_L v0, _OFFSETOF_SC_REGS_V0(a0) Index: src/lib/libc/arch/mips/gen/setjmp.S diff -u src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.2 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.3 --- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.2 Tue Aug 18 06:52:09 2009 +++ src/lib/libc/arch/mips/gen/setjmp.S Sat Dec 12 19:08:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $ */ +/* $NetBSD: setjmp.S,v 1.17.34.3 2009/12/12 19:08:57 cliff Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ #if 0 RCSID(from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $) + RCSID($NetBSD: setjmp.S,v 1.17.34.3 2009/12/12 19:08:57 cliff Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -115,6 +115,7 @@ INT_S v0, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 1 cfc1 v0, $31 INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0) +#ifndef SOFTFLOAT_FOR_GCC #if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32) FP_S $f20, _OFFSETOF_SC_FPREGS_F20(a0) FP_S $f22, _OFFSETOF_SC_FPREGS_F22(a0) @@ -135,6 +136,7 @@ FP_S $f29, _OFFSETOF_SC_FPREGS_F29(a0) FP_S $f31, _OFFSETOF_SC_FPREGS_F31(a0) #endif +#endif /* SOFTFLOAT_FOR_GCC */ REG_EPILOGUE j ra move v0, zero
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Sun Aug 23 23:17:55 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: sigsetjmp.S Log Message: savemask goes into the slot at _JBLEN To generate a diff of this commit: cvs rdiff -u -r1.8.34.2 -r1.8.34.3 src/lib/libc/arch/mips/gen/sigsetjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/sigsetjmp.S diff -u src/lib/libc/arch/mips/gen/sigsetjmp.S:1.8.34.2 src/lib/libc/arch/mips/gen/sigsetjmp.S:1.8.34.3 --- src/lib/libc/arch/mips/gen/sigsetjmp.S:1.8.34.2 Tue Aug 18 06:52:09 2009 +++ src/lib/libc/arch/mips/gen/sigsetjmp.S Sun Aug 23 23:17:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sigsetjmp.S,v 1.8.34.2 2009/08/18 06:52:09 matt Exp $ */ +/* $NetBSD: sigsetjmp.S,v 1.8.34.3 2009/08/23 23:17:55 matt Exp $ */ /*- * Copyright (c) 1991, 1993, 1995, @@ -44,7 +44,7 @@ #if 0 RCSID(from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: sigsetjmp.S,v 1.8.34.2 2009/08/18 06:52:09 matt Exp $) + RCSID($NetBSD: sigsetjmp.S,v 1.8.34.3 2009/08/23 23:17:55 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -62,7 +62,7 @@ LEAF(__sigsetjmp14) PIC_PROLOGUE(__sigsetjmp14) - INT_S a1, _OFFSETOF_SC_MASK(a0) # save savemask + REG_S a1, _JBLEN*SZREG(a0) # save savemask bne a1, 0x0, 1f # do saving of signal mask? PIC_TAILCALL(_setjmp) @@ -71,7 +71,7 @@ LEAF(__siglongjmp14) PIC_PROLOGUE(__siglongjmp14) - INT_L t0, _OFFSETOF_SC_MASK(a0) # get savemask + REG_L t0, _JBLEN*SZREG(a0) # get savemask bne t0, 0x0, 1f # restore signal mask? PIC_TAILCALL(_longjmp)
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Tue Aug 18 06:46:00 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: makecontext.c Log Message: Dont case pointers to __greg_t, use intptr_t (pointers on mips are signed) To generate a diff of this commit: cvs rdiff -u -r1.4.14.1 -r1.4.14.2 src/lib/libc/arch/mips/gen/makecontext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/makecontext.c diff -u src/lib/libc/arch/mips/gen/makecontext.c:1.4.14.1 src/lib/libc/arch/mips/gen/makecontext.c:1.4.14.2 --- src/lib/libc/arch/mips/gen/makecontext.c:1.4.14.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/gen/makecontext.c Tue Aug 18 06:45:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: makecontext.c,v 1.4.14.1 2009/08/16 03:36:02 matt Exp $ */ +/* $NetBSD: makecontext.c,v 1.4.14.2 2009/08/18 06:45:59 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: makecontext.c,v 1.4.14.1 2009/08/16 03:36:02 matt Exp $); +__RCSID($NetBSD: makecontext.c,v 1.4.14.2 2009/08/18 06:45:59 matt Exp $); #endif #include inttypes.h @@ -65,10 +65,10 @@ ((uintptr_t)sp ~0xf); /* Align on quad-word boundary. */ #endif - gr[_REG_SP] = (__greg_t)sp; - gr[_REG_RA] = (__greg_t)__resumecontext; - gr[_REG_T9] = (__greg_t)func; /* required for .abicalls */ - gr[_REG_EPC] = (__greg_t)func; + gr[_REG_SP] = (intptr_t)sp; + gr[_REG_RA] = (intptr_t)__resumecontext; + gr[_REG_T9] = (intptr_t)func; /* required for .abicalls */ + gr[_REG_EPC] = (intptr_t)func; /* Construct argument list. */ va_start(ap, argc);
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Tue Aug 18 06:52:09 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: fabs.S ldexp.S modf.S setjmp.S sigsetjmp.S swapcontext.S Log Message: Cleanup/Add RCSIDs. Cleanup/fix setjmp Cleanup includes. (assym.h is your friend) To generate a diff of this commit: cvs rdiff -u -r1.7.46.1 -r1.7.46.2 src/lib/libc/arch/mips/gen/fabs.S cvs rdiff -u -r1.8.46.1 -r1.8.46.2 src/lib/libc/arch/mips/gen/ldexp.S cvs rdiff -u -r1.10.46.1 -r1.10.46.2 src/lib/libc/arch/mips/gen/modf.S cvs rdiff -u -r1.17.34.1 -r1.17.34.2 src/lib/libc/arch/mips/gen/setjmp.S cvs rdiff -u -r1.8.34.1 -r1.8.34.2 src/lib/libc/arch/mips/gen/sigsetjmp.S cvs rdiff -u -r1.3.14.1 -r1.3.14.2 src/lib/libc/arch/mips/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/fabs.S diff -u src/lib/libc/arch/mips/gen/fabs.S:1.7.46.1 src/lib/libc/arch/mips/gen/fabs.S:1.7.46.2 --- src/lib/libc/arch/mips/gen/fabs.S:1.7.46.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/gen/fabs.S Tue Aug 18 06:52:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fabs.S,v 1.7.46.1 2009/08/16 03:36:02 matt Exp $ */ +/* $NetBSD: fabs.S,v 1.7.46.2 2009/08/18 06:52:09 matt Exp $ */ /*- * Copyright (c) 1993 @@ -35,8 +35,11 @@ #include mips/asm.h #if defined(LIBC_SCCS) !defined(lint) +#if 0 RCSID(from: @(#)fabs.s 8.1 (Berkeley) 2/16/94) - RCSID($NetBSD: fabs.S,v 1.7.46.1 2009/08/16 03:36:02 matt Exp $) +#else + RCSID($NetBSD: fabs.S,v 1.7.46.2 2009/08/18 06:52:09 matt Exp $) +#endif #endif /* LIBC_SCCS and not lint */ Index: src/lib/libc/arch/mips/gen/ldexp.S diff -u src/lib/libc/arch/mips/gen/ldexp.S:1.8.46.1 src/lib/libc/arch/mips/gen/ldexp.S:1.8.46.2 --- src/lib/libc/arch/mips/gen/ldexp.S:1.8.46.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/gen/ldexp.S Tue Aug 18 06:52:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ldexp.S,v 1.8.46.1 2009/08/16 03:36:02 matt Exp $ */ +/* $NetBSD: ldexp.S,v 1.8.46.2 2009/08/18 06:52:09 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -35,8 +35,11 @@ #include mips/asm.h #if defined(LIBC_SCCS) !defined(lint) +#if 0 RCSID(from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93) - RCSID($NetBSD: ldexp.S,v 1.8.46.1 2009/08/16 03:36:02 matt Exp $) +#else + RCSID($NetBSD: ldexp.S,v 1.8.46.2 2009/08/18 06:52:09 matt Exp $) +#endif #endif /* LIBC_SCCS and not lint */ #define DEXP_INF 0x7ff Index: src/lib/libc/arch/mips/gen/modf.S diff -u src/lib/libc/arch/mips/gen/modf.S:1.10.46.1 src/lib/libc/arch/mips/gen/modf.S:1.10.46.2 --- src/lib/libc/arch/mips/gen/modf.S:1.10.46.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/gen/modf.S Tue Aug 18 06:52:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: modf.S,v 1.10.46.1 2009/08/16 03:36:02 matt Exp $ */ +/* $NetBSD: modf.S,v 1.10.46.2 2009/08/18 06:52:09 matt Exp $ */ /*- * Copyright (c) 1991, 1993, 1995 @@ -35,8 +35,11 @@ #include mips/asm.h #if defined(LIBC_SCCS) !defined(lint) +#if 0 RCSID(from: @(#)modf.s 8.1 (Berkeley) 6/4/93) - RCSID($NetBSD: modf.S,v 1.10.46.1 2009/08/16 03:36:02 matt Exp $) +#else + RCSID($NetBSD: modf.S,v 1.10.46.2 2009/08/18 06:52:09 matt Exp $) +#endif #endif /* LIBC_SCCS and not lint */ /* Index: src/lib/libc/arch/mips/gen/setjmp.S diff -u src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.1 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.2 --- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/gen/setjmp.S Tue Aug 18 06:52:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.S,v 1.17.34.1 2009/08/16 03:36:02 matt Exp $ */ +/* $NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -32,17 +32,17 @@ * SUCH DAMAGE. */ -#include machine/cdefs.h #include sys/syscall.h #include mips/asm.h -#include machine/signal.h -#include machine/setjmp.h #include assym.h #if defined(LIBC_SCCS) !defined(lint) +#if 0 RCSID(from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93) - RCSID($NetBSD: setjmp.S,v 1.17.34.1 2009/08/16 03:36:02 matt Exp $) +#else + RCSID($NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $) +#endif #endif /* LIBC_SCCS and not lint */ /* @@ -67,33 +67,33 @@ REG_S ra, CALLFRAME_RA(sp) # save RA REG_S s0, CALLFRAME_S0(sp) # save S0 - move a0, s0# squirrel away sc + move s0, a0# save sigcontext /* Get the signal mask. */ PTR_ADDU a2, a0, _OFFSETOF_SC_MASK # sc.sc_mask move a1, zero jal _C_LABEL(__sigprocmask14) # get current signal mask - move a0, zero # (in delay slot) /* Get the signal stack. */ move a0, zero - PTR_ADDU a1, sp, CALLFRAME_SIZ # pointer to struct sigaltstack + PTR_ADDU a1, sp, CALLFRAME_SIZ # pointer to stack_t jal _C_LABEL(__sigaltstack14) - nop + + move a0, s0# restore jmpbuf INT_L v1, CALLFRAME_SIZ+_OFFSETOF_STACK_T_FLAGS(sp) # get old ss_onstack and v1, v1, SS_ONSTACK # extract
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: uebayasi Date: Tue Aug 18 15:04:23 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: swapcontext.S Log Message: Include assym.h. Fix build. To generate a diff of this commit: cvs rdiff -u -r1.3.14.2 -r1.3.14.3 src/lib/libc/arch/mips/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/swapcontext.S diff -u src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.2 src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.3 --- src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.2 Tue Aug 18 06:52:09 2009 +++ src/lib/libc/arch/mips/gen/swapcontext.S Tue Aug 18 15:04:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: swapcontext.S,v 1.3.14.2 2009/08/18 06:52:09 matt Exp $ */ +/* $NetBSD: swapcontext.S,v 1.3.14.3 2009/08/18 15:04:23 uebayasi Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,9 +30,10 @@ */ #include SYS.h +#include assym.h #if defined(SYSLIBC_SCCS) !defined(lint) - RCSID($NetBSD: swapcontext.S,v 1.3.14.2 2009/08/18 06:52:09 matt Exp $) + RCSID($NetBSD: swapcontext.S,v 1.3.14.3 2009/08/18 15:04:23 uebayasi Exp $) #endif /* SYSLIBC_SCCS !lint */ .set reorder
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips/gen
Module Name:src Committed By: uebayasi Date: Tue Aug 18 15:16:45 UTC 2009 Modified Files: src/lib/libc/arch/mips/gen [matt-nb5-mips64]: swapcontext.S Log Message: REGSZ - SZREG To generate a diff of this commit: cvs rdiff -u -r1.3.14.3 -r1.3.14.4 src/lib/libc/arch/mips/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/swapcontext.S diff -u src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.3 src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.4 --- src/lib/libc/arch/mips/gen/swapcontext.S:1.3.14.3 Tue Aug 18 15:04:23 2009 +++ src/lib/libc/arch/mips/gen/swapcontext.S Tue Aug 18 15:16:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: swapcontext.S,v 1.3.14.3 2009/08/18 15:04:23 uebayasi Exp $ */ +/* $NetBSD: swapcontext.S,v 1.3.14.4 2009/08/18 15:16:45 uebayasi Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include assym.h #if defined(SYSLIBC_SCCS) !defined(lint) - RCSID($NetBSD: swapcontext.S,v 1.3.14.3 2009/08/18 15:04:23 uebayasi Exp $) + RCSID($NetBSD: swapcontext.S,v 1.3.14.4 2009/08/18 15:16:45 uebayasi Exp $) #endif /* SYSLIBC_SCCS !lint */ .set reorder @@ -43,13 +43,13 @@ PTR_SUBU sp, sp, CALLFRAME_SIZ PTR_S ra, CALLFRAME_RA(sp) # save ra PTR_S a0, 0(sp) # stash away oucp - PTR_S a1, REGSZ(sp) # stash away ucp + PTR_S a1, SZREG(sp) # stash away ucp SYSTRAP(getcontext) PTR_L ra, CALLFRAME_RA(sp) bne a3, zero, 1f PTR_L v1, 0(sp) # load oucp again for adjustment - PTR_L a0, REGSZ(sp) # load ucp + PTR_L a0, SZREG(sp) # load ucp PTR_ADDIU v0, sp, CALLFRAME_SIZ REG_PROLOGUE REG_S zero, _OFFSETOF_UC_GREGS_V0(v1)
