Changeset 12868 for branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

Timestamp:

08/06/10 22:37:16 (13 years ago)

Author:

ehuelsmann

Message:

Miscelanious fixes.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-instructions.lisp (modified) (3 diffs)

branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

@@ -398 +398 @@
   (declare (optimize speed))
   (declare (type '(integer 0 255) opcode))
-  (or (<= 153 opcode 168)
+  (or (<= 153 opcode 167)
       (<= 198 opcode 200))) ;; ifnull / ifnonnull / goto_w
 
@@ -404 +404 @@
          (inline unconditional-control-transfer-p))
 (defun unconditional-control-transfer-p (opcode)
-  (or (= 168 opcode) ;; goto
+  (or (= 167 opcode) ;; goto
       (= 200 opcode) ;; goto_w
       (<= 172 opcode 177) ;; ?return
@@ -720 +720 @@
         (setf depth (+ depth instruction-stack))
         (setf (instruction-depth instruction) depth)
-        (when (branch-opcode-p opcode)
+        (when (branch-p opcode)
           (let ((label (car (instruction-args instruction))))
             (declare (type symbol label))