Changeset 14428

Timestamp:

Nov 12, 2010, 1:31:04 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

In %get-xcf-byte, xcf.relative-pc (which is a fixnum) can be negative,
and %int-to-ptr doesn't like that. Go through some gyrations to
account for that. See ticket:775.

File:

• trunk/source/level-1/x86-trap-support.lisp (modified) (1 diff)

trunk/source/level-1/x86-trap-support.lisp

@@ -318 +318 @@
                         (type (simple-array (unsigned-byte 8) (*)) containing-object))
         (aref containing-object (the fixnum (+ byte-offset delta))))
-      (%get-unsigned-byte (%int-to-ptr byte-offset) delta))))
+      ;; xcf.relative-pc is a fixnum, but it might be negative.
+      (let* ((encoded-pc (%get-ptr xcf-ptr target::xcf.relative-pc))
+             (pc (ash (%ptr-to-int encoded-pc) (- target::fixnumshift))))
+        (%get-unsigned-byte (%int-to-ptr pc) delta)))))
 
 ;;; If the byte following a uuo (which is "skip" bytes long, set