Changeset 13984

Timestamp:

Jul 19, 2010, 7:41:16 AM (14 years ago)

Author:

Gary Byers

Message:

Make %ERR-DISP callback return number of bytes to advance PC on return
from UUO handling.

File:

• branches/arm/level-1/arm-error-signal.lisp (modified) (3 diffs)

branches/arm/level-1/arm-error-signal.lisp

@@ -120 +120 @@
                                   :unsigned-fullword arg
                                   :unsigned-fullword fnreg
-                                  :unsigned-fullword relative-pc)
-  (let* ((fn (unless (eql 0 fnreg) (xp-gpr-lisp xp fnreg))))
+                                  :unsigned-fullword relative-pc
+                                  :int)
+  (let* ((fn (unless (eql 0 fnreg) (xp-gpr-lisp xp fnreg)))
+         (delta 0))
     (with-xp-stack-frames (xp fn frame-ptr)
       (with-error-reentry-detection
           (cond
             ((eql 0 error-number)       ; Hopefully a UUO.
+             (setq delta 4)
              (if (/= (logand arg #x0ff000f0) #x07f000f0)
                (%error "Unknown non-UUO: #x~x" (list arg) frame-ptr)
@@ -204 +207 @@
                                  nil frame-ptr))
                         (5
+                         (setq delta 0)
                          (handle-udf-call xp frame-ptr))
                         (6
@@ -243 +247 @@
             (t
              (error "%errdisp callback: error-number = ~d, arg = #x~x, fnreg = ~d, rpc = ~d"
-                    error-number arg fnreg relative-pc)))))))
+                    error-number arg fnreg relative-pc)))))
+    delta))