From a2688c310d158d99e751cdf8287a578f1b885290 Mon Sep 17 00:00:00 2001
From: michi <none@none>
Date: Thu, 7 Jun 2007 11:29:38 +0000
Subject: [PATCH] * 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
---
 src/mm/cacao-gc/gc.h   | 2 +-
 src/mm/cacao-gc/heap.c | 1 -
 src/vm/jit/replace.c   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mm/cacao-gc/gc.h b/src/mm/cacao-gc/gc.h
index c698b8588..f8057233d 100644
--- 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 e85032bbb..548860489 100644
--- 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 2e76b3d40..fb353b538 100644
--- 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;
 }
-- 
2.25.1