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

Timestamp:

07/31/10 21:33:24 (13 years ago)

Author:

ehuelsmann

Message:

Introduce "dual mode" operation for emit-invoke* and emit-*static,
in order to allow test-writing.

File:

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

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

@@ -876 +876 @@
 
 
-(defvar *current-code-attribute*)
+(defvar *current-code-attribute* nil)
 
 (defun save-code-specials (code)
@@ -890 +890 @@
         *register* (code-current-local code)))
 
-(defmacro with-code-to-method ((method &key safe-nesting) &body body)
+(defmacro with-code-to-method ((class-file method &key safe-nesting) &body body)
   (let ((m (gensym))
         (c (gensym)))
@@ -899 +899 @@
        (let* ((,m ,method)
               (,c (method-ensure-code method))
+              (*pool* (class-file-constants ,class-file))
               (*code* (code-code ,c))
               (*registers-allocated* (code-max-locals ,c))