* contrib/vmlog/vmlog_cacao.c, contrib/vmlog/vmlog_cacao.h: Replaced

the old java_objectheader with java_object_t. Adapted lock function
calls. This makes cacao compile with --enable-vmlog again.

--HG--
branch : edwin-replacement
extra : transplant_source : b%8CEJ%B1%D5%80%19%B5%C2%BC3%A8%AE%20%96%8A%AB%93%1D

diff --git a/contrib/vmlog/vmlog_cacao.c b/contrib/vmlog/vmlog_cacao.c
index 04b9e8f251da5055ea31809985c62f329609843c..276aee261451f332d88d7c9476c1642b8aa65453 100644 (file)
--- a/contrib/vmlog/vmlog_cacao.c
+++ b/contrib/vmlog/vmlog_cacao.c
@@ -26,12 +26,12 @@
 /*** global variables ************************************************/
 
 static vmlog_log *vmlog_global_log = NULL;
-static java_objectheader vmlog_global_lock;
+static java_object_t *vmlog_global_lock = NULL;
 
 /*** locking *********************************************************/
 
-#define VMLOG_LOCK(vml)    lock_monitor_enter(&vmlog_global_lock)
-#define VMLOG_UNLOCK(vml)  lock_monitor_exit(&vmlog_global_lock)
+#define VMLOG_LOCK(vml)    lock_monitor_enter(vmlog_global_lock)
+#define VMLOG_UNLOCK(vml)  lock_monitor_exit(vmlog_global_lock)
 
 /*** include the vmlog code ******************************************/
 
@@ -65,7 +65,8 @@ void vmlog_cacao_init(JavaVMInitArgs *vmargs)
 
 void vmlog_cacao_init_lock(void)
 {
-       lock_init_object_lock(&vmlog_global_lock);
+       vmlog_global_lock = NEW(java_object_t);
+       lock_init_object_lock(vmlog_global_lock);
 }
 
 static void vmlog_cacao_do_log(vmlog_log_function fun,
@@ -117,7 +118,7 @@ void vmlog_cacao_unwnd_method(methodinfo *m)
        vmlog_cacao_do_log(vmlog_log_unwnd,m);
 }
 
-void vmlog_cacao_throw(java_objectheader *xptr)
+void vmlog_cacao_throw(java_object_t *xptr)
 {
        classinfo *c;
        
@@ -135,7 +136,7 @@ void vmlog_cacao_throw(java_objectheader *xptr)
        }
 }
 
-void vmlog_cacao_catch(java_objectheader *xptr)
+void vmlog_cacao_catch(java_object_t *xptr)
 {
        classinfo *c;
        

diff --git a/contrib/vmlog/vmlog_cacao.h b/contrib/vmlog/vmlog_cacao.h
index c67cca8c1562ba1e770fa8164f26a0f7645e6fb8..a58fcd979be82c3c438978252d5bde9c73ff7c37 100644 (file)
--- a/contrib/vmlog/vmlog_cacao.h
+++ b/contrib/vmlog/vmlog_cacao.h
@@ -31,8 +31,8 @@ void vmlog_cacao_unwnd_method(methodinfo *m);
 void vmlog_cacao_unrol_method(methodinfo *m);
 void vmlog_cacao_rerol_method(methodinfo *m);
 
-void vmlog_cacao_throw(java_objectheader *xptr);
-void vmlog_cacao_catch(java_objectheader *xptr);
+void vmlog_cacao_throw(java_object_t *xptr);
+void vmlog_cacao_catch(java_object_t *xptr);
 void vmlog_cacao_signl(const char *name);
 
 #endif