Changeset 12868


Ignore:
Timestamp:
08/06/10 22:37:16 (12 years ago)
Author:
ehuelsmann
Message:

Miscelanious fixes.

Location:
branches/generic-class-file/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12867 r12868  
    928928      (declare (type (unsigned-byte 16) i))
    929929      (let ((instruction (aref code i)))
    930         (when (branch-opcode-p (instruction-opcode instruction))
     930        (when (branch-p (instruction-opcode instruction))
    931931          (let ((label (car (instruction-args instruction))))
    932932            (set label marker)))))
     
    10781078        (setf changed-p (or (optimize-3) changed-p))
    10791079        (if changed-p
    1080             (setf *code* delete-unreachable-code *code*)
     1080            (setf *code* (delete-unreachable-code *code*))
    10811081            (multiple-value-setq
    10821082                (*code* changed-p)
     
    11131113        (declare (type (unsigned-byte 16) i))
    11141114        (let ((instruction (aref code i)))
    1115           (when (branch-opcode-p (instruction-opcode instruction))
     1115          (when (branch-p (instruction-opcode instruction))
    11161116            (let* ((label (car (instruction-args instruction)))
    11171117                   (offset (- (the (unsigned-byte 16) (symbol-value (the symbol label))) index)))
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

    r12867 r12868  
    398398  (declare (optimize speed))
    399399  (declare (type '(integer 0 255) opcode))
    400   (or (<= 153 opcode 168)
     400  (or (<= 153 opcode 167)
    401401      (<= 198 opcode 200))) ;; ifnull / ifnonnull / goto_w
    402402
     
    404404         (inline unconditional-control-transfer-p))
    405405(defun unconditional-control-transfer-p (opcode)
    406   (or (= 168 opcode) ;; goto
     406  (or (= 167 opcode) ;; goto
    407407      (= 200 opcode) ;; goto_w
    408408      (<= 172 opcode 177) ;; ?return
     
    720720        (setf depth (+ depth instruction-stack))
    721721        (setf (instruction-depth instruction) depth)
    722         (when (branch-opcode-p opcode)
     722        (when (branch-p opcode)
    723723          (let ((label (car (instruction-args instruction))))
    724724            (declare (type symbol label))
Note: See TracChangeset for help on using the changeset viewer.