[Openmcl-cvs-notifications] r10892 - /trunk/source/lisp-kernel/x86-gc.c

[gb at clozure.com]

Author: gb
Date: Fri Sep 26 10:02:17 2008
New Revision: 10892

Log:
Use the new format-string convention.

Modified:
    trunk/source/lisp-kernel/x86-gc.c

Modified: trunk/source/lisp-kernel/x86-gc.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-gc.c (original)
+++ trunk/source/lisp-kernel/x86-gc.c Fri Sep 26 10:02:17 2008
@@ -54,7 +54,7 @@
 #ifdef X8664
   case fulltag_nil:
     if (n !=3D lisp_nil) {
-      Bug(NULL,"Object tagged as nil, not nil : 0x%08x", n);
+      Bug(NULL,"Object tagged as nil, not nil : " LISP, n);
     }
     return;
 #endif
@@ -70,7 +70,7 @@
   case fulltag_immheader_1: =

   case fulltag_immheader_2: =

 #endif
-    Bug(NULL, "Header not expected : 0x%lx", n);
+    Bug(NULL, "Header not expected : 0x" LISP, n);
     return;
 =

 #ifdef X8632
@@ -85,7 +85,7 @@
       a =3D active_dynamic_area;
       if ((n > (ptr_to_lispobj(a->active))) &&
           (n < (ptr_to_lispobj(a->high)))) {
-        Bug(NULL, "TRA points to heap free space: 0x%lx", n);
+        Bug(NULL, "TRA points to heap free space: 0x" LISP, n);
       }
       return;
     }
@@ -101,7 +101,7 @@
       if (fun =3D=3D 0 ||
 	 (header_subtag(header_of(fun)) !=3D subtag_function) ||
 	 (heap_area_containing((BytePtr)ptr_from_lispobj(fun)) !=3D a)) {
-	Bug(NULL, "TRA at 0x%x has bad function address 0x%x\n", n, fun);
+	Bug(NULL, "TRA at 0x" LISP " has bad function address 0x" LISP "\n", n, f=
un);
       }
       n =3D fun;
     }
@@ -119,7 +119,7 @@
       if ((disp =3D=3D 0) ||
           (fulltag_of(n) !=3D fulltag_function) ||
           (heap_area_containing((BytePtr)ptr_from_lispobj(n)) !=3D a)) {
-        Bug(NULL, "TRA at 0x%lx has bad displacement %d\n", n, disp);
+        Bug(NULL, "TRA at 0x" LISP " has bad displacement %d\n", n, disp);
       }
     }
 #endif
@@ -142,7 +142,7 @@
       a =3D active_dynamic_area;
       if ((n > (ptr_to_lispobj(a->active))) &&
           (n < (ptr_to_lispobj(a->high)))) {
-        Bug(NULL, "Node points to heap free space: 0x%lx", n);
+        Bug(NULL, "Node points to heap free space: 0x" LISP, n);
       }
       return;
     }
@@ -154,14 +154,14 @@
   if (tag =3D=3D fulltag_cons) {
     if ((nodeheader_tag_p(header_tag)) ||
         (immheader_tag_p(header_tag))) {
-      Bug(NULL, "Cons cell at 0x%lx has bogus header : 0x%lx", n, header);
+      Bug(NULL, "Cons cell at 0x" LISP " has bogus header : 0x" LISP, n, h=
eader);
     }
     return;
   }
 =

   if ((!nodeheader_tag_p(header_tag)) &&
       (!immheader_tag_p(header_tag))) {
-    Bug(NULL,"Vector at 0x%lx has bogus header : 0x%lx", n, header);
+    Bug(NULL,"Vector at 0x" LISP " has bogus header : 0x" LISP, n, header);
   }
   return;
 }
@@ -188,12 +188,12 @@
     tag =3D fulltag_of(node);
     if (immheader_tag_p(tag)) {
       if (! header_allowed) {
-        Bug(NULL, "Header not expected at 0x%lx\n", prev);
+        Bug(NULL, "Header not expected at 0x" LISP "\n", prev);
       }
       current =3D (LispObj *)skip_over_ivector((natural)prev, node);
     } else if (nodeheader_tag_p(tag)) {
       if (! header_allowed) {
-        Bug(NULL, "Header not expected at 0x%lx\n", prev);
+        Bug(NULL, "Header not expected at 0x" LISP "\n", prev);
       }
       elements =3D header_element_count(node) | 1;
       if (header_subtag(node) =3D=3D subtag_function) {
@@ -432,7 +432,7 @@
 	prefix_nodes =3D (natural) ((int) deref(base,1));
 #endif
         if (prefix_nodes > element_count) {
-          Bug(NULL, "Function 0x%lx trashed",n);
+          Bug(NULL, "Function 0x" LISP " trashed",n);
         }
       }
       base +=3D (1+element_count);
@@ -634,7 +634,7 @@
 	int code_words =3D (unsigned short)base[1];
 #endif
         if (code_words >=3D nmark) {
-          Bug(NULL,"Bad function at 0x%lx",n);
+          Bug(NULL,"Bad function at 0x" LISP,n);
         }
 	nmark -=3D code_words;
       }
@@ -1276,7 +1276,7 @@
     *end =3D (LispObj *) a->high;
 =

 #if 0
-  fprintf(stderr, "mark VSP range: 0x%lx:0x%lx\n", start, end);
+  fprintf(stderr, "mark VSP range: 0x" LISP ":0x" LISP "\n", start, end);
 #endif
   mark_headerless_area_range(start, end);
 }
@@ -1824,7 +1824,7 @@
         current =3D src;
         if (GCDebug) {
           if (dest !=3D ptr_from_lispobj(locative_forwarding_address(ptr_t=
o_lispobj(src)))) {
-            Bug(NULL, "Out of synch in heap compaction.  Forwarding from 0=
x%lx to 0x%lx,\n expected to go to 0x%lx\n", =

+            Bug(NULL, "Out of synch in heap compaction.  Forwarding from 0=
x" LISP " to 0x" LISP ",\n expected to go to 0x" LISP "\n", =

                 src, dest, locative_forwarding_address(ptr_to_lispobj(src)=
));
           }
         }