Print this page


Split Close
Expand all
Collapse all
          --- old/src/cpu/x86/vm/interp_masm_x86_64.cpp
          +++ new/src/cpu/x86/vm/interp_masm_x86_64.cpp
↓ open down ↓ 205 lines elided ↑ open up ↑
 206  206  }
 207  207  
 208  208  
 209  209  void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
 210  210                                                         int bcp_offset,
 211  211                                                         size_t index_size) {
 212  212    assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
 213  213    if (index_size == sizeof(u2)) {
 214  214      load_unsigned_short(index, Address(r13, bcp_offset));
 215  215    } else if (index_size == sizeof(u4)) {
 216      -    assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic");
      216 +    assert(EnableInvokeDynamic, "giant index used only for JSR 292");
 217  217      movl(index, Address(r13, bcp_offset));
 218  218      // Check if the secondary index definition is still ~x, otherwise
 219  219      // we have to change the following assembler code to calculate the
 220  220      // plain index.
 221  221      assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line");
 222  222      notl(index);  // convert to plain index
 223  223    } else if (index_size == sizeof(u1)) {
 224      -    assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles");
      224 +    assert(EnableInvokeDynamic, "tiny index used only for JSR 292");
 225  225      load_unsigned_byte(index, Address(r13, bcp_offset));
 226  226    } else {
 227  227      ShouldNotReachHere();
 228  228    }
 229  229  }
 230  230  
 231  231  
 232  232  void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache,
 233  233                                                             Register index,
 234  234                                                             int bcp_offset,
↓ open down ↓ 1278 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX