Module Name: src
Committed By: christos
Date: Tue Mar 27 19:24:03 UTC 2012
Modified Files:
src/usr.bin/xlint/arch/alpha: targparam.h
src/usr.bin/xlint/arch/arm: targparam.h
src/usr.bin/xlint/arch/hppa: targparam.h
src/usr.bin/xlint/arch/i386: targparam.h
src/usr.bin/xlint/arch/ia64: targparam.h
src/usr.bin/xlint/arch/m68000: targparam.h
src/usr.bin/xlint/arch/m68k: targparam.h
src/usr.bin/xlint/arch/mips: targparam.h
src/usr.bin/xlint/arch/mips64: targparam.h
src/usr.bin/xlint/arch/powerpc: targparam.h
src/usr.bin/xlint/arch/powerpc64: targparam.h
src/usr.bin/xlint/arch/sh3: targparam.h
src/usr.bin/xlint/arch/sparc: targparam.h
src/usr.bin/xlint/arch/sparc64: targparam.h
src/usr.bin/xlint/arch/vax: targparam.h
src/usr.bin/xlint/arch/x86_64: targparam.h
src/usr.bin/xlint/common: ilp32.h lp64.h
src/usr.bin/xlint/lint1: cgram.y decl.c main1.c scan.l tree.c
Added Files:
src/usr.bin/xlint/common: schar.h uchar.h
Log Message:
more cross lint friendlyness
XXX: needs more constants converted double/float
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/alpha/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/arm/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/hppa/targparam.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/i386/targparam.h
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/xlint/arch/ia64/targparam.h
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/arch/m68000/targparam.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/m68k/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/mips/targparam.h
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/arch/mips64/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/powerpc/targparam.h
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/xlint/arch/powerpc64/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/sh3/targparam.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/sparc/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/sparc64/targparam.h
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/xlint/arch/vax/targparam.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/x86_64/targparam.h
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/common/ilp32.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/common/lp64.h
cvs rdiff -u -r0 -r1.1 src/usr.bin/xlint/common/schar.h \
src/usr.bin/xlint/common/uchar.h
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/xlint/lint1/cgram.y \
src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/xlint/lint1/scan.l
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/arch/alpha/targparam.h
diff -u src/usr.bin/xlint/arch/alpha/targparam.h:1.3 src/usr.bin/xlint/arch/alpha/targparam.h:1.4
--- src/usr.bin/xlint/arch/alpha/targparam.h:1.3 Thu May 29 14:12:13 2003
+++ src/usr.bin/xlint/arch/alpha/targparam.h Tue Mar 27 15:24:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.3 2003/05/29 18:12:13 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.4 2012/03/27 19:24:01 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/arch/arm/targparam.h
diff -u src/usr.bin/xlint/arch/arm/targparam.h:1.4 src/usr.bin/xlint/arch/arm/targparam.h:1.5
--- src/usr.bin/xlint/arch/arm/targparam.h:1.4 Sun Jul 11 08:07:31 2010
+++ src/usr.bin/xlint/arch/arm/targparam.h Tue Mar 27 15:24:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2010/07/11 12:07:31 mrg Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:01 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "uchar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/hppa/targparam.h
diff -u src/usr.bin/xlint/arch/hppa/targparam.h:1.4 src/usr.bin/xlint/arch/hppa/targparam.h:1.5
--- src/usr.bin/xlint/arch/hppa/targparam.h:1.4 Thu Feb 16 11:27:15 2012
+++ src/usr.bin/xlint/arch/hppa/targparam.h Tue Mar 27 15:24:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2012/02/16 16:27:15 skrll Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:01 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/i386/targparam.h
diff -u src/usr.bin/xlint/arch/i386/targparam.h:1.3 src/usr.bin/xlint/arch/i386/targparam.h:1.4
--- src/usr.bin/xlint/arch/i386/targparam.h:1.3 Thu May 29 14:12:14 2003
+++ src/usr.bin/xlint/arch/i386/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.3 2003/05/29 18:12:14 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.4 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/ia64/targparam.h
diff -u src/usr.bin/xlint/arch/ia64/targparam.h:1.1 src/usr.bin/xlint/arch/ia64/targparam.h:1.2
--- src/usr.bin/xlint/arch/ia64/targparam.h:1.1 Sat Apr 1 04:39:47 2006
+++ src/usr.bin/xlint/arch/ia64/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.1 2006/04/01 09:39:47 cherry Exp $ */
+/* $NetBSD: targparam.h,v 1.2 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/arch/m68000/targparam.h
diff -u src/usr.bin/xlint/arch/m68000/targparam.h:1.2 src/usr.bin/xlint/arch/m68000/targparam.h:1.3
--- src/usr.bin/xlint/arch/m68000/targparam.h:1.2 Thu May 29 14:12:14 2003
+++ src/usr.bin/xlint/arch/m68000/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.2 2003/05/29 18:12:14 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.3 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/m68k/targparam.h
diff -u src/usr.bin/xlint/arch/m68k/targparam.h:1.3 src/usr.bin/xlint/arch/m68k/targparam.h:1.4
--- src/usr.bin/xlint/arch/m68k/targparam.h:1.3 Thu May 29 14:12:15 2003
+++ src/usr.bin/xlint/arch/m68k/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.3 2003/05/29 18:12:15 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.4 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/mips/targparam.h
diff -u src/usr.bin/xlint/arch/mips/targparam.h:1.4 src/usr.bin/xlint/arch/mips/targparam.h:1.5
--- src/usr.bin/xlint/arch/mips/targparam.h:1.4 Sun Jun 12 12:56:59 2005
+++ src/usr.bin/xlint/arch/mips/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2005/06/12 16:56:59 matt Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/mips64/targparam.h
diff -u src/usr.bin/xlint/arch/mips64/targparam.h:1.2 src/usr.bin/xlint/arch/mips64/targparam.h:1.3
--- src/usr.bin/xlint/arch/mips64/targparam.h:1.2 Tue Jan 18 03:30:10 2011
+++ src/usr.bin/xlint/arch/mips64/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.2 2011/01/18 08:30:10 matt Exp $ */
+/* $NetBSD: targparam.h,v 1.3 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/arch/powerpc/targparam.h
diff -u src/usr.bin/xlint/arch/powerpc/targparam.h:1.4 src/usr.bin/xlint/arch/powerpc/targparam.h:1.5
--- src/usr.bin/xlint/arch/powerpc/targparam.h:1.4 Sat Feb 19 12:15:56 2005
+++ src/usr.bin/xlint/arch/powerpc/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2005/02/19 17:15:56 matt Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "uchar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/powerpc64/targparam.h
diff -u src/usr.bin/xlint/arch/powerpc64/targparam.h:1.1 src/usr.bin/xlint/arch/powerpc64/targparam.h:1.2
--- src/usr.bin/xlint/arch/powerpc64/targparam.h:1.1 Thu Jun 29 19:41:28 2006
+++ src/usr.bin/xlint/arch/powerpc64/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.1 2006/06/29 23:41:28 mrg Exp $ */
+/* $NetBSD: targparam.h,v 1.2 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "uchar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/arch/sh3/targparam.h
diff -u src/usr.bin/xlint/arch/sh3/targparam.h:1.4 src/usr.bin/xlint/arch/sh3/targparam.h:1.5
--- src/usr.bin/xlint/arch/sh3/targparam.h:1.4 Fri Oct 20 08:51:12 2006
+++ src/usr.bin/xlint/arch/sh3/targparam.h Tue Mar 27 15:24:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2006/10/20 12:51:12 he Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/sparc/targparam.h
diff -u src/usr.bin/xlint/arch/sparc/targparam.h:1.3 src/usr.bin/xlint/arch/sparc/targparam.h:1.4
--- src/usr.bin/xlint/arch/sparc/targparam.h:1.3 Thu May 29 14:12:16 2003
+++ src/usr.bin/xlint/arch/sparc/targparam.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.3 2003/05/29 18:12:16 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.4 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/sparc64/targparam.h
diff -u src/usr.bin/xlint/arch/sparc64/targparam.h:1.4 src/usr.bin/xlint/arch/sparc64/targparam.h:1.5
--- src/usr.bin/xlint/arch/sparc64/targparam.h:1.4 Thu May 29 14:12:16 2003
+++ src/usr.bin/xlint/arch/sparc64/targparam.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.4 2003/05/29 18:12:16 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.5 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/arch/vax/targparam.h
diff -u src/usr.bin/xlint/arch/vax/targparam.h:1.5 src/usr.bin/xlint/arch/vax/targparam.h:1.6
--- src/usr.bin/xlint/arch/vax/targparam.h:1.5 Sun Jul 11 08:07:31 2010
+++ src/usr.bin/xlint/arch/vax/targparam.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.5 2010/07/11 12:07:31 mrg Exp $ */
+/* $NetBSD: targparam.h,v 1.6 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "ilp32.h"
/*
Index: src/usr.bin/xlint/arch/x86_64/targparam.h
diff -u src/usr.bin/xlint/arch/x86_64/targparam.h:1.3 src/usr.bin/xlint/arch/x86_64/targparam.h:1.4
--- src/usr.bin/xlint/arch/x86_64/targparam.h:1.3 Thu May 29 14:12:17 2003
+++ src/usr.bin/xlint/arch/x86_64/targparam.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: targparam.h,v 1.3 2003/05/29 18:12:17 christos Exp $ */
+/* $NetBSD: targparam.h,v 1.4 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,7 +34,7 @@
/*
* Machine-dependent target parameters for lint1.
*/
-
+#include "schar.h"
#include "lp64.h"
/*
Index: src/usr.bin/xlint/common/ilp32.h
diff -u src/usr.bin/xlint/common/ilp32.h:1.2 src/usr.bin/xlint/common/ilp32.h:1.3
--- src/usr.bin/xlint/common/ilp32.h:1.2 Wed Feb 20 11:10:34 2002
+++ src/usr.bin/xlint/common/ilp32.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ilp32.h,v 1.2 2002/02/20 16:10:34 thorpej Exp $ */
+/* $NetBSD: ilp32.h,v 1.3 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,6 +46,14 @@
#define QUAD_SIZE (8 * CHAR_BIT)
#define PTR_SIZE (4 * CHAR_BIT)
+#define TARG_SCHAR_MAX ((signed char) (((unsigned char) -1) >> 1))
+#define TARG_SCHAR_MIN ((-TARG_CHAR_MAX) - 1)
+#define TARG_UCHAR_MAX ((unsigned char) -1)
+
+#define TARG_SHRT_MAX ((int16_t) (((uint16_t) -1) >> 1))
+#define TARG_SHRT_MIN ((-TARG_SHRT_MAX) - 1)
+#define TARG_USHRT_MAX ((uint16_t) -1)
+
#define TARG_INT_MAX ((int32_t) (((uint32_t) -1) >> 1))
#define TARG_INT_MIN ((-TARG_INT_MAX) - 1)
#define TARG_UINT_MAX ((uint32_t) -1)
Index: src/usr.bin/xlint/common/lp64.h
diff -u src/usr.bin/xlint/common/lp64.h:1.3 src/usr.bin/xlint/common/lp64.h:1.4
--- src/usr.bin/xlint/common/lp64.h:1.3 Wed May 21 08:09:39 2003
+++ src/usr.bin/xlint/common/lp64.h Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lp64.h,v 1.3 2003/05/21 12:09:39 simonb Exp $ */
+/* $NetBSD: lp64.h,v 1.4 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,6 +46,14 @@
#define QUAD_SIZE (8 * CHAR_BIT)
#define PTR_SIZE (8 * CHAR_BIT)
+#define TARG_SCHAR_MAX ((signed char) (((unsigned char) -1) >> 1))
+#define TARG_SCHAR_MIN ((-TARG_CHAR_MAX) - 1)
+#define TARG_UCHAR_MAX ((unsigned char) -1)
+
+#define TARG_SHRT_MAX ((int16_t) (((uint16_t) -1) >> 1))
+#define TARG_SHRT_MIN ((-TARG_SHRT_MAX) - 1)
+#define TARG_USHRT_MAX ((uint16_t) -1)
+
#define TARG_INT_MAX ((int32_t) (((uint32_t) -1) >> 1))
#define TARG_INT_MIN ((-TARG_INT_MAX) - 1)
#define TARG_UINT_MAX ((uint32_t) -1)
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.53 src/usr.bin/xlint/lint1/cgram.y:1.54
--- src/usr.bin/xlint/lint1/cgram.y:1.53 Sun Dec 25 15:11:22 2011
+++ src/usr.bin/xlint/lint1/cgram.y Tue Mar 27 15:24:03 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.53 2011/12/25 20:11:22 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.54 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.53 2011/12/25 20:11:22 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.54 2012/03/27 19:24:03 christos Exp $");
#endif
#include <stdlib.h>
@@ -1873,13 +1873,13 @@ toicon(tnode_t *tn, int required)
i = (int)v->v_quad;
if (isutyp(t)) {
if (uq_gt((uint64_t)v->v_quad,
- (uint64_t)INT_MAX)) {
+ (uint64_t)TARG_INT_MAX)) {
/* integral constant too large */
warning(56);
}
} else {
- if (q_gt(v->v_quad, (int64_t)INT_MAX) ||
- q_lt(v->v_quad, (int64_t)INT_MIN)) {
+ if (q_gt(v->v_quad, (int64_t)TARG_INT_MAX) ||
+ q_lt(v->v_quad, (int64_t)TARG_INT_MIN)) {
/* integral constant too large */
warning(56);
}
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.53 src/usr.bin/xlint/lint1/decl.c:1.54
--- src/usr.bin/xlint/lint1/decl.c:1.53 Thu Jun 23 21:10:31 2011
+++ src/usr.bin/xlint/lint1/decl.c Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.53 2011/06/24 01:10:31 christos Exp $ */
+/* $NetBSD: decl.c,v 1.54 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.53 2011/06/24 01:10:31 christos Exp $");
+__RCSID("$NetBSD: decl.c,v 1.54 2012/03/27 19:24:03 christos Exp $");
#endif
#include <sys/param.h>
@@ -1831,7 +1831,7 @@ ename(sym_t *sym, int val, int impl)
sym->s_type = dcs->d_tagtyp;
sym->s_value.v_tspec = INT;
sym->s_value.v_quad = val;
- if (impl && val - 1 == INT_MAX) {
+ if (impl && val - 1 == TARG_INT_MAX) {
/* overflow in enumeration values: %s */
warning(48, sym->s_name);
}
@@ -2099,7 +2099,7 @@ eqtype(type_t *tp1, type_t *tp2, int ign
t = INT;
} else if (t == USHORT) {
/* CONSTCOND */
- t = INT_MAX < USHRT_MAX || tflag ? UINT : INT;
+ t = TARG_INT_MAX < TARG_USHRT_MAX || tflag ? UINT : INT;
}
}
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.19 src/usr.bin/xlint/lint1/main1.c:1.20
--- src/usr.bin/xlint/lint1/main1.c:1.19 Thu Jul 31 11:21:34 2008
+++ src/usr.bin/xlint/lint1/main1.c Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.19 2008/07/31 15:21:34 christos Exp $ */
+/* $NetBSD: main1.c,v 1.20 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main1.c,v 1.19 2008/07/31 15:21:34 christos Exp $");
+__RCSID("$NetBSD: main1.c,v 1.20 2012/03/27 19:24:03 christos Exp $");
#endif
#include <sys/types.h>
@@ -180,7 +180,7 @@ main(int argc, char *argv[])
errno = 0;
msg = strtol(ptr, &eptr, 0);
- if ((msg == LONG_MIN || msg == LONG_MAX) &&
+ if ((msg == TARG_LONG_MIN || msg == TARG_LONG_MAX) &&
errno == ERANGE)
err(1, "invalid error message id '%s'",
ptr);
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.49 src/usr.bin/xlint/lint1/scan.l:1.50
--- src/usr.bin/xlint/lint1/scan.l:1.49 Sun Oct 2 15:45:10 2011
+++ src/usr.bin/xlint/lint1/scan.l Tue Mar 27 15:24:03 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.49 2011/10/02 19:45:10 christos Exp $ */
+/* $NetBSD: scan.l,v 1.50 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.49 2011/10/02 19:45:10 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.50 2012/03/27 19:24:03 christos Exp $");
#endif
#include <stdlib.h>
@@ -953,7 +953,7 @@ getescc(int d)
/* bad octal digit %c */
warning(77, c);
pbc = c;
- if (v > UCHAR_MAX) {
+ if (v > TARG_UCHAR_MAX) {
/* character escape does not fit in char. */
warning(76);
v &= CHAR_MASK;
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.69 src/usr.bin/xlint/lint1/tree.c:1.70
--- src/usr.bin/xlint/lint1/tree.c:1.69 Wed Mar 21 10:17:22 2012
+++ src/usr.bin/xlint/lint1/tree.c Tue Mar 27 15:24:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.69 2012/03/21 14:17:22 christos Exp $ */
+/* $NetBSD: tree.c,v 1.70 2012/03/27 19:24:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.69 2012/03/21 14:17:22 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.70 2012/03/27 19:24:03 christos Exp $");
#endif
#include <stdlib.h>
@@ -1874,24 +1874,24 @@ cvtcon(op_t op, int arg, type_t *tp, val
case BOOL:
max = 1; min = 0; break;
case CHAR:
- max = CHAR_MAX; min = CHAR_MIN; break;
+ max = TARG_CHAR_MAX; min = TARG_CHAR_MIN; break;
case UCHAR:
- max = UCHAR_MAX; min = 0; break;
+ max = TARG_UCHAR_MAX; min = 0; break;
case SCHAR:
- max = SCHAR_MAX; min = SCHAR_MIN; break;
+ max = TARG_SCHAR_MAX; min = TARG_SCHAR_MIN; break;
case SHORT:
- max = SHRT_MAX; min = SHRT_MIN; break;
+ max = TARG_SHRT_MAX; min = TARG_SHRT_MIN; break;
case USHORT:
- max = USHRT_MAX; min = 0; break;
+ max = TARG_USHRT_MAX; min = 0; break;
case ENUM:
case INT:
- max = INT_MAX; min = INT_MIN; break;
+ max = TARG_INT_MAX; min = TARG_INT_MIN; break;
case UINT:
- max = (u_int)UINT_MAX; min = 0; break;
+ max = (u_int)TARG_UINT_MAX;min = 0; break;
case LONG:
- max = LONG_MAX; min = LONG_MIN; break;
+ max = TARG_LONG_MAX; min = TARG_LONG_MIN; break;
case ULONG:
- max = (u_long)ULONG_MAX; min = 0; break;
+ max = (u_long)TARG_ULONG_MAX; min = 0; break;
case QUAD:
max = QUAD_MAX; min = QUAD_MIN; break;
case UQUAD:
Added files:
Index: src/usr.bin/xlint/common/schar.h
diff -u /dev/null src/usr.bin/xlint/common/schar.h:1.1
--- /dev/null Tue Mar 27 15:24:04 2012
+++ src/usr.bin/xlint/common/schar.h Tue Mar 27 15:24:03 2012
@@ -0,0 +1,2 @@
+#define TARG_CHAR_MAX ((char) (((unsigned char) -1) >> 1))
+#define TARG_CHAR_MIN ((-TARG_CHAR_MAX) - 1)
Index: src/usr.bin/xlint/common/uchar.h
diff -u /dev/null src/usr.bin/xlint/common/uchar.h:1.1
--- /dev/null Tue Mar 27 15:24:04 2012
+++ src/usr.bin/xlint/common/uchar.h Tue Mar 27 15:24:03 2012
@@ -0,0 +1,2 @@
+#define TARG_CHAR_MAX ((unsigned char) -1)
+#define TARG_CHAR_MIN 0
