Changeset 4955 for trunk/ccl/level-0/X86


Ignore:
Timestamp:
Aug 18, 2006, 3:40:48 PM (15 years ago)
Author:
gb
Message:

Refer to rcontext segment register as :rcontext, since x86-64 Darwin doesn't
laugh and play like the other children.

Location:
trunk/ccl/level-0/X86
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/level-0/X86/x86-def.lisp

    r4786 r4955  
    214214(defx86lapfunction %current-tsp ()
    215215  (check-nargs 0)
    216   (movq (@ (% rcontext) x8664::tcr.save-tsp) (% arg_z))
     216  (movq (@ (% :rcontext) x8664::tcr.save-tsp) (% arg_z))
    217217  (single-value-return))
    218218
     
    288288  (check-nargs 1)
    289289  (movl ($ x8664::nil-value) (%l arg_y))
    290   (movq (@ (% rcontext) x8664::tcr.catch-top) (% arg_z))
     290  (movq (@ (% :rcontext) x8664::tcr.catch-top) (% arg_z))
    291291  (testb (%b arg_z) (%b arg_z))
    292292  (cmoveq (% arg_y) (% arg_z))
     
    310310
    311311(defx86lapfunction %save-standard-binding-list ((bindings arg_z))
    312   (movq (@ (% rcontext) x8664::tcr.vs-area) (% imm0))
     312  (movq (@ (% :rcontext) x8664::tcr.vs-area) (% imm0))
    313313  (movq (@ x8664::area.high (% imm0)) (% imm1))
    314314  (subq ($ x8664::node-size) (% imm1))
     
    317317
    318318(defx86lapfunction %saved-bindings-address ()
    319   (movq (@ (% rcontext) x8664::tcr.vs-area) (% imm0))
     319  (movq (@ (% :rcontext) x8664::tcr.vs-area) (% imm0))
    320320  (movq (@ x8664::area.high (% imm0)) (% imm1))
    321321  (lea (@ (- x8664::node-size) (% imm1)) (% arg_z))
     
    566566  (movq (@ 56 (% temp0)) (% fp7))
    567567  (call-subprim .SPffcall)
    568   (movq (@ (% rcontext) x8664::tcr.foreign-sp) (% mm5))
     568  (movq (@ (% :rcontext) x8664::tcr.foreign-sp) (% mm5))
    569569  (movq (% mm5) (@ (% frame)))
    570   (movq (% frame) (@ (% rcontext) x8664::tcr.foreign-sp))
     570  (movq (% frame) (@ (% :rcontext) x8664::tcr.foreign-sp))
    571571  (movq (% rax) (@ 8 (% frame)))
    572572  (movq (% fp0) (@ 16 (% frame)))
  • trunk/ccl/level-0/X86/x86-float.lisp

    r4618 r4955  
    199199(defx86lapfunction %get-post-ffi-mxcsr ()
    200200  (xor (% arg_z) (% arg_z))
    201   (movl (@ (% rcontext) x8664::tcr.ffi-exception) (%l imm0))
    202   (movl (%l arg_z) (@ (% rcontext) x8664::tcr.ffi-exception))
     201  (movl (@ (% :rcontext) x8664::tcr.ffi-exception) (%l imm0))
     202  (movl (%l arg_z) (@ (% :rcontext) x8664::tcr.ffi-exception))
    203203  (box-fixnum imm0 arg_z)
    204204  (single-value-return))
  • trunk/ccl/level-0/X86/x86-io.lisp

    r3176 r4955  
    2222
    2323(defx86lapfunction %get-errno ()
    24   (movq (@ (% rcontext) x8664::tcr.errno-loc) (% imm1))
     24  (movq (@ (% :rcontext) x8664::tcr.errno-loc) (% imm1))
    2525  (movslq (@ (% imm1)) (% imm0))
    2626  (movss (% fp0) (@ (% imm1)))
  • trunk/ccl/level-0/X86/x86-misc.lisp

    r4087 r4955  
    176176
    177177(defx86lapfunction %heap-bytes-allocated ()
    178   (movq (@ (% rcontext) x8664::tcr.last-allocptr) (% temp0))
    179   (movq (@ (% rcontext) x8664::tcr.save-allocptr) (% temp1))
    180   (movq (@ (% rcontext) x8664::tcr.total-bytes-allocated) (% imm0))
     178  (movq (@ (% :rcontext) x8664::tcr.last-allocptr) (% temp0))
     179  (movq (@ (% :rcontext) x8664::tcr.save-allocptr) (% temp1))
     180  (movq (@ (% :rcontext) x8664::tcr.total-bytes-allocated) (% imm0))
    181181  (movq (% temp0) (% temp2))
    182182  (subq (% temp1) (% temp0))
     
    259259
    260260(defx86lapfunction interrupt-level ()
    261   (movq (@ (% rcontext) x8664::tcr.tlb-pointer) (% imm1))
     261  (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% imm1))
    262262  (movq (@ x8664::interrupt-level-binding-index (% imm1)) (% arg_z))
    263263  (single-value-return))
    264264
    265265(defx86lapfunction set-interrupt-level ((new arg_z))
    266   (movq (@ (% rcontext) x8664::tcr.tlb-pointer) (% imm1))
     266  (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% imm1))
    267267  (trap-unless-fixnum new)
    268268  (movq (% new) (@ x8664::interrupt-level-binding-index (% imm1)))
     
    270270
    271271(defx86lapfunction %current-tcr ()
    272   (movq (@ (% rcontext) x8664::tcr.linear) (% arg_z))
     272  (movq (@ (% :rcontext) x8664::tcr.linear) (% arg_z))
    273273  (single-value-return))
    274274
    275275(defx86lapfunction %tcr-toplevel-function ((tcr arg_z))
    276276  (check-nargs 1)
    277   (cmpq (% tcr) (@ (% x8664::rcontext) x8664::tcr.linear))
     277  (cmpq (% tcr) (@ (% :rcontext) x8664::tcr.linear))
    278278  (movq (% rsp) (% imm0))
    279279  (movq (@ x8664::tcr.vs-area (% tcr)) (% temp0))
     
    289289(defx86lapfunction %set-tcr-toplevel-function ((tcr arg_y) (fun arg_z))
    290290  (check-nargs 2)
    291   (cmpq (% tcr) (@ (% x8664::rcontext) x8664::tcr.linear))
     291  (cmpq (% tcr) (@ (% :rcontext) x8664::tcr.linear))
    292292  (movq (% rsp) (% imm0))
    293293  (movq (@ x8664::tcr.vs-area (% tcr)) (% temp0))
     
    409409  ;;; If we are and the value's about to go to 0, clear the writer field.
    410410  (movq (@ x8664::lock.writer (% lock)) (% imm0))
    411   (cmpq (% imm0) (@ (% rcontext) x8664::tcr.linear))
     411  (cmpq (% imm0) (@ (% :rcontext) x8664::tcr.linear))
    412412  (jne @fail)
    413413  (addq ($ '1) (@ x8664::lock._value (% lock)))
     
    537537  ; Pop dynamic bindings until we get to db-link
    538538  (lwz imm0 12 vsp)                     ; db-link
    539   (lwz imm1 x8664::tcr.db-link x8664::rcontext)
     539  (lwz imm1 x8664::tcr.db-link :rcontext)
    540540  (cmp cr0 imm0 imm1)
    541541  (beq cr0 @restore-regs)               ; .SPunbind-to expects there to be something to do
     
    677677
    678678(defx86lapfunction %current-db-link ()
    679   (movq (@ (% rcontext) x8664::tcr.db-link) (% arg_z))
     679  (movq (@ (% :rcontext) x8664::tcr.db-link) (% arg_z))
    680680  (single-value-return))
    681681
  • trunk/ccl/level-0/X86/x86-symbol.lisp

    r4550 r4955  
    9090(defx86lapfunction %symptr-binding-address ((symptr arg_z))
    9191  (movq (@ x8664::symbol.binding-index (% symptr)) (% arg_y))
    92   (rcmp (% arg_y) (@ (% rcontext) x8664::tcr.tlb-limit))
    93   (movq (@ (% rcontext) x8664::tcr.tlb-pointer) (% arg_x))
     92  (rcmp (% arg_y) (@ (% :rcontext) x8664::tcr.tlb-limit))
     93  (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% arg_x))
    9494  (jae @sym)
    9595  (cmpb ($ x8664::no-thread-local-binding-marker) (@ (% arg_x) (% arg_y)))
  • trunk/ccl/level-0/X86/x86-utils.lisp

    r4049 r4955  
    4444
    4545    ; update active pointer for tsp area.
    46     (movq (@ (% rcontext) x8664::tcr.ts-area) (% address))
    47     (movq (@ (% rcontext) x8664::tcr.save-tsp) (% temp))
     46    (movq (@ (% :rcontext) x8664::tcr.ts-area) (% address))
     47    (movq (@ (% :rcontext) x8664::tcr.save-tsp) (% temp))
    4848    (movq (% temp) (@ x8664::area.active (% address)))
    4949   
    5050    ;; Update active pointer for vsp area.
    51     (movq (@ (% rcontext) x8664::tcr.vs-area) (% address))
     51    (movq (@ (% :rcontext) x8664::tcr.vs-area) (% address))
    5252    (movq (% rsp) (@ x8664::area.active (% address)))
    5353
     
    219219    (movq (@ x8664::area.low (% a)) (% obj))
    220220    (subq ($ (- x8664::cons.size x8664::fulltag-cons))
    221           (@ (% rcontext) x8664::tcr.save-allocptr))
    222     (movq (@ (% rcontext) x8664::tcr.save-allocptr) (% allocptr))
    223     (cmpq (@ (% rcontext) x8664::tcr.save-allocbase) (% allocptr))
     221          (@ (% :rcontext) x8664::tcr.save-allocptr))
     222    (movq (@ (% :rcontext) x8664::tcr.save-allocptr) (% allocptr))
     223    (cmpq (@ (% :rcontext) x8664::tcr.save-allocbase) (% allocptr))
    224224    (jg @ok)
    225225    (uuo-alloc)
    226226    @ok
    227227    (andb ($ (lognot x8664::fulltagmask))
    228           (@ (% rcontext) x8664::tcr.save-allocptr))
     228          (@ (% :rcontext) x8664::tcr.save-allocptr))
    229229    (movq (% allocptr) (% limit))
    230230    (jmp @test)
Note: See TracChangeset for help on using the changeset viewer.