replace helper_* calls in the pathers with calls to resolve_*_eager

[cacao.git] / src / vm / jit / intrp / patcher.c

diff --git a/src/vm/jit/intrp/patcher.c b/src/vm/jit/intrp/patcher.c
index 705346f32b929880130e5f979929d4a7c790d470..bd109fcda13b4ed4c7edfa08e36a05f13d73f5b7 100644 (file)
--- a/src/vm/jit/intrp/patcher.c
+++ b/src/vm/jit/intrp/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $
+   $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $
 
 */
 
@@ -65,7 +65,7 @@ bool patcher_get_putstatic(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                return false;
        }
 
@@ -102,7 +102,7 @@ bool patcher_get_putfield(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                return false;
        }
 
@@ -131,7 +131,7 @@ bool patcher_builtin_new(u1 *sp)
        
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo_nonabstract(cr))) {
+       if (!(c = resolve_classref_eager_nonabstract(cr))) {
                return false;
        }
 
@@ -168,7 +168,7 @@ bool patcher_builtin_newarray(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                return false;
        }
 
@@ -203,7 +203,7 @@ bool patcher_builtin_multianewarray(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                return false;
        }
 
@@ -232,7 +232,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                return false;
        }
 
@@ -261,7 +261,7 @@ bool patcher_invokestatic_special(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                return false;
        }
 
@@ -290,7 +290,7 @@ bool patcher_invokevirtual(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                return false;
        }
 
@@ -319,7 +319,7 @@ bool patcher_invokeinterface(u1 *sp)
 
        /* get the methodinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                return false;
        }
 
@@ -353,7 +353,7 @@ bool patcher_checkcast_instanceof(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                return false;
        }