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

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

diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c
index d073c3a155df9831c6e1c443e3550c85ea21552e..1ac8081b5cd9ef7aa97968ee73fbc00af781398d 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/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 $
 
 */
 
@@ -86,7 +86,7 @@ bool patcher_get_putstatic(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -151,7 +151,7 @@ bool patcher_get_putfield(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -223,7 +223,7 @@ bool patcher_builtin_new(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo_nonabstract(cr))) {
+       if (!(c = resolve_classref_eager_nonabstract(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -294,7 +294,7 @@ bool patcher_builtin_newarray(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -362,7 +362,7 @@ bool patcher_builtin_multianewarray(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -429,7 +429,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -501,7 +501,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp)
 
        /* get the classinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -567,7 +567,7 @@ bool patcher_invokestatic_special(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -626,7 +626,7 @@ bool patcher_invokevirtual(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -692,7 +692,7 @@ bool patcher_invokeinterface(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(m = helper_resolve_methodinfo(um))) {
+       if (!(m = resolve_method_eager(um))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -763,7 +763,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -824,7 +824,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -894,7 +894,7 @@ bool patcher_checkcast_instanceof_class(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;