Changeset 13710 for trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

Timestamp:

12/27/11 19:50:08 (12 years ago)

Author:

astalla

Message:

First stab at restoring runtime-class.
Supported: extending a Java class, implementing interfaces, defining methods
of up to 7 non-primitive arguments returning void or a non-primitive object.
Unsupported: everything else, including fields, constructors, annotations,
primitive arguments and return values, and the LispObject[] call convention
for functions with more than 8 arguments.

File:

• trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

@@ -234 +234 @@
 (define-opcode freturn 174 1 nil nil)
 (define-opcode dreturn 175 1 nil nil)
+(define-opcode ireturn 172 1 -1 nil)
 (define-opcode areturn 176 1 -1 nil)
 (define-opcode return 177 1 0 nil)
@@ -569 +570 @@
                  166 ; if_acmpne
                  167 ; goto
+                 172 ; ireturn
                  176 ; areturn
                  177 ; return
@@ -722 +724 @@
                                     in ~A at index ~D: ~
                                     found ~S, expected ~S."
-                                   (compiland-name *current-compiland*)
+                                   (if *current-compiland*
+                                       (compiland-name *current-compiland*)
+                                       "<unknown>")
                                    i instruction-depth
                                    (+ depth instruction-stack)))
@@ -733 +737 @@
                                     in ~A at index ~D: ~
                                     negative depth ~S."
-                                   (compiland-name *current-compiland*)
+                                   (if *current-compiland*
+                                       (compiland-name *current-compiland*)
+                                       "<unknown>")
                                    i depth))
         (when (branch-p opcode)