* src/threads/lock.cpp: Slight memory barrier clarification.

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

diff --git a/src/vm/exceptions.cpp b/src/vm/exceptions.cpp
index c318e6e9731f92feed3a5881d8e63a98a5fd4082..332fca04b15e1c1304b1921a9b7c292fc84a96d3 100644 (file)
--- a/src/vm/exceptions.cpp
+++ b/src/vm/exceptions.cpp
@@ -35,24 +35,24 @@
 
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
-#include "native/native.h"
+#include "native/native.hpp"
 
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
 #include "threads/thread.hpp"
 
 #include "toolbox/util.h"
 
 #include "vm/jit/builtin.hpp"
-#include "vm/class.h"
+#include "vm/class.hpp"
 #include "vm/exceptions.hpp"
 #include "vm/global.h"
 #include "vm/globals.hpp"
 #include "vm/javaobjects.hpp"
 #include "vm/loader.hpp"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/os.hpp"
 #include "vm/string.hpp"
@@ -62,7 +62,7 @@
 #include "vm/jit/jit.hpp"
 #include "vm/jit/methodheader.h"
 #include "vm/jit/patcher-common.hpp"
-#include "vm/jit/show.h"
+#include "vm/jit/show.hpp"
 #include "vm/jit/stacktrace.hpp"
 #include "vm/jit/trace.hpp"
 
@@ -241,7 +241,7 @@ static void exceptions_abort(utf *classname, utf *message)
 
        log_finish();
 
-       VM::get_current()->abort("Aborting...");
+       os::abort("Aborting...");
 }
 
 
@@ -2011,7 +2011,7 @@ void exceptions_print_stacktrace(void)
                                                                         false);
 
                if (m == NULL)
-                       VM::get_current()->abort("exceptions_print_stacktrace: printStackTrace()V not found");
+                       os::abort("exceptions_print_stacktrace: printStackTrace()V not found");
 
                /* Print message. */