Changeset 9409 for branches

Timestamp:

May 8, 2008, 8:25:06 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

xp-argument-list, handle-udf-call for x8632.

File:

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

branches/ia32/level-1/x86-error-signal.lisp

@@ -27 +27 @@
   (encoded-gpr-lisp xp target::nargs))
 
-
+#+x8664-target
 (defun xp-argument-list (xp)
   (let ((nargs (xp-argument-count xp))
@@ -45 +45 @@
                    (push (%get-object sp (* i x8664::node-size)) args))
                  args)))))))
-                          
+
+#+x8632-target
+(defun xp-argument-list (xp)
+  (let ((nargs (xp-argument-count xp))
+        (arg-y (encoded-gpr-lisp xp x8632::arg_y))
+        (arg-z (encoded-gpr-lisp xp x8632::arg_z)))
+    (cond ((eql nargs 0) nil)
+          ((eql nargs 1) (list arg-z))
+          (t
+           (let ((args (list arg-y arg-z)))
+             (if (eql nargs 2)
+               args
+               (let ((sp (%inc-ptr (encoded-gpr-macptr xp x8632::esp)
+                                   (+ x8632::node-size x8632::xcf.size))))
+                 (dotimes (i (- nargs 2))
+                   (push (%get-object sp (* i x8632::node-size)) args))
+                 args)))))))
+
 ;;; Making this be continuable is hard, because of the xcf on the
 ;;; stack and the way that the kernel saves/restores rsp and rbp
@@ -59 +76 @@
                   (%kernel-restart-internal
                    $xudfcall
-                   (list (encoded-gpr-lisp xp x8664::fname) args)
+                   (list (encoded-gpr-lisp xp target::fname) args)
                    frame-ptr)))
          (f #'(lambda (values) (apply #'values values))))
-    (setf (encoded-gpr-lisp xp x8664::arg_z) values
-          (encoded-gpr-lisp xp x8664::fn) f)))
+    (setf (encoded-gpr-lisp xp target::arg_z) values
+          (encoded-gpr-lisp xp target::fn) f)))
 
 #+x8664-target