< prev index next >

src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Print this page
@@ -1320,11 +1320,10 @@
                                         masm->code(),
                                         vep_offset,
                                         frame_complete,
                                         stack_slots / VMRegImpl::slots_per_word,
                                         in_ByteSize(-1),
-                                        in_ByteSize(-1),
                                         (OopMapSet *) NULL);
    }
  
  
    ///////////////////////////////////////////////////////////////////////

@@ -1427,12 +1426,10 @@
    //     7| #slots == mult of 2 |
    //      |---------------------|
    //      | work space          |
    //     6| 2 slots = 8 bytes   |
    //      |---------------------|
-   //     5| lock box (if sync)  |
-   //      |---------------------| <- lock_slot_offset
    //     4| klass (if static)   |
    //      |---------------------| <- klass_slot_offset
    //     3| oopHandle area      |
    //      |                     |
    //      |                     |

@@ -1471,18 +1468,10 @@
      klass_slot_offset  = stack_slots;
      klass_offset       = klass_slot_offset * VMRegImpl::stack_slot_size;
      stack_slots       += VMRegImpl::slots_per_word;
    }
  
-   int lock_slot_offset = 0;
-   int lock_offset      = -1;
-   if (method->is_synchronized()) {                                        // 5)
-     lock_slot_offset   = stack_slots;
-     lock_offset        = lock_slot_offset * VMRegImpl::stack_slot_size;
-     stack_slots       += VMRegImpl::slots_per_word;
-   }
- 
    int workspace_slot_offset= stack_slots;                                 // 6)
    stack_slots         += 2;
  
    // Now compute actual number of stack words we need.
    // Round to align stack properly.

@@ -1707,14 +1696,10 @@
      // Load the oop for the object or class. R_carg2_classorobject contains
      // either the handlized oop from the incoming arguments or the handlized
      // class mirror (if the method is static).
      __ z_lg(r_oop, 0, Z_ARG2);
  
-     lock_offset = (lock_slot_offset * VMRegImpl::stack_slot_size);
-     // Get the lock box slot's address.
-     __ add2reg(r_box, lock_offset, Z_SP);
- 
      // Try fastpath for locking.
      // Fast_lock kills r_temp_1, r_temp_2. (Don't use R1 as temp, won't work!)
      __ compiler_fast_lock_object(r_oop, r_box, r_tmp1, r_tmp2);
      __ z_bre(done);
  

@@ -1730,11 +1715,10 @@
  
      RegisterSaver::save_live_registers(masm, RegisterSaver::arg_registers);
  
      // Prepare arguments for call.
      __ z_lg(Z_ARG1, 0, Z_ARG2); // Ynboxed class mirror or unboxed object.
-     __ add2reg(Z_ARG2, lock_offset, oldSP);
      __ z_lgr(Z_ARG3, Z_thread);
  
      __ set_last_Java_frame(oldSP, Z_R10 /* gc map pc */);
  
      // Do the call.

@@ -1905,13 +1889,10 @@
      int   offset = method_is_static ? klass_offset : receiver_offset;
  
      assert(offset != -1, "");
      __ z_lg(r_oop, offset, Z_SP);
  
-     // ... and address of lock object box.
-     __ add2reg(r_box, lock_offset, Z_SP);
- 
      // Try fastpath for unlocking.
      __ compiler_fast_unlock_object(r_oop, r_box, r_tmp1, r_tmp2); // Don't use R1 as temp.
      __ z_bre(done);
  
      // Slow path for unlocking.

@@ -1931,12 +1912,11 @@
  
      // Inline a special case of call_VM that disallows any pending_exception.
  
      // Get locked oop from the handle we passed to jni.
      __ z_lg(Z_ARG1, offset, Z_SP);
-     __ add2reg(Z_ARG2, lock_offset, Z_SP);
-     __ z_lgr(Z_ARG3, Z_thread);
+     __ z_lgr(Z_ARG2, Z_thread);
  
      __ load_const_optimized(Z_R1_scratch, CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C));
  
      __ call(Z_R1_scratch);
  

@@ -2039,11 +2019,10 @@
                                              masm->code(),
                                              (int)(wrapper_VEPStart-wrapper_CodeStart),
                                              (int)(wrapper_FrameDone-wrapper_CodeStart),
                                              stack_slots / VMRegImpl::slots_per_word,
                                              (method_is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
-                                             in_ByteSize(lock_offset),
                                              oop_maps);
  
    return nm;
  }
  
< prev index next >