Changeset 10095

Timestamp:

Jul 18, 2008, 7:32:25 PM (11 years ago)

Author:

rme

Message:

Conditionalize for x8632.

File:

• trunk/source/lisp-kernel/xlbt.c (modified) (5 diffs)

trunk/source/lisp-kernel/xlbt.c

@@ -29 +29 @@
     pc = frame->xtra;
   }
+#ifdef X8632
+  if (fulltag_of(pc) == fulltag_tra) {
+    if (*((unsigned char *)pc) == RECOVER_FN_OPCODE) {
+      natural n = *((natural *)(pc + 1));
+      fun = (LispObj)n;
+    }
+    if (fun && header_subtag(header_of(fun)) == subtag_function) {
+      delta = pc - fun;
+      Dprintf("(#x%08X) #x%08X : %s + %d", frame, pc, print_lisp_object(fun), delta);
+      return;
+    }
+  }
+  if (pc == 0) {
+    fun = ((xcf *)frame)->nominal_function;
+    Dprintf("(#x%08X) #x%08X : %s + ??", frame, pc, print_lisp_object(fun));
+    return;
+  }
+#else
   if (tag_of(pc) == tag_tra) {
     if ((*((unsigned short *)pc) == RECOVER_FN_FROM_RIP_WORD0) &&
@@ -46 +64 @@
     return;
   }
+#endif
 }
 
@@ -59 +78 @@
     }
 
+#ifdef X8632
+    if (fulltag_of(ra) == fulltag_tra) {
+#else
     if (tag_of(ra) == tag_tra) {
+#endif
       return true;
     } else if ((ra == lisp_global(LEXPR_RETURN)) ||
@@ -126 +149 @@
     if ((((LispObj) ptr_to_lispobj(vs_area->low)) > currentRBP) ||
         (((LispObj) ptr_to_lispobj(vs_area->high)) < currentRBP)) {
+#ifdef X8664
       currentRBP = (LispObj) (tcr->save_rbp);
+#else
+      currentRBP = (LispObj) (tcr->save_ebp);
+#endif
     }
     if ((((LispObj) ptr_to_lispobj(vs_area->low)) > currentRBP) ||
@@ -143 +170 @@
 plbt(ExceptionInformation *xp)
 {
+#ifdef X8632
+  plbt_sp(xpGPR(xp,Iebp));
+#else
   plbt_sp(xpGPR(xp,Irbp));
+#endif
 }