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 ↓ 207 lines elided ↑ open up ↑
 208  208    bswapl(reg);
 209  209    shrl(reg, 16);
 210  210  }
 211  211  
 212  212  
 213  213  void InterpreterMacroAssembler::get_cache_index_at_bcp(Register reg, int bcp_offset, size_t index_size) {
 214  214    assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
 215  215    if (index_size == sizeof(u2)) {
 216  216      load_unsigned_short(reg, Address(rsi, bcp_offset));
 217  217    } else if (index_size == sizeof(u4)) {
 218      -    assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic");
      218 +    assert(EnableInvokeDynamic, "giant index used only for JSR 292");
 219  219      movl(reg, Address(rsi, bcp_offset));
 220  220      // Check if the secondary index definition is still ~x, otherwise
 221  221      // we have to change the following assembler code to calculate the
 222  222      // plain index.
 223  223      assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line");
 224  224      notl(reg);  // convert to plain index
 225  225    } else if (index_size == sizeof(u1)) {
 226      -    assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles");
      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  236    assert(cache != index, "must use different registers");
↓ open down ↓ 1194 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX