* src/vm/resolve.c: Removed new_ prefix from function names.

[cacao.git] / src / vm / resolve.h

diff --git a/src/vm/resolve.h b/src/vm/resolve.h
index 60521016f9acfdab3fbe56da32e766c546c7331f..23c5ac0a964c2f8282ced2d02e0af626788b8129 100644 (file)
--- a/src/vm/resolve.h
+++ b/src/vm/resolve.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: resolve.h 4986 2006-05-29 20:22:58Z edwin $
+   $Id: resolve.h 5655 2006-10-03 20:44:46Z edwin $
 
 */
 
@@ -49,6 +49,7 @@ typedef struct unresolved_subtype_set unresolved_subtype_set;
 #include "vm/global.h"
 #include "vm/references.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/reg.h"
 #include "vm/jit/verify/typeinfo.h"
 
 
@@ -168,31 +169,34 @@ unresolved_class * create_unresolved_class(methodinfo *refmethod,
                                                typeinfo *valuetype);
 #endif
 
-unresolved_field * create_unresolved_field(classinfo *referer,methodinfo *refmethod,
-                                               instruction *iptr);
+unresolved_field *create_unresolved_field(classinfo *referer,
+                                                                                         methodinfo *refmethod,
+                                                                                         instruction *iptr);
 
-unresolved_method * create_unresolved_method(classinfo *referer,methodinfo *refmethod,
-                                                instruction *iptr);
+unresolved_method *create_unresolved_method(classinfo *referer,
+                                                                                               methodinfo *refmethod,
+                                                                                               instruction *iptr);
 
 void unresolved_class_free(unresolved_class *ref);
 void unresolved_field_free(unresolved_field *ref);
 void unresolved_method_free(unresolved_method *ref);
 
-resolve_result_t resolve_method_lazy(instruction *iptr,stackptr curstack,
-                                                                        methodinfo *refmethod);
-resolve_result_t resolve_field_lazy(instruction *iptr,stackptr curstack,
-                                                                       methodinfo *refmethod);
+resolve_result_t resolve_method_lazy(jitdata *jd,
+                                                                                instruction *iptr,
+                                                                                methodinfo *refmethod);
+
+resolve_result_t resolve_field_lazy(jitdata *jd,
+                                                                               instruction *iptr,
+                                                                               methodinfo *refmethod);
 
 #ifdef ENABLE_VERIFIER
-bool constrain_unresolved_field(unresolved_field *ref,
-                                                  classinfo *referer,methodinfo *refmethod,
-                                                  instruction *iptr,
-                                                  stackelement *stack);
-
-bool constrain_unresolved_method(unresolved_method *ref,
-                                                       classinfo *referer,methodinfo *refmethod,
-                                                       instruction *iptr,
-                                                       stackelement *stack);
+bool constrain_unresolved_field(jitdata *jd, 
+                                                                       unresolved_field *ref, classinfo *referer,
+                                                                       methodinfo *refmethod, instruction *iptr);
+
+bool constrain_unresolved_method(jitdata *jd,
+                                                                        unresolved_method *ref, classinfo *referer,
+                                                                        methodinfo *refmethod, instruction *iptr);
 
 #endif