Changeset 10101 for trunk/source/lisp-kernel/x86_print.c

Timestamp:

Jul 18, 2008, 7:49:04 PM (13 years ago)

Author:

rme

Message:

Additions for x8632.

File:

• trunk/source/lisp-kernel/x86_print.c (modified) (10 diffs)

trunk/source/lisp-kernel/x86_print.c

@@ -266 +266 @@
 }
 
+#ifdef X8632
+LispObj
+nth_immediate(LispObj o, unsigned n)
+{
+  u16_t imm_word_count = *(u16_t *)(o + misc_data_offset);
+  natural *constants = (natural *)((char *)o + misc_data_offset + (imm_word_count << 2));
+  LispObj result = (LispObj)(constants[n-1]);
+
+  return result;
+}
+#endif
+
 void
 sprint_function(LispObj o, int depth)
@@ -303 +315 @@
       sprint_specializers_list(method_specializers, depth);
       add_char(' ');
+    } else if (lfbits & lfbits_gfn_mask) {
+      LispObj gf_slots;
+      LispObj gf_name;
+
+      add_c_string("Generic Function ");
+
+#ifdef X8632
+      gf_slots = nth_immediate(o, 2);
+      gf_name = deref(gf_slots, 2);
+      sprint_lisp_object(gf_name, depth);
+      add_char(' ');
+#endif
     } else {
       add_c_string("Function ");
@@ -316 +340 @@
 sprint_tra(LispObj o, int depth)
 {
+#ifdef X8664
   signed sdisp;
   unsigned disp = 0;
@@ -336 +361 @@
     sprint_unsigned_hex(o);
   }
+#else
+  LispObj f = 0;
+  unsigned disp = 0;
+
+  if (*(unsigned char *)o == RECOVER_FN_OPCODE) {
+    f = (LispObj)(*((natural *)(o + 1)));
+    disp = o - f;
+  }
+
+  if (f && header_subtag(header_of(f)) == subtag_function) {
+    add_c_string("tagged return address: ");
+    sprint_function(f, depth);
+    add_c_string(" + ");
+    sprint_unsigned_decimal(disp);
+  } else {
+    add_c_string("(tra ?) : ");
+    sprint_unsigned_hex(o);
+  }
+#endif
 }
                
@@ -473 +517 @@
     case fulltag_nodeheader_1:
 #else
+    case fulltag_immheader:
+    case fulltag_nodeheader:
 #endif      
       add_c_string("#<header ? ");
@@ -483 +529 @@
     case fulltag_imm_1:
 #else
+    case fulltag_imm:
 #endif
       if (o == unbound) {
@@ -493 +540 @@
             add_char(c);
           } else {
-            sprintf(numbuf, "%o", c);
+            sprintf(numbuf, "%#o", c);
             add_c_string(numbuf);
           }
@@ -511 +558 @@
       }
       break;
-   
+
+#ifdef X8664
     case fulltag_nil:
+#endif
     case fulltag_cons:
       sprint_list(o, depth);
@@ -521 +570 @@
       break;
 
+#ifdef X8664
     case fulltag_symbol:
       sprint_symbol(o);
@@ -528 +578 @@
       sprint_function(o, depth);
       break;
-
+#endif
+
+#ifdef X8664
     case fulltag_tra_0:
     case fulltag_tra_1:
+#else
+    case fulltag_tra:
+#endif
       sprint_tra(o,depth);
       break;