Changeset 11817


Ignore:
Timestamp:
05/03/09 06:10:01 (14 years ago)
Author:
ehuelsmann
Message:

A little bit of reindenting; making some lines < 80

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r11816 r11817  
    39923992      (setf (block-environment-register block) (allocate-register))
    39933993      (emit-push-current-thread)
    3994       (emit 'getfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     3994      (emit 'getfield +lisp-thread-class+ "lastSpecialBinding"
     3995            +lisp-special-binding+)
    39953996      (astore (block-environment-register block))
    39963997      (label label-START))
     
    40174018             (aload values-register)
    40184019             (emit 'ifnull LABEL1)
    4019              ;; Reaching here, we have multiple values (or no values at all). We need
    4020              ;; the slow path if we have more variables than values.
     4020             ;; Reaching here, we have multiple values (or no values at all).
     4021             ;; We need the slow path if we have more variables than values.
    40214022             (aload values-register)
    40224023             (emit 'arraylength)
    40234024             (emit-push-constant-int (length vars))
    40244025             (emit 'if_icmplt LABEL1)
    4025              ;; Reaching here, we have enough values for all the variables. We can use
    4026              ;; the values we have. This is the fast path.
     4026             ;; Reaching here, we have enough values for all the variables.
     4027             ;; We can use the values we have. This is the fast path.
    40274028             (aload values-register)
    40284029             (emit 'goto LABEL2)
     
    40634064      (aload *thread*)
    40644065      (aload (block-environment-register block))
    4065       (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     4066      (emit 'putfield +lisp-thread-class+ "lastSpecialBinding"
     4067            +lisp-special-binding+)
    40664068      (push (make-handler :from label-START
    40674069                          :to label-END
     
    40934095                                ;; We can eliminate the variable.
    40944096                                ;; FIXME This may no longer be true when we start tracking writes!
    4095                                 (aver (= (variable-reads variable) (length (variable-references variable))))
     4097                                (aver (= (variable-reads variable)
     4098                                         (length (variable-references variable))))
    40964099                                (dolist (ref (variable-references variable))
    40974100                                  (aver (eq (var-ref-variable ref) variable))
    40984101                                  (setf (var-ref-variable ref) source-var))
    40994102                                ;; Check for DOTIMES limit variable.
    4100                                 (when (get (variable-name variable) 'sys::dotimes-limit-variable-p)
    4101                                   (let* ((symbol (get (variable-name variable) 'sys::dotimes-index-variable-name))
     4103                                (when (get (variable-name variable)
     4104                                           'sys::dotimes-limit-variable-p)
     4105                                  (let* ((symbol (get (variable-name variable)
     4106                                                      'sys::dotimes-index-variable-name))
    41024107                                         (index-variable (find-variable symbol (block-vars block))))
    41034108                                    (when index-variable
    4104                                       (setf (get (variable-name index-variable) 'sys::dotimes-limit-variable-name)
     4109                                      (setf (get (variable-name index-variable)
     4110                                                 'sys::dotimes-limit-variable-name)
    41054111                                            (variable-name source-var)))))
    41064112                                (push variable removed)))))))
     
    42724278                 (allocate-variable-register variable))
    42734279               (cond ((variable-special-p variable)
    4274                       (emit-move-from-stack (setf (variable-temp-register variable) (allocate-register))))
     4280                      (emit-move-from-stack
     4281                       (setf (variable-temp-register variable)
     4282                             (allocate-register))))
    42754283                     ((variable-representation variable)
    42764284                      (emit-move-to-variable variable))
     
    43874395      (setf (block-environment-register block) (allocate-register))
    43884396      (emit-push-current-thread)
    4389       (emit 'getfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     4397      (emit 'getfield +lisp-thread-class+ "lastSpecialBinding"
     4398            +lisp-special-binding+)
    43904399      (astore (block-environment-register block))
    43914400      (label label-START))
     
    45454554            (aload *thread*)
    45464555            (aload register)
    4547             (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+))
     4556            (emit 'putfield +lisp-thread-class+ "lastSpecialBinding"
     4557                  +lisp-special-binding+))
    45484558          (maybe-generate-interrupt-check)
    45494559          (emit 'goto (tag-label tag))
     
    48224832      (emit-clear-values))
    48234833    (emit-push-current-thread)
    4824     (emit 'getfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     4834    (emit 'getfield +lisp-thread-class+ "lastSpecialBinding"
     4835          +lisp-special-binding+)
    48254836    (astore environment-register)
    48264837    (label label-START)
     
    48354846    (aload *thread*)
    48364847    (aload environment-register)
    4837     (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     4848    (emit 'putfield +lisp-thread-class+ "lastSpecialBinding"
     4849          +lisp-special-binding+)
    48384850    (emit 'athrow)
    48394851
     
    48424854    (aload *thread*)
    48434855    (aload environment-register)
    4844     (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     4856    (emit 'putfield +lisp-thread-class+ "lastSpecialBinding"
     4857          +lisp-special-binding+)
    48454858    (fix-boxing representation nil)
    48464859    (push (make-handler :from label-START
Note: See TracChangeset for help on using the changeset viewer.