CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: dholland Date: Sun Jan 27 02:42:32 UTC 2019 Modified Files: src/lib/libc/arch/m68k/gen: fabs.S Log Message: fix another mergeo To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/fabs.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/m68k/gen/fabs.S diff -u src/lib/libc/arch/m68k/gen/fabs.S:1.13 src/lib/libc/arch/m68k/gen/fabs.S:1.14 --- src/lib/libc/arch/m68k/gen/fabs.S:1.13 Sun Jan 27 02:08:35 2019 +++ src/lib/libc/arch/m68k/gen/fabs.S Sun Jan 27 02:42:32 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $ */ +/* $NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,11 +32,7 @@ #include #include -RCSID("$NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $") - -#ifndef __HAVE_LONG_DOUBLE -STRONG_ALIAS(fabsl, fabs) -#endif +RCSID("$NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $") #ifndef __HAVE_LONG_DOUBLE STRONG_ALIAS(fabsl, fabs)
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: dholland Date: Sun Jan 27 02:42:32 UTC 2019 Modified Files: src/lib/libc/arch/m68k/gen: fabs.S Log Message: fix another mergeo To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/fabs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:34:33 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: Makefile.inc Log Message: Cleanup. hardfloat stuff is now in its own directory To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/arch/m68k/gen/Makefile.inc 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/m68k/gen/Makefile.inc diff -u src/lib/libc/arch/m68k/gen/Makefile.inc:1.31 src/lib/libc/arch/m68k/gen/Makefile.inc:1.32 --- src/lib/libc/arch/m68k/gen/Makefile.inc:1.31 Tue Nov 22 15:25:28 2011 +++ src/lib/libc/arch/m68k/gen/Makefile.inc Thu Jul 18 21:34:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.31 2011/11/22 15:25:28 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.32 2013/07/18 21:34:33 matt Exp $ SRCS+= alloca.S fabs.S @@ -14,7 +14,7 @@ SRCS+= nanf.c # 68000-based machines use a double-extended `long double' type # for which the generic ieee754 versions can be used -.if ${MACHINE_ARCH} == m68000 +.if ${MACHINE_ARCH} != m68k SRCS+= infinityl_dbl_ieee754.c .else SRCS+= infinityl.c @@ -37,15 +37,10 @@ SRCS+= flt_rounds_softfloat.S .if ${MKSOFTFLOAT} != yes SRCS+= fpfake.c .endif -.else -SRCS+= modf.S -SRCS+= flt_rounds.S fpgetmask.S fpgetround.S fpgetsticky.S fpsetmask.S \ - fpsetround.S fpsetsticky.S -SRCS+= adddf3.S addsf3.S cmpdf2.S cmpsf2.S divdf3.S \ - divsf3.S divsi3.S extendsfdf2.S fixdfsi.S fixunsdfsi.S \ - floatsidf.S modsi3.S muldf3.S mulsf3.S mulsi3.S \ - subdf3.S subsf3.S truncdfsf2.S udivsi3.S \ - umodsi3.S umulsi3.S +.endif + +.if ${MACHINE_ARCH} == m68k +SRCS+= divsi3.S modsi3.S mulsi3.S udivsi3.S umodsi3.S umulsi3.S .endif SRCS+= setjmp.S longjmp.c @@ -54,17 +49,7 @@ SRCS+= sigsetjmp.S SRCS+= makecontext.c resumecontext.S swapcontext.S -.ifdef M68040 -SRCS+= ldexp_ieee754.c # generic ieee754 version -.elifdef MKSOFTFLOAT SRCS+= ldexp_ieee754.c # generic ieee754 version -.elifdef M68060 -SRCS+= ldexp_ieee754.c # generic ieee754 version -.elif ${MACHINE_ARCH} == m68000 -SRCS+= ldexp_ieee754.c # generic ieee754 version -.else -SRCS+= ldexp_881.c -.endif LSRCS.m68k.gen= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c \ Lint_resumecontext.c Lint_swapcontext.c
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:36:08 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: flt_rounds_softfloat.S Log Message: Fix typo. Don't define map if it isn't used. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.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/m68k/gen/flt_rounds_softfloat.S diff -u src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S:1.4 src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S:1.5 --- src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S:1.4 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S Thu Jul 18 21:36:08 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds_softfloat.S,v 1.4 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: flt_rounds_softfloat.S,v 1.5 2013/07/18 21:36:08 matt Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -12,14 +12,14 @@ #include machine/asm.h .text - .even - +#if 0 /* NB: this is tied to the gcc-2.95 lb1sf68.asm: */ _map: .byte 1 /* round to nearest */ .byte 0 /* round to zero */ .byte 2 /* round to positive infinity */ .byte 3 /* round to negative infinity */ +#endif ENTRY(__flt_rounds) /* lea _C_LABEL(_fpCCR),%a0 | check the rounding mode */ @@ -27,4 +27,4 @@ ENTRY(__flt_rounds) /* lea _map,%a0 */ moveb #0,%d0 rts -END(_flt_rounds) +END(__flt_rounds)
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:36:37 UTC 2013 Removed Files: src/lib/libc/arch/m68k/gen: adddf3.S addsf3.S cmpdf2.S cmpsf2.S divdf3.S divsf3.S extendsfdf2.S fixdfsi.S fixunsdfsi.S floatsidf.S flt_rounds.S fpgetmask.S fpgetround.S fpgetsticky.S fpsetmask.S fpsetround.S fpsetsticky.S modf.S muldf3.S mulsf3.S subdf3.S subsf3.S truncdfsf2.S Log Message: Remove hardfloat now that it's someplace else. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/lib/libc/arch/m68k/gen/adddf3.S \ src/lib/libc/arch/m68k/gen/addsf3.S src/lib/libc/arch/m68k/gen/divdf3.S \ src/lib/libc/arch/m68k/gen/divsf3.S \ src/lib/libc/arch/m68k/gen/extendsfdf2.S \ src/lib/libc/arch/m68k/gen/floatsidf.S \ src/lib/libc/arch/m68k/gen/fpgetmask.S \ src/lib/libc/arch/m68k/gen/fpgetsticky.S \ src/lib/libc/arch/m68k/gen/modf.S src/lib/libc/arch/m68k/gen/mulsf3.S \ src/lib/libc/arch/m68k/gen/subdf3.S src/lib/libc/arch/m68k/gen/subsf3.S \ src/lib/libc/arch/m68k/gen/truncdfsf2.S cvs rdiff -u -r1.7 -r0 src/lib/libc/arch/m68k/gen/cmpdf2.S \ src/lib/libc/arch/m68k/gen/cmpsf2.S src/lib/libc/arch/m68k/gen/fixdfsi.S \ src/lib/libc/arch/m68k/gen/fixunsdfsi.S cvs rdiff -u -r1.10 -r0 src/lib/libc/arch/m68k/gen/flt_rounds.S \ src/lib/libc/arch/m68k/gen/fpsetround.S cvs rdiff -u -r1.9 -r0 src/lib/libc/arch/m68k/gen/fpgetround.S \ src/lib/libc/arch/m68k/gen/fpsetmask.S \ src/lib/libc/arch/m68k/gen/fpsetsticky.S \ src/lib/libc/arch/m68k/gen/muldf3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:34:33 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: Makefile.inc Log Message: Cleanup. hardfloat stuff is now in its own directory To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/arch/m68k/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:36:08 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: flt_rounds_softfloat.S Log Message: Fix typo. Don't define map if it isn't used. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Thu Jul 18 21:36:37 UTC 2013 Removed Files: src/lib/libc/arch/m68k/gen: adddf3.S addsf3.S cmpdf2.S cmpsf2.S divdf3.S divsf3.S extendsfdf2.S fixdfsi.S fixunsdfsi.S floatsidf.S flt_rounds.S fpgetmask.S fpgetround.S fpgetsticky.S fpsetmask.S fpsetround.S fpsetsticky.S modf.S muldf3.S mulsf3.S subdf3.S subsf3.S truncdfsf2.S Log Message: Remove hardfloat now that it's someplace else. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/lib/libc/arch/m68k/gen/adddf3.S \ src/lib/libc/arch/m68k/gen/addsf3.S src/lib/libc/arch/m68k/gen/divdf3.S \ src/lib/libc/arch/m68k/gen/divsf3.S \ src/lib/libc/arch/m68k/gen/extendsfdf2.S \ src/lib/libc/arch/m68k/gen/floatsidf.S \ src/lib/libc/arch/m68k/gen/fpgetmask.S \ src/lib/libc/arch/m68k/gen/fpgetsticky.S \ src/lib/libc/arch/m68k/gen/modf.S src/lib/libc/arch/m68k/gen/mulsf3.S \ src/lib/libc/arch/m68k/gen/subdf3.S src/lib/libc/arch/m68k/gen/subsf3.S \ src/lib/libc/arch/m68k/gen/truncdfsf2.S cvs rdiff -u -r1.7 -r0 src/lib/libc/arch/m68k/gen/cmpdf2.S \ src/lib/libc/arch/m68k/gen/cmpsf2.S src/lib/libc/arch/m68k/gen/fixdfsi.S \ src/lib/libc/arch/m68k/gen/fixunsdfsi.S cvs rdiff -u -r1.10 -r0 src/lib/libc/arch/m68k/gen/flt_rounds.S \ src/lib/libc/arch/m68k/gen/fpsetround.S cvs rdiff -u -r1.9 -r0 src/lib/libc/arch/m68k/gen/fpgetround.S \ src/lib/libc/arch/m68k/gen/fpsetmask.S \ src/lib/libc/arch/m68k/gen/fpsetsticky.S \ src/lib/libc/arch/m68k/gen/muldf3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 06:43:32 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: fabs.S negdf2.S negsf2.S Log Message: Use __HAVE_FPU__ instead __HAVE_68881__ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/m68k/gen/fabs.S cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/m68k/gen/negdf2.S \ src/lib/libc/arch/m68k/gen/negsf2.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/m68k/gen/fabs.S diff -u src/lib/libc/arch/m68k/gen/fabs.S:1.10 src/lib/libc/arch/m68k/gen/fabs.S:1.11 --- src/lib/libc/arch/m68k/gen/fabs.S:1.10 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/fabs.S Wed Jul 17 06:43:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fabs.S,v 1.10 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -31,10 +31,10 @@ #include machine/asm.h -RCSID($NetBSD: fabs.S,v 1.10 2013/07/16 22:12:20 matt Exp $) +RCSID($NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $) ENTRY(fabs) -#if defined(__SVR4_ABI__) defined(__HAVE_68881__) +#if defined(__SVR4_ABI__) defined(__HAVE_FPU__) bclr #31,4(%sp) fmoved 4(%sp),%fp0 #else Index: src/lib/libc/arch/m68k/gen/negdf2.S diff -u src/lib/libc/arch/m68k/gen/negdf2.S:1.9 src/lib/libc/arch/m68k/gen/negdf2.S:1.10 --- src/lib/libc/arch/m68k/gen/negdf2.S:1.9 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/negdf2.S Wed Jul 17 06:43:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: negdf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,13 +39,13 @@ #if 0 RCSID(from: @(#)negdf2.s 5.1 (Berkeley) 6/7/90) #else - RCSID($NetBSD: negdf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ /* -double */ ENTRY(__negdf2) -#if defined(__SVR4_ABI__) defined(__HAVE_68881__) +#if defined(__SVR4_ABI__) defined(__HAVE_FPU__) fnegd 4(%sp),%fp0 #else movel 4(%sp),%d0 Index: src/lib/libc/arch/m68k/gen/negsf2.S diff -u src/lib/libc/arch/m68k/gen/negsf2.S:1.9 src/lib/libc/arch/m68k/gen/negsf2.S:1.10 --- src/lib/libc/arch/m68k/gen/negsf2.S:1.9 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/negsf2.S Wed Jul 17 06:43:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: negsf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,13 +39,13 @@ #if 0 RCSIDfrom: @(#)negsf2.s 5.1 (Berkeley) 6/7/90) #else - RCSID($NetBSD: negsf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ /* -single */ ENTRY(__negsf2) -#if defined(__SVR4_ABI__) defined(__HAVE_68881__) +#if defined(__SVR4_ABI__) defined(__HAVE_FPU__) fnegs 4(%sp),%fp0 #else movel 4(%sp),%d0
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 06:43:32 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: fabs.S negdf2.S negsf2.S Log Message: Use __HAVE_FPU__ instead __HAVE_68881__ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/m68k/gen/fabs.S cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/m68k/gen/negdf2.S \ src/lib/libc/arch/m68k/gen/negsf2.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Jul 16 22:12:20 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: _setjmp.S adddf3.S addsf3.S alloca.S ashlsi3.S ashrsi3.S cmpdf2.S cmpsf2.S divdf3.S divsf3.S extendsfdf2.S fabs.S fixdfsi.S fixunsdfsi.S floatsidf.S flt_rounds.S flt_rounds_softfloat.S fpgetmask.S fpgetround.S fpgetsticky.S fpsetmask.S fpsetround.S fpsetsticky.S lshlsi3.S lshrsi3.S modf.S muldf3.S mulsf3.S negdf2.S negsf2.S resumecontext.S setjmp.S sigsetjmp.S subdf3.S subsf3.S swapcontext.S truncdfsf2.S umulsi3.S Log Message: Add END(func) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/m68k/gen/_setjmp.S \ src/lib/libc/arch/m68k/gen/fpgetround.S \ src/lib/libc/arch/m68k/gen/fpsetmask.S \ src/lib/libc/arch/m68k/gen/fpsetsticky.S \ src/lib/libc/arch/m68k/gen/muldf3.S src/lib/libc/arch/m68k/gen/negdf2.S \ src/lib/libc/arch/m68k/gen/negsf2.S cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/gen/adddf3.S \ src/lib/libc/arch/m68k/gen/addsf3.S src/lib/libc/arch/m68k/gen/alloca.S \ src/lib/libc/arch/m68k/gen/divdf3.S src/lib/libc/arch/m68k/gen/divsf3.S \ src/lib/libc/arch/m68k/gen/extendsfdf2.S \ src/lib/libc/arch/m68k/gen/floatsidf.S \ src/lib/libc/arch/m68k/gen/fpgetmask.S \ src/lib/libc/arch/m68k/gen/fpgetsticky.S \ src/lib/libc/arch/m68k/gen/modf.S src/lib/libc/arch/m68k/gen/mulsf3.S \ src/lib/libc/arch/m68k/gen/subdf3.S src/lib/libc/arch/m68k/gen/subsf3.S \ src/lib/libc/arch/m68k/gen/truncdfsf2.S cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/m68k/gen/ashlsi3.S \ src/lib/libc/arch/m68k/gen/ashrsi3.S src/lib/libc/arch/m68k/gen/cmpdf2.S \ src/lib/libc/arch/m68k/gen/cmpsf2.S src/lib/libc/arch/m68k/gen/fixdfsi.S \ src/lib/libc/arch/m68k/gen/fixunsdfsi.S \ src/lib/libc/arch/m68k/gen/lshlsi3.S src/lib/libc/arch/m68k/gen/lshrsi3.S \ src/lib/libc/arch/m68k/gen/resumecontext.S \ src/lib/libc/arch/m68k/gen/umulsi3.S cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/m68k/gen/fabs.S \ src/lib/libc/arch/m68k/gen/flt_rounds.S \ src/lib/libc/arch/m68k/gen/fpsetround.S \ src/lib/libc/arch/m68k/gen/sigsetjmp.S cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/setjmp.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/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/m68k/gen/_setjmp.S diff -u src/lib/libc/arch/m68k/gen/_setjmp.S:1.8 src/lib/libc/arch/m68k/gen/_setjmp.S:1.9 --- src/lib/libc/arch/m68k/gen/_setjmp.S:1.8 Tue Jul 16 20:49:42 2013 +++ src/lib/libc/arch/m68k/gen/_setjmp.S Tue Jul 16 22:12:20 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.8 2013/07/16 20:49:42 matt Exp $ */ +/* $NetBSD: _setjmp.S,v 1.9 2013/07/16 22:12:20 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ #if 0 RCSID(from: @(#)_setjmp.s 5.1 (Berkeley) 5/12/90) #else - RCSID($NetBSD: _setjmp.S,v 1.8 2013/07/16 20:49:42 matt Exp $) + RCSID($NetBSD: _setjmp.S,v 1.9 2013/07/16 22:12:20 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -66,6 +66,7 @@ ENTRY(_setjmp) moveml #0x3CFC,(%a0) /* save other non-scratch regs */ clrl %d0 /* return zero */ rts +END(_setjmp) ENTRY(_longjmp) movl 4(%sp),%a0 /* save area pointer */ @@ -86,3 +87,4 @@ ok: botch: jbsr PIC_PLT(_C_LABEL(longjmperror)) stop #0 +END(_longjmp) Index: src/lib/libc/arch/m68k/gen/fpgetround.S diff -u src/lib/libc/arch/m68k/gen/fpgetround.S:1.8 src/lib/libc/arch/m68k/gen/fpgetround.S:1.9 --- src/lib/libc/arch/m68k/gen/fpgetround.S:1.8 Sun Jan 13 21:45:44 2002 +++ src/lib/libc/arch/m68k/gen/fpgetround.S Tue Jul 16 22:12:20 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetround.S,v 1.8 2002/01/13 21:45:44 thorpej Exp $ */ +/* $NetBSD: fpgetround.S,v 1.9 2013/07/16 22:12:20 matt Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -7,12 +7,9 @@ #include machine/asm.h -#ifdef WEAK_ALIAS WEAK_ALIAS(fpgetround, _fpgetround) ENTRY(_fpgetround) -#else -ENTRY(fpgetround) -#endif fmovel %fpcr,%d0 bfextu %d0{#26:#2},%d0 rts +END(_fpgetround) Index: src/lib/libc/arch/m68k/gen/fpsetmask.S diff -u src/lib/libc/arch/m68k/gen/fpsetmask.S:1.8 src/lib/libc/arch/m68k/gen/fpsetmask.S:1.9 --- src/lib/libc/arch/m68k/gen/fpsetmask.S:1.8 Tue Jul 16 20:49:42 2013 +++ src/lib/libc/arch/m68k/gen/fpsetmask.S Tue Jul 16 22:12:20 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetmask.S,v 1.8 2013/07/16 20:49:42 matt Exp $ */ +/* $NetBSD: fpsetmask.S,v 1.9 2013/07/16 22:12:20 matt Exp $ */ /* * Written by Charles M. Hannum, Apr 9, 1995 @@ -7,12 +7,8 @@ #include machine/asm.h -#ifdef WEAK_ALIAS WEAK_ALIAS(fpsetmask, _fpsetmask) ENTRY(_fpsetmask) -#else -ENTRY(fpsetmask) -#endif movel %d2,-(%sp)
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 03:04:54 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: resumecontext.S Log Message: Use assym.h To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/gen/resumecontext.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/m68k/gen/resumecontext.S diff -u src/lib/libc/arch/m68k/gen/resumecontext.S:1.7 src/lib/libc/arch/m68k/gen/resumecontext.S:1.8 --- src/lib/libc/arch/m68k/gen/resumecontext.S:1.7 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/resumecontext.S Wed Jul 17 03:04:54 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: resumecontext.S,v 1.7 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: resumecontext.S,v 1.8 2013/07/17 03:04:54 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,9 +30,10 @@ */ #include machine/asm.h +#include assym.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: resumecontext.S,v 1.7 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: resumecontext.S,v 1.8 2013/07/17 03:04:54 matt Exp $) #endif /* LIBC_SCCS !lint */ /* @@ -42,11 +43,11 @@ */ ENTRY(_resumecontext) - subl #(4 + 1024),%sp /* retaddr preservation + ucontext_t */ + subl #(4 + UC_SIZE),%sp /* retaddr preservation + ucontext_t */ lea (%sp),%a0 movl %a0,-(%sp) jbsr PIC_PLT(_C_LABEL(_getcontext)) - movl (4 + 4)(%sp),(%sp) /* uc_link */ + movl (4 + UC_LINK)(%sp),(%sp) /* uc_link */ tstl (%sp) /* check for NULL */ jne 1f jbsr PIC_PLT(_C_LABEL(exit)) /* cleanly exit(0) */
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 03:05:17 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: swapcontext.S Log Message: Use assym.h To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/m68k/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/m68k/gen/swapcontext.S diff -u src/lib/libc/arch/m68k/gen/swapcontext.S:1.5 src/lib/libc/arch/m68k/gen/swapcontext.S:1.6 --- src/lib/libc/arch/m68k/gen/swapcontext.S:1.5 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/swapcontext.S Wed Jul 17 03:05:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: swapcontext.S,v 1.5 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: swapcontext.S,v 1.6 2013/07/17 03:05:17 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,9 +30,10 @@ */ #include SYS.h +#include assym.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: swapcontext.S,v 1.5 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: swapcontext.S,v 1.6 2013/07/17 03:05:17 matt Exp $) #endif /* LIBC_SCCS !lint */ ENTRY(swapcontext) @@ -41,8 +42,8 @@ ENTRY(swapcontext) tstl %d0 | OK? jne L1 movl (%sp),%a0 - addql #8,96(%a0) | adjust saved stack pointer (again) - movl 4(%sp),100(%a0) | adjust saved program counter (again) + addql #8,UC_MCONTEXT_SP(%a0) | adjust saved stack pointer (again) + movl %sp@(4),UC_MCONTEXT_PC(%a0) | adjust saved program counter (again) movl 12(%sp),(%sp) | push ucp on stack jbsr PIC_PLT(_C_LABEL(setcontext)) | setcontext(ucp) L1: addql #4,%sp | pop ucp
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 03:05:41 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: setjmp.S Log Message: Use assym.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/m68k/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/m68k/gen/setjmp.S diff -u src/lib/libc/arch/m68k/gen/setjmp.S:1.14 src/lib/libc/arch/m68k/gen/setjmp.S:1.15 --- src/lib/libc/arch/m68k/gen/setjmp.S:1.14 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/setjmp.S Wed Jul 17 03:05:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.S,v 1.14 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: setjmp.S,v 1.15 2013/07/17 03:05:41 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,12 +34,13 @@ */ #include machine/asm.h +#include assym.h #if defined(LIBC_SCCS) !defined(lint) #if 0 RCSID(from: @(#)setjmp.s 5.1 (Berkeley) 5/12/90) #else - RCSID($NetBSD: setjmp.S,v 1.14 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: setjmp.S,v 1.15 2013/07/17 03:05:41 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -67,11 +68,11 @@ ENTRY(__setjmp14) /* Get pointer to jmp_buf; a sigcontext is at the beginning. */ movl 4(%sp),%a0 - movl %d0,(%a0) /* store onstack */ - clrl 4(%a0) /* unused word (old style signal mask) */ + movl %d0,SC_ONSTACK(%a0) /* store onstack */ + clrl SC___MASK13(%a0) /* unused word (old style signal mask) */ /* Get the signal mask. */ - pea 28(%a0) /* oset = sc.sc_mask */ + pea SC_MASK(%a0) /* oset = sc.sc_mask */ movl #0,-(%sp) /* set = NULL */ movl #0,-(%sp) /* action = 0 ignored */ jbsr PIC_PLT(_C_LABEL(__sigprocmask14)) @@ -79,14 +80,14 @@ ENTRY(__setjmp14) movl 4(%sp),%a0 /* get jmp_buf pointer again */ lea 4(%sp),%a1 /* adjust SP since we won't rts */ - movl %a1,8(%a0) /* save SP */ - movl %a6,12(%a0) /* save FP */ - clrl 16(%a0) /* no AP */ - movl (%sp),20(%a0) /* save return PC */ - clrl 24(%a0) /* clear PS */ + movl %a1,SC_SP(%a0) /* save SP */ + movl %a6,SC_FP(%a0) /* save FP */ + clrl SC_AP(%a0) /* no AP */ + movl (%sp),SC_PC(%a0)/* save return PC */ + clrl SC_PS(%a0) /* clear PS */ /* Save remaining non-scratch regs after signal mask. */ - moveml #0x3CFC,44(%a0) + moveml #0x3CFC,SC_SIZE(%a0) clrl %d0 /* return 0 */ rts
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 04:57:55 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: alloca.S Log Message: Use a more portable series of instructions. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/m68k/gen/alloca.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/m68k/gen/alloca.S diff -u src/lib/libc/arch/m68k/gen/alloca.S:1.8 src/lib/libc/arch/m68k/gen/alloca.S:1.9 --- src/lib/libc/arch/m68k/gen/alloca.S:1.8 Tue Jul 16 22:12:20 2013 +++ src/lib/libc/arch/m68k/gen/alloca.S Wed Jul 17 04:57:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: alloca.S,v 1.8 2013/07/16 22:12:20 matt Exp $ */ +/* $NetBSD: alloca.S,v 1.9 2013/07/17 04:57:55 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ #if 0 RCSID(from: @(#)alloca.s 5.1 (Berkeley) 5/12/90) #else - RCSID($NetBSD: alloca.S,v 1.8 2013/07/16 22:12:20 matt Exp $) + RCSID($NetBSD: alloca.S,v 1.9 2013/07/17 04:57:55 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -49,10 +49,11 @@ ENTRY(alloca) movl (%sp),%a1 /* save return addr */ movl %sp,%d0 /* get current SP value */ subl 4(%sp),%d0 /* allocate requested space */ - andb #~3,%d0 /* longword align for efficiency */ + movql #-4,%d1 /* sign extend a mask */ + andl %d1,%d0 /* longword align for efficiency */ addql #8,%d0 /* reuse space of call frame */ movl %d0,%sp /* set new SP value */ - lea -4(%sp),%sp /* account for argument pop in caller */ + subql #4,%sp /* account for argument pop in caller */ #ifdef __SVR4_ABI__ moveal %d0,%a0 #endif
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Jul 16 22:12:20 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: _setjmp.S adddf3.S addsf3.S alloca.S ashlsi3.S ashrsi3.S cmpdf2.S cmpsf2.S divdf3.S divsf3.S extendsfdf2.S fabs.S fixdfsi.S fixunsdfsi.S floatsidf.S flt_rounds.S flt_rounds_softfloat.S fpgetmask.S fpgetround.S fpgetsticky.S fpsetmask.S fpsetround.S fpsetsticky.S lshlsi3.S lshrsi3.S modf.S muldf3.S mulsf3.S negdf2.S negsf2.S resumecontext.S setjmp.S sigsetjmp.S subdf3.S subsf3.S swapcontext.S truncdfsf2.S umulsi3.S Log Message: Add END(func) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/m68k/gen/_setjmp.S \ src/lib/libc/arch/m68k/gen/fpgetround.S \ src/lib/libc/arch/m68k/gen/fpsetmask.S \ src/lib/libc/arch/m68k/gen/fpsetsticky.S \ src/lib/libc/arch/m68k/gen/muldf3.S src/lib/libc/arch/m68k/gen/negdf2.S \ src/lib/libc/arch/m68k/gen/negsf2.S cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/gen/adddf3.S \ src/lib/libc/arch/m68k/gen/addsf3.S src/lib/libc/arch/m68k/gen/alloca.S \ src/lib/libc/arch/m68k/gen/divdf3.S src/lib/libc/arch/m68k/gen/divsf3.S \ src/lib/libc/arch/m68k/gen/extendsfdf2.S \ src/lib/libc/arch/m68k/gen/floatsidf.S \ src/lib/libc/arch/m68k/gen/fpgetmask.S \ src/lib/libc/arch/m68k/gen/fpgetsticky.S \ src/lib/libc/arch/m68k/gen/modf.S src/lib/libc/arch/m68k/gen/mulsf3.S \ src/lib/libc/arch/m68k/gen/subdf3.S src/lib/libc/arch/m68k/gen/subsf3.S \ src/lib/libc/arch/m68k/gen/truncdfsf2.S cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/m68k/gen/ashlsi3.S \ src/lib/libc/arch/m68k/gen/ashrsi3.S src/lib/libc/arch/m68k/gen/cmpdf2.S \ src/lib/libc/arch/m68k/gen/cmpsf2.S src/lib/libc/arch/m68k/gen/fixdfsi.S \ src/lib/libc/arch/m68k/gen/fixunsdfsi.S \ src/lib/libc/arch/m68k/gen/lshlsi3.S src/lib/libc/arch/m68k/gen/lshrsi3.S \ src/lib/libc/arch/m68k/gen/resumecontext.S \ src/lib/libc/arch/m68k/gen/umulsi3.S cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/m68k/gen/fabs.S \ src/lib/libc/arch/m68k/gen/flt_rounds.S \ src/lib/libc/arch/m68k/gen/fpsetround.S \ src/lib/libc/arch/m68k/gen/sigsetjmp.S cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/setjmp.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 03:05:17 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: swapcontext.S Log Message: Use assym.h To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/m68k/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Wed Jul 17 03:05:41 UTC 2013 Modified Files: src/lib/libc/arch/m68k/gen: setjmp.S Log Message: Use assym.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/m68k/gen/setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: he Date: Tue Mar 20 10:40:48 UTC 2012 Modified Files: src/lib/libc/arch/m68k/gen: fpfake.c Log Message: Sprinkle some /* ARGSUSED */ before the dummy functions to appease lint. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/m68k/gen/fpfake.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/m68k/gen/fpfake.c diff -u src/lib/libc/arch/m68k/gen/fpfake.c:1.1 src/lib/libc/arch/m68k/gen/fpfake.c:1.2 --- src/lib/libc/arch/m68k/gen/fpfake.c:1.1 Sat Nov 28 23:46:38 2009 +++ src/lib/libc/arch/m68k/gen/fpfake.c Tue Mar 20 10:40:48 2012 @@ -18,18 +18,21 @@ fpgetsticky(void) return 0; } +/* ARGSUSED */ fp_except fpsetmask(fp_except mask) { return 0; } +/* ARGSUSED */ fp_rnd fpsetround(fp_rnd rnd_dir) { return 0; } +/* ARGSUSED */ fp_except fpsetsticky(fp_except sticky) {
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: he Date: Tue Mar 20 10:40:48 UTC 2012 Modified Files: src/lib/libc/arch/m68k/gen: fpfake.c Log Message: Sprinkle some /* ARGSUSED */ before the dummy functions to appease lint. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/m68k/gen/fpfake.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: christos Date: Sun Mar 18 16:26:34 UTC 2012 Modified Files: src/lib/libc/arch/m68k/gen: _lwp.c Log Message: fix lint To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/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/m68k/gen/_lwp.c diff -u src/lib/libc/arch/m68k/gen/_lwp.c:1.7 src/lib/libc/arch/m68k/gen/_lwp.c:1.8 --- src/lib/libc/arch/m68k/gen/_lwp.c:1.7 Tue Nov 22 10:25:28 2011 +++ src/lib/libc/arch/m68k/gen/_lwp.c Sun Mar 18 12:26:34 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.7 2011/11/22 15:25:28 joerg Exp $ */ +/* $NetBSD: _lwp.c,v 1.8 2012/03/18 16:26:34 christos 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.7 2011/11/22 15:25:28 joerg Exp $); +__RCSID($NetBSD: _lwp.c,v 1.8 2012/03/18 16:26:34 christos Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -55,7 +55,7 @@ _lwp_makecontext(ucontext_t *u, void (*s u-uc_mcontext.__gregs[_REG_PC] = (int)start; - sp = (void **) (stack_base + stack_size); + sp = (void **)(void *)(stack_base + stack_size); *--sp = arg; *--sp = (void *) _lwp_exit;
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src Committed By: christos Date: Sun Mar 18 16:26:34 UTC 2012 Modified Files: src/lib/libc/arch/m68k/gen: _lwp.c Log Message: fix lint To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libc/arch/m68k/gen
In article 20091129042013.gm4...@x300.tombi.co.jp, Masao Uebayashi uebay...@tombi.co.jp wrote: Module Name: src Committed By:christos Date:Sat Nov 28 23:46:39 UTC 2009 Modified Files: src/lib/libc/arch/m68k/gen: Makefile.inc Added Files: src/lib/libc/arch/m68k/gen: fpfake.c Log Message: Add no/op routines for m68000 for the sticky, mask, and round settings. Could you consider to improve the quality of commit messages always explain the reason of the changes? :) Fixes the build? Does not link otherwise? christos