Changeset 9406


Ignore:
Timestamp:
May 8, 2008, 4:33:27 AM (11 years ago)
Author:
rme
Message:

Some x8632 conditionalization.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ia32/level-1/x86-trap-support.lisp

    r8372 r9406  
    154154  (defconstant gp-regs-offset 0)
    155155
     156  ;;; xxx pick: use types from interface db, or correct "portable" ones
    156157  (defmacro xp-gp-regs (xp)
    157     `(pref (pref ,xp :portable_ucontext.uc_mcontext) :portable_mcontext.ss))
     158    `(pref (pref ,xp :ucontext_t.uc_mcontext) :portable_mcontext.ss))
    158159
    159160  (defconstant flags-register-offset 9)
     
    171172
    172173(defun indexed-gpr-lisp (xp igpr)
    173   (%get-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
     174  (%get-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
    174175(defun (setf indexed-gpr-lisp) (new xp igpr)
    175   (%set-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)) new))
     176  (%set-object (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift)) new))
    176177(defun encoded-gpr-lisp (xp gpr)
    177178  (indexed-gpr-lisp xp (aref *encoded-gpr-to-indexed-gpr* gpr)))
     
    179180  (setf (indexed-gpr-lisp xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
    180181(defun indexed-gpr-integer (xp igpr)
    181   (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
     182  #+x8664-target
     183  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)))
     184  #+x8632-target
     185  (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8632::word-shift))))
    182186(defun (setf indexed-gpr-integer) (new xp igpr)
    183187  (setf
     188   #+x8664-target
    184189   (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift)))
     190   #+x8632-target
     191   (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8632::word-shift)))
    185192   new))
    186193(defun encoded-gpr-integer (xp gpr)
     
    189196  (setf (indexed-gpr-integer xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
    190197(defun indexed-gpr-macptr (xp igpr)
    191   (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
     198  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
    192199(defun (setf indexed-gpr-macptr) (new xp igpr)
    193   (setf (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))) new))
     200  (setf (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))) new))
    194201(defun indexed-gpr-macptr (xp igpr)
    195   (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr x8664::word-shift))))
     202  (%get-ptr (xp-gp-regs xp) (+ gp-regs-offset (ash igpr target::word-shift))))
    196203(defun encoded-gpr-macptr (xp gpr)
    197204  (indexed-gpr-macptr xp (aref *encoded-gpr-to-indexed-gpr* gpr)))
     
    199206  (setf (indexed-gpr-macptr xp (aref *encoded-gpr-to-indexed-gpr* gpr)) new))
    200207(defun xp-flags-register (xp)
    201   (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8664::fixnumshift))))
     208  #+x8664-target
     209  (%get-signed-long-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8664::fixnumshift)))
     210  #+x8632-target
     211  (%get-signed-long (xp-gp-regs xp) (+ gp-regs-offset (ash flags-register-offset x8632::fixnumshift))))
    202212 
    203213
    204214
    205215(defun %get-xcf-byte (xcf-ptr delta)
    206   (let* ((containing-object (%get-object xcf-ptr x8664::xcf.containing-object))
    207          (byte-offset (%get-object xcf-ptr x8664::xcf.relative-pc)))
     216  (let* ((containing-object (%get-object xcf-ptr target::xcf.containing-object))
     217         (byte-offset (%get-object xcf-ptr target::xcf.relative-pc)))
    208218    (if containing-object
    209219      (locally (declare (optimize (speed 3) (safety 0))
Note: See TracChangeset for help on using the changeset viewer.