Changeset 10575

Show
Ignore:
Timestamp:
08/27/08 05:49:59 (3 months ago)
Author:
gb
Message:

Use (:rcontext ..) syntax.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/level-0/X86/X8632

    • Property svn:ignore set to
      *.dx32fsl

  • trunk/source/level-0/X86/X8632/x8632-bignum.lisp

    r9797 r10575  
    784784(defx8632lapfunction %floor-loop-quo ((x 8) (res 4) #|(ra 0)|# (yhi arg_y) (ylo arg_z)) 
    785785  (compose-digit yhi ylo imm0) 
    786   (movl (% imm0) (@ (% :rcontext) x8632::tcr.unboxed0)) 
     786  (movl (% imm0) (:rcontext x8632::tcr.unboxed0)) 
    787787  (pop (% temp0)) 
    788788  (pop (% arg_z))                       ;res 
    …… 
    798798    @loop 
    799799    (movl (@ x8632::misc-data-offset (% bignum) (% temp0)) (% eax)) 
    800     (divl (@ (% :rcontext) x8632::tcr.unboxed0)) 
     800    (divl (:rcontext x8632::tcr.unboxed0)) 
    801801    (movl (% eax) (@ x8632::misc-data-offset (% result) (% temp0))) 
    802802    @next 
    …… 
    822822(defx8632lapfunction %floor-loop-no-quo ((x 4) #|(ra 0)|# (yhi arg_y) (ylo arg_z)) 
    823823  (compose-digit yhi ylo imm0) 
    824   (movl (% imm0) (@ (% :rcontext) x8632::tcr.unboxed0)) 
     824  (movl (% imm0) (:rcontext x8632::tcr.unboxed0)) 
    825825  (pop (% temp0)) 
    826826  (pop (% arg_y)) 
    …… 
    835835    @loop 
    836836    (movl (@ x8632::misc-data-offset (% bignum) (% temp0)) (% eax)) 
    837     (divl (@ (% :rcontext) x8632::tcr.unboxed0)) 
     837    (divl (:rcontext x8632::tcr.unboxed0)) 
    838838    ;;(movl (% eax) (@ x8632::misc-data-offset (% result) (% temp0))) 
    839839    @next 

  • trunk/source/level-0/X86/X8632/x8632-def.lisp

    r10560 r10575  
    211211(defx8632lapfunction %current-tsp () 
    212212  (check-nargs 0) 
    213   (movl (@ (% :rcontext) x8632::tcr.save-tsp) (% arg_z)) 
     213  (movl (:rcontext x8632::tcr.save-tsp) (% arg_z)) 
    214214  (single-value-return)) 
    215215 
    …… 
    271271  (check-nargs 1) 
    272272  (movl ($ x8632::nil-value) (% arg_y)) 
    273   (movl (@ (% :rcontext) x8632::tcr.catch-top) (% arg_z)) 
     273  (movl (:rcontext x8632::tcr.catch-top) (% arg_z)) 
    274274  (testb (%b arg_z) (%b arg_z)) 
    275275  (cmovel (% arg_y) (% arg_z)) 
    …… 
    292292(defx8632lapfunction %save-standard-binding-list ((bindings arg_z)) 
    293293  (mark-as-imm temp0) 
    294   (movl (@ (% :rcontext) x8632::tcr.vs-area) (% imm0)) 
     294  (movl (:rcontext x8632::tcr.vs-area) (% imm0)) 
    295295  (movl (@ x8632::area.high (% imm0)) (% temp0)) 
    296296  (subl ($ x8632::node-size) (% temp0)) 
    …… 
    301301(defx8632lapfunction %saved-bindings-address () 
    302302  (mark-as-imm temp0) 
    303   (movl (@ (% :rcontext) x8632::tcr.vs-area) (% imm0)) 
     303  (movl (:rcontext x8632::tcr.vs-area) (% imm0)) 
    304304  (movl (@ x8632::area.high (% imm0)) (% temp0)) 
    305305  (leal (@ (- x8632::node-size) (% temp0)) (% arg_z)) 
    …… 
    339339  ;; * Set nargs to 0, then spread "args" on stack (clobbers regs) 
    340340  ;; * Jump to function (saved previously) 
    341   (popl (@ (% :rcontext) x8632::tcr.save0))   ;return address 
    342   (popl (@ (% :rcontext) x8632::tcr.next-method-context)) ;magic arg 
     341  (popl (:rcontext x8632::tcr.save0)) ;return address 
     342  (popl (:rcontext x8632::tcr.next-method-context)) ;magic arg 
    343343  (discard-reserved-frame) 
    344   (movl (% function) (@ (% :rcontext) x8632::tcr.save1)) 
     344  (movl (% function) (:rcontext x8632::tcr.save1)) 
    345345  (set-nargs 0) 
    346346  (movl (@ (% args)) (% temp0))         ;lexpr-count 
    …… 
    368368  (jmp @two) 
    369369  @go 
    370   (pushl (@ (% :rcontext) x8632::tcr.save0))   ;return address 
    371   (movl (@ (% :rcontext) x8632::tcr.save1) (% temp0)) ;function 
    372   (movapd (% fpzero) (@ (% :rcontext) x8632::tcr.save0)) ;clear spill area 
     370  (pushl (:rcontext x8632::tcr.save0))         ;return address 
     371  (movl (:rcontext x8632::tcr.save1) (% temp0)) ;function 
     372  (movapd (% fpzero) (:rcontext x8632::tcr.save0)) ;clear spill area 
    373373  (jmp (% temp0))) 
    374374 
    …… 
    378378                                                 (args arg_z)) 
    379379  ;; Similar to above. 
    380   (popl (@ (% :rcontext) x8632::tcr.save0))   ;save return address 
    381   (popl (@ (% :rcontext) x8632::tcr.next-method-context))     ; 
     380  (popl (:rcontext x8632::tcr.save0)) ;save return address 
     381  (popl (:rcontext x8632::tcr.next-method-context))   ; 
    382382  (discard-reserved-frame) 
    383   (movl (% args) (@ (% :rcontext) x8632::tcr.save2))  ;in case of error 
     383  (movl (% args) (:rcontext x8632::tcr.save2))        ;in case of error 
    384384  (set-nargs 0) 
    385385  (pushl ($ target::reserved-frame-marker))             ;reserve frame (might discard it 
    …… 
    413413  (je @discard-and-go) 
    414414  @go 
    415   (pushl (@ (% :rcontext) x8632::tcr.save0))   ;return address 
    416   (movapd (% fpzero) (@ (% :rcontext) x8632::tcr.save0)) ;clear out spill area 
     415  (pushl (:rcontext x8632::tcr.save0))         ;return address 
     416  (movapd (% fpzero) (:rcontext x8632::tcr.save0)) ;clear out spill area 
    417417  (jmp (% temp0)) 
    418418  @bad 
    419419  (addl (% nargs) (% esp)) 
    420   (movl (@ (% :rcontext) x8632::tcr.save1) (% arg_z)) ;saved args 
    421   (movapd (% fpzero) (@ (% :rcontext) x8632::tcr.save0)) ;clear out spill area 
     420  (movl (:rcontext x8632::tcr.save1) (% arg_z)) ;saved args 
     421  (movapd (% fpzero) (:rcontext x8632::tcr.save0)) ;clear out spill area 
    422422  (movl ($ '#.$XNOSPREAD) (% arg_y)) 
    423423  (set-nargs 2) 
    …… 
    474474   (:arglist (function arg1 arg2 &rest other-args)) 
    475475   (check-nargs 3 nil) 
    476    (popl (@ (% :rcontext) x8632::tcr.save0))  ;save return address 
     476   (popl (:rcontext x8632::tcr.save0))        ;save return address 
    477477   ;; only two arg regs on x8632, so the caller will always push a frame 
    478478   (movl (% arg_z) (% temp0))           ; last 
    …… 
    482482   ;; Do .SPspreadargz inline here 
    483483   (xorl (%l temp1) (%l temp1)) 
    484    (movl (% arg_z) (@ (% :rcontext) x8632::tcr.save1)) ; save in case of error 
     484   (movl (% arg_z) (:rcontext x8632::tcr.save1)) ; save in case of error 
    485485   (cmp-reg-to-nil arg_z) 
    486486   (je @done) 
    …… 
    505505   (addl ($ '1) (% nargs)) 
    506506   (load-constant funcall temp0) 
    507    (pushl (@ (% :rcontext) x8632::tcr.save0)) ;return address 
    508    (movapd (% fpzero) (@ (% :rcontext) x8632::tcr.save0)) ;clear out spill area 
     507   (pushl (:rcontext x8632::tcr.save0))       ;return address 
     508   (movapd (% fpzero) (:rcontext x8632::tcr.save0)) ;clear out spill area 
    509509   (jmp-subprim .SPfuncall) 
    510510   @bad                               ;error spreading list. 
    511511   (add (% temp1) (% esp))            ;discard whatever's been pushed 
    512    (movl (@ (% :rcontext) x8632::tcr.save1) (% arg_z)) 
    513    (movapd (% fpzero) (@ (% :rcontext) x8632::tcr.save0)) ;clear out spill area 
     512   (movl (:rcontext x8632::tcr.save1) (% arg_z)) 
     513   (movapd (% fpzero) (:rcontext x8632::tcr.save0)) ;clear out spill area 
    514514   (movl ($ '#.$XNOSPREAD) (% arg_y)) 
    515515   (set-nargs 2) 
    …… 
    535535  ;; there might be an fp result on x87 stack, so don't use 
    536536  ;; any mmx instructions until the result has been read. 
    537   (movd (@ (% :rcontext) x8632::tcr.foreign-sp) (% xmm0)) 
     537  (movd (:rcontext x8632::tcr.foreign-sp) (% xmm0)) 
    538538  (movd (% xmm0) (@ (% frame))) 
    539   (movl (% frame) (@ (% :rcontext) x8632::tcr.foreign-sp)) 
     539  (movl (% frame) (:rcontext x8632::tcr.foreign-sp)) 
    540540  (cmpl ($ '1) (@ -4 (% ebp))) 
    541541  (je @single) 

  • trunk/source/level-0/X86/X8632/x8632-float.lisp

    r9482 r10575  
    266266;;; Return the MXCSR as a fixnum 
    267267(defx8632lapfunction %get-mxcsr () 
    268   (stmxcsr (@ (% :rcontext) x8632::tcr.scratch-mxcsr)) 
    269   (movl (@ (% :rcontext) x8632::tcr.scratch-mxcsr) (% imm0)) 
     268  (stmxcsr (:rcontext x8632::tcr.scratch-mxcsr)) 
     269  (movl (:rcontext x8632::tcr.scratch-mxcsr) (% imm0)) 
    270270  (box-fixnum imm0 arg_z) 
    271271  (single-value-return)) 
    …… 
    277277  (unbox-fixnum val imm0) 
    278278  (andl ($ x86::mxcsr-write-mask) (% imm0)) 
    279   (movl (% imm0) (@ (% :rcontext) x8632::tcr.scratch-mxcsr)) 
    280   (ldmxcsr (@ (% :rcontext) x8632::tcr.scratch-mxcsr)) 
     279  (movl (% imm0) (:rcontext x8632::tcr.scratch-mxcsr)) 
     280  (ldmxcsr (:rcontext x8632::tcr.scratch-mxcsr)) 
    281281  (single-value-return)) 
    282282 
    …… 
    306306(defx8632lapfunction %get-post-ffi-mxcsr () 
    307307  (xor (% arg_z) (% arg_z)) 
    308   (movl (@ (% :rcontext) x8632::tcr.ffi-exception) (%l imm0)) 
    309   (movl (%l arg_z) (@ (% :rcontext) x8632::tcr.ffi-exception)) 
     308  (movl (:rcontext x8632::tcr.ffi-exception) (%l imm0)) 
     309  (movl (%l arg_z) (:rcontext x8632::tcr.ffi-exception)) 
    310310  (box-fixnum imm0 arg_z) 
    311311  (single-value-return)) 

  • trunk/source/level-0/X86/X8632/x8632-misc.lisp

    r10559 r10575  
    805805  (single-value-return)) 
    806806 
    807 (defx86lapfunction %get-gs-register () 
     807(defx8632lapfunction %get-gs-register () 
    808808  (xorl (% imm0) (% imm0)) 
    809809  (:byte #x66)                          ;movw %gs,%ax 

  • trunk/source/level-0/X86/X8632/x8632-symbol.lisp

    r10446 r10575  
    5858(defx8632lapfunction %symptr-binding-address ((symptr arg_z)) 
    5959  (movl (@ x8632::symbol.binding-index (% symptr)) (% arg_y)) 
    60   (rcmp (% arg_y) (@ (% :rcontext) x8632::tcr.tlb-limit)) 
    61   (movl (@ (% :rcontext) x8632::tcr.tlb-pointer) (% temp0)) 
     60  (rcmp (% arg_y) (:rcontext x8632::tcr.tlb-limit)) 
     61  (movl (:rcontext x8632::tcr.tlb-pointer) (% temp0)) 
    6262  (jae @sym) 
    6363  (cmpb ($ x8632::subtag-no-thread-local-binding) (@ (% temp0) (% arg_y))) 

  • trunk/source/level-0/X86/X8632/x8632-utils.lisp

    r10450 r10575  
    2525 
    2626    ; update active pointer for tsp area. 
    27     (movl (@ (% :rcontext) x8632::tcr.ts-area) (% address)) 
    28     (movl (@ (% :rcontext) x8632::tcr.save-tsp) (% temp)) 
     27    (movl (:rcontext x8632::tcr.ts-area) (% address)) 
     28    (movl (:rcontext x8632::tcr.save-tsp) (% temp)) 
    2929    (movl (% temp) (@ x8632::area.active (% address))) 
    3030     
    3131    ;; Update active pointer for vsp area. 
    32     (movl (@ (% :rcontext) x8632::tcr.vs-area) (% address)) 
     32    (movl (:rcontext x8632::tcr.vs-area) (% address)) 
    3333    (movl (% esp) (@ x8632::area.active (% address))) 
    3434 
    …… 
    174174    (push (% f)) 
    175175    (subl ($ (- x8632::cons.size x8632::fulltag-cons)) 
    176           (@ (% :rcontext) x8632::tcr.save-allocptr)) 
    177     (movl (@ (% :rcontext) x8632::tcr.save-allocptr) (% allocptr)) ;aka temp0 
    178     (cmpl (@ (% :rcontext) x8632::tcr.save-allocbase) (% allocptr)) 
     176          (:rcontext x8632::tcr.save-allocptr)) 
     177    (movl (:rcontext x8632::tcr.save-allocptr) (% allocptr)) ;aka temp0 
     178    (cmpl (:rcontext x8632::tcr.save-allocbase) (% allocptr)) 
    179179    (jg @ok) 
    180180    (uuo-alloc) 
    181181    @ok 
    182182    (andb ($ (lognot x8632::fulltagmask)) 
    183           (@ (% :rcontext) x8632::tcr.save-allocptr)) 
     183          (:rcontext x8632::tcr.save-allocptr)) 
    184184    (push (% allocptr))                 ;sentinel 
    185185    (ref-global tenured-area a) 

  • trunk/source/level-0/X86/x86-def.lisp

    r10145 r10575  
    235235(defx86lapfunction %current-tsp () 
    236236  (check-nargs 0) 
    237   (movq (@ (% :rcontext) x8664::tcr.save-tsp) (% arg_z)) 
     237  (movq (:rcontext x8664::tcr.save-tsp) (% arg_z)) 
    238238  (single-value-return)) 
    239239 
    …… 
    298298  (check-nargs 1) 
    299299  (movl ($ x8664::nil-value) (%l arg_y)) 
    300   (movq (@ (% :rcontext) x8664::tcr.catch-top) (% arg_z)) 
     300  (movq (:rcontext x8664::tcr.catch-top) (% arg_z)) 
    301301  (testb (%b arg_z) (%b arg_z)) 
    302302  (cmoveq (% arg_y) (% arg_z)) 
    …… 
    320320 
    321321(defx86lapfunction %save-standard-binding-list ((bindings arg_z)) 
    322   (movq (@ (% :rcontext) x8664::tcr.vs-area) (% imm0)) 
     322  (movq (:rcontext x8664::tcr.vs-area) (% imm0)) 
    323323  (movq (@ x8664::area.high (% imm0)) (% imm1)) 
    324324  (subq ($ x8664::node-size) (% imm1)) 
    …… 
    327327 
    328328(defx86lapfunction %saved-bindings-address () 
    329   (movq (@ (% :rcontext) x8664::tcr.vs-area) (% imm0)) 
     329  (movq (:rcontext x8664::tcr.vs-area) (% imm0)) 
    330330  (movq (@ x8664::area.high (% imm0)) (% imm1)) 
    331331  (lea (@ (- x8664::node-size) (% imm1)) (% arg_z)) 
    …… 
    580580  (movq (@ 56 (% temp0)) (% fp7)) 
    581581  (call-subprim .SPffcall) 
    582   (movq (@ (% :rcontext) x8664::tcr.foreign-sp) (% mm5)) 
     582  (movq (:rcontext x8664::tcr.foreign-sp) (% mm5)) 
    583583  (movq (% mm5) (@ (% frame))) 
    584   (movq (% frame) (@ (% :rcontext) x8664::tcr.foreign-sp)) 
     584  (movq (% frame) (:rcontext x8664::tcr.foreign-sp)) 
    585585  (movq (% rax) (@ 8 (% frame))) 
    586586  (movq (% fp0) (@ 16 (% frame))) 

  • trunk/source/level-0/X86/x86-float.lisp

    r10145 r10575  
    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/source/level-0/X86/x86-io.lisp

    r10143 r10575  
    2323#+x8664-target 
    2424(defx86lapfunction %get-errno () 
    25   (movq (@ (% :rcontext) x8664::tcr.errno-loc) (% imm1)) 
     25  (movq (:rcontext x8664::tcr.errno-loc) (% imm1)) 
    2626  (movslq (@ (% imm1)) (% imm0)) 
    2727  (movss (% fpzero) (@ (% imm1))) 
    …… 
    3232#+x8632-target 
    3333(defx8632lapfunction %get-errno () 
    34   (movl (@ (% :rcontext) x8632::tcr.errno-loc) (% imm0)) 
     34  (movl (:rcontext x8632::tcr.errno-loc) (% imm0)) 
    3535  (movl (@ (% imm0)) (% imm0)) 
    3636  (neg (% imm0)) 
    3737  (box-fixnum imm0 arg_z) 
    38   (movl (@ (% :rcontext) x8632::tcr.errno-loc) (% imm0)) 
     38  (movl (:rcontext x8632::tcr.errno-loc) (% imm0)) 
    3939  (movss (% fpzero) (@ (% imm0))) 
    4040  (single-value-return)) 

  • trunk/source/level-0/X86/x86-misc.lisp

    r10405 r10575  
    216216 
    217217(defx86lapfunction %heap-bytes-allocated () 
    218   (movq (@ (% :rcontext) x8664::tcr.save-allocptr) (% temp1)) 
    219   (movq (@ (% :rcontext) x8664::tcr.last-allocptr) (% temp0)) 
     218  (movq (:rcontext x8664::tcr.save-allocptr) (% temp1)) 
     219  (movq (:rcontext x8664::tcr.last-allocptr) (% temp0)) 
    220220  (cmpq ($ -16) (% temp1)) 
    221   (movq (@ (% :rcontext) x8664::tcr.total-bytes-allocated) (% imm0)) 
     221  (movq (:rcontext x8664::tcr.total-bytes-allocated) (% imm0)) 
    222222  (jz @go) 
    223223  (movq (% temp0) (% temp2)) 
    …… 
    315315 
    316316(defx86lapfunction interrupt-level () 
    317   (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% imm1)) 
     317  (movq (:rcontext x8664::tcr.tlb-pointer) (% imm1)) 
    318318  (movq (@ x8664::interrupt-level-binding-index (% imm1)) (% arg_z)) 
    319319  (single-value-return)) 
    320320 
    321321(defx86lapfunction set-interrupt-level ((new arg_z)) 
    322   (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% imm1)) 
     322  (movq (:rcontext x8664::tcr.tlb-pointer) (% imm1)) 
    323323  (trap-unless-fixnum new) 
    324324  (movq (% new) (@ x8664::interrupt-level-binding-index (% imm1))) 
    …… 
    326326 
    327327(defx86lapfunction %current-tcr () 
    328   (movq (@ (% :rcontext) x8664::tcr.linear) (% arg_z)) 
     328  (movq (:rcontext x8664::tcr.linear) (% arg_z)) 
    329329  (single-value-return)) 
    330330 
    331331(defx86lapfunction %tcr-toplevel-function ((tcr arg_z)) 
    332332  (check-nargs 1) 
    333   (cmpq (% tcr) (@ (% :rcontext) x8664::tcr.linear)) 
     333  (cmpq (% tcr) (:rcontext x8664::tcr.linear)) 
    334334  (movq (% rsp) (% imm0)) 
    335335  (movq (@ x8664::tcr.vs-area (% tcr)) (% temp0)) 
    …… 
    345345(defx86lapfunction %set-tcr-toplevel-function ((tcr arg_y) (fun arg_z)) 
    346346  (check-nargs 2) 
    347   (cmpq (% tcr) (@ (% :rcontext) x8664::tcr.linear)) 
     347  (cmpq (% tcr) (:rcontext x8664::tcr.linear)) 
    348348  (movq (% rsp) (% imm0)) 
    349349  (movq (@ x8664::tcr.vs-area (% tcr)) (% temp0)) 
    …… 
    608608  (push (% save1)) 
    609609  (push (% save2)) 
    610   (push (% save3)) 
     610  (push (% save3))                      ; this'd be the TCR on Win64. 
    611611  (set-nargs 4) 
    612612  (jmp-subprim .SPvalues)) 
    …… 
    614614 
    615615(defx86lapfunction %current-db-link () 
    616   (movq (@ (% :rcontext) x8664::tcr.db-link) (% arg_z)) 
     616  (movq (:rcontext x8664::tcr.db-link) (% arg_z)) 
    617617  (single-value-return)) 
    618618 
    …… 
    643643  (macptr-ptr src imm0) 
    644644  (leaq (@ (:^ done) (% fn)) (% ra0)) 
    645   (movq (% imm0) (@ (% :rcontext) x8664::tcr.safe-ref-address)) 
     645  (movq (% imm0) (:rcontext x8664::tcr.safe-ref-address)) 
    646646  (movq (@ (% imm0)) (% imm0)) 
    647647  (jmp done) 
    648648  (:tra done) 
    649649  (recover-fn-from-rip) 
    650   (movq ($ 0) (@ (% :rcontext) x8664::tcr.safe-ref-address)) 
     650  (movq ($ 0) (:rcontext x8664::tcr.safe-ref-address)) 
    651651  (movq (% imm0) (@ x8664::macptr.address (% dest))) 
    652652  (restore-simple-frame) 
    …… 
    658658 
    659659(defx86lapfunction %check-deferred-gc () 
    660   (btq ($ (+ arch::tcr-flag-bit-pending-suspend target::fixnumshift)) (@ (% :rcontext) x8664::tcr.flags)) 
     660  (btq ($ (+ arch::tcr-flag-bit-pending-suspend target::fixnumshift)) (:rcontext x8664::tcr.flags)) 
    661661  (movl ($ x8664::nil-value) (% arg_z.l)) 
    662662  (jae @done) 
    …… 
    716716  (movq (@ '*spin-lock-timeouts* (% fn)) (% temp1)) 
    717717  (movq (@ target::symbol.vcell (% temp0)) (% temp0)) 
    718   (movq (@ (% :rcontext) x8664::tcr.linear) (% arg_y)) 
     718  (movq (:rcontext x8664::tcr.linear) (% arg_y)) 
    719719  @try-swap 
    720720  (xorq (% rax) (% rax)) 
    …… 
    743743;;; and this protoype is cloned (with the right parameters). 
    744744 
     745;;; For win64 (which doesn't really have a "save3" register), the code 
     746;;; which instantiates this should always set save3-offset to 0. 
    745747(defx86lapfunction %%apply-in-frame-proto () 
    746748  (:fixed-constants (target-frame target-catch target-db-link target-xcf target-tsp target-foreign-sp save0-offset save1-offset save2-offset save3-offset function args)) 
    …… 
    750752  (xorl (%l imm0) (%l imm0)) 
    751753  (cmpb ($ x8664::fulltag-nil) (%b temp0)) 
    752   (movq (@ (% :rcontext) target::tcr.catch-top) (% arg_z)) 
     754  (movq (:rcontext target::tcr.catch-top) (% arg_z)) 
    753755  (jz @did-catch) 
    754756  @find-catch 
    …… 
    819821  (movq (@ target::xcf.prev-xframe (% arg_z)) (% temp0)) 
    820822  (movq (@ target::xcf.foreign-sp (% arg_z)) (% imm0)) 
    821   (movq (% temp0) (@ (% :rcontext) target::tcr.xframe)) 
    822   (movq (% imm0) (@ (% :rcontext) target::tcr.foreign-sp)) 
     823  (movq (% temp0) (:rcontext target::tcr.xframe)) 
     824  (movq (% imm0) (:rcontext target::tcr.foreign-sp)) 
    823825  ;; All done processing the xcf.  NVRs may have been 
    824826  ;; saved between the last catch/last xcf and the 
    …… 
    832834  (movq (@ 'target-foreign-sp (% fn)) (% temp0)) 
    833835  (je @no-tsp) 
    834   (movq (% imm0) (@ (% :rcontext) target::tcr.save-tsp)) 
    835   (movq (% imm0) (@ (% :rcontext) target::tcr.next-tsp)) 
     836  (movq (% imm0) (:rcontext target::tcr.save-tsp)) 
     837  (movq (% imm0) (:rcontext target::tcr.next-tsp)) 
    836838  @no-tsp 
    837839  (cmpb ($ x8664::fulltag-nil) (%b temp0)) 
    838840  (je @no-sp) 
    839   (movq (% temp0) (@ (% :rcontext) target::tcr.foreign-sp)) 
     841  (movq (% temp0) (:rcontext target::tcr.foreign-sp)) 
    840842  @no-sp 
    841843  (movq (@ 'target-frame (% fn)) (% rbp)) 

  • trunk/source/level-0/X86/x86-symbol.lisp

    r10446 r10575  
    9292(defx86lapfunction %symptr-binding-address ((symptr arg_z)) 
    9393  (movq (@ x8664::symbol.binding-index (% symptr)) (% arg_y)) 
    94   (rcmp (% arg_y) (@ (% :rcontext) x8664::tcr.tlb-limit)) 
    95   (movq (@ (% :rcontext) x8664::tcr.tlb-pointer) (% arg_x)) 
     94  (rcmp (% arg_y) (:rcontext x8664::tcr.tlb-limit)) 
     95  (movq (:rcontext x8664::tcr.tlb-pointer) (% arg_x)) 
    9696  (jae @sym) 
    9797  (cmpb ($ x8664::no-thread-local-binding-marker) (@ (% arg_x) (% arg_y))) 

  • trunk/source/level-0/X86/x86-utils.lisp

    r10145 r10575  
    4646 
    4747    ; update active pointer for tsp area. 
    48     (movq (@ (% :rcontext) x8664::tcr.ts-area) (% address)) 
    49     (movq (@ (% :rcontext) x8664::tcr.save-tsp) (% temp)) 
     48    (movq (:rcontext x8664::tcr.ts-area) (% address)) 
     49    (movq (:rcontext x8664::tcr.save-tsp) (% temp)) 
    5050    (movq (% temp) (@ x8664::area.active (% address))) 
    5151     
    5252    ;; Update active pointer for vsp area. 
    53     (movq (@ (% :rcontext) x8664::tcr.vs-area) (% address)) 
     53    (movq (:rcontext x8664::tcr.vs-area) (% address)) 
    5454    (movq (% rsp) (@ x8664::area.active (% address))) 
    5555 
    …… 
    217217    (movq (@ x8664::area.low (% a)) (% obj)) 
    218218    (subq ($ (- x8664::cons.size x8664::fulltag-cons)) 
    219           (@ (% :rcontext) x8664::tcr.save-allocptr)) 
    220     (movq (@ (% :rcontext) x8664::tcr.save-allocptr) (% allocptr)) 
    221     (cmpq (@ (% :rcontext) x8664::tcr.save-allocbase) (% allocptr)) 
     219          (:rcontext x8664::tcr.save-allocptr)) 
     220    (movq (:rcontext x8664::tcr.save-allocptr) (% allocptr)) 
     221    (cmpq (:rcontext x8664::tcr.save-allocbase) (% allocptr)) 
    222222    (jg @ok) 
    223223    (uuo-alloc) 
    224224    @ok 
    225225    (andb ($ (lognot x8664::fulltagmask)) 
    226           (@ (% :rcontext) x8664::tcr.save-allocptr)) 
     226          (:rcontext x8664::tcr.save-allocptr)) 
    227227    (movq (% allocptr) (% limit)) 
    228228    (jmp @test) 

  • trunk/source/level-0/l0-init.lisp

    r10148 r10575  
    8282    #+darwinx8664-target :darwinx8664-target 
    8383    #+darwinx8664-target :darwinx8664-host 
     84    #+windows-target :windows-host 
     85    #+windows-target :windows-target 
     86    #+win64-target :win64-target 
     87    #+win64-target :win64-host 
    8488    #+solaris-target :solaris-host 
    8589    #+solaris-target :solaris-target 
    …… 
    100104    #+freebsd-target :freebsd 
    101105    #+solaris-target :solaris 
     106    #+windows-target :windows 
    102107    ;; :mcl                                ;deprecated 
    103108    ) 

  • trunk/source/level-0/l0-io.lisp

    r10184 r10575  
    3232  #+solarisx8664-target 
    3333  (require "X8664-SOLARIS-SYSCALLS") 
     34  #+win64-target 
     35  (require "X86-WIN64-SYSCALLS") 
    3436  ) 
    3537 
    …… 
    5153                    3 
    5254                    4)))))) 
     55    0)) 
     56 
     57(defun utf-16-octets-in-string (string start end) 
     58  (if (>= end start) 
     59    (do* ((noctets 0) 
     60          (i start (1+ i))) 
     61         ((= i end) noctets) 
     62      (declare (fixnum noctets)) 
     63      (let* ((code (char-code (schar string i)))) 
     64        (declare (type (mod #x110000) code)) 
     65        (incf noctets 
     66              (if (< code #x10000) 
     67                2 
     68                4)))) 
    5369    0)) 
    5470 
    …… 
    87103                   (logior #x80 (logand #x3f code))) 
    88104             (incf idx 4)))))) 
     105 
     106(defun native-utf-16-memory-encode (string pointer idx start end) 
     107  (declare (fixnum idx)) 
     108  (do* ((i start (1+ i))) 
     109       ((>= i end) idx) 
     110    (let* ((code (char-code (schar string i))) 
     111           (highbits (- code #x10000))) 
     112      (declare (type (mod #x110000) code) 
     113               (fixnum  highbits)) 
     114      (cond ((< highbits 0) 
     115             (setf (%get-unsigned-word pointer idx) code) 
     116             (incf idx 2)) 
     117            (t 
     118             (setf (%get-unsigned-word pointer idx) (logior #xd800 (the fixnum (ash highbits -10)))) 
     119             (incf idx 2) 
     120             (setf (%get-unsigned-word pointer idx) (logior #xdc00 (the fixnum (logand highbits #x3ff)))) 
     121             (incf idx 2)))))) 
    89122 
    90123(defun utf-8-memory-decode (pointer noctets idx string) 
    …… 
    175208 
    176209(defun fd-open (path flags &optional (create-mode #o666)) 
    177   (#+darwin-target with-utf-8-cstrs #-darwin-target with-cstrs ((p path)) 
     210  (#+darwin-target with-utf-8-cstrs 
     211   #+windows-target with-native-utf-16-cstrs 
     212   #-(or darwin-target windows-target) with-cstrs 
     213   ((p path)) 
    178214    (let* ((fd (syscall syscalls::open p flags create-mode))) 
    179215      (declare (fixnum fd))