* recreated 'default' branch after merging it into 'jitcache-arm-x86'

[cacao.git] / src / vm / string.cpp

diff --git a/src/vm/string.cpp b/src/vm/string.cpp
index a6b7c08c3c1024cfd2735adf4d1785415e63e8f0..184f8f66cf742b936a148e9e9b386598f2a4259a 100644 (file)
--- a/src/vm/string.cpp
+++ b/src/vm/string.cpp
@@ -37,10 +37,10 @@
 
 #include "native/llni.h"
 
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
 
-#include "vm/array.h"
-#include "vm/builtin.h"
+#include "vm/array.hpp"
+#include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"
 #include "vm/globals.hpp"
 #include "vm/javaobjects.hpp"
@@ -49,7 +49,6 @@
 #include "vm/statistics.h"
 #include "vm/string.hpp"
 #include "vm/utf8.h"
-#include "vm/vm.hpp"
 
 
 /* global variables ***********************************************************/
@@ -107,8 +106,7 @@ void stringtable_update(void)
                                
                                if (js.is_null() || (js.get_value() == NULL)) {
                                        /* error in hashtable found */
-
-                                       vm_abort("stringtable_update: invalid literalstring in hashtable");
+                                       os::abort("stringtable_update: invalid literalstring in hashtable");
                                }
 
                                a = LLNI_UNWRAP(js.get_value());
@@ -524,7 +522,7 @@ static java_object_t *literalstring_u2(java_chararray_t *a, int32_t length,
 #endif
 
 #if defined(ENABLE_THREADS)
-       lock_init_object_lock(o);
+       o->lockword.init();
 #endif
 
        o->vftbl = class_java_lang_String->vftbl;