Module Name: src
Committed By: martin
Date: Sat Mar 17 21:35:06 UTC 2012
Modified Files:
src/lib/libc/arch/sparc64/gen: flt_rounds.c fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c longjmp.c
makecontext.c
Log Message:
delint
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sparc64/gen/flt_rounds.c \
src/lib/libc/arch/sparc64/gen/fpgetmask.c \
src/lib/libc/arch/sparc64/gen/fpgetround.c \
src/lib/libc/arch/sparc64/gen/fpsetround.c \
src/lib/libc/arch/sparc64/gen/makecontext.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc64/gen/fpgetsticky.c \
src/lib/libc/arch/sparc64/gen/fpsetmask.c \
src/lib/libc/arch/sparc64/gen/fpsetsticky.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc64/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/sparc64/gen/flt_rounds.c
diff -u src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.4 src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.5
--- src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/flt_rounds.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.4 2005/12/24 23:10:08 perry Exp $");
+__RCSID("$NetBSD: flt_rounds.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -23,7 +23,7 @@ static const int map[] = {
int
__flt_rounds()
{
- int x;
+ uint32_t x;
__asm("st %%fsr,%0" : "=m" (*&x));
return map[(x >> 30) & 0x03];
Index: src/lib/libc/arch/sparc64/gen/fpgetmask.c
diff -u src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.4 src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpgetmask.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.4 2005/12/24 23:10:08 perry Exp $");
+__RCSID("$NetBSD: fpgetmask.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -21,7 +22,7 @@ __weak_alias(fpgetmask,_fpgetmask)
fp_except
fpgetmask()
{
- int x;
+ uint32_t x;
__asm("st %%fsr,%0" : "=m" (*&x));
return (x >> 23) & 0x1f;
Index: src/lib/libc/arch/sparc64/gen/fpgetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpgetround.c:1.4 src/lib/libc/arch/sparc64/gen/fpgetround.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpgetround.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpgetround.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $");
+__RCSID("$NetBSD: fpgetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -21,7 +22,7 @@ __weak_alias(fpgetround,_fpgetround)
fp_rnd
fpgetround()
{
- int x;
+ uint32_t x;
__asm("st %%fsr,%0" : "=m" (*&x));
return (x >> 30) & 0x03;
Index: src/lib/libc/arch/sparc64/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetround.c:1.4 src/lib/libc/arch/sparc64/gen/fpsetround.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpsetround.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpsetround.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpsetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -33,5 +34,5 @@ fpsetround(rnd_dir)
__asm("ld %0,%%fsr" : : "m" (*&new));
- return (old >> 30) & 0x03;
+ return ((uint32_t)old >> 30) & 0x03;
}
Index: src/lib/libc/arch/sparc64/gen/makecontext.c
diff -u src/lib/libc/arch/sparc64/gen/makecontext.c:1.4 src/lib/libc/arch/sparc64/gen/makecontext.c:1.5
--- src/lib/libc/arch/sparc64/gen/makecontext.c:1.4 Mon Apr 28 20:22:57 2008
+++ src/lib/libc/arch/sparc64/gen/makecontext.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:57 martin Exp $ */
+/* $NetBSD: makecontext.c,v 1.5 2012/03/17 21:35:06 martin 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 2008/04/28 20:22:57 martin Exp $");
+__RCSID("$NetBSD: makecontext.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
#endif
#include <inttypes.h>
@@ -50,6 +50,7 @@ makecontext(ucontext_t *ucp, void (*func
ulong *sp;
va_list ap;
+ /*LINTED*/
sp = (ulong *)((caddr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
/* Align on quad-word boundary. */
sp = (ulong *)((ulong)sp & ~0xf);
@@ -71,6 +72,7 @@ makecontext(ucontext_t *ucp, void (*func
sp[14] = (ulong)sp - 2047;
sp[15] = (ulong)_resumecontext - 8;
+ /*LINTED*/
sp = (ulong *)((caddr_t)sp - 2047);
gr[_REG_O6] = (__greg_t)sp;
Index: src/lib/libc/arch/sparc64/gen/fpgetsticky.c
diff -u src/lib/libc/arch/sparc64/gen/fpgetsticky.c:1.5 src/lib/libc/arch/sparc64/gen/fpgetsticky.c:1.6
--- src/lib/libc/arch/sparc64/gen/fpgetsticky.c:1.5 Sun Mar 6 10:32:47 2011
+++ src/lib/libc/arch/sparc64/gen/fpgetsticky.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.5 2011/03/06 10:32:47 martin Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.5 2011/03/06 10:32:47 martin Exp $");
+__RCSID("$NetBSD: fpgetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -25,7 +26,7 @@ extern fp_except _softfloat_float_except
fp_except
fpgetsticky()
{
- int x;
+ uint32_t x;
fp_except res;
__asm("st %%fsr,%0" : "=m" (*&x));
Index: src/lib/libc/arch/sparc64/gen/fpsetmask.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.5 src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.6
--- src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.5 Sun Mar 6 10:32:47 2011
+++ src/lib/libc/arch/sparc64/gen/fpsetmask.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.5 2011/03/06 10:32:47 martin Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.6 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.5 2011/03/06 10:32:47 martin Exp $");
+__RCSID("$NetBSD: fpsetmask.c,v 1.6 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -37,7 +38,7 @@ fpsetmask(mask)
__asm("ld %0,%%fsr" : : "m" (*&new));
- old = (old >> 23) & 0x1f;
+ old = ((uint32_t)old >> 23) & 0x1f;
#ifdef EXCEPTIONS_WITH_SOFTFLOAT
/* update softfloat mask as well */
Index: src/lib/libc/arch/sparc64/gen/fpsetsticky.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.5 src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.6
--- src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.5 Sun Mar 6 10:32:47 2011
+++ src/lib/libc/arch/sparc64/gen/fpsetsticky.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetsticky.c,v 1.5 2011/03/06 10:32:47 martin Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.5 2011/03/06 10:32:47 martin Exp $");
+__RCSID("$NetBSD: fpsetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#include <ieeefp.h>
#ifdef __weak_alias
@@ -37,7 +38,7 @@ fpsetsticky(sticky)
__asm("ld %0,%%fsr" : : "m" (*&new));
- old = (old >> 5) & 0x1f;
+ old = ((uint32_t)old >> 5) & 0x1f;
#ifdef EXCEPTIONS_WITH_SOFTFLOAT
old |= _softfloat_float_exception_flags;
Index: src/lib/libc/arch/sparc64/gen/longjmp.c
diff -u src/lib/libc/arch/sparc64/gen/longjmp.c:1.6 src/lib/libc/arch/sparc64/gen/longjmp.c:1.7
--- src/lib/libc/arch/sparc64/gen/longjmp.c:1.6 Sat Apr 30 23:39:08 2011
+++ src/lib/libc/arch/sparc64/gen/longjmp.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: longjmp.c,v 1.6 2011/04/30 23:39:08 martin Exp $ */
+/* $NetBSD: longjmp.c,v 1.7 2012/03/17 21:35:06 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -54,10 +54,12 @@ typedef struct {
* setjmp.S uses hard coded offsets into the jump_buf,
* make sure any changes cause a compile failure here
*/
-__CTASSERT(0x68 == offsetof(__jmp_buf_regs_t,save_mask)+
+#ifndef lint /* XXX this is too much for lint */
+__CTASSERT(0x68 == offsetof(__jmp_buf_regs_t,save_mask) +
sizeof(struct sigcontext));
__CTASSERT(sizeof(sigjmp_buf) >= sizeof(__jmp_buf_regs_t) +
sizeof(struct sigcontext));
+#endif
void
__longjmp14(jmp_buf env, int val)
