projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from default with manual cleanup (src/vm/class.cpp).
[cacao.git]
/
src
/
vm
/
jit
/
stacktrace.cpp
diff --git
a/src/vm/jit/stacktrace.cpp
b/src/vm/jit/stacktrace.cpp
index f338c60baf3a3e16c2e01722ba085b91b934f188..14050370570cfa1a493a69f5cce38669868fbd9a 100644
(file)
--- a/
src/vm/jit/stacktrace.cpp
+++ b/
src/vm/jit/stacktrace.cpp
@@
-39,34
+39,31
@@
#include "vm/jit/stacktrace.hpp"
#include "vm/jit/stacktrace.hpp"
-#include "vm/global.h" /* required here for native includes */
-#include "native/jni.h"
#include "native/llni.h"
#include "threads/thread.hpp"
#include "toolbox/logging.h"
#include "native/llni.h"
#include "threads/thread.hpp"
#include "toolbox/logging.h"
-#include "vm/array.h"
-#include "vm/builtin.h"
+#include "vm/array.hpp"
+#include "vm/jit/builtin.hpp"
+#include "vm/class.hpp"
#include "vm/cycles-stats.h"
#include "vm/exceptions.hpp"
#include "vm/cycles-stats.h"
#include "vm/exceptions.hpp"
+#include "vm/globals.hpp"
+#include "vm/javaobjects.hpp"
+#include "vm/loader.hpp"
+#include "vm/method.h"
+#include "vm/options.h"
#include "vm/string.hpp"
#include "vm/vm.hpp"
#include "vm/jit/asmpart.h"
#include "vm/string.hpp"
#include "vm/vm.hpp"
#include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
-#include "vm/jit/linenumbertable.h"
+#include "vm/jit/codegen-common.h
pp
"
+#include "vm/jit/linenumbertable.h
pp
"
#include "vm/jit/methodheader.h"
#include "vm/jit/methodtree.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/methodtree.h"
-#include "vmcore/class.h"
-#include "vmcore/globals.hpp"
-#include "vmcore/javaobjects.hpp"
-#include "vmcore/loader.h"
-#include "vmcore/method.h"
-#include "vmcore/options.h"
-
// FIXME Use C-linkage for now.
extern "C" {
// FIXME Use C-linkage for now.
extern "C" {
@@
-1142,7
+1139,7
@@
void stacktrace_print(stacktrace_t *st)
/* Get the line number. */
/* Get the line number. */
- linenumber =
linenumbertable_linenumber_for_pc(&m, ste->code
, ste->pc);
+ linenumber =
ste->code->linenumbertable->find(&m
, ste->pc);
stacktrace_print_entry(m, linenumber);
}
stacktrace_print_entry(m, linenumber);
}
@@
-1182,9
+1179,8
@@
void stacktrace_print_current(void)
code = tmpsfi.code;
m = code->m;
code = tmpsfi.code;
m = code->m;
- /* Get the line number. */
-
- linenumber = linenumbertable_linenumber_for_pc(&m, code, tmpsfi.xpc);
+ // Get the line number.
+ linenumber = code->linenumbertable->find(&m, tmpsfi.xpc);
stacktrace_print_entry(m, linenumber);
}
stacktrace_print_entry(m, linenumber);
}
@@
-1227,9
+1223,8
@@
void stacktrace_print_of_thread(threadobject *t)
code = tmpsfi.code;
m = code->m;
code = tmpsfi.code;
m = code->m;
- /* Get the line number. */
-
- linenumber = linenumbertable_linenumber_for_pc(&m, code, tmpsfi.xpc);
+ // Get the line number.
+ linenumber = code->linenumbertable->find(&m, tmpsfi.xpc);
stacktrace_print_entry(m, linenumber);
}
stacktrace_print_entry(m, linenumber);
}