Changeset 10984

Timestamp:

02/07/06 18:06:26 (18 years ago)

Author:

piso

Message:

P2-LOAD-TIME-VALUE: move the result to the target in the COMPILE-FILE case too.

File:

• trunk/j/src/org/armedbear/lisp/jvm.lisp (modified) (4 diffs)

trunk/j/src/org/armedbear/lisp/jvm.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003-2006 Peter Graves
-;;; $Id: jvm.lisp,v 1.768 2006-01-20 14:28:09 piso Exp $
+;;; $Id: jvm.lisp,v 1.769 2006-02-07 18:06:26 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -5884 +5884 @@
 (defun compile-progn (form target representation)
   (compile-progn-body (cdr form) target)
-;;   (when (eq representation :int)
-;;     (emit-unbox-fixnum))
-  (fix-boxing representation nil)
-  )
+  (fix-boxing representation nil))
 
 (defun p2-eval-when (form target representation)
@@ -5893 +5890 @@
              (memq 'eval (cadr form)))
          (compile-progn-body (cddr form) target)
-;;          (when (eq representation :int)
-;;            (emit-unbox-fixnum)))
          (fix-boxing representation nil))
         (t
@@ -5903 +5898 @@
   (cond (*compile-file-truename*
          (emit 'getstatic *this-class*
-               (declare-load-time-value (second form)) +lisp-object+))
+               (declare-load-time-value (second form)) +lisp-object+)
+         (fix-boxing representation nil)
+         (emit-move-from-stack target representation))
         (t
          (compile-constant (eval (second form)) target representation))))