Print this page


Split Close
Expand all
Collapse all
          --- old/src/cpu/x86/vm/interp_masm_x86_32.cpp
          +++ new/src/cpu/x86/vm/interp_masm_x86_32.cpp
↓ open down ↓ 225 lines elided ↑ open up ↑
 226  226      assert(EnableInvokeDynamic, "tiny index used only for JSR 292");
 227  227      load_unsigned_byte(reg, Address(rsi, bcp_offset));
 228  228    } else {
 229  229      ShouldNotReachHere();
 230  230    }
 231  231  }
 232  232  
 233  233  
 234  234  void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register index,
 235  235                                                             int bcp_offset, size_t index_size) {
 236      -  assert(cache != index, "must use different registers");
      236 +  assert_different_registers(cache, index);
 237  237    get_cache_index_at_bcp(index, bcp_offset, index_size);
 238  238    movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
 239  239    assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below");
 240  240    shlptr(index, 2); // convert from field index to ConstantPoolCacheEntry index
 241  241  }
 242  242  
 243  243  
      244 +void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register cache,
      245 +                                                                        Register index,
      246 +                                                                        Register bytecode,
      247 +                                                                        int byte_no,
      248 +                                                                        int bcp_offset,
      249 +                                                                        size_t index_size) {
      250 +  get_cache_and_index_at_bcp(cache, index, bcp_offset, index_size);
      251 +  movptr(bytecode, Address(cache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
      252 +  const int shift_count = (1 + byte_no) * BitsPerByte;
      253 +  shrptr(bytecode, shift_count);
      254 +  andptr(bytecode, 0xFF);
      255 +}
      256 +
      257 +
 244  258  void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp,
 245  259                                                                 int bcp_offset, size_t index_size) {
 246  260    assert(cache != tmp, "must use different register");
 247  261    get_cache_index_at_bcp(tmp, bcp_offset, index_size);
 248  262    assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below");
 249  263                                 // convert from field index to ConstantPoolCacheEntry index
 250  264                                 // and from word offset to byte offset
 251  265    shll(tmp, 2 + LogBytesPerWord);
 252  266    movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
 253  267                                 // skip past the header
↓ open down ↓ 1151 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX