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

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

diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c
index 36c431f521bd3f9b6183b4f27d6a910927a4f361..3c11891d11e67c67b5668632a11194ff3f6e786d 100644 (file)
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 3392 2005-10-10 13:40:11Z twisti $
+   $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $
 
 */
 
@@ -80,7 +80,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;
@@ -149,7 +149,7 @@ bool patcher_getfield(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -213,7 +213,7 @@ bool patcher_putfield(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -286,7 +286,7 @@ bool patcher_putfieldconst(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(fi = helper_resolve_fieldinfo(uf))) {
+       if (!(fi = resolve_field_eager(uf))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -359,7 +359,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;
@@ -424,7 +424,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;
@@ -493,7 +493,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;
@@ -558,7 +558,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;
@@ -623,7 +623,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;
@@ -687,7 +687,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;
@@ -748,7 +748,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;
@@ -811,7 +811,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;
@@ -876,7 +876,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;
@@ -939,7 +939,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;
@@ -1006,7 +1006,7 @@ bool patcher_checkcast_class(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;
@@ -1069,7 +1069,7 @@ bool patcher_instanceof_class(u1 *sp)
 
        /* get the fieldinfo */
 
-       if (!(c = helper_resolve_classinfo(cr))) {
+       if (!(c = resolve_classref_eager(cr))) {
                PATCHER_MONITOREXIT;
 
                return false;