X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvm%2Fjit%2Fs390%2Fmd.c;h=5e11280ac1dc33ceeb731e5cd3ec03929b100126;hb=5d22373538ae0e6903b8d3c3be1c1643135d856f;hp=3959f0a91b87a2398462fc32b7da77c4c8187516;hpb=70bd214ee92d267a4bcfb4dbe2dc6e8e0d2c6a51;p=cacao.git

diff --git a/src/vm/jit/s390/md.c b/src/vm/jit/s390/md.c
index 3959f0a91..5e11280ac 100644
--- a/src/vm/jit/s390/md.c
+++ b/src/vm/jit/s390/md.c
@@ -34,9 +34,9 @@
 
 #include "vm/jit/s390/md-abi.h"
 
-#include "threads/thread.h"
+#include "threads/thread.hpp"
 
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
 #include "vm/signallocal.h"
 
 #include "vm/jit/asmpart.h"
@@ -44,15 +44,15 @@
 #include "vm/jit/executionstate.h"
 #include "vm/jit/methodheader.h"
 #include "vm/jit/methodtree.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/stacktrace.hpp"
 #include "vm/jit/trap.h"
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vmcore/options.h" /* XXX debug */
+#include "vm/options.h" /* XXX debug */
 #include "vm/jit/disass.h" /* XXX debug */
 #endif
 
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/codegen-common.hpp"
 #include "vm/jit/s390/codegen.h"
 #include "vm/jit/s390/md.h"
 
@@ -412,27 +412,6 @@ void md_executionstate_write(executionstate_t* es, void* context)
 }
 
 
-#if defined(ENABLE_THREADS)
-void md_critical_section_restart(ucontext_t *_uc)
-{
-	mcontext_t *_mc;
-	u1         *pc;
-	void       *npc;
-
-	_mc = &_uc->uc_mcontext;
-
-	pc = (u1 *)_mc->psw.addr;
-
-	npc = critical_find_restart_point(pc);
-
-	if (npc != NULL) {
-		log_println("%s: pc=%p, npc=%p", __FUNCTION__, pc, npc);
-		_mc->psw.addr = (ptrint) npc;
-	}
-}
-#endif
-
-
 /* md_jit_method_patch_address *************************************************
 
    Gets the patch address of the currently compiled method. The offset