* Merged in new trap code (twisti-branch).

[cacao.git] / src / vm / vm.c

diff --git a/src/vm/vm.c b/src/vm/vm.c
index b2a0a7eaa25a743178c9704e4f36af906ba1852c..30134fcb11eb31a270201d08b74e8a4c1253b56b 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -104,6 +104,8 @@
 # include "vm/jit/python.h"
 #endif
 
+#include "vm/jit/trap.h"
+
 #include "vmcore/classcache.h"
 #include "vmcore/options.h"
 #include "vmcore/statistics.h"
@@ -1516,7 +1518,9 @@ bool vm_create(JavaVMInitArgs *vm_args)
        primitive_postinit();
        method_init();
 
-       exceptions_init();
+#if defined(ENABLE_JIT)
+       trap_init();
+#endif
 
        if (!builtin_init())
                vm_abort("vm_create: builtin_init failed");