* configure.ac: New switch for disabling -O2 (--disable-optimizations).

[cacao.git] / src / cacao / cacao.cpp

diff --git a/src/cacao/cacao.cpp b/src/cacao/cacao.cpp
index 4ec3c526417418d0e8231e0f8d0113af92b5405a..0745caa7b7970e60a295b36a771891e32ec6d530 100644 (file)
--- a/src/cacao/cacao.cpp
+++ b/src/cacao/cacao.cpp
@@ -25,29 +25,20 @@
 
 #include "config.h"
 
-#include <assert.h>
-
 #if defined(ENABLE_JRE_LAYOUT)
 # include <errno.h>
 # include <libgen.h>
 # include <unistd.h>
 #endif
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "vm/types.h"
-
-#include "native/jni.h"
-#include "native/native.h"
-
-#if defined(ENABLE_JVMTI)
-# include "native/jvmti/jvmti.h"
-# include "native/jvmti/cacaodbg.h"
-#endif
-
-#include "vmcore/os.hpp"
+#include "native/jni.hpp"
+#include "native/native.hpp"
 
+#include "vm/os.hpp"
 #include "vm/vm.hpp"
 
 
@@ -84,17 +75,12 @@ int main(int argc, char **argv)
        void*       libjvm_vm_run;
        const char* lterror;
 
-       bool (*VM_create)(JavaVM **, void **, void *);
-       void (*vm_run)(JavaVM *, JavaVMInitArgs *);
+       bool (*VM_create)(JavaVM**, void**, void*);
+       void (*vm_run)(JavaVM*, JavaVMInitArgs*);
 #endif
 
-       JavaVM         *vm;                 /* denotes a Java VM                  */
-       JNIEnv         *env;
-       JavaVMInitArgs *vm_args;
-
-       /* prepare the options */
-
-       vm_args = prepare_options(argc, argv);
+       // Prepare the options.
+       JavaVMInitArgs* vm_args = prepare_options(argc, argv);
        
        /* load and initialize a Java VM, return a JNI interface pointer in env */
 
@@ -119,7 +105,7 @@ int main(int argc, char **argv)
                os::abort();
        }
 
-       /* concatinate the library name */
+       /* concatenate the library name */
 
        strcat(path, "/../lib/"LIBJVM_NAME);
 # else
@@ -149,9 +135,8 @@ int main(int argc, char **argv)
                        os::abort();
                }
 
-               /* free the error string */
-
-               free((void *) lterror);
+               // Free the error string.
+               os::free((void*) lterror);
        }
 
        libjvm_VM_create = os::dlsym(libjvm_handle, "VM_create");
@@ -161,19 +146,14 @@ int main(int argc, char **argv)
                os::abort();
        }
 
-       VM_create =
-               (bool (*)(JavaVM **, void **, void *)) (ptrint) libjvm_VM_create;
+       VM_create = (bool (*)(JavaVM**, void**, void*)) (uintptr_t) libjvm_VM_create;
 #endif
 
-       /* create the Java VM */
-
-       (void) VM_create(&vm, (void**) &env, vm_args);
+       // Create the Java VM.
+       JavaVM* vm;
+       void*   env; // We use a void* instead of a JNIEnv* here to prevent a compiler warning.
 
-#if defined(ENABLE_JVMTI)
-# error This should be a JVMTI function.
-       Mutex_init(&dbgcomlock);
-       if (jvmti) jvmti_set_phase(JVMTI_PHASE_START);
-#endif
+       (void) VM_create(&vm, &env, vm_args);
 
 #if defined(ENABLE_LIBJVM)
        libjvm_vm_run = os::dlsym(libjvm_handle, "vm_run");
@@ -183,15 +163,13 @@ int main(int argc, char **argv)
                os::abort();
        }
 
-       vm_run = (void (*)(JavaVM *, JavaVMInitArgs *)) (ptrint) libjvm_vm_run;
+       vm_run = (void (*)(JavaVM*, JavaVMInitArgs*)) (uintptr_t) libjvm_vm_run;
 #endif
 
-       /* run the VM */
-
+       // Run the VM.
        vm_run(vm, vm_args);
 
-       /* keep compiler happy */
-
+       // Keep compiler happy.
        return 0;
 }