Changeset 10883

Timestamp:

Sep 26, 2008, 1:53:35 PM (12 years ago)

Author:

gb

Message:

*printf format strings specify the width of their integer arguments (as
signed/unsigned "long", "long long", etc.) Since 64-bit Windows defines
"long" as a 32-bit integer, we have to use "long long" (e.g., "%llx") to
print a lisp object successfully, but printing a 32-bit lisp pointer
as a "long long" may print at least 32 bits of garbage ... Define
a few constants based on word size, and use implicit concatenation of
adjacent C string constants to hide this.

File:

• trunk/source/lisp-kernel/macros.h (modified) (1 diff)

trunk/source/lisp-kernel/macros.h

@@ -97 +97 @@
 #define LSEEK(fd,offset,how) lseek(fd,offset,how)
 #endif
+
+/* We can't easily and unconditionally use format strings like "0x%lx"
+   to print lisp objects: the "l" might not match the word size, and
+   neither would (necessarily) something like "0x%llx".  We can at 
+   least exploit the fact that on all current platforms, "ll" ("long long")
+   is the size of a 64-bit lisp object and "l" ("long") is the size of
+   a 32-bit lisp object. */
+
+#if (WORD_SIZE == 64)
+#define LISP "%llx"
+#define ZLISP "%016llx"
+#define DECIMAL "%lld"
+#else
+#define LISP "%lx"
+#define ZLISP "%08x"
+#define DECIMAL "%ld"
+#endif