< prev index next >


Print this page


@@ -28,11 +28,11 @@
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
-#include "oops/markWord.hpp"
+#include "oops/markOop.hpp"
 #include "runtime/basicLock.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"

@@ -95,16 +95,16 @@
   // Save Rbox in Rscratch to be used for the cas operation
   mov(Rbox, Rscratch);
   // and mark it unlocked
-  or3(Rmark, markWord::unlocked_value, Rmark);
+  or3(Rmark, markOopDesc::unlocked_value, Rmark);
   // save unlocked object header into the displaced header location on the stack
   st_ptr(Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
-  // compare object markWord with Rmark and if equal exchange Rscratch with object markWord
+  // compare object markOop with Rmark and if equal exchange Rscratch with object markOop
   assert(mark_addr.disp() == 0, "cas must take a zero displacement");
   cas_ptr(mark_addr.base(), Rmark, Rscratch);
   // if compare/exchange succeeded we found an unlocked object and we now have locked it
   // hence we are done
   cmp(Rmark, Rscratch);

@@ -142,11 +142,11 @@
     ld_ptr(Rbox, BasicObjectLock::obj_offset_in_bytes(), Roop);
   // Check if it is still a light weight lock, this is is true if we see
-  // the stack address of the basicLock in the markWord of the object
+  // the stack address of the basicLock in the markOop of the object
   cas_ptr(mark_addr.base(), Rbox, Rmark);
   cmp(Rbox, Rmark);
   brx(Assembler::notEqual, false, Assembler::pn, slow_case);

@@ -177,11 +177,11 @@
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
   assert_different_registers(obj, klass, len, t1, t2);
   if (UseBiasedLocking && !len->is_valid()) {
     ld_ptr(klass, in_bytes(Klass::prototype_header_offset()), t1);
   } else {
-    set((intx)markWord::prototype().value(), t1);
+    set((intx)markOopDesc::prototype(), t1);
   st_ptr(t1, obj, oopDesc::mark_offset_in_bytes());
   if (UseCompressedClassPointers) {
     // Save klass
     mov(klass, t1);
< prev index next >