X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=asmpart.h;h=0ce6e85e76c189eee20118e32c25b8cca6922db9;hb=e0b006f6bba145d12cd741563f0ed402721e3937;hp=d6a205dd4446e5fe7600b18307d9e334d4723db6;hpb=617846d9677bfa97c6dbcebb059266d016c5811c;p=cacao.git

diff --git a/asmpart.h b/asmpart.h
index d6a205dd4..0ce6e85e7 100644
--- a/asmpart.h
+++ b/asmpart.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: asmpart.h 1082 2004-05-26 15:04:54Z jowenn $
+   $Id: asmpart.h 1296 2004-07-10 17:02:15Z stefan $
 
 */
 
@@ -76,6 +76,12 @@ java_objectheader *asm_calljavafunction2(methodinfo *m, u4 count, u4 size, void
 jdouble asm_calljavafunction2double(methodinfo *m, u4 count, u4 size, void *callblock);
 jlong asm_calljavafunction2long(methodinfo *m, u4 count, u4 size, void *callblock);
 
+/* We need these two labels in codegen.inc to add the asm_calljavafunction*'s
+   into the methodtable */
+#if defined(__I386__) || defined(__X86_64__)
+void calljava_xhandler();
+void calljava_xhandler2();
+#endif
 
 
 void asm_handle_exception();
@@ -84,7 +90,7 @@ void asm_handle_nat_exception();
 void asm_check_clinit();
 
 void asm_handle_builtin_exception(classinfo *);
-void asm_throw_and_handle_hardware_nullpointer_exception();
+void asm_throw_and_handle_exception();
 void asm_throw_and_handle_hardware_arithmetic_exception();
 
 java_objectarray* Java_java_lang_VMSecurityManager_getClassContext(JNIEnv *env, jclass clazz);
@@ -98,9 +104,11 @@ void asm_builtin_trace();
 void asm_builtin_exittrace();
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-extern threadcritnode *asm_criticalsections;
+extern threadcritnode asm_criticalsections;
 #endif
-void asm_getclassvalues_atomic(vftbl *super, vftbl *sub, castinfo *out);
+
+void asm_getclassvalues_atomic(vftbl_t *super, vftbl_t *sub, castinfo *out);
+
 
 #endif /* _ASMPART_H */