- moved jit_init

- added builtin_init

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index f9f7d0aed2eece542f215e0d064c3cb6aa6990b2..86e6c91876a34b9e9bd6551f2b83d63387faaa0c 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: cacao.c 2456 2005-05-12 22:59:04Z twisti $
+   $Id: cacao.c 2550 2005-06-06 14:44:06Z twisti $
 
 */
 
@@ -860,11 +860,17 @@ int main(int argc, char **argv)
 #endif
 
        /* install architecture dependent signal handler used for exceptions */
+
        init_exceptions();
 
-       /* initializes jit compiler and codegen stuff */
-       jit_init();
+       /* initialize the codegen sub systems */
+
+       codegen_init();
+
+       /* initializes jit compiler */
 
+       jit_init();
+       
        /* initialize some cacao subsystems */
 
        utf8_init();
@@ -881,6 +887,9 @@ int main(int argc, char **argv)
        if (!exceptions_init())
                throw_main_exception_exit();
 
+       if (!builtin_init())
+               throw_main_exception_exit();
+
 #if defined(USE_THREADS)
        initThreads((u1 *) &dummy);
 #endif