CMUCL commit: src/lisp (gencgc.c lisp.c save.c x86-validate.h)

[Alex Goncharov]

    Date: Thursday, December 17, 2009 @ 23:03:24
  Author: agoncharov
    Path: /project/cmucl/cvsroot/src/lisp

Modified: gencgc.c lisp.c save.c x86-validate.h

of (FresBSD+) Get rid of gcc warnings: int != ulong; char *strdup() != int strdup; lisp space


----------------+
 gencgc.c       |   14 +++++++-------
 lisp.c         |    6 +++---
 save.c         |    3 ++-
 x86-validate.h |   12 ++++++------
 4 files changed, 18 insertions(+), 17 deletions(-)


Index: src/lisp/gencgc.c
diff -u src/lisp/gencgc.c:1.104 src/lisp/gencgc.c:1.105
--- src/lisp/gencgc.c:1.104	Thu Dec 17 10:53:45 2009
+++ src/lisp/gencgc.c	Thu Dec 17 23:03:24 2009
@@ -7,7 +7,7 @@
  *
  * Douglas Crosher, 1996, 1997, 1998, 1999.
  *
- * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.104 2009-12-17 15:53:45 rtoy Exp $
+ * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.105 2009-12-18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -2037,7 +2037,7 @@
         in_space = TRUE;
     }
 #elif defined(i386)
-#if defined(DARWIN) || defined(__linux__)
+#if defined(DARWIN) || defined(__linux__) || defined(__FreeBSD__)
     /*
      * For x86, we see some object at 0xffffffe9.  I (rtoy) am not
      * sure that is, but it clearly can't be in malloc space so we
@@ -2520,12 +2520,12 @@
                 fprintf(stderr, "Not in Lisp spaces:  object = %p, ptr = %p\n", (void*)object, ptr);
                 if (1) {
                     lispobj header = *ptr;
-                    fprintf(stderr, "  Header value = 0x%x\n", header);
+                    fprintf(stderr, "  Header value = 0x%lx\n", (unsigned long) header);
                     if (maybe_static_array_p(header)) {
                         int static_p;
 
-                        fprintf(stderr, "Possible static vector at %p.  header = 0x%x\n",
-                                ptr, header);
+                        fprintf(stderr, "Possible static vector at %p.  header = 0x%lx\n",
+                                ptr, (unsigned long) header);
                       
                         static_p = (HeaderValue(header) & 1) == 1;
                         if (static_p) {
@@ -2534,8 +2534,8 @@
                              * reachable by setting the MSB of the header.
                              */
                             *ptr = header | 0x80000000;
-                            fprintf(stderr, "Scavenged static vector @%p, header = 0x%x\n",
-                                    ptr, header);
+                            fprintf(stderr, "Scavenged static vector @%p, header = 0x%lx\n",
+                                    ptr, (unsigned long) header);
                       
                         }
                     }
Index: src/lisp/lisp.c
diff -u src/lisp/lisp.c:1.68 src/lisp/lisp.c:1.69
--- src/lisp/lisp.c:1.68	Mon Jul 13 15:41:54 2009
+++ src/lisp/lisp.c	Thu Dec 17 23:03:24 2009
@@ -1,7 +1,7 @@
 /*
  * main() entry point for a stand alone lisp image.
  *
- * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.68 2009-07-13 19:41:54 rtoy Rel $
+ * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.69 2009-12-18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -519,8 +519,8 @@
 #endif
 	    if (dynamic_space_size > DYNAMIC_SPACE_SIZE) {
 		fprintf(stderr,
-			"-dynamic-space-size must be no greater than %d MBytes.\n",
-			DYNAMIC_SPACE_SIZE / (1024 * 1024));
+			"-dynamic-space-size must be no greater than %lu MBytes.\n",
+			DYNAMIC_SPACE_SIZE / (1024 * 1024UL));
 		exit(1);
 	    }
 	} else if (strcmp(arg, "-monitor") == 0) {
Index: src/lisp/save.c
diff -u src/lisp/save.c:1.22 src/lisp/save.c:1.23
--- src/lisp/save.c:1.22	Mon Sep 28 08:32:42 2009
+++ src/lisp/save.c	Thu Dec 17 23:03:24 2009
@@ -1,6 +1,6 @@
 /*
 
- $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.22 2009-09-28 12:32:42 rtoy Rel $
+ $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.23 2009-12-18 04:03:24 agoncharov Exp $
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "lisp.h"
 #include "os.h"
Index: src/lisp/x86-validate.h
diff -u src/lisp/x86-validate.h:1.28 src/lisp/x86-validate.h:1.29
--- src/lisp/x86-validate.h:1.28	Fri Jul  6 04:04:39 2007
+++ src/lisp/x86-validate.h	Thu Dec 17 23:03:24 2009
@@ -3,7 +3,7 @@
  * This code was written as part of the CMU Common Lisp project at
  * Carnegie Mellon University, and has been placed in the public domain.
  *
- *  $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.28 2007-07-06 08:04:39 cshapiro Rel $
+ *  $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.29 2009-12-18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -82,16 +82,16 @@
 #define SIGNAL_STACK_START	0x47fd8000
 #define SIGNAL_STACK_SIZE	SIGSTKSZ
 
-#define DYNAMIC_0_SPACE_START	(0x48000000)
+#define DYNAMIC_0_SPACE_START	(0x48000000UL)
 #ifdef GENCGC
-#define DYNAMIC_SPACE_SIZE	(0x78000000)	/* May be up to 1.7 GB */
+#define DYNAMIC_SPACE_SIZE	(0x78000000UL)	/* May be up to 1.7 GB */
 #else
-#define DYNAMIC_SPACE_SIZE	(0x04000000)	/* 64MB */
+#define DYNAMIC_SPACE_SIZE	(0x04000000UL)	/* 64MB */
 #endif
-#define DEFAULT_DYNAMIC_SPACE_SIZE	(0x20000000)	/* 512MB */
+#define DEFAULT_DYNAMIC_SPACE_SIZE	(0x20000000UL)	/* 512MB */
 #ifdef LINKAGE_TABLE
 #define FOREIGN_LINKAGE_SPACE_START ((unsigned long) LinkageSpaceStart)
-#define FOREIGN_LINKAGE_SPACE_SIZE (0x100000)	/* 1MB */
+#define FOREIGN_LINKAGE_SPACE_SIZE (0x100000UL)	/* 1MB */
 #endif
 #endif /* __FreeBSD__ */