Merged revisions 8187-8244 via svnmerge from

[cacao.git] / src / vmcore / method.h

diff --git a/src/vmcore/method.h b/src/vmcore/method.h
index 208f8a57a3201180e80877eb1425144ba90a8545..282db25bf0882e9d2865ac7d6134bda9c4b860df 100644 (file)
--- a/src/vmcore/method.h
+++ b/src/vmcore/method.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: method.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: method.h 8231 2007-07-25 14:21:24Z twisti $
 */
 
 
@@ -46,6 +46,7 @@ typedef struct codeinfo            codeinfo;
 #include "vmcore/descriptor.h"
 #include "vmcore/references.h"
 #include "vmcore/linker.h"
+#include "vmcore/loader.h"
 
 #if defined(ENABLE_JAVASE)
 # include "vmcore/stackmap.h"
@@ -63,6 +64,7 @@ typedef struct codeinfo            codeinfo;
 /* methodinfo *****************************************************************/
 
 struct methodinfo {                 /* method structure                       */
+       java_objectheader header;       /* we need this in jit's monitorenter     */
        s4            flags;            /* ACC flags                              */
        utf          *name;             /* name of method                         */
        utf          *descriptor;       /* JavaVM descriptor string of method     */
@@ -103,6 +105,10 @@ struct methodinfo {                 /* method structure                       */
 #if defined(ENABLE_REPLACEMENT)
        s4            hitcountdown;     /* decreased for each hit                 */
 #endif
+
+#if defined(ENABLE_DEBUG_FILTER)
+       u1            filtermatches;    /* flags indicating which filters the method matches */
+#endif
 };
 
 
@@ -152,11 +158,16 @@ struct lineinfo {
 
 /* function prototypes ********************************************************/
 
+bool method_load(classbuffer *cb, methodinfo *m, descriptor_pool *descpool);
 void method_free(methodinfo *m);
 bool method_canoverwrite(methodinfo *m, methodinfo *old);
 
 methodinfo *method_vftbl_lookup(vftbl_t *vftbl, methodinfo* m);
 
+java_objectarray *method_get_parametertypearray(methodinfo *m);
+java_objectarray *method_get_exceptionarray(methodinfo *m);
+classinfo        *method_returntype_get(methodinfo *m);
+
 void method_add_assumption_monomorphic(methodinfo *m, methodinfo *caller);
 void method_break_assumption_monomorphic(methodinfo *m, method_worklist **wl);