Changeset 11838

Timestamp:

05/07/09 18:01:06 (14 years ago)

Author:

ehuelsmann

Message:

Remove code handling JSR/RET instructions.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass2.lisp (modified) (2 diffs)
• opcodes.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -1126 +1126 @@
                  166 ; if_acmpne
                  167 ; goto
-                 168 ; jsr
-                 169 ; ret
                  176 ; areturn
                  177 ; return
@@ -1323 +1321 @@
         (return-from walk-code))
       (let ((opcode (instruction-opcode instruction)))
-        (unless (eql opcode 168) ; JSR
-          (setf depth (+ depth instruction-stack)))
+        (setf depth (+ depth instruction-stack))
         (setf (instruction-depth instruction) depth)
-        (if (eql opcode 168) ; JSR
-            (let ((label (car (instruction-args instruction))))
-              (declare (type symbol label))
-              (walk-code code (symbol-value label) (1+ depth)))
-            (when (branch-opcode-p opcode)
-              (let ((label (car (instruction-args instruction))))
-                (declare (type symbol label))
-                (walk-code code (symbol-value label) depth))))
-        (when (member opcode '(167 169 176 191)) ; GOTO RET ARETURN ATHROW
+        (when (branch-opcode-p opcode)
+          (let ((label (car (instruction-args instruction))))
+            (declare (type symbol label))
+            (walk-code code (symbol-value label) depth)))
+        (when (member opcode '(167 176 191)) ; GOTO ARETURN ATHROW
           ;; Current path ends.
           (return-from walk-code))))))

trunk/abcl/src/org/armedbear/lisp/opcodes.lisp

@@ -221 +221 @@
 (define-opcode if_acmpne 166 3 -2)
 (define-opcode goto 167 3 0)
-(define-opcode jsr 168 3 1)
-(define-opcode ret 169 2 0)
+;;(define-opcode jsr 168 3 1) Don't use these 2 opcodes: deprecated
+;;(define-opcode ret 169 2 0) their use results in JVM verifier errors
 (define-opcode tableswitch 170 0 nil)
 (define-opcode lookupswitch 171 0 nil)