Changeset 9404 for branches

Timestamp:

May 7, 2008, 9:17:55 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Some changes to make x8632 backtrace sort of work (for some liberal definition
of work).

File:

• branches/ia32/lib/x86-backtrace.lisp (modified) (3 diffs)

branches/ia32/lib/x86-backtrace.lisp

@@ -38 +38 @@
 
 (defun xcf-p (p)
-  (eql 0 (%fixnum-ref p x8664::lisp-frame.return-address)))
+  (eql 0 (%fixnum-ref p target::lisp-frame.return-address)))
 
 (defun %current-xcf ()
@@ -48 +48 @@
 ;;; Try to determine the program counter value, relative to an xcf's nominal function.
 (defun pc-from-xcf (xcf)
-  (let* ((nominal-function (%fixnum-ref xcf x8664::xcf.nominal-function))
-         (containing-object (%fixnum-ref xcf x8664::xcf.containing-object)))
+  (let* ((nominal-function (%fixnum-ref xcf target::xcf.nominal-function))
+         (containing-object (%fixnum-ref xcf target::xcf.containing-object)))
     (when (typep nominal-function 'function)
       (if (eq containing-object (function-to-function-vector nominal-function))
-        (- (%fixnum-ref xcf x8664::xcf.relative-pc)
-           x8664::tag-function)
-        (let* ((tra (%fixnum-ref xcf x8664::xcf.ra0)))
-          (if (and (= (lisptag tra) x8664::tag-tra)
+        (- (%fixnum-ref xcf target::xcf.relative-pc)
+           #+x8632-target x8632::fulltag-misc
+           #+x8664-target x8664::tag-function)
+        (let* ((tra (%fixnum-ref xcf target::xcf.ra0)))
+          (if (and #+x8664-target (= (lisptag tra) x8664::tag-tra)
+                   #+x8632-target (= (fulltag tra) x8632::fulltag-tra)
                    (eq nominal-function (%return-address-function tra)))
             (%return-address-offset tra)))))))
@@ -62 +64 @@
   (if (xcf-p p)
     (values
-     (%fixnum-ref p x8664::xcf.nominal-function)
+     (%fixnum-ref p target::xcf.nominal-function)
      (pc-from-xcf p))
     (%cfp-lfun p)))