* Updated to jitcache-arm-x86 branch d4f6023b26c5+d1b5b1c106ac
[cacao.git] / src / vm / jit / i386 / patcher.c
index 61d853bf38f29b339269f59e16c429b4c67ecaad..19b91971803a6c59d1c2f0a9f04dac19662a7e9d 100644 (file)
 
 #include "mm/memory.h"
 
-#include "native/native.h"
+#include "native/native.hpp"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 #include "vm/class.h"
-#include "vm/field.h"
+#include "vm/field.hpp"
 #include "vm/initialize.h"
 #include "vm/options.h"
 #include "vm/references.h"
 #include "vm/resolve.h"
 
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/patcher-common.hpp"
 
 
 #define PATCH_BACK_ORIGINAL_MCODE                                                      \
@@ -245,7 +245,7 @@ bool patcher_putfieldconst(patchref_t *pr)
 
    Machine code:
 
-   <patched call postition>
+   <patched call position>
    c7 04 24 00 00 00 00       movl   $0x0000000,(%esp)
    b8 00 00 00 00             mov    $0x0000000,%eax
 
@@ -380,7 +380,7 @@ bool patcher_invokestatic_special(patchref_t *pr)
        ra    = (u1 *)                pr->mpc;
        um    = (unresolved_method *) pr->ref;
 
-       /* get the fieldinfo */
+       /* get the methodinfo */
 
        if (!(m = resolve_method_eager(um)))
                return false;