* src/vm/jit/x86_64/md.c (md_signal_handler_sigusr2): Fixed comment.

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

diff --git a/src/vm/resolve.h b/src/vm/resolve.h
index a2090518acad07104ef1f4739d9ec197abdb835a..d33a466b17b4a6e4f4cf4738fcafe6980d34b3ce 100644 (file)
--- a/src/vm/resolve.h
+++ b/src/vm/resolve.h
@@ -1,9 +1,9 @@
 /* vm/resolve.h - resolving classes/interfaces/fields/methods
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Edwin Steiner
 
    Changes:
 
-   $Id: resolve.h 3460 2005-10-20 09:34:16Z edwin $
+   $Id: resolve.h 5008 2006-06-01 16:00:18Z edwin $
 
 */
 
@@ -44,9 +44,12 @@ typedef struct unresolved_method unresolved_method;
 typedef struct unresolved_subtype_set unresolved_subtype_set;
 
 
+#include "config.h"
+#include "vm/types.h"
 #include "vm/global.h"
 #include "vm/references.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/verify/typeinfo.h"
 
 
 /* constants ******************************************************************/
@@ -63,12 +66,16 @@ typedef enum {
        resolveEager
 } resolve_mode_t;
 
-
 typedef enum {
        resolveLinkageError,
        resolveIllegalAccessError
 } resolve_err_t;
 
+typedef enum {
+       resolveFailed = false,  /* this must be a false value */
+       resolveDeferred = true, /* this must be a true value  */
+       resolveSucceeded
+} resolve_result_t;
 
 /* structs ********************************************************************/
 
@@ -133,11 +140,15 @@ bool resolve_classref_or_classinfo(methodinfo *refmethod,
 
 bool resolve_class_from_typedesc(typedesc *d,bool checkaccess,bool link,classinfo **result);
 
+#ifdef ENABLE_VERIFIER
 bool resolve_class(unresolved_class *ref,
                          resolve_mode_t mode,
                          bool checkaccess,
                          classinfo **result);
 
+classinfo * resolve_class_eager(unresolved_class *ref);
+#endif /* ENABLE_VERIFIER */
+
 bool resolve_field(unresolved_field *ref,
                          resolve_mode_t mode,
                          fieldinfo **result);
@@ -148,46 +159,57 @@ bool resolve_method(unresolved_method *ref,
 
 classinfo * resolve_classref_eager(constant_classref *ref);
 classinfo * resolve_classref_eager_nonabstract(constant_classref *ref);
-classinfo * resolve_class_eager(unresolved_class *ref);
 fieldinfo * resolve_field_eager(unresolved_field *ref);
 methodinfo * resolve_method_eager(unresolved_method *ref);
 
-bool resolve_and_check_subtype_set(classinfo *referer,methodinfo *refmethod,
-                                                         unresolved_subtype_set *ref,
-                                                         classref_or_classinfo type,
-                                                         bool reversed,
-                                                         resolve_mode_t mode,
-                                                         resolve_err_t error,
-                                                         bool *checked);
-
+#ifdef ENABLE_VERIFIER
 unresolved_class * create_unresolved_class(methodinfo *refmethod,
                                                constant_classref *classref,
                                                typeinfo *valuetype);
+#endif
 
+unresolved_field * new_create_unresolved_field(classinfo *referer,methodinfo *refmethod,
+                                               new_instruction *iptr);
 unresolved_field * create_unresolved_field(classinfo *referer,methodinfo *refmethod,
                                                instruction *iptr);
 
+unresolved_method * new_create_unresolved_method(classinfo *referer,methodinfo *refmethod,
+                                                new_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 new_resolve_method_lazy(new_instruction *iptr,stackptr curstack,
+                                                                        methodinfo *refmethod);
+resolve_result_t resolve_method_lazy(instruction *iptr,stackptr curstack,
+                                                                        methodinfo *refmethod);
+resolve_result_t new_resolve_field_lazy(new_instruction *iptr,stackptr curstack,
+                                                                       methodinfo *refmethod);
+resolve_result_t resolve_field_lazy(instruction *iptr,stackptr curstack,
+                                                                       methodinfo *refmethod);
+
+#ifdef ENABLE_VERIFIER
 bool constrain_unresolved_field(unresolved_field *ref,
                                                   classinfo *referer,methodinfo *refmethod,
                                                   instruction *iptr,
                                                   stackelement *stack);
 
-unresolved_method * create_unresolved_method(classinfo *referer,methodinfo *refmethod,
-                                                instruction *iptr);
-
 bool constrain_unresolved_method(unresolved_method *ref,
                                                        classinfo *referer,methodinfo *refmethod,
                                                        instruction *iptr,
                                                        stackelement *stack);
 
-void unresolved_class_free(unresolved_class *ref);
-void unresolved_field_free(unresolved_field *ref);
-void unresolved_method_free(unresolved_method *ref);
+#endif
 
+#ifndef NDEBUG
 void unresolved_class_debug_dump(unresolved_class *ref,FILE *file);
 void unresolved_field_debug_dump(unresolved_field *ref,FILE *file);
 void unresolved_method_debug_dump(unresolved_method *ref,FILE *file);
 void unresolved_subtype_set_debug_dump(unresolved_subtype_set *stset,FILE *file);
+#endif
        
 #endif /* _RESOLVE_H */