You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by aa...@apache.org on 2008/07/27 17:03:41 UTC
svn commit: r680117 - in /harmony/enhanced/drlvm/trunk/vm:
gc_gen/src/common/ gc_gen/src/gen/ gc_gen/src/mark_compact/
gc_gen/src/semi_space/ interpreter/src/ port/include/tl/ vmcore/include/
vmcore/src/class_support/ vmcore/src/exception/ vmcore/src/i...
Author: aaf
Date: Sun Jul 27 08:03:39 2008
New Revision: 680117
URL: http://svn.apache.org/viewvc?rev=680117&view=rev
Log:
Committed HARMONY-5917: localization of Harmony VM and GC.
Modified:
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp
harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/hashtable.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/java_type.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base_natives/java_lang_thread_em64t.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp Sun Jul 27 08:03:39 2008
@@ -127,7 +127,7 @@
unsigned int num_alloced = metadata->num_alloc_segs;
if(num_alloced == GC_METADATA_SEGMENT_NUM){
- DIE(("GC: Run out GC metadata, please give it more segments!"));
+ LDIE(78, "GC: Run out GC metadata, please give it more segments!");
}
unsigned int seg_size = GC_METADATA_EXTEND_SIZE_BYTES + METADATA_BLOCK_SIZE_BYTES;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp Sun Jul 27 08:03:39 2008
@@ -84,7 +84,7 @@
GC_PROP |= ALGO_MS_NORMAL;
gc = gc_ms_create();
}else{
- WARN(("\nGC algorithm setting incorrect. Will use default value.\n"));
+ LWARN(48, "GC algorithm setting incorrect. Will use default value.");
GC_PROP |= ALGO_COMPACT_MOVE;
gc = gc_mc_create();
}
@@ -96,7 +96,7 @@
{
assert(property_name);
if(!vm_property_is_set(property_name, VM_PROPERTIES)) {
- DIE(("Property value %s is not set!", property_name));
+ LDIE(76, "Property value {0} is not set!" << property_name);
}
return vm_property_get_integer(property_name, 0, VM_PROPERTIES);
@@ -106,7 +106,7 @@
{
assert(property_name);
if (!vm_property_is_set(property_name, VM_PROPERTIES)){
- DIE(("Property value %s is not set!", property_name));
+ LDIE(76, "Property value {0} is not set!" << property_name);
}
return vm_property_get_boolean(property_name, FALSE, VM_PROPERTIES);
@@ -116,7 +116,7 @@
{
assert(property_name);
if(!vm_property_is_set(property_name, VM_PROPERTIES)) {
- DIE(("Property value %s is not set!", property_name));
+ LDIE(76, "Property value {0} is not set!" << property_name);
}
return vm_property_get_size(property_name, 0, VM_PROPERTIES);
@@ -157,7 +157,7 @@
if(unique_algo){
if(minor_algo || major_algo){
- WARN(("Generational options cannot be set with unique_algo, ignored."));
+ LWARN(60, "Generational options cannot be set with unique_algo, ignored.");
}
gc = gc_decide_collection_algo(unique_algo, has_los);
vm_properties_destroy_value(unique_algo);
@@ -201,11 +201,11 @@
if (max_heap_size < min_heap_size){
max_heap_size = min_heap_size;
- WARN(("Max heap size you set is too small, reset to %dMB", max_heap_size/MB));
+ LWARN(61, "Max heap size you set is too small, reset to {0}MB" << max_heap_size/MB);
}
if (0 == max_heap_size){
max_heap_size = HEAP_SIZE_DEFAULT;
- WARN(("Max heap size you set equals to zero, reset to %dMB", max_heap_size/MB));
+ LWARN(62, "Max heap size you set equals to zero, reset to {0}MB" << max_heap_size/MB);
}
min_heap_size = max_heap_size / 10;
@@ -219,13 +219,13 @@
min_heap_size = vm_property_get_size("gc.ms");
if (min_heap_size < min_heap_size_bytes){
min_heap_size = min_heap_size_bytes;
- WARN(("Min heap size you set is too small, reset to %dMB", min_heap_size/MB));
+ LWARN(63, "Min heap size you set is too small, reset to {0}MB" << min_heap_size/MB);
}
}
if (min_heap_size > max_heap_size){
max_heap_size = min_heap_size;
- WARN(("Max heap size is too small, reset to %dMB", max_heap_size/MB));
+ LWARN(61, "Max heap size you set is too small, reset to {0}MB" << max_heap_size/MB);
}
min_heap_size_bytes = min_heap_size;
@@ -314,7 +314,7 @@
Boolean use_all_concurrent_phase= vm_property_get_boolean("gc.concurrent_gc");
if(use_all_concurrent_phase){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
- DIE(( "Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
+ LDIE(77, "Please define USE_UNIQUE_MARK_SWEEP_GC macro.");
#endif
gc_specify_con_enum();
gc_specify_con_mark();
@@ -327,7 +327,7 @@
Boolean USE_CONCURRENT_ENUMERATION = vm_property_get_boolean("gc.concurrent_enumeration");
if(USE_CONCURRENT_ENUMERATION){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
- DIE(("Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
+ LDIE(77, "Please define USE_UNIQUE_MARK_SWEEP_GC macro.");
#endif
gc_specify_con_enum();
gc->generate_barrier = TRUE;
@@ -338,7 +338,7 @@
Boolean USE_CONCURRENT_MARK = vm_property_get_boolean("gc.concurrent_mark");
if(USE_CONCURRENT_MARK){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
- DIE(("Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
+ LDIE(77, "Please define USE_UNIQUE_MARK_SWEEP_GC macro.");
#endif
gc_specify_con_mark();
gc->generate_barrier = TRUE;
@@ -352,7 +352,7 @@
/*currently, concurrent sweeping only starts after concurrent marking.*/
assert(gc_is_specify_con_mark());
#ifndef USE_UNIQUE_MARK_SWEEP_GC
- DIE(("Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
+ LDIE(77, "Please define USE_UNIQUE_MARK_SWEEP_GC macro.");
#endif
gc_specify_con_sweep();
IGNORE_FINREF = TRUE; /*TODO: finref is unsupported.*/
@@ -384,14 +384,14 @@
if(vm_property_is_set("gc.prefetch_distance",VM_PROPERTIES)==1) {
PREFETCH_DISTANCE = vm_property_get_size("gc.prefetch_distance");
if(!PREFETCH_ENABLED) {
- WARN(("Prefetch distance set with Prefetch disabled!"));
+ LWARN(64, "Prefetch distance set with Prefetch disabled!");
}
}
if(vm_property_is_set("gc.prefetch_stride",VM_PROPERTIES)==1) {
PREFETCH_STRIDE = vm_property_get_size("gc.prefetch_stride");
if(!PREFETCH_ENABLED) {
- WARN(("Prefetch stride set with Prefetch disabled!"));
+ LWARN(65, "Prefetch stride set with Prefetch disabled!");
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp Sun Jul 27 08:03:39 2008
@@ -69,15 +69,12 @@
alloc_addr = VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
release_lock_memory_priv();
if(alloc_addr == NULL){
- WARN(("GC large_page: No required number of large pages found. Please reboot.....\n"));
+ LWARN(49, "GC large_page: No required number of large pages found. Please reboot.....");
return NULL;
}else
return alloc_addr;
}else{
- WARN(("GC large_page: Check that you have permissions:"));
- WARN(("GC large_page: Control Panel->Administrative Tools->Local Security Settings->->User Rights Assignment->Lock pages in memory."));
- WARN(("GC large_page: Start VM as soon after reboot as possible, because large pages become fragmented and unusable after a while."));
- WARN(("GC large_page: Heap size should be multiple of large page size."));
+ LWARN(50, "GC large_page: Check that you have permissions:\nGC large_page: Control Panel->Administrative Tools->Local Security Settings->->User Rights Assignment->Lock pages in memory.\nGC large_page: Start VM as soon after reboot as possible, because large pages become fragmented and unusable after a while.\nGC large_page: Heap size should be multiple of large page size.");
return NULL;
}
}
@@ -108,7 +105,7 @@
static void parse_proc_meminfo(size_t required_size){
FILE* f = fopen("/proc/meminfo", "r");
if (f == NULL){
- WARN(("GC large_page: Can't open /proc/meminfo"));
+ LWARN(51, "GC large_page: Can't open /proc/meminfo");
return;
}
@@ -125,18 +122,16 @@
if (buf) free(buf);
if (proc_huge_pages_total == (size_t)-1){
- WARN(("GC large_page: Large pages are not supported by kernel."));
- WARN(("GC large_page: CONFIG_HUGETLB_PAGE and CONFIG_HUGETLBFS needs to be enabled."));
+ LWARN(52, "GC large_page: Large pages are not supported by kernel.\nGC large_page: CONFIG_HUGETLB_PAGE and CONFIG_HUGETLBFS needs to be enabled.");
} else if (proc_huge_pages_total == 0){
- WARN(("GC large_page: No large pages reserved, Use following command: echo num> /proc/sys/vm/nr_hugepages."));
- WARN(("GC large_page: Do it just after kernel boot before huge pages become fragmented."));
+ LWARN(53, "GC large_page: No large pages reserved, Use the following command: echo num> /proc/sys/vm/nr_hugepages.\nGC large_page: Do it just after kernel boot before huge pages become fragmented.");
} else if (proc_huge_pages_free * proc_huge_page_size < required_size) {
if (proc_huge_pages_total * proc_huge_page_size >= required_size) {
- WARN(("GC large_page: Not enough free large pages, some of reserved space is already busy."));
+ LWARN(54, "GC large_page: Not enough free large pages, some of reserved space is already busy.");
} else {
- WARN(("GC large_page: Not enough free large pages, some of reserved space is already busy."));
+ LWARN(54, "GC large_page: Not enough free large pages, some of reserved space is already busy.");
}
- WARN(("GC large_page: Large pages can be only allocated."));
+ LWARN(55, "GC large_page: Large pages can be only allocated.");
}
}
@@ -151,9 +146,7 @@
int fd = open(buf, O_CREAT | O_RDWR, 0700);
if (fd == -1){
- WARN(("GC large_page: Can't open Mount hugetlbfs with: mount none /mnt/huge -t hugetlbfsi."));
- WARN(("GC large_page: Check you have appropriate permissions to /mnt/huge."));
- WARN(("GC large_page: Use command line switch -Dgc.lp=/mnt/huge."));
+ LWARN(56, "GC large_page: Can't open Mount hugetlbfs with: mount none /mnt/huge -t hugetlbfs.\nGC large_page: Check you have appropriate permissions to /mnt/huge.\nGC large_page: Use command line switch -Dgc.lp=/mnt/huge.");
free(buf);
return NULL;
}
@@ -161,7 +154,7 @@
void* addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (addr == MAP_FAILED){
- WARN(("GC large_page: Map failed."));
+ LWARN(57, "GC large_page: Map failed.");
close(fd);
free(buf);
return NULL;
@@ -175,7 +168,7 @@
parse_proc_meminfo(size);
void* alloc_addr = mmap_large_pages(size, hint);
if(alloc_addr == NULL){
- WARN(("GC large_page: Large pages allocation failed."));
+ LWARN(58, "GC large_page: Large pages allocation failed.");
return NULL;
}
return alloc_addr;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp Sun Jul 27 08:03:39 2008
@@ -153,8 +153,8 @@
assert(!((POINTER_SIZE_INT)nos_boundary % SPACE_ALLOC_UNIT));
nos_base = vm_reserve_mem(nos_boundary, nos_reserve_size);
if( nos_base != nos_boundary ){
- DIE2("gc.base","Warning: Static NOS mapping: Can't reserve memory at address"<<nos_boundary<<" for size "<<nos_reserve_size<<" for NOS.");
- DIE2("gc.base","Please not use static NOS mapping by undefining STATIC_NOS_MAPPING, or adjusting NOS_BOUNDARY value.");
+ LDIE(82, "gc.base: Warning: Static NOS mapping: Can't reserve memory at address {0} for size {1} for NOS."<< nos_boundary << nos_reserve_size);
+ LDIE(83, "gc.base: Please not use static NOS mapping by undefining STATIC_NOS_MAPPING, or adjusting NOS_BOUNDARY value.");
exit(0);
}
reserved_end = (void*)((POINTER_SIZE_INT)nos_base + nos_reserve_size);
@@ -165,7 +165,7 @@
while( !reserved_base || reserved_base >= nos_base){
los_mos_base = (void*)((POINTER_SIZE_INT)los_mos_base - SPACE_ALLOC_UNIT);
if(los_mos_base < RESERVE_BOTTOM){
- DIE2("gc.base","Static NOS mapping: Can't reserve memory at address"<<reserved_base<<" for specified size "<<los_mos_size);
+ LDIE(84, "gc.base: Static NOS mapping: Can't reserve memory at address {0} for specified size {1}." <<reserved_base << los_mos_size);
exit(0);
}
reserved_base = vm_reserve_mem(los_mos_base, los_mos_reserve_size);
@@ -192,17 +192,17 @@
if(large_page_hint){
reserved_base = alloc_large_pages(max_heap_size, large_page_hint);
if(reserved_base){
- WARN(("GC use large pages."));
+ LWARN(46, "GC use large pages.");
} else {
free(large_page_hint);
large_page_hint = NULL;
- WARN(("GC use small pages."));
+ LWARN(47, "GC use small pages.");
}
}
if(reserved_base == NULL){
if(max_heap_size < min_heap_size){
- DIE(("Max heap size is smaller than min heap size. Please choose other values."));
+ LDIE(79, "Max heap size is smaller than min heap size. Please choose other values.");
}
unsigned int max_size_reduced = 0;
@@ -216,7 +216,7 @@
physical_start = reserved_base;
if(max_size_reduced){
- DIE(("Max heap size: can't be reserved. The max size can be reserved is %dMB", max_heap_size/MB));
+ LDIE(80, "Max heap size: can't be reserved. The max size can be reserved is {0}MB" << max_heap_size/MB);
exit(0);
}
@@ -486,7 +486,7 @@
GC_PROP |= ALGO_COPY_SEMISPACE;
}else {
- WARN(("GC algorithm setting incorrect. Will use default value.\n"));
+ LWARN(48, "GC algorithm setting incorrect. Will use default value.");
use_default = TRUE;
}
}
@@ -509,7 +509,7 @@
GC_PROP |= ALGO_MARKSWEEP;
}else{
- WARN(("GC algorithm setting incorrect. Will use default value.\n"));
+ LWARN(48, "GC algorithm setting incorrect. Will use default value.");
use_default = TRUE;
}
}
@@ -884,7 +884,7 @@
}
if( gc->collect_result == FALSE){
- DIE(("Out of Memory while collecting!\n"));
+ LDIE(81, "Out of Memory while collecting!");
}
nos_reset_after_collection(nos);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp Sun Jul 27 08:03:39 2008
@@ -292,7 +292,7 @@
TRACE2("gc.process", "\nGC: end of move compact algo ... \n");
}else{
- DIE(("GC: The speficied major collection algorithm doesn't exist!"));
+ LDIE(75, "GC: The speficied major collection algorithm doesn't exist!");
}
if((!LOS_ADJUST_BOUNDARY)&&(kind != TRANS_NOTHING) ) {
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp Sun Jul 27 08:03:39 2008
@@ -283,7 +283,7 @@
old_num = atomic_inc32(&num_space_changing_collectors);
if( ++old_num == num_active_collectors ){
if(NOS_SIZE) /* when NOS_SIZE is speficied, it can't be shrunk. */
- WARN(("GC: collector[%p]: MOS is overflowed, have to reduce NOS size.", ((POINTER_SIZE_INT)collector->thread_handle)));
+ LWARN(59, "GC: collector[{0}]: MOS is overflowed, have to reduce NOS size." << ((POINTER_SIZE_INT)collector->thread_handle));
Block *old_nos_boundary = nspace->blocks;
nos_boundary = &mspace->blocks[mspace->free_block_idx - mspace->first_block_idx];
if(nspace->num_managed_blocks != 0) /* FIXME:: why can it be 0 here?? Because mspace extend can't happen is NOS is zero size */
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp Sun Jul 27 08:03:39 2008
@@ -39,9 +39,9 @@
if( TOSPACE_SIZE != 0 ) TOSPACE_SIZE -= 1;
if( TOSPACE_SIZE >= MB ){
- WARN(("GC Init: TOSPACE_SIZE is too big, set it to be %dMB", TOSPACE_SIZE/MB));
+ LWARN(66, "GC Init: TOSPACE_SIZE is too big, set it to be {0}MB" << TOSPACE_SIZE/MB);
}else{
- WARN(("GC Init: TOSPACE_SIZE is too big, set it to be %dKB", TOSPACE_SIZE/KB));
+ LWARN(66, "GC Init: TOSPACE_SIZE is too big, set it to be {0}KB" << TOSPACE_SIZE/KB);
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp Sun Jul 27 08:03:39 2008
@@ -21,6 +21,7 @@
#include "platform_lowlevel.h"
#include "interpreter_exports.h"
#include "jit_export.h"
+#include "cxxlog.h"
typedef void *GC_Enumeration_Handle;
@@ -42,11 +43,11 @@
EXPORT extern void JIT_execute_method(JIT_Handle,jmethodID method, jvalue *return_value, jvalue *args);
}
-EXPORT void JIT_unwind_stack_frame(JIT_Handle, Method_Handle, JitFrameContext *) { abort(); }
-EXPORT void JIT_get_root_set_from_stack_frame(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *) { abort(); }
+EXPORT void JIT_unwind_stack_frame(JIT_Handle, Method_Handle, JitFrameContext *) { LDIE(51, "Not implemented"); }
+EXPORT void JIT_get_root_set_from_stack_frame(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *) { LDIE(51, "Not implemented"); }
EXPORT void JIT_get_root_set_for_thread_dump(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *) {return;}
-EXPORT void JIT_fix_handler_context(JIT_Handle, Method_Handle, JitFrameContext *) { abort(); }
-EXPORT void * JIT_get_address_of_this(JIT_Handle, Method_Handle, const JitFrameContext *) { abort(); return (void *)JIT_FAILURE;}
+EXPORT void JIT_fix_handler_context(JIT_Handle, Method_Handle, JitFrameContext *) { LDIE(51, "Not implemented"); }
+EXPORT void * JIT_get_address_of_this(JIT_Handle, Method_Handle, const JitFrameContext *) { LDIE(51, "Not implemented"); return (void *)JIT_FAILURE;}
struct StackTraceFrame;
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp Sun Jul 27 08:03:39 2008
@@ -171,7 +171,7 @@
}
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
// assert(argId <= sz + 2);
@@ -243,7 +243,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
if (exn_raised()) {
@@ -401,7 +401,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(*mtype == ')');
@@ -537,7 +537,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
if (method->is_synchronized()) {
@@ -679,7 +679,7 @@
pos -= 2;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(*mtype == ')');
@@ -816,7 +816,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
if (method->is_synchronized()) {
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -38,13 +38,13 @@
return (uint64*) &m2n->local_object_handles;
case M2N_METHOD:
INFO("get_stacked_register_address for method:");
- DIE(("Unexpected register"));
+ LDIE(74, "Unexpected register");
case M2N_FRAME_TYPE:
return (uint64*) &m2n->current_frame_type;
default:
INFO("get_stacked_register_address: " << (int)reg);
- DIE(("Unexpected register"));
+ LDIE(74, "Unexpected register");
}
return 0;
}
@@ -153,7 +153,7 @@
arg_words[argId++] = args[pos++].j;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(argId <= sz + 2);
@@ -232,7 +232,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
TRACE("invokeJNI: done\n");
@@ -359,7 +359,7 @@
pos-= 2;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(*mtype == ')');
@@ -510,7 +510,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
TRACE("invokeJNI: done\n");
@@ -627,7 +627,7 @@
pos-=2;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(*mtype == ')');
@@ -778,7 +778,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
TRACE("invokeJNI: done\n");
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Sun Jul 27 08:03:39 2008
@@ -1698,7 +1698,7 @@
}
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
frame.ip += 3;
}
@@ -1779,7 +1779,7 @@
}
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
DEBUG_BYTECODE(field->get_name()->bytes << " " << field->get_descriptor()->bytes
<< " (val = " << (int)frame.stack.pick().i << ")");
@@ -1896,7 +1896,7 @@
}
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
frame.ip += 3;
}
@@ -1977,7 +1977,7 @@
}
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
DEBUG_BYTECODE(field->get_name()->bytes << " " << field->get_descriptor()->bytes
<< " (val = " << (int)frame.stack.pick().i << ")");
@@ -2487,7 +2487,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
method_exit_callback(method, false, val);
@@ -3217,7 +3217,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
setLastStackFrame(frame.prev);
DEBUG_TRACE("interpreter_invoke }}}\n");
@@ -3305,7 +3305,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
setLastStackFrame(frame.prev);
@@ -3393,7 +3393,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
setLastStackFrame(frame.prev);
@@ -3582,7 +3582,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
setLastStackFrame(frame.prev);
DEBUG_TRACE("invoke_special }}}\n");
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp Sun Jul 27 08:03:39 2008
@@ -598,7 +598,7 @@
}
break;
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
return val;
}
Modified: harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h Sun Jul 27 08:03:39 2008
@@ -16,7 +16,7 @@
*/
#ifndef TL_MEMORY_POOL_H
#define TL_MEMORY_POOL_H
-#include "clog.h"
+#include "cxxlog.h"
#include <apr_pools.h>
#include "open/types.h"
@@ -26,8 +26,8 @@
class VMEXPORT MemoryPool {
private:
// denied functions
- MemoryPool(const MemoryPool&) {DIE(("Not implemented"));}
- MemoryPool& operator=(const MemoryPool&) {DIE(("Not implemented")); return *this;}
+ MemoryPool(const MemoryPool&) {LDIE(51, "Not implemented");}
+ MemoryPool& operator=(const MemoryPool&) {LDIE(51, "Not implemented"); return *this;}
protected:
apr_pool_t* pool;
public:
@@ -41,8 +41,8 @@
class VMEXPORT MemoryPoolMT {
private:
// denied functions
- MemoryPoolMT(const MemoryPoolMT&) {DIE(("Not implemented"));}
- MemoryPoolMT& operator=(const MemoryPoolMT&) {DIE(("Not implemented")); return *this;}
+ MemoryPoolMT(const MemoryPoolMT&) {LDIE(51, "Not implemented");}
+ MemoryPoolMT& operator=(const MemoryPoolMT&) {LDIE(51, "Not implemented"); return *this;}
MemoryPool unsync_pool;
apr_thread_mutex_t *mutex;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/hashtable.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/hashtable.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/hashtable.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/hashtable.h Sun Jul 27 08:03:39 2008
@@ -23,7 +23,7 @@
#define __HASHTABLE_H__
#include <assert.h>
-#include "clog.h"
+#include "cxxlog.h"
#include <map>
// FIXME: we expect POINTER_SIZE_INT is already defined by some includes...
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h Sun Jul 27 08:03:39 2008
@@ -26,7 +26,7 @@
#include "jit_export_jpda.h"
#include <apr_dso.h>
#include <apr_strings.h>
-#include "clog.h"
+#include "cxxlog.h"
#include "lock_manager.h"
#include "jvmti_dasm.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Sun Jul 27 08:03:39 2008
@@ -637,7 +637,7 @@
clss = NULL; // to allow star jit initialization
break;
default:
- DIE(("Unknown vm data type")); // We need a better way to indicate an internal error
+ LDIE(69, "Unknown vm data type"); // We need a better way to indicate an internal error
}
return clss;
} // class_get_class_of_primitive_type
@@ -718,7 +718,7 @@
case VM_DATA_TYPE_CLASS:
return VM_DATA_TYPE_CLASS;
default:
- DIE(("Unknown vm data type"));
+ LDIE(69, "Unknown vm data type");
}
return VM_DATA_TYPE_INVALID;
} // class_cp_get_field_type
@@ -875,7 +875,7 @@
|| const_pool.is_methodref(index)
|| const_pool.is_interfacemethodref(index)))
{
- DIE(("Wrong index"));
+ LDIE(70, "Wrong index");
return 0;
}
index = const_pool.get_ref_name_and_type_index(index);
@@ -891,7 +891,7 @@
|| const_pool.is_methodref(index)
|| const_pool.is_interfacemethodref(index)))
{
- DIE(("Wrong index"));
+ LDIE(70, "Wrong index");
return 0;
}
index = const_pool.get_ref_class_index(index);
@@ -903,7 +903,7 @@
assert(cl);
ConstantPool& const_pool = cl->get_constant_pool();
if (!const_pool.is_class(index)) {
- DIE(("Wrong index"));
+ LDIE(70, "Wrong index");
return 0;
}
return const_pool.get_utf8_chars(const_pool.get_class_name_index(index));
@@ -1427,7 +1427,7 @@
assert(msh);
Method_Signature *ms = (Method_Signature *)msh;
if(idx >= ms->num_args) {
- DIE(("Wrong index"));
+ LDIE(70, "Wrong index");
return 0;
}
assert(ms->arg_type_descs);
@@ -1778,7 +1778,7 @@
VM_Global_State::loader_env->VmProperties()->set(key, value);
break;
default:
- DIE(("Unknown property table: %d", table_number));
+ LDIE(71, "Unknown property table: {0}" << table_number);
}
}
@@ -1795,7 +1795,7 @@
break;
default:
value = NULL;
- DIE(("Unknown property table: %d", table_number));
+ LDIE(71, "Unknown property table: {0}" << table_number);
}
return value;
}
@@ -1821,7 +1821,7 @@
value = VM_Global_State::loader_env->VmProperties()->is_set(key);
break;
default:
- DIE(("Unknown property table: %d", table_number));
+ LDIE(71, "Unknown property table: {0}" << table_number);
}
return value ? TRUE : FALSE;
}
@@ -1838,7 +1838,7 @@
break;
default:
value = NULL;
- DIE(("Unknown property table: %d", table_number));
+ LDIE(71, "Unknown property table: {0}" << table_number);
}
return value;
}
@@ -1856,7 +1856,7 @@
break;
default:
value = NULL;
- DIE(("Unknown property table: %d", table_number));
+ LDIE(71, "Unknown property table: {0}" << table_number);
}
return value;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp Sun Jul 27 08:03:39 2008
@@ -352,7 +352,7 @@
value.const_value.string = cp.get_utf8_string(const_idx);
break;
default:
- DIE(("Annotation parsing internal error"));
+ LDIE(68, "Annotation parsing internal error");
}
}
break;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp Sun Jul 27 08:03:39 2008
@@ -173,7 +173,7 @@
return false;
if(p_class->is_array())
return true;
- DIE(("Should never be called unless p_class is an array"));
+ LDIE(65, "Should never be called unless p_class is an array");
return true;
}
@@ -1396,7 +1396,7 @@
break;
default:
m_vtable->array_element_shift = 65535;
- DIE(("Unexpected array element size: %d", m_vtable->array_element_size));
+ LDIE(66, "Unexpected array element size: {0}" << m_vtable->array_element_size);
break;
}
}
@@ -1422,7 +1422,7 @@
if(m_alignment != GC_OBJECT_ALIGNMENT) {
// The GC will align on 4 byte boundaries by default on IA32....
#ifdef POINTER64
- DIE(("Alignment is supposed to be appropriate"));
+ LDIE(67, "Alignment is supposed to be appropriate");
#endif
// Make sure it is a legal mask.
assert((m_alignment & CL_PROP_ALIGNMENT_MASK) <= CL_PROP_ALIGNMENT_MASK);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Sun Jul 27 08:03:39 2008
@@ -589,8 +589,8 @@
Class* c = it->second;
if (*c->get_class_handle())
{
- DIE(("FAILED on unloading classloader: \n%p live j.l.Class of unloaded class is detected: %s",
- (void*)m_table[i], c->get_name()->bytes));
+ LDIE(72, "FAILED on unloading classloader: \n{0} live j.l.Class of unloaded class is detected: {1}" <<
+ (void*)m_table[i] << c->get_name()->bytes);
}
}
#endif
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/java_type.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/java_type.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/java_type.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/java_type.cpp Sun Jul 27 08:03:39 2008
@@ -141,7 +141,7 @@
return clss;
default:
// All other types are not Java types, so fail
- DIE(("Unexpected kind"));
+ LDIE(73, "Unexpected kind");
return NULL;
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp Sun Jul 27 08:03:39 2008
@@ -746,11 +746,11 @@
}
break;
default:
- DIE(("Unexpected stack state"));
+ LDIE(57, "Unexpected stack state");
return;
}
}
- DIE(("Should not get here"));
+ LDIE(56, "should'nt get here");
} //Method::_set_nop
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type.cpp Sun Jul 27 08:03:39 2008
@@ -156,7 +156,7 @@
case VM_DATA_TYPE_CHAR: k = K_Char; break;
case VM_DATA_TYPE_VOID: k = K_Void; break;
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
td = new TypeDesc(k, NULL, NULL, NULL, c->get_class_loader(), c);
} else if (c->is_array()) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp Sun Jul 27 08:03:39 2008
@@ -164,7 +164,7 @@
Method_Signature_Handle type_info_get_method_sig(Type_Info_Handle UNREF tih)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
return 0;
} //type_info_get_method_sig
@@ -182,7 +182,7 @@
case K_UnmanagedPointer:
return td->get_pointed_to_type();
default:
- DIE(("Unexpected kind"));
+ LDIE(73, "Unexpected kind");
return 0;
}
} //type_info_get_type_info
@@ -223,7 +223,7 @@
case K_Object:
return td->is_loaded();
default:
- DIE(("Unexpected kind"));
+ LDIE(73, "Unexpected kind");
return 0;
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp Sun Jul 27 08:03:39 2008
@@ -75,7 +75,7 @@
} else if (NULL != vm_thread->thread_exception.exc_class) {
exc = exn_create((Exception*)&(vm_thread->thread_exception));
} else {
- DIE(("It's impossible internal error in exception handling."));
+ LDIE(59, "It's impossible internal error in exception handling.");
}
return exc;
} // exn_get
@@ -100,7 +100,7 @@
} else if (NULL != vm_thread->thread_exception.exc_class) {
result = vm_thread->thread_exception.exc_class;
} else {
- DIE(("It's impossible internal error in exception handling."));
+ LDIE(59, "It's impossible internal error in exception handling.");
}
return result;
}
@@ -387,7 +387,7 @@
exn_throw_by_class_internal(exc_class, exc_message, exc_cause);
} else {
- DIE(("There is no exception."));
+ LDIE(60, "There is no exception.");
}
#endif
DIE(("It's Unreachable place."));
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp Sun Jul 27 08:03:39 2008
@@ -785,7 +785,7 @@
static void rth_throw_lazy(Method * exn_constr)
{
#if defined(_IPF_) || defined(_EM64T_)
- DIE(("Lazy exceptions are not supported on this platform"));
+ LDIE(61, "Lazy exceptions are not supported on this platform");
#else
U_8 *args = (U_8 *) (m2n_get_args(m2n_get_last_frame()) + 1); // +1 to skip constructor
if (NULL != exn_constr) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties Sun Jul 27 08:03:39 2008
@@ -105,6 +105,48 @@
LDIE041=Verifier: vf_set_error: unknown check type
LDIE042={0} Verifier: abort!
LDIE043=ERROR: Can't determine vm module location. Please specify {0} property.
+LDIE044=Not Supported
+LDIE045=Not supported on this platform
+LDIE046=Not supported on IA32 currently
+LDIE047=Not supported on EM64T currently
+LDIE048=Unexpected value of 'mode' input parameter
+LDIE049=The last called function should not return
+LDIE050=Unexpected helper id {0}
+LDIE051=Not implemented
+LDIE052=Unexpected data type
+LDIE053=Unexpected java type
+LDIE054=Lock table not initialized!
+LDIE055=Fat monitor table is exceeded!
+LDIE056=shouldn't get here
+LDIE057=Unexpected stack state
+LDIE058=Unknown type descriptor
+LDIE059=It's impossible internal error in exception handling.
+LDIE060=There is no exception.
+LDIE061=Lazy exceptions are not supported on this platform
+LDIE062=Unexpected type specifier
+LDIE063=Exception raised while initializing helper class {0}
+LDIE064=Can't add new JIT
+LDIE065=Should never be called unless p_class is an array
+LDIE066=Unexpected array element size: {0}
+LDIE067=Alignment is supposed to be appropriate
+LDIE068=Annotation parsing internal error
+LDIE069=Unknown vm data type
+LDIE070=Wrong index
+LDIE071=Unknown property table: {0}
+LDIE072=FAILED on unloading classloader: \n{0} live j.l.Class of unloaded class is de tected: {1}
+LDIE073=Unexpected kind
+LDIE074=Unexpected register
+LDIE075=GC: The speficied major collection algorithm doesn't exist!
+LDIE076=Property value {0} is not set!
+LDIE077=Please define USE_UNIQUE_MARK_SWEEP_GC macro.
+LDIE078=GC: Run out GC metadata, please give it more segments!
+LDIE079=Max heap size is smaller than min heap size. Please choose other values.
+LDIE080=Max heap size: can't be reserved. The max size can be reserved is {0}MB
+LDIE081=Out of Memory while collecting!
+LDIE082=gc.base: Warning: Static NOS mapping: Can't reserve memory at address {0} for size {1} for NOS.
+LDIE083=gc.base: Please not use static NOS mapping by undefining STATIC_NOS_MAPPING, or adjusting NOS_BOUNDARY value.
+LDIE084=gc.base: Static NOS mapping: Can't reserve memory at address {0} for specified size {1}.
+LDIE085=Outdated Code
# WARN messages
# =============
@@ -154,3 +196,24 @@
WARN043=Fatal exception, terminating
WARN044={0} internal property is undefined
WARN045=ERROR: Heap size is too large for precompiled compressed mode.
+WARN046=GC use large pages.
+WARN047=GC use small pages.
+WARN048=GC algorithm setting incorrect. Will use default value.
+WARN049=GC large_page: No required number of large pages found. Please reboot.....
+WARN050=GC large_page: Check that you have permissions:\nGC large_page: Control Panel->Administrative Tools->Local Security Settings->->User Rights Assignment->Lock pages in memory.\nGC large_page: Start VM as soon after reboot as possible, because large pages become fragmented and unusable after a while.\nGC large_page: Heap size should be multiple of large page size.
+WARN051=GC large_page: Can't open /proc/meminfo
+WARN052=GC large_page: Large pages are not supported by kernel.\nGC large_page: CONFIG_HUGETLB_PAGE and CONFIG_HUGETLBFS needs to be enabled.
+WARN053=GC large_page: No large pages reserved, Use following command: echo num> /proc/sys/vm/nr_hugepages.\nGC large_page: Do it just after kernel boot before huge pages become fragmented.
+WARN054=GC large_page: Not enough free large pages, some of reserved space is already busy.
+WARN055=GC large_page: Large pages can be only allocated.
+WARN056=GC large_page: Can't open Mount hugetlbfs with: mount none /mnt/huge -t hugetlbfs.\nGC large_page: Check you have appropriate permissions to /mnt/huge.\nGC large_page: Use command line switch -Dgc.lp=/mnt/huge.
+WARN057=GC large_page: Map failed.
+WARN058=GC large_page: Large pages allocation failed.
+WARN058=GC: collector[{0}]: MOS is overflowed, have to reduce NOS size.
+WARN060=Generational options cannot be set with unique_algo, ignored.
+WARN061=Max heap size you set is too small, reset to {0}MB
+WARN062=Max heap size you set equals to zero, reset to {0}MB
+WARN063=Min heap size you set is too small, reset to {0}MB
+WARN064=Prefetch distance set with Prefetch disabled!
+WARN065=Prefetch stride set with Prefetch disabled!
+WARN066=GC Init: TOSPACE_SIZE is too big, set it to be {0}MB
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Sun Jul 27 08:03:39 2008
@@ -163,7 +163,7 @@
{
int max_jit_num = sizeof(jit_compilers) / sizeof(JIT *) - 2;
if(jit_compilers[max_jit_num]) {
- DIE(("Can't add new JIT"));
+ LDIE(64, "Can't add new JIT");
return;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp Sun Jul 27 08:03:39 2008
@@ -1880,7 +1880,7 @@
}
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
break;
}
iter = advance_arg_iterator(iter);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp Sun Jul 27 08:03:39 2008
@@ -264,7 +264,7 @@
break;
}
default:
- DIE(("Unknown type descriptor"));
+ LDIE(58, "Unknown type descriptor");
}
return retobj;
@@ -317,7 +317,7 @@
value.d = GetDoubleField (env, wobj, value_id);
break;
default:
- DIE(("Unknown type descriptor"));
+ LDIE(58, "Unknown type descriptor");
}
return value;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/rt_helper_info.cpp Sun Jul 27 08:03:39 2008
@@ -245,7 +245,7 @@
class_initialize(magic_helper_class);
if (exn_raised()){
- DIE(("Exception raised while initializing helper class %s", magic_helper_class->get_name()->bytes));
+ LDIE(63, "Exception raised while initializing helper class {0}" << magic_helper_class->get_name()->bytes);
}
tmn_suspend_enable();
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Sun Jul 27 08:03:39 2008
@@ -617,7 +617,7 @@
{
// If we ever get here, we are in an implemented JNI function
// By looking at the call stack and assembly it should be clear which one
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp Sun Jul 27 08:03:39 2008
@@ -775,7 +775,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseBooleanArrayElements
@@ -828,7 +828,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseByteArrayElements
@@ -882,7 +882,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseCharArrayElements
@@ -936,7 +936,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseShortArrayElements
@@ -990,7 +990,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseIntArrayElements
@@ -1044,7 +1044,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseLongArrayElements
@@ -1099,7 +1099,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseFloatArrayElements
@@ -1153,7 +1153,7 @@
STD_FREE(elems);
break;
default:
- DIE(("Unexpected value of 'mode' input parameter"));
+ LDIE(48, "Unexpected value of 'mode' input parameter");
break;
}
} //ReleaseDoubleArrayElements
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp Sun Jul 27 08:03:39 2008
@@ -135,7 +135,7 @@
jvalue_args[arg_number].d = va_arg(args, jdouble);
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
break;
}
iter = advance_arg_iterator(iter);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp Sun Jul 27 08:03:39 2008
@@ -231,7 +231,7 @@
{
// If we ever get here, we are in an implemented JVMTI function
// By looking at the call stack and assembly it should be clear which one
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
jint JNICALL create_jvmti_environment(JavaVM *vm_ext, void **env, jint version)
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp Sun Jul 27 08:03:39 2008
@@ -835,7 +835,7 @@
return; // We'll go to updated regs
#else
// PLATFORM dependent code
- abort();
+ LDIE(45, "Not supported on this platform");
#endif
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp Sun Jul 27 08:03:39 2008
@@ -38,7 +38,7 @@
#include "jvmti_break_intf.h"
#include "jni_utils.h"
-#define NOT_IMPLEMENTED assert(0); abort()
+#define NOT_IMPLEMENTED LDIE(51, "Not implemented")
static inline short
jvmti_GetHalfWordValue( const unsigned char *bytecode,
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp Sun Jul 27 08:03:39 2008
@@ -189,7 +189,7 @@
return NULL;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
return exn_raised() ? NULL : wrap_primitive(jenv, result, (char)return_type);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp Sun Jul 27 08:03:39 2008
@@ -272,7 +272,7 @@
// returns the location of the n'th fp local
const LcgEM64TLoc * get_fp_local(const unsigned n) const {
// DO NOT SUPPORT FP LOCALS
- DIE(("Not supported"));
+ LDIE(44, "Not supported");
return NULL;
/*
assert(n < context.get_num_fr_locals());
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -1106,7 +1106,7 @@
emitter.ipf_stf(float_mem_size_d, mem_st_spill, mem_none, tmp_addr1->addr, src->addr, current_predicate);
}
else {
- DIE(("Unexpected kind")); // src shouldn't be a GR!
+ LDIE(73, "Unexpected kind"); // src shouldn't be a GR!
}
}
else if (dest->kind == LLK_Gr) {
@@ -1121,7 +1121,7 @@
emitter.ipf_mov(dest->addr, src->addr, current_predicate);
}
else {
- DIE(("Unexpected kind")); // src->kind shouldn't be LLK_Fr or LLK_Stk16
+ LDIE(73, "Unexpected kind"); // src->kind shouldn't be LLK_Fr or LLK_Stk16
}
}
else if (dest->kind == LLK_Fr) {
@@ -1142,7 +1142,7 @@
emitter.ipf_fmov(dest->addr, src->addr, current_predicate);
}
else {
- DIE(("Unexpected kind")); // src should not be GR!
+ LDIE(73, "Unexpected kind"); // src should not be GR!
}
}
else {
@@ -1686,7 +1686,7 @@
emitter.ipf_sxt(ext_size, dst_loc->addr, dst_loc->addr, current_predicate);
}
else {
- DIE(("Unexpected kind")); // dst_loc shouldn't be FR or STK16
+ LDIE(73, "Unexpected kind"); // dst_loc shouldn't be FR or STK16
}
} // ld
@@ -1752,7 +1752,7 @@
emitter.ipf_st(size, st_flag, mem_none, addr_loc->addr, src_loc->addr, current_predicate);
}
else {
- DIE(("Unexpected kind")); // src_loc shouldn't be FR or STK16!
+ LDIE(73, "Unexpected kind"); // src_loc shouldn't be FR or STK16!
}
} // st
@@ -1950,7 +1950,7 @@
call_addr_gr = tmp_res->addr;
}
else {
- DIE(("Unexpected kind")); // address can't be FP!
+ LDIE(73, "Unexpected kind"); // address can't be FP!
}
emitter.ipf_mtbr(tmp_br, call_addr_gr);
emitter.ipf_bri(br_cond, br_many, br_sptk, br_none, tmp_br);
@@ -1998,7 +1998,7 @@
call_addr_gr = tmp_res->addr;
}
else {
- DIE(("Unexpected kind")); // address can't be FP!
+ LDIE(73, "Unexpected kind"); // address can't be FP!
}
if (context.has_push_m2n()) {
emitter.ipf_mtbr(BRANCH_CALL_REG, call_addr_gr);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -140,19 +140,19 @@
void m2n_set_ip(M2nFrame* lm2nf, NativeCodePtr ip)
{
assert(lm2nf);
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
// sets pointer to the registers used for jvmti PopFrame
void set_pop_frame_registers(M2nFrame* m2nf, Registers* regs) {
// FIXME: not sure we want to support this function on IPF
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
// returns pointer to the registers used for jvmti PopFrame
Registers* get_pop_frame_registers(M2nFrame* m2nf) {
// FIXME: not sure we want to support this function on IPF
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
return 0;
}
@@ -466,27 +466,25 @@
void m2n_push_suspended_frame(M2nFrame* m2nf, Registers* regs)
{
- abort(); // FIXME: check that it works
+ LDIE(86, "check that it works"); // FIXME: check that it works
m2n_push_suspended_frame(p_TLS_vmthread, m2nf, regs);
}
void m2n_push_suspended_frame(VM_thread* thread, M2nFrame* m2nf, Registers* regs)
{
- // FIXME: not implemented
- assert(0);
- abort();
+ LDIE(51, "Not implemented");
}
M2nFrame* m2n_push_suspended_frame(Registers* regs)
{
- abort(); // FIXME: check that it works
+ LDIE(86, "check that it works"); // FIXME: check that it works
return m2n_push_suspended_frame(p_TLS_vmthread, regs);
}
M2nFrame* m2n_push_suspended_frame(VM_thread* thread, Registers* regs)
{
- abort(); // FIXME: check that it works
+ LDIE(86, "check that it works"); // FIXME: check that it works
M2nFrame* m2nf = (M2nFrame*)STD_MALLOC(sizeof(M2nFrame));
assert(m2nf);
m2n_push_suspended_frame(thread, m2nf, regs);
@@ -494,9 +492,7 @@
}
bool m2n_is_suspended_frame(M2nFrame * m2nf) {
- // FIXME: not implemented
- assert(0);
- abort();
+ LDIE(51, "Not implemented");
return false;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -435,13 +435,13 @@
// We do not support threads suspended in managed code yet.
StackIterator* si_create_from_registers(Registers*, bool is_ip_past, M2nFrame*)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
return NULL;
}
void si_fill_from_registers(StackIterator* si, Registers*, bool is_ip_past, M2nFrame*)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
size_t si_size(){
@@ -537,7 +537,7 @@
// 20040713 Experimental: set the code chunk in the stack iterator
void si_set_code_chunk_info(StackIterator* si, CodeChunkInfo* cci)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
CodeChunkInfo* si_get_code_chunk_info(StackIterator* si)
@@ -562,9 +562,7 @@
void** si_get_return_pointer(StackIterator* si)
{
- // FIXME: not implemented
- assert(0);
- abort();
+ LDIE(51, "Not implemented");
return 0;
}
@@ -612,11 +610,11 @@
void si_copy_to_registers(StackIterator* si, Registers*)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
void si_set_callback(StackIterator* si, NativeCodePtr* callback) {
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
}
extern "C" void do_loadrs_asm(int loadrs);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp Sun Jul 27 08:03:39 2008
@@ -331,7 +331,7 @@
// ? 20030613: I really don't want this code here, but for now...
Class_Handle UNUSED ch = type_info_get_class(tih);
assert(ch);
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
case VM_DATA_TYPE_MP:
case VM_DATA_TYPE_UP:
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp Sun Jul 27 08:03:39 2008
@@ -114,7 +114,7 @@
for(i=0; i<c->mp_size; i++)
// ? 20030710: GC V4 does not support this, and a static build fails on Linux
#ifdef PLATFORM_POSIX
- DIE(("Not supported on this platform"));
+ LDIE(45, "Not supported on this platform");
#else
gc_add_root_set_entry_managed_pointer(c->elements[c->obj_size+i], FALSE);
#endif
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp Sun Jul 27 08:03:39 2008
@@ -612,7 +612,7 @@
}
break;
default:
- DIE(("Unexpected type specifier"));
+ LDIE(62, "Unexpected type specifier");
}
return ACR_Okay;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -28,8 +28,7 @@
void *dummy_tls_func()
{
- assert(0);
- abort();
+ LDIE(56, "shouldn't get here");
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp Sun Jul 27 08:03:39 2008
@@ -50,7 +50,7 @@
}
void patch_code_with_threads_suspended(U_8* UNREF code_block, U_8* UNREF new_code, size_t UNREF size) {
- DIE(("Not supported on EM64T currently"));
+ LDIE(47, "Not supported on EM64T currently");
}
void compile_protect_arguments(Method_Handle method, GcFrame * gc) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp Sun Jul 27 08:03:39 2008
@@ -326,7 +326,7 @@
case VM_RT_NEW_VECTOR_USING_VTABLE:
return rth_get_lil_new_vector_using_vtable();
default:
- DIE(("Unexpected helper id %d", f));
+ LDIE(50, "Unexpected helper id {0}" << f);
return NULL;
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base_natives/java_lang_thread_em64t.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base_natives/java_lang_thread_em64t.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base_natives/java_lang_thread_em64t.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base_natives/java_lang_thread_em64t.h Sun Jul 27 08:03:39 2008
@@ -20,13 +20,13 @@
*/
-#include "clog.h"
+#include "cxxlog.h"
#ifdef PLATFORM_POSIX
-#define OS_HW_REGS_TO_VM_THREAD_REGS() DIE(("Not supported"));
-#define OS_VM_THREAD_REGS_TO_HW_REGS() DIE(("Not supported"));
+#define OS_HW_REGS_TO_VM_THREAD_REGS() LDIE(44, "Not supported");
+#define OS_VM_THREAD_REGS_TO_HW_REGS() LDIE(44, "Not supported");
#else
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp Sun Jul 27 08:03:39 2008
@@ -141,7 +141,7 @@
}
void patch_code_with_threads_suspended(U_8* UNREF code_block, U_8* UNREF new_code, size_t UNREF size) {
- DIE(("Not supported on IA32 currently"));
+ LDIE(46, "Not supported on IA32 currently");
}
// Convert a reference on the stack, if null, from a managed null
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp Sun Jul 27 08:03:39 2008
@@ -275,7 +275,7 @@
argId -= 2;
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
}
assert(argId >= 0);
@@ -331,7 +331,7 @@
break;
default:
- DIE(("Unexpected java type"));
+ LDIE(53, "Unexpected java type");
}
if (exn_raised()) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp Sun Jul 27 08:03:39 2008
@@ -66,7 +66,7 @@
ASSERT_THROW_AREA;
assert(!hythread_is_suspend_enabled());
exn_throw_by_name("java/lang/ClassCastException");
- DIE(("The last called function should not return"));
+ LDIE(49, "The last called function should not return");
} //vm_throw_java_lang_ClassCastException
#ifdef VM_STATS // exclude remark in release mode (defined but not used)
@@ -776,7 +776,7 @@
{
ASSERT_THROW_AREA;
exn_throw_by_name("java/lang/IncompatibleClassChangeError");
- DIE(("The last called function should not return"));
+ LDIE(49, "The last called function should not return");
} //vm_throw_java_lang_IncompatibleClassChangeError
@@ -850,7 +850,7 @@
ASSERT_THROW_AREA;
assert(!hythread_is_suspend_enabled());
exn_throw_by_name("java/lang/ArithmeticException");
- DIE(("The last called function should not return"));
+ LDIE(49, "The last called function should not return");
} //vm_throw_java_lang_ArithmeticException
@@ -948,7 +948,7 @@
{
TRACE("vm_throw_linking_exception, idx=" << cp_index << "\n");
vm_rt_class_throw_linking_error(clss, cp_index, opcode);
- DIE(("The last called function should not return"));
+ LDIE(49, "The last called function should not return");
} //vm_throw_linking_exception
@@ -1058,7 +1058,7 @@
case VM_RT_GC_HEAP_WRITE_REF:
return (void*)gc_heap_slot_write_ref;
default:
- DIE(("Unexpected helper id"));
+ LDIE(50, "Unexpected helper id {0}" << f);
return 0;
}
} //vm_helper_get_addr
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp Sun Jul 27 08:03:39 2008
@@ -134,7 +134,7 @@
s = mov(s, ebx_opnd, eax_opnd);
#else
// DO NOT RUN THIS OVERRIDE ON LINUX (it will not work)
- DIE(("Not supported for this platform"));
+ LDIE(45, "Not supported on this platform");
#endif // !PLATFORM_POSIX
s = mov(s, eax_opnd, M_Base_Opnd(ebx_reg, current_offset)); // ld r,[l1+current_offset]
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.h Sun Jul 27 08:03:39 2008
@@ -20,12 +20,12 @@
*/
-#include "clog.h"
+#include "cxxlog.h"
#ifdef PLATFORM_POSIX
-#define OS_HW_REGS_TO_VM_THREAD_REGS() DIE(("Not supported"));
-#define OS_VM_THREAD_REGS_TO_HW_REGS() DIE(("Not supported"));
+#define OS_HW_REGS_TO_VM_THREAD_REGS() LDIE(44, "Not supported");
+#define OS_VM_THREAD_REGS_TO_HW_REGS() LDIE(44, "Not supported");
#else
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -300,7 +300,7 @@
static unsigned default_override_size(Method *m)
{
- DIE(("Not implemented"));
+ LDIE(51, "Not implemented");
return 0;
}
@@ -415,7 +415,7 @@
case VM_DATA_TYPE_VALUE:
{
// 20030711: Must verify this with the calling convention
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
// This should never cause loading
Class_Handle c = type_info_get_class(tih);
assert(c);
@@ -423,7 +423,7 @@
break;
}
default:
- DIE(("Unexpected data type"));
+ LDIE(52, "Unexpected data type");
}
}
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Sun Jul 27 08:03:39 2008
@@ -1107,8 +1107,7 @@
return; // ichebyki
#if 1
// FIXME: code outdated
- assert(0);
- abort();
+ LDIE(85, "Outdated Code");
#else
const int thread_stack_key_reg = THREAD_ID_REG;
const int object_stack_key_addr_reg = SCRATCH_GENERAL_REG4;
@@ -1191,8 +1190,7 @@
{
return; // ichebyki
// FIXME: code is outdated
- assert(0);
- abort();
+ LDIE(85, "Outdated Code");
#if 0
const int object_stack_key_addr_reg = SCRATCH_GENERAL_REG3;
const int object_lock_info_reg = SCRATCH_GENERAL_REG4;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h Sun Jul 27 08:03:39 2008
@@ -249,7 +249,7 @@
void ipf_nop (EM_Syllable_Type tv, unsigned imm21=0)
{ encoder->ipf_nop(tv, imm21);
- DIE(("Not implemented")); //ToDo: nop assumes several form depending on which slot
+ LDIE(51, "Not implemented"); //ToDo: nop assumes several form depending on which slot
}
void ipf_add (unsigned dest, unsigned src1, unsigned src2, unsigned pred=0)
@@ -1354,7 +1354,7 @@
private:
- void operator delete (void *) { DIE(("Not implemented")); }
+ void operator delete (void *) { LDIE(51, "Not implemented"); }
protected: // data
@@ -1743,7 +1743,7 @@
}
private: // functions
- void operator delete (void *) { DIE(("Not implemented")); }
+ void operator delete (void *) { LDIE(51, "Not implemented"); }
virtual void emit_bundle(Bundle_IR * bundle);
virtual void place_instr_into_slot(Bundle_IR * bundle, int slot, Unsch_Instr_IR& instr, unsigned need_stop);
@@ -1889,7 +1889,7 @@
private:
- void operator delete (void *) { DIE(("Not implemented")); }
+ void operator delete (void *) { LDIE(51, "Not implemented"); }
// set whether instruction sets/resets reference
void set_def_ref (bool def_ref) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h Sun Jul 27 08:03:39 2008
@@ -39,7 +39,7 @@
// assure little-endian because get_slot01_code_image() needs it
}
- void code_emit() { DIE(("Not implemented")); } // shouldn't be called
+ void code_emit() { LDIE(51, "Not implemented"); } // shouldn't be called
void get_slot01_code_image(uint64 *p_code_image1, uint64 *p_code_image2) {
uint64& code_image1 = *p_code_image1;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp?rev=680117&r1=680116&r2=680117&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp Sun Jul 27 08:03:39 2008
@@ -215,8 +215,7 @@
{
TRACE2("signals", "Native breakpoint detected at " << regs->get_ip());
#ifdef _IPF_
- assert(0); // Not implemented
- abort();
+ LDIE(51, "Not implemented");
#endif
if (VM_Global_State::loader_env == NULL || interpreter_enabled())
@@ -242,8 +241,7 @@
{
TRACE2("signals", "ArithmeticException detected at " << regs->get_ip());
#ifdef _IPF_
- assert(0); // Not implemented
- abort();
+ LDIE(51, "Not implemented");
#endif
vm_thread_t vmthread = get_thread_ptr();