[Openmcl-cvs-notifications] r14207 - in /trunk/source/lisp-kernel: image.c x86-constants32.h x86-constants64.h x86-exceptions.c

[rme at clozure.com]

Author: rme
Date: Mon Aug 23 20:31:39 2010
New Revision: 14207

Log:
Don't do arithmetic on pointers to void.

GCC accepts this (it pretends that sizeof(void) =3D=3D 1), but other
compilers choke on it.

Modified:
    trunk/source/lisp-kernel/image.c
    trunk/source/lisp-kernel/x86-constants32.h
    trunk/source/lisp-kernel/x86-constants64.h
    trunk/source/lisp-kernel/x86-exceptions.c

Modified: trunk/source/lisp-kernel/image.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/image.c (original)
+++ trunk/source/lisp-kernel/image.c Mon Aug 23 20:31:39 2010
@@ -196,7 +196,7 @@
     pos =3D seek_to_next_page(fd), advance;
   natural
     mem_size =3D sect->memory_size;
-  void *addr;
+  char *addr;
   area *a;
 =

   advance =3D mem_size;
@@ -281,7 +281,7 @@
 =

 =

   case AREA_STATIC_CONS:
-    addr =3D (void *) lisp_global(HEAP_START);
+    addr =3D (char *) lisp_global(HEAP_START);
     a =3D new_area(addr-align_to_power_of_2(mem_size,log2_page_size), addr=
, AREA_STATIC_CONS);
     if (mem_size) {      =

       if (!MapFile(a->low,

Modified: trunk/source/lisp-kernel/x86-constants32.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/x86-constants32.h (original)
+++ trunk/source/lisp-kernel/x86-constants32.h Mon Aug 23 20:31:39 2010
@@ -333,9 +333,9 @@
   signed_natural foreign_exception_status; /* non-zero -> call lisp_exit_h=
ook */
   void *native_thread_info;		     /* platform-dependent */
   void *native_thread_id;	/* mach_thread_t, pid_t, etc. */
-  void *last_allocptr;
-  void *save_allocptr;
-  void *save_allocbase;
+  char *last_allocptr;
+  char *save_allocptr;
+  char *save_allocbase;
   void *reset_completion;
   void *activate;
   signed_natural suspend_count;

Modified: trunk/source/lisp-kernel/x86-constants64.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/x86-constants64.h (original)
+++ trunk/source/lisp-kernel/x86-constants64.h Mon Aug 23 20:31:39 2010
@@ -356,9 +356,9 @@
   signed_natural foreign_exception_status;	/* non-zero -> call lisp_exit_h=
ook */
   void* native_thread_info;	/* platform-dependent */
   void* native_thread_id;	/* mach_thread_t, pid_t, etc. */
-  void* last_allocptr;
-  void* save_allocptr;
-  void* save_allocbase;
+  char *last_allocptr;
+  char *save_allocptr;
+  char *save_allocbase;
   void* reset_completion;
   void* activate;
   signed_natural suspend_count;

Modified: trunk/source/lisp-kernel/x86-exceptions.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/x86-exceptions.c (original)
+++ trunk/source/lisp-kernel/x86-exceptions.c Mon Aug 23 20:31:39 2010
@@ -3758,7 +3758,7 @@
 area *
 new_watched_area(natural size)
 {
-  void *p;
+  char *p;
 =

   p =3D MapMemory(NULL, size, MEMPROTECT_RWX);
   if ((signed_natural)p =3D=3D -1) {