* src/vm/jit/replace.c (replace_find_replacement_point): Fixed assertion.

* src/mm/cacao-gc/gc.h [__M68K__]: Added this architecture.
* src/mm/cacao-gc/heap.c (heap_alloc_intern): Removed debug code.

--HG--
branch : exact-gc

diff --git a/src/mm/cacao-gc/gc.h b/src/mm/cacao-gc/gc.h
index c698b8588f8f4f259265cb033a9ad5418c071e05..f8057233d157aa77135799a4f113c5628695ee54 100644 (file)
--- a/src/mm/cacao-gc/gc.h
+++ b/src/mm/cacao-gc/gc.h
@@ -93,7 +93,7 @@
 # error "GC does only work with replacement enabled!"
 #endif
 
-#if 1 && !defined(__ALPHA__) && !defined(__I386__) && !defined(__POWERPC__) && !defined(__X86_64__)
+#if 1 && !defined(__ALPHA__) && !defined(__I386__) && !defined(__POWERPC__) && !defined(__X86_64__) && !defined(__M68K__)
 # error "GC was only ported to i386 so far!"
 #endif
 

diff --git a/src/mm/cacao-gc/heap.c b/src/mm/cacao-gc/heap.c
index e85032bbb78526c6508844c1ba710ef96f93c801..548860489bef1f4ae7eda40db0c45d338e19581d 100644 (file)
--- a/src/mm/cacao-gc/heap.c
+++ b/src/mm/cacao-gc/heap.c
@@ -202,7 +202,6 @@ static java_objectheader *heap_alloc_intern(u4 bytelength, regioninfo_t *region,
 
        /* unlock the region */
        LOCK_MONITOR_EXIT(region);
-       GC_LOG( region = NULL; );
 
        /* clear allocated memory region */
        GC_ASSERT(p);

diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c
index 2e76b3d402b71b01a0ae9d44dd27653438dd7b4c..fb353b538cd18d371b21dd0eabb41bac5c49a36b 100644 (file)
--- a/src/vm/jit/replace.c
+++ b/src/vm/jit/replace.c
@@ -2135,7 +2135,7 @@ rplpoint *replace_find_replacement_point_for_pc(codeinfo *code, u1 *pc)
                        found = rp;
        }
 
-       assert(found->pc + found->callsize >= pc);
+       assert(found == NULL || found->pc + found->callsize >= pc);
 
        return found;
 }