harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r560888 - in /harmony/enhanced/drlvm/trunk/vm: em/src/DrlEMImpl.cpp gc_cc/src/init.cpp gc_gen/src/common/gc_common.cpp vmcore/src/init/vm_properties.cpp
Date Mon, 30 Jul 2007 08:29:45 GMT
Author: varlax
Date: Mon Jul 30 01:29:36 2007
New Revision: 560888

URL: http://svn.apache.org/viewvc?view=rev&rev=560888
Log:
Fixed HARMONY-4560 [drlvm] incomplete support of "vm.assert_dialog" setting

Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?view=diff&rev=560888&r1=560887&r2=560888
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Mon Jul 30 01:29:36 2007
@@ -356,6 +356,11 @@
 
 bool DrlEMImpl::init() {
     _execute_method = JIT_execute_method_default;
+
+    if (!get_boolean_property("vm.assert_dialog", TRUE, VM_PROPERTIES)) {
+        disable_assert_dialogs();
+    }
+
     std::string config = readConfiguration();
     if (!config.empty()) {
         buildChains(config);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp?view=diff&rev=560888&r1=560887&r2=560888
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp Mon Jul 30 01:29:36 2007
@@ -288,6 +288,11 @@
 
 int gc_init() {
     INFO2("gc.init", "GC init called\n");
+
+    if (!get_boolean_property("vm.assert_dialog", TRUE, VM_PROPERTIES)) {
+        disable_assert_dialogs();
+    }
+
     init_mem();
     init_slots();
     init_select_gc();

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp?view=diff&rev=560888&r1=560887&r2=560888
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp Mon Jul 30 01:29:36 2007
@@ -127,6 +127,9 @@
 
 void gc_parse_options(GC* gc) 
 {
+  if (!get_boolean_property("vm.assert_dialog", TRUE, VM_PROPERTIES))
+    disable_assert_dialogs();
+  
   POINTER_SIZE_INT max_heap_size = HEAP_SIZE_DEFAULT;
   POINTER_SIZE_INT min_heap_size = min_heap_size_bytes;
   

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?view=diff&rev=560888&r1=560887&r2=560888
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Mon Jul 30 01:29:36
2007
@@ -266,7 +266,11 @@
 //vm part
 static void init_vm_properties(Properties & properties)
 {
+#ifdef _DEBUG
         properties.set_new("vm.assert_dialog", "true");
+#else
+        properties.set_new("vm.assert_dialog", "false");
+#endif
         properties.set_new("vm.crash_handler", "false");
         properties.set_new("vm.finalize", "true");
         properties.set_new("vm.jit_may_inline_sync", "true");



Mime
View raw message