Commit 2abafb1e authored by ehuelsmann@1c010e3e-69d0-11dd-93a8-456734b0d56f's avatar ehuelsmann@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files

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.
parent ed6dadaa
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
(in-package #:system) (in-package #:system)
(require "JVM") (require "COMPILER-PASS2")
;; (require "COMPILER-ERROR") already made accessible through JVM
(defvar *fbound-names*) (defvar *fbound-names*)
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
(require "KNOWN-SYMBOLS") (require "KNOWN-SYMBOLS")
(require "DUMP-FORM") (require "DUMP-FORM")
(require "OPCODES")
(require "JAVA") (require "JAVA")
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
(require "DUMP-FORM") (require "DUMP-FORM")
(require "JVM-CLASS-FILE") (require "JVM-CLASS-FILE")
(require "JVM")
(require "COMPILER-PASS1")
(require "JAVA")) (require "JAVA"))
...@@ -32,6 +32,9 @@ ...@@ -32,6 +32,9 @@
(in-package #:jvm) (in-package #:jvm)
(require "COMPILER-ERROR")
(declaim (inline u2 s1 s2)) (declaim (inline u2 s1 s2))
(defknown u2 (fixnum) cons) (defknown u2 (fixnum) cons)
...@@ -34,21 +34,7 @@ ...@@ -34,21 +34,7 @@
(export '(compile-defun *catch-errors* jvm-compile-package (export '(compile-defun *catch-errors* jvm-compile-package
derive-compiler-type)) derive-compiler-type))
(eval-when (:compile-toplevel :load-toplevel :execute) (require "JVM-CLASS-FILE")
(require "LOOP")
(require "FORMAT")
(require "CLOS")
(require "PRINT-OBJECT")
(require "COMPILER-TYPES")
(require "COMPILER-ERROR")
(require "DUMP-FORM")
(require "JVM-CLASS-FILE")
(require "KNOWN-SYMBOLS")
(require "JAVA")
(require "COMPILER-PASS1")
(require "COMPILER-PASS2"))
(defvar *closure-variables* nil) (defvar *closure-variables* nil)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment