Mercurial > hg > release > icedtea6-1.12

changeset 2746:7818ff550f62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More volatile tidying-up.
author aph
date Mon, 05 Dec 2011 10:48:00 -0500
parents c3830a06fd60
children 3ca12f50fff3
files arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
diffstat 3 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Mon Dec 05 10:32:03 2011 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Mon Dec 05 10:48:00 2011 -0500
@@ -1967,7 +1967,6 @@
 
 	str	stack, [tmp_xxx, #THREAD_JAVA_SP]
 
-	dmb_st
 	mov	r0, #0	@ deoptimized_frames = 0
 	ldmfd	arm_sp!, {fast_regset, pc}
 1:
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Dec 05 10:32:03 2011 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Dec 05 10:48:00 2011 -0500
@@ -3221,7 +3221,6 @@
 
 	bl	fast_normal_entry
 
-	dmb_st
 	mov	r0, #0	@ deoptimized_frames = 0
 	ldmfd	arm_sp!, {regset, pc}
 
@@ -3388,7 +3387,6 @@
 
 	str	r1, [tmp_xxx, #THREAD_JAVA_SP]
 
-	dmb_st
 	mov	r0, #0	@ deoptimized_frames = 0
 	ldmfd	arm_sp!, {fast_regset, pc}
 
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Mon Dec 05 10:32:03 2011 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Mon Dec 05 10:48:00 2011 -0500
@@ -1,5 +1,3 @@
-#include <iostream>
-
 /*
  * Copyright 2009, 2010 Edward Nevill
  *
@@ -5815,8 +5813,6 @@
 
 	if (cache->is_volatile())
 	  fullBarrier(jinfo->codebuf);
-	else
-	  storeBarrier(jinfo->codebuf);
 
 	break;
       }
@@ -5892,8 +5888,6 @@
 
 	if (cache->is_volatile())
 	  fullBarrier(jinfo->codebuf);
-	else
-	  storeBarrier(jinfo->codebuf);
 
 	break;
       }
@@ -5952,8 +5946,6 @@
 	      ldrsh_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	    else
 	      ldr_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
-	    if (entry->is_volatile())
-	      fullBarrier(jinfo->codebuf);
 	    break;
 	  }
 	}
@@ -6076,8 +6068,6 @@
 		ldrsh_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
 	      else
 		ldr_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0);
-	      if (entry->is_volatile())
-		fullBarrier(jinfo->codebuf);
 	      break;
 	    }
 	  }