From: Christian Thalinger <twisti@complang.tuwien.ac.at>
Date: Sat, 13 Oct 2007 17:22:07 +0000 (+0200)
Subject: * src/vm/exceptions.c (exceptions_handle_exception) [__ARM__]: Added
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=2f47610340df6a67ce16e8ee54271f1234b794e3;p=cacao.git

* src/vm/exceptions.c (exceptions_handle_exception) [__ARM__]: Added
#ifdef to the -8 path.

* src/vm/jit/arm/codegen.c (codegen_emit): Added +1 to rd->memuse for
synchronizedoffset.
---

diff --git a/src/vm/exceptions.c b/src/vm/exceptions.c
index 1139c5129..bab903ce0 100644
--- a/src/vm/exceptions.c
+++ b/src/vm/exceptions.c
@@ -1872,7 +1872,7 @@ u1 *exceptions_handle_exception(java_object_t *xptro, u1 *xpc, u1 *pv, u1 *sp)
 	if (code_is_synchronized(code)) {
 		/* Get synchronization object. */
 
-# if (defined(__MIPS__) && (SIZEOF_VOID_P == 4)) || defined(__I386__) || defined(__S390__) || defined(__POWERPC__)
+# if defined(__ARM__) || (defined(__MIPS__) && (SIZEOF_VOID_P == 4)) || defined(__I386__) || defined(__S390__) || defined(__POWERPC__)
 		/* XXX change this if we ever want to use 4-byte stackslots */
 		o = *((java_object_t **) (sp + code->synchronizedoffset - 8));
 # else
diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c
index 463d36576..048389eb9 100644
--- a/src/vm/jit/arm/codegen.c
+++ b/src/vm/jit/arm/codegen.c
@@ -154,7 +154,7 @@ bool codegen_emit(jitdata *jd)
 	*/
 	/* XXX Remove this "offset by one". */
 
-	code->synchronizedoffset = rd->memuse * 8 + 4;
+	code->synchronizedoffset = (rd->memuse + 1) * 8;
 
 	/* REMOVEME: We still need it for exception handling in assembler. */