[armedbear-cvs] r14111 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Fri Aug 17 09:02:52 2012
New Revision: 14111

Log:
Reverse the REQUIREs graph: before, modules would require JVM,
which would require the rest of the compiler. That doesn't work
with the automatic autoloader, because that requires the files
in which symbol function bindings are located.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
   trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
   trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp
   trunk/abcl/src/org/armedbear/lisp/jvm.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Fri Aug 17 07:19:10 2012	(r14110)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Fri Aug 17 09:02:52 2012	(r14111)
@@ -31,8 +31,7 @@
 
 (in-package #:system)
 
-(require "JVM")
-;; (require "COMPILER-ERROR") already made accessible through JVM
+(require "COMPILER-PASS2")
 
 (defvar *fbound-names*)
 

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	Fri Aug 17 07:19:10 2012	(r14110)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	Fri Aug 17 09:02:52 2012	(r14111)
@@ -39,7 +39,6 @@
 (require "KNOWN-FUNCTIONS")
 (require "KNOWN-SYMBOLS")
 (require "DUMP-FORM")
-(require "OPCODES")
 (require "JAVA")
 
 

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 17 07:19:10 2012	(r14110)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 17 09:02:52 2012	(r14111)
@@ -43,6 +43,8 @@
   (require "DUMP-FORM")
   (require "JVM-INSTRUCTIONS")
   (require "JVM-CLASS-FILE")
+  (require "JVM")
+  (require "COMPILER-PASS1")
   (require "JAVA"))
 
 

Modified: trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp	Fri Aug 17 07:19:10 2012	(r14110)
+++ trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp	Fri Aug 17 09:02:52 2012	(r14111)
@@ -32,6 +32,9 @@
 
 (in-package #:jvm)
 
+(require "COMPILER-ERROR")
+
+
 (declaim (inline u2 s1 s2))
 
 (defknown u2 (fixnum) cons)

Modified: trunk/abcl/src/org/armedbear/lisp/jvm.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jvm.lisp	Fri Aug 17 07:19:10 2012	(r14110)
+++ trunk/abcl/src/org/armedbear/lisp/jvm.lisp	Fri Aug 17 09:02:52 2012	(r14111)
@@ -34,21 +34,7 @@
 (export '(compile-defun *catch-errors* jvm-compile-package
           derive-compiler-type))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (require "LOOP")
-  (require "FORMAT")
-  (require "CLOS")
-  (require "PRINT-OBJECT")
-  (require "COMPILER-TYPES")
-  (require "COMPILER-ERROR")
-  (require "KNOWN-FUNCTIONS")
-  (require "DUMP-FORM")
-  (require "JVM-INSTRUCTIONS")
-  (require "JVM-CLASS-FILE")
-  (require "KNOWN-SYMBOLS")
-  (require "JAVA")
-  (require "COMPILER-PASS1")
-  (require "COMPILER-PASS2"))
+(require "JVM-CLASS-FILE")
 
 (defvar *closure-variables* nil)