From: Stefan Ring <stefan@complang.tuwien.ac.at>
Date: Wed, 30 Apr 2008 18:38:07 +0000 (+0200)
Subject: Backed out changeset ecf451e74e7e
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=2c4a017a72eebd5da6d62be39e7ea0181db2a827

Backed out changeset ecf451e74e7e
---

diff --git a/src/vm/jit/i386/machine-instr.h b/src/vm/jit/i386/machine-instr.h
index eb3706400..1499e961f 100644
--- a/src/vm/jit/i386/machine-instr.h
+++ b/src/vm/jit/i386/machine-instr.h
@@ -16,6 +16,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() /* nothing */
 #define MEMORY_BARRIER() __asm__ __volatile__ ( \
-		"mfence" : : : "memory" );
+		"lock; add $0, 0(%%esp)" : : : "memory" );
 
 #endif
diff --git a/src/vmcore/linker.c b/src/vmcore/linker.c
index 3468558c9..e8b985aad 100644
--- a/src/vmcore/linker.c
+++ b/src/vmcore/linker.c
@@ -1214,7 +1214,6 @@ static void linker_compute_class_values(classinfo *c)
 {
 	classinfo *subs;
 
-	/*printf("computing class %s\n", c->name->text);*/
 	c->vftbl->baseval = ++classvalue;
 
 	subs = c->sub;
diff --git a/tests/threads/threadInterrupt.java b/tests/threads/threadInterrupt.java
index cbff11317..ef4108379 100644
--- a/tests/threads/threadInterrupt.java
+++ b/tests/threads/threadInterrupt.java
@@ -1,10 +1,3 @@
-// This test has been added because of a bug in CACAO that allowed threads
-// blocked inside monitorenter to be interrupted. In the presence of the bug,
-// the program would not exit.
-//
-// The bug has been fixed as part of the sable lock implementation.
-// hg revision 2988182011bb ff (Wed Feb 06 18:46:34 2008 +0100)
-
 public class threadInterrupt {
 	public static class firstthread implements Runnable {
 		private threadInterrupt s;
diff --git a/tests/threads/waitAndInterrupt.java b/tests/threads/waitAndInterrupt.java
index 6a1ac0bde..2f68b7558 100644
--- a/tests/threads/waitAndInterrupt.java
+++ b/tests/threads/waitAndInterrupt.java
@@ -1,6 +1,3 @@
-// This should run forever. If it stops, that's a good indication for a bug in
-// the VM.
-//
 // This test grew a bit more elaborate than anticipated...
 // It verifies that the JVM handles properly the case of a thread being
 // interrupted and notified at the same time.