Changeset 12868
- Timestamp:
- 08/06/10 22:37:16 (13 years ago)
- 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 928 928 (declare (type (unsigned-byte 16) i)) 929 929 (let ((instruction (aref code i))) 930 (when (branch- opcode-p (instruction-opcode instruction))930 (when (branch-p (instruction-opcode instruction)) 931 931 (let ((label (car (instruction-args instruction)))) 932 932 (set label marker))))) … … 1078 1078 (setf changed-p (or (optimize-3) changed-p)) 1079 1079 (if changed-p 1080 (setf *code* delete-unreachable-code *code*)1080 (setf *code* (delete-unreachable-code *code*)) 1081 1081 (multiple-value-setq 1082 1082 (*code* changed-p) … … 1113 1113 (declare (type (unsigned-byte 16) i)) 1114 1114 (let ((instruction (aref code i))) 1115 (when (branch- opcode-p (instruction-opcode instruction))1115 (when (branch-p (instruction-opcode instruction)) 1116 1116 (let* ((label (car (instruction-args instruction))) 1117 1117 (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 398 398 (declare (optimize speed)) 399 399 (declare (type '(integer 0 255) opcode)) 400 (or (<= 153 opcode 16 8)400 (or (<= 153 opcode 167) 401 401 (<= 198 opcode 200))) ;; ifnull / ifnonnull / goto_w 402 402 … … 404 404 (inline unconditional-control-transfer-p)) 405 405 (defun unconditional-control-transfer-p (opcode) 406 (or (= 16 8opcode) ;; goto406 (or (= 167 opcode) ;; goto 407 407 (= 200 opcode) ;; goto_w 408 408 (<= 172 opcode 177) ;; ?return … … 720 720 (setf depth (+ depth instruction-stack)) 721 721 (setf (instruction-depth instruction) depth) 722 (when (branch- opcode-p opcode)722 (when (branch-p opcode) 723 723 (let ((label (car (instruction-args instruction)))) 724 724 (declare (type symbol label))
Note: See TracChangeset
for help on using the changeset viewer.