Ignore:
Timestamp:
Oct 14, 2008, 6:30:00 PM (13 years ago)
Author:
gz
Message:

Merge/bootstrap assorted low level stuff from trunk - kernel, syscall stuff, lowmem-bias, formatting tweaks, a few bug fixes included

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/compiler/X86/X8664/x8664-vinsns.lisp

    r10972 r11089  
    389389  ((:pred >= min 1)
    390390   (movq (:%q x8664::arg_z) (:%q x8664::arg_y)))
    391   (movq (:$l x8664::nil-value) (:%q x8664::arg_z))
     391  (movq (:$l (:apply target-nil-value)) (:%q x8664::arg_z))
    392392  :done)
    393393
     
    408408  ((:pred >= min 1)
    409409   (movq (:%q x8664::arg_z) (:%q x8664::arg_x)))
    410   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     410  (movl (:$l (:apply target-nil-value)) (:%l x8664::arg_y))
    411411  (jmp :last)
    412412  :one
     
    418418  (movq (:%q x8664::arg_z) (:%q x8664::arg_y))
    419419  :last
    420   (movq (:$l x8664::nil-value) (:%q x8664::arg_z))
     420  (movq (:$l (:apply target-nil-value)) (:%q x8664::arg_z))
    421421  :done)
    422422
     
    456456  ((:pred >= min 1)
    457457   (pushq (:%q x8664::arg_z)))
    458   (movl (:$l x8664::nil-value) (:%l x8664::arg_x))
     458  (movl (:$l (:apply target-nil-value)) (:%l x8664::arg_x))
    459459  :last-2
    460   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     460  (movl (:$l (:apply target-nil-value)) (:%l x8664::arg_y))
    461461  :last-1
    462   (movl (:$l x8664::nil-value) (:%l x8664::arg_z))
     462  (movl (:$l (:apply target-nil-value)) (:%l x8664::arg_z))
    463463  :done)
    464464
     
    479479  ((:pred >= n 16)
    480480   (cmpl (:$l (:apply ash n x8664::word-shift)) (:%l temp))) 
    481   (pushq (:$l x8664::nil-value))
     481  (pushq (:$l (:apply target-nil-value)))
    482482  (jne :loop)
    483483  :done)
     
    593593(define-x8664-vinsn compare-to-t (()
    594594                                    ((arg0 t)))
    595   (cmpq (:$l x8664::t-value) (:%q arg0)))
     595  (cmpq (:$l (:apply target-t-value)) (:%q arg0)))
    596596
    597597(define-x8664-vinsn ref-constant (((dest :lisp))
     
    846846(define-x8664-vinsn (load-nil :constant-ref) (((dest t))
    847847                                              ())
    848   (movl (:$l x8664::nil-value) (:%l dest)))
     848  (movl (:$l (:apply target-nil-value)) (:%l dest)))
    849849
    850850
    851851(define-x8664-vinsn (load-t :constant-ref) (((dest t))
    852852                                            ())
    853   (movl(:$l x8664::t-value) (:%l dest)))
     853  (movl(:$l (:apply target-t-value)) (:%l dest)))
    854854
    855855
     
    919919(define-x8664-vinsn cr-bit->boolean (((dest :lisp))
    920920                                     ((crbit :u8const)))
    921   (movl (:$l x8664::nil-value) (:%l dest))
     921  (movl (:$l (:apply target-nil-value)) (:%l dest))
    922922  (cmovccl (:$ub crbit) (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l dest)) (:%l dest)))
    923923
     
    17101710  (jmp :done)
    17111711  :push-loop
    1712   (pushq (:$l x8664::nil-value))
     1712  (pushq (:$l (:apply target-nil-value)))
    17131713  (addl (:$b x8664::node-size) (:%l x8664::nargs))
    17141714  (subl (:$b x8664::node-size) (:%l imm))
     
    17521752(define-x8664-vinsn pass-multiple-values-symbol (()
    17531753                                                 ())
    1754   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr))))
     1754  (pushq (:@ (:apply + (:apply target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr))))
    17551755  (jmp (:@ x8664::symbol.fcell (:% x8664::fname))))
    17561756
     
    17671767  (jl :bad)
    17681768  (cmoveq (:@ x8664::symbol.fcell (:%q x8664::fname)) (:%q x8664::fn))
    1769   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr))))
     1769  (pushq (:@ (:apply + (:apply target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr))))
    17701770  (jmp (:%q x8664::fn))
    17711771
     
    32583258                                     (imm :imm)))
    32593259  (xorl (:%l imm) (:%l imm))
    3260   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     3260  (movl (:$l (:apply target-nil-value)) (:%l x8664::arg_y))
    32613261  :loop
    32623262  (rcmpl (:%l imm) (:%l nargs))
     
    32723272                                        ((temp :u64)))
    32733273  (testl (:%l x8664::nargs) (:%l x8664::nargs))
    3274   (movl (:$l x8664::nil-value) (:%l temp))
     3274  (movl (:$l (:apply target-nil-value)) (:%l temp))
    32753275  (cmovnel (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l temp)) (:%l temp))
    32763276  (pushq (:%q temp)))
     
    32813281                                         (temp1 :u64)))
    32823282  (rcmpl (:%l x8664::nargs) (:$b x8664::node-size))
    3283   (movl (:$l x8664::nil-value) (:%l temp0))
     3283  (movl (:$l (:apply target-nil-value)) (:%l temp0))
    32843284  (movl (:%l temp0) (:%l temp1))
    32853285  (cmovael (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l temp0)) (:%l temp0))
     
    34083408                                       ()
    34093409                                       ((temp :imm)))
    3410   (movq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr)))
     3410  (movq (:@ (:apply + (:apply target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr)))
    34113411        (:%q temp))
    34123412  (cmpq (:%q temp)
    34133413        (:%q x8664::ra0))
    34143414  (je :multiple)
    3415   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::lexpr-return1v))))
     3415  (pushq (:@ (:apply + (:apply target-nil-value) (x8664::%kernel-global 'x86::lexpr-return1v))))
    34163416  (jmp :finish)
    34173417  :multiple
    3418   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::lexpr-return))))
     3418  (pushq (:@ (:apply + (:apply target-nil-value) (x8664::%kernel-global 'x86::lexpr-return))))
    34193419  (pushq (:%q temp))
    34203420  :finish
     
    35333533                                     ((tag :u8)))
    35343534  :begin
    3535   (movl (:$l (+ x8664::nil-value x8664::nilsym-offset)) (:%l tag))
     3535  (movl (:$l (:apply + (:apply target-nil-value) x8664::nilsym-offset)) (:%l tag))
    35363536  (cmpb (:$b x8664::fulltag-nil) (:%b src))
    35373537  (cmoveq (:%q tag) (:%q dest))
     
    36393639  (cmpl (:$b (ash #xd800 -11))(:%l temp))
    36403640  :bad-if-eq
    3641   (movl (:$l x8664::nil-value) (:%l temp))
     3641  (movl (:$l (:apply target-nil-value)) (:%l temp))
    36423642  (cmovel (:%l temp) (:%l dest))
    36433643  (je :done)
     
    36943694  (leaq (:@ (:%q x8664::rsp) (:%q x8664::nargs)) (:%q imm0))
    36953695  (subq (:@ (:%q imm0)) (:%q x8664::nargs))
    3696   (movl (:$l x8664::nil-value) (:%l result))
     3696  (movl (:$l (:apply target-nil-value)) (:%l result))
    36973697  (jle :done)
    36983698  ;; I -think- that a CMOV would be safe here, assuming that N wasn't
Note: See TracChangeset for help on using the changeset viewer.