* patcher_builtin_newarray, patcher_builtin_multianewarray,

[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 3c11891d11e67c67b5668632a11194ff3f6e786d..2831080f1ca10c3e8a9ceb4e567304087b137f59 100644 (file)
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $
+   $Id: patcher.c 3569 2005-11-04 16:47:25Z twisti $
 
 */
 
@@ -42,8 +42,8 @@
 #include "vm/field.h"
 #include "vm/initialize.h"
 #include "vm/options.h"
+#include "vm/resolve.h"
 #include "vm/references.h"
-#include "vm/jit/helper.h"
 #include "vm/jit/patcher.h"
 
 
@@ -435,9 +435,9 @@ bool patcher_builtin_newarray(u1 *sp)
        *((u4 *) (ra + 8 + 0)) = (u4) mcode;
        *((u1 *) (ra + 8 + 4)) = (u1) (mcode >> 32);
 
-       /* patch the class' vftbl pointer */
+       /* patch the classinfo pointer */
 
-       *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
+       *((ptrint *) (ra + 4)) = (ptrint) c;
 
        /* if we show disassembly, we have to skip the nop's */
 
@@ -509,9 +509,9 @@ bool patcher_builtin_multianewarray(u1 *sp)
        if (opt_showdisassemble)
                ra = ra + 5;
 
-       /* patch the class' vftbl pointer */
+       /* patch the classinfo pointer */
 
-       *((ptrint *) (ra + 7 + 4)) = (ptrint) c->vftbl;
+       *((ptrint *) (ra + 7 + 4)) = (ptrint) c;
 
        /* patch new function address */
 
@@ -574,9 +574,9 @@ bool patcher_builtin_arraycheckcast(u1 *sp)
        if (opt_showdisassemble)
                ra = ra + 5;
 
-       /* patch the class' vftbl pointer */
+       /* patch the classinfo pointer */
 
-       *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
+       *((ptrint *) (ra + 4)) = (ptrint) c;
 
        /* patch new function address */
 
@@ -634,9 +634,9 @@ bool patcher_builtin_arrayinstanceof(u1 *sp)
        *((u4 *) (ra + 8 + 0)) = (u4) mcode;
        *((u1 *) (ra + 8 + 4)) = (u1) (mcode >> 32);
 
-       /* patch the class' vftbl pointer */
+       /* patch the classinfo pointer */
 
-       *((ptrint *) (ra + 4)) = (ptrint) c->vftbl;
+       *((ptrint *) (ra + 4)) = (ptrint) c;
 
        /* if we show disassembly, we have to skip the nop's */