* src/vmcore/resolve.c: Moved back to src/vm/resolve.c.

[cacao.git] / src / vmcore / loader.c

diff --git a/src/vmcore/loader.c b/src/vmcore/loader.c
index 2ccd7b5849d192f67c863c3a55c07df676f92d6c..128581558f7fcb28e1a4d9c3ad683670b37088f7 100644 (file)
--- a/src/vmcore/loader.c
+++ b/src/vmcore/loader.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: loader.c 7268 2007-02-01 12:02:56Z twisti $
+   $Id: loader.c 7464 2007-03-06 00:26:31Z edwin $
 
 */
 
@@ -49,8 +49,7 @@
 #include "vm/stringlocal.h"
 #include "vm/vm.h"
 
-#include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit_interface.h"
 
 #if defined(ENABLE_JAVASE)
 # include "vmcore/annotation.h"
@@ -1421,6 +1420,12 @@ static bool loader_load_method(classbuffer *cb, methodinfo *m,
                return false;
        }
 
+       /* initialize the hit countdown field */
+
+#if defined(ENABLE_REPLACEMENT)
+       m->hitcountdown = METHOD_INITIAL_HIT_COUNTDOWN;
+#endif
+
        /* everything was ok */
 
        return true;
@@ -1923,7 +1928,10 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
        if (!suck_check_classbuffer_size(cb, 2))
                goto return_exception;
 
-       c->flags = suck_u2(cb);
+       /* We OR the flags here, as we set already some flags in
+          class_create_classinfo. */
+
+       c->flags |= suck_u2(cb);
 
        /* check ACC flags consistency */