Changeset 5011

Timestamp:

Aug 22, 2006, 1:08:03 AM (18 years ago)

Author:

Gary Byers

Message:

Try not to use sprintf() (at least not for printing integers), since it seems
to need access to pthread data (and calling print_lisp_object() from GDB
might fail if %gs is pointing at the lisp TCR.)

File:

• trunk/ccl/lisp-kernel/x86_print.c (modified) (2 diffs)

trunk/ccl/lisp-kernel/x86_print.c

@@ -64 +64 @@
 }
 
-char numbuf[64];
+char numbuf[64], *digits = "012456789ABCDEF";
+
+
+void
+sprint_unsigned_decimal_aux(natural n, Boolean first)
+{
+  if (n == 0) {
+    if (first) {
+      add_char('0');
+    }
+  } else {
+    sprint_unsigned_decimal_aux(n/10, false);
+    add_char(digits[n%10]);
+  }
+}
+
+void
+sprint_unsigned_decimal(natural n)
+{
+  sprint_unsigned_decimal_aux(n, true);
+}
 
 void
 sprint_signed_decimal(signed_natural n)
 {
-  sprintf(numbuf, "%ld", n);
-  add_c_string(numbuf);
-}
-
-void
-sprint_unsigned_decimal(natural n)
-{
-  sprintf(numbuf, "%lu", n);
-  add_c_string(numbuf);
-}
+  if (n < 0) {
+    add_char('-');
+    n = -n;
+  }
+  sprint_unsigned_decimal(n);
+}
+
 
 void
 sprint_unsigned_hex(natural n)
 {
-#if WORD_SIZE==64
-  sprintf(numbuf, "#x%016lx", n);
+  int i, 
+    ndigits =
+#if WORD_SIZE == 64
+    16
 #else
-  sprintf(numbuf, "#x%08lx", n);
+    8
 #endif
-  add_c_string(numbuf);
+    ;
+
+  add_c_string("#0x");
+  for (i = 0; i < ndigits; i++) {
+    add_char(digits[(n>>(4*(ndigits-(i+1))))&15]);
+  }
 }
 
@@ -210 +234 @@
   sprint_unsigned_decimal(elements);
   add_c_string("-element vector subtag = ");
-  sprintf(numbuf, "%02X @", subtag);
-  add_c_string(numbuf);
+  add_char(digits[subtag>>4]);
+  add_char(digits[subtag&15]);
+  add_c_string(" @");
   sprint_unsigned_hex(o);
   add_c_string(" (");