* configure.ac (AC_CHECK_ENABLE_ASSERTION): Added

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

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 2a9b9cbc8bf0d20f56e34c34007065eff2436624..32215d9b9c1a7778cab7589050e87798bfcb3a25 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -64,6 +64,11 @@
 #include "toolbox/logging.h"
 
 #include "vm/array.h"
+
+#if defined(ENABLE_ASSERTION)
+#include "vm/assertion.h"
+#endif
+
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/finalizer.h"
@@ -1260,19 +1265,27 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 
                case OPT_EA:
-                       /* currently ignored */
+#if defined(ENABLE_ASSERTION)
+                       assertion_ea_da(opt_arg, true);
+#endif
                        break;
 
                case OPT_DA:
-                       /* currently ignored */
+#if defined(ENABLE_ASSERTION)
+                       assertion_ea_da(opt_arg, false);
+#endif
                        break;
 
                case OPT_ESA:
-                       _Jv_jvm->Java_java_lang_VMClassLoader_defaultAssertionStatus = true;
+#if defined(ENABLE_ASSERTION)
+                       assertion_system_enabled = true;
+#endif
                        break;
 
                case OPT_DSA:
-                       _Jv_jvm->Java_java_lang_VMClassLoader_defaultAssertionStatus = false;
+#if defined(ENABLE_ASSERTION)
+                       assertion_system_enabled = false;
+#endif
                        break;
 
 #if defined(ENABLE_PROFILING)