src/hotspot/cpu/x86/nativeInst_x86.hpp

rev 48494 : 8195112: x86 (32 bit): implementation for Thread-local handshakes
Reviewed-by:

*** 702,719 ****
  }
  inline bool NativeInstruction::is_far_jump()     { return is_mov_literal64(); }
  inline bool NativeInstruction::is_cond_jump()    { return (int_at(0) & 0xF0FF) == 0x800F /* long jump */ ||
                                                            (ubyte_at(0) & 0xF0) == 0x70;  /* short jump */ }
  inline bool NativeInstruction::is_safepoint_poll() {
- #ifdef AMD64
    if (SafepointMechanism::uses_thread_local_poll()) {
      const bool has_rex_prefix = ubyte_at(0) == NativeTstRegMem::instruction_rex_b_prefix;
      const int test_offset = has_rex_prefix ? 1 : 0;
      const bool is_test_opcode = ubyte_at(test_offset) == NativeTstRegMem::instruction_code_memXregl;
      const bool is_rax_target = (ubyte_at(test_offset + 1) & NativeTstRegMem::modrm_mask) == NativeTstRegMem::modrm_reg;
      return is_test_opcode && is_rax_target;
    }
    // Try decoding a near safepoint first:
    if (ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl &&
        ubyte_at(1) == 0x05) { // 00 rax 101
      address fault = addr_at(6) + int_at(2);
      NOT_JVMCI(assert(!Assembler::is_polling_page_far(), "unexpected poll encoding");)
--- 702,723 ----
  }
  inline bool NativeInstruction::is_far_jump()     { return is_mov_literal64(); }
  inline bool NativeInstruction::is_cond_jump()    { return (int_at(0) & 0xF0FF) == 0x800F /* long jump */ ||
                                                            (ubyte_at(0) & 0xF0) == 0x70;  /* short jump */ }
  inline bool NativeInstruction::is_safepoint_poll() {
    if (SafepointMechanism::uses_thread_local_poll()) {
+ #ifdef AMD64
      const bool has_rex_prefix = ubyte_at(0) == NativeTstRegMem::instruction_rex_b_prefix;
      const int test_offset = has_rex_prefix ? 1 : 0;
+ #else
+     const int test_offset = 0;
+ #endif
      const bool is_test_opcode = ubyte_at(test_offset) == NativeTstRegMem::instruction_code_memXregl;
      const bool is_rax_target = (ubyte_at(test_offset + 1) & NativeTstRegMem::modrm_mask) == NativeTstRegMem::modrm_reg;
      return is_test_opcode && is_rax_target;
    }
+ #ifdef AMD64
    // Try decoding a near safepoint first:
    if (ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl &&
        ubyte_at(1) == 0x05) { // 00 rax 101
      address fault = addr_at(6) + int_at(2);
      NOT_JVMCI(assert(!Assembler::is_polling_page_far(), "unexpected poll encoding");)