Index: /branches/ia32/level-1/x86-trap-support.lisp
===================================================================
--- /branches/ia32/level-1/x86-trap-support.lisp	(revision 9405)
+++ /branches/ia32/level-1/x86-trap-support.lisp	(revision 9406)
@@ -154,6 +154,7 @@
   (defconstant gp-regs-offset 0)
 
+  ;;; xxx pick: use types from interface db, or correct "portable" ones
   (defmacro xp-gp-regs (xp)
-    `(pref (pref ,xp :portable_ucontext.uc_mcontext) :portable_mcontext.ss))
+    `(pref (pref ,xp :ucontext_t.uc_mcontext) :portable_mcontext.ss))
 
   (defconstant flags-register-offset 9)
@@ -171,7 +172,7 @@
 
 (defun indexed-gpr-lisp (xp igpr)
-  (%get-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
+  (%get-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
 (defun (setf indexed-gpr-lisp) (new xp igpr)
-  (%set-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)) new))
+  (%set-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift)) new))
 (defun encoded-gpr-lisp (xp gpr)
   (indexed-gpr-lisp xp (aref *encoded-gpr-to-indexed-gpr* gpr)))
@@ -179,8 +180,14 @@
   (setf (indexed-gpr-lisp xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
 (defun indexed-gpr-integer (xp igpr)
-  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
+  #+x8664-target
+  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)))
+  #+x8632-target
+  (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8632::word-shift))))
 (defun (setf indexed-gpr-integer) (new xp igpr)
   (setf
+   #+x8664-target
    (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)))
+   #+x8632-target
+   (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8632::word-shift)))
    new))
 (defun encoded-gpr-integer (xp gpr)
@@ -189,9 +196,9 @@
   (setf (indexed-gpr-integer xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
 (defun indexed-gpr-macptr (xp igpr)
-  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
+  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
 (defun (setf indexed-gpr-macptr) (new xp igpr)
-  (setf (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))) new))
+  (setf (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))) new))
 (defun indexed-gpr-macptr (xp igpr)
-  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
+  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
 (defun encoded-gpr-macptr (xp gpr)
   (indexed-gpr-macptr xp (aref *encoded-gpr-to-indexed-gpr* gpr)))
@@ -199,11 +206,14 @@
   (setf (indexed-gpr-macptr xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
 (defun xp-flags-register (xp)
-  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8664::fixnumshift))))
+  #+x8664-target
+  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8664::fixnumshift)))
+  #+x8632-target
+  (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8632::fixnumshift))))
   
 
 
 (defun %get-xcf-byte (xcf-ptr delta)
-  (let* ((containing-object (%get-object xcf-ptr x8664::xcf.containing-object))
-         (byte-offset (%get-object xcf-ptr x8664::xcf.relative-pc)))
+  (let* ((containing-object (%get-object xcf-ptr target::xcf.containing-object))
+         (byte-offset (%get-object xcf-ptr target::xcf.relative-pc)))
     (if containing-object
       (locally (declare (optimize (speed 3) (safety 0))