src/vm/vm.c (vm_create): rename jvmti function calls

[cacao.git] / src / cacao / cacao.c

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 27e3f30d6be0d5957c6687c795b51d104f5a8ee8..57a51f63545de682b8dba8c2b35bf7bd025549b4 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -31,7 +31,7 @@
             Philipp Tomsich
             Christian Thalinger
 
-   $Id: cacao.c 4874 2006-05-05 14:36:18Z edwin $
+   $Id: cacao.c 4944 2006-05-23 15:31:19Z motse $
 
 */
 
@@ -50,7 +50,8 @@
 #if defined(ENABLE_JVMTI)
 #include "native/jvmti/jvmti.h"
 #include "native/jvmti/cacaodbg.h"
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+
+#if defined(ENABLE_THREADS)
 #include <pthread.h>
 #endif
 #endif
@@ -180,6 +181,7 @@ static char *getmainclassnamefromjar(char *mainstring)
 void exit_handler(void);
 
 
+
 /* main ************************************************************************
 
    The main program.
@@ -188,9 +190,6 @@ void exit_handler(void);
 
 int main(int argc, char **argv)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       void *dummy;
-#endif
        s4 i;
        
        /* local variables ********************************************************/
@@ -198,10 +197,6 @@ int main(int argc, char **argv)
        JavaVMInitArgs *vm_args;
        JavaVM         *jvm;                /* denotes a Java VM                  */
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       stackbottom = &dummy;
-#endif
-       
        if (atexit(vm_exit_handler))
                throw_cacao_exception_exit(string_java_lang_InternalError,
                                                                   "Unable to register exit_handler");
@@ -218,11 +213,11 @@ int main(int argc, char **argv)
        
        /* load and initialize a Java VM, return a JNI interface pointer in env */
 
-       JNI_CreateJavaVM(&jvm, (void **) &_Jv_env, vm_args);
+       JNI_CreateJavaVM(&jvm, (void *) &_Jv_env, vm_args);
 
 #if defined(ENABLE_JVMTI)
-       if (dbgprocess && jvmti && jdwp) /* is this the parent/debugger process ? */
-               set_jvmti_phase(JVMTI_PHASE_START);
+       pthread_mutex_init(&dbgcomlock,NULL);
+       jvmti_set_phase(JVMTI_PHASE_START);
 #endif
 
        /* do we have a main class? */
@@ -313,20 +308,22 @@ int main(int argc, char **argv)
                /*class_showmethods(currentThread->group->header.vftbl->class); */
 
 #if defined(ENABLE_JVMTI)
-               /* if this is the parent process than start the jdwp listening */
-               if (jvmti || jdwp) {
-                       fprintf(stderr, "jdwp/debugger set herewego brkpt %p\n",&&herewego);
-                       setsysbrkpt(HEREWEGOBRK,&&herewego);
-                       if (dbgprocess && jdwp) cacaodbglisten(transport);
+               /* start the jdwp listening thread*/
+               if (jdwp) {
+                       log_text("cacao vm - init VMjdwp");
+                       if (!jvmti_VMjdwpInit()) exit(1);
+                       setup_jdwp_thread(transport);
+                       if (!suspend) {
+                               fprintf(stderr,"suspend false -> continue debuggee\n");
+                       } else {
+                               fprintf(stderr,"suspend true -> do no continue debuggee(todo)\n");
+                               /* XXX todo*/
+                       }
                }
 
-               if (!dbgprocess) {
-                       fprintf(stderr,"debuggee: herewe go\n");
-                       fflush(stderr);
-               }
-               /* here we go... */
-       herewego:
+               jvmti_set_phase(JVMTI_PHASE_LIVE);
 #endif
+
                (void) vm_call_method(m, NULL, oa);
 
                /* exception occurred? */
@@ -379,7 +376,7 @@ int main(int argc, char **argv)
                                        if (!(c->state & CLASS_LINKED)) {
                                                if (!link_class(c)) {
                                                        fprintf(stderr, "Error linking: ");
-                                                       utf_fprint_classname(stderr, c->name);
+                                                       utf_fprint_printable_ascii_classname(stderr, c->name);
                                                        fprintf(stderr, "\n");
 
                                                        /* print out exception and cause */
@@ -400,10 +397,10 @@ int main(int argc, char **argv)
                                                if (m->jcode) {
                                                        if (!jit_compile(m)) {
                                                                fprintf(stderr, "Error compiling: ");
-                                                               utf_fprint_classname(stderr, c->name);
+                                                               utf_fprint_printable_ascii_classname(stderr, c->name);
                                                                fprintf(stderr, ".");
-                                                               utf_fprint(stderr, m->name);
-                                                               utf_fprint(stderr, m->descriptor);
+                                                               utf_fprint_printable_ascii(stderr, m->name);
+                                                               utf_fprint_printable_ascii(stderr, m->descriptor);
                                                                fprintf(stderr, "\n");
 
                                                                /* print out exception and cause */