X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fcodegen-common.cpp;fp=src%2Fvm%2Fjit%2Fcodegen-common.cpp;h=5536ba819c29871a28a64885a8905814e161f586;hb=735bdda890a385d1fa9cc532faadbbc96f2d1218;hp=a44c52fb3b6da56571e88a9262d095303d62a255;hpb=d62d56aa9150bb2156dac82966795fdcbd7562e0;p=cacao.git

diff --git a/src/vm/jit/codegen-common.cpp b/src/vm/jit/codegen-common.cpp
index a44c52fb3..5536ba819 100644
--- a/src/vm/jit/codegen-common.cpp
+++ b/src/vm/jit/codegen-common.cpp
@@ -1507,16 +1507,20 @@ bool codegen_emit(jitdata *jd)
 #if defined(__I386__)
 				// Generate architecture specific instructions.
 				codegen_emit_instruction(jd, iptr);
+				break;
 #else
+			{
+				fieldinfo* fi;
+				patchref_t* pr;
 				if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 					unresolved_field* uf = iptr->sx.s23.s3.uf;
 					fieldtype = uf->fieldref->parseddesc.fd->type;
 					disp      = dseg_add_unique_address(cd, 0);
 
-					patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
+					pr = patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 				}
 				else {
-					fieldinfo* fi = iptr->sx.s23.s3.fmiref->p.field;
+					fi        = iptr->sx.s23.s3.fmiref->p.field;
 					fieldtype = fi->type;
 					disp      = dseg_add_address(cd, fi->value);
 
@@ -1527,6 +1531,10 @@ bool codegen_emit(jitdata *jd)
 					}
 				}
 
+#if defined(USES_PATCHABLE_MEMORY_BARRIER)
+				codegen_emit_patchable_barrier(iptr, cd, pr, fi);
+#endif
+
 				// XXX X86_64: Here We had this:
 				/* This approach is much faster than moving the field
 				   address inline into a register. */
@@ -1556,24 +1564,30 @@ bool codegen_emit(jitdata *jd)
 					break;
 				}
 				emit_store_dst(jd, iptr, d);
-#endif
 				break;
+			}
+#endif
 
 			case ICMD_PUTSTATIC:  /* ..., value  ==> ...                      */
 
 #if defined(__I386__)
 				// Generate architecture specific instructions.
 				codegen_emit_instruction(jd, iptr);
+				break;
 #else
+			{
+				fieldinfo* fi;
+				patchref_t* pr;
+
 				if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 					unresolved_field* uf = iptr->sx.s23.s3.uf;
 					fieldtype = uf->fieldref->parseddesc.fd->type;
 					disp      = dseg_add_unique_address(cd, 0);
 
-					patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
+					pr = patcher_add_patch_ref(jd, PATCHER_get_putstatic, uf, disp);
 				}
 				else {
-					fieldinfo* fi = iptr->sx.s23.s3.fmiref->p.field;
+					fi = iptr->sx.s23.s3.fmiref->p.field;
 					fieldtype = fi->type;
 					disp      = dseg_add_address(cd, fi->value);
 
@@ -1612,8 +1626,12 @@ bool codegen_emit(jitdata *jd)
 					M_DST(s1, REG_ITMP1, 0);
 					break;
 				}
+#if defined(USES_PATCHABLE_MEMORY_BARRIER)
+				codegen_emit_patchable_barrier(iptr, cd, pr, fi);
 #endif
 				break;
+			}
+#endif
 
 			/* branch operations **********************************************/