Changeset 9410 for branches

Timestamp:

May 8, 2008, 8:32:30 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Use ucontext/mcontext structures defined in interface database instead
of defining foreign-types ourselves.

(The usual names are still around on 32-bit Darwin, but things have
been "cleaned up" on 64-bit Darwin.)

File:

• branches/ia32/level-1/x86-trap-support.lisp (modified) (1 diff)

branches/ia32/level-1/x86-trap-support.lisp

@@ -132 +132 @@
 #+darwinx8632-target
 (progn
-  (eval-when (:compile-toplevel :execute)
-    (def-foreign-type nil
-        (:struct :portable_mcontext
-                 (:es :x86_exception_state32_t)
-                 (:ss :x86_thread_state32_t)
-                 (:fs :x86_float_state32_t)))
-    (def-foreign-type nil
-        (:struct :portable_uc_stack
-                 (:ss_sp (:* :void))
-                 (:ss_size (:unsigned 32))
-                 (:ss_flags  (:signed 32))))
-    (def-foreign-type nil
-        (:struct :portable_ucontext
-                 (:onstack (:signed 32))
-                 (:sigmask (:unsigned 32))
-                 (:stack (:struct :portable_uc_stack))
-                 (:link :address)
-                 (:uc_mcsize (:unsigned 32))
-                 (:uc_mcontext (:* (:struct :portable_mcontext))))))
-
   (defconstant gp-regs-offset 0)
-
-  ;;; xxx pick: use types from interface db, or correct "portable" ones
   (defmacro xp-gp-regs (xp)
-    `(pref (pref ,xp :ucontext_t.uc_mcontext) :portable_mcontext.ss))
-
+    `(pref (pref ,xp :ucontext.uc_mcontext) :mcontext.ss))
+  (defun xp-mxcsr (xp)
+    (%get-unsigned-long (pref (pref xp :ucontext.uc_mcontext) :mcontext.fs) 32))
   (defconstant flags-register-offset 9)
   (defconstant eip-register-offset 10)