*** old/src/hotspot/cpu/sparc/jvmciCodeInstaller_sparc.cpp	Thu Mar 28 11:22:10 2019
--- new/src/hotspot/cpu/sparc/jvmciCodeInstaller_sparc.cpp	Thu Mar 28 11:22:10 2019

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 29,39 ****
--- 29,39 ----
  #include "runtime/handles.inline.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/align.hpp"
  #include "vmreg_sparc.inline.hpp"
  
! jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, Handle method, TRAPS) {
! jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, JVMCIObject method, JVMCI_TRAPS) {
    if (inst->is_call() || inst->is_jump()) {
      return pc_offset + NativeCall::instruction_size;
    } else if (inst->is_call_reg()) {
      return pc_offset + NativeCallReg::instruction_size;
    } else if (inst->is_sethi()) {

*** 42,56 ****
--- 42,56 ----
      JVMCI_ERROR_0("unsupported type of instruction for call site");
      return 0;
    }
  }
  
! void CodeInstaller::pd_patch_OopConstant(int pc_offset, Handle constant, TRAPS) {
! void CodeInstaller::pd_patch_OopConstant(int pc_offset, JVMCIObject constant, JVMCI_TRAPS) {
    address pc = _instructions->start() + pc_offset;
!   Handle obj(THREAD, HotSpotObjectConstantImpl::object(constant));
!   Handle obj = jvmci_env()->asConstant(constant, JVMCI_CHECK);
    jobject value = JNIHandles::make_local(obj());
!   if (HotSpotObjectConstantImpl::compressed(constant)) {
!   if (jvmci_env()->get_HotSpotObjectConstantImpl_compressed(constant)) {
      int oop_index = _oop_recorder->find_index(value);
      RelocationHolder rspec = oop_Relocation::spec(oop_index);
      _instructions->relocate(pc, rspec, 1);
    } else {
      NativeMovConstReg* move = nativeMovConstReg_at(pc);

*** 62,87 ****
--- 62,87 ----
      _instructions->relocate(pc + NativeMovConstReg::sethi_offset, rspec);
      _instructions->relocate(pc + NativeMovConstReg::add_offset, rspec);
    }
  }
  
! void CodeInstaller::pd_patch_MetaspaceConstant(int pc_offset, Handle constant, TRAPS) {
! void CodeInstaller::pd_patch_MetaspaceConstant(int pc_offset, JVMCIObject constant, JVMCI_TRAPS) {
    address pc = _instructions->start() + pc_offset;
!   if (HotSpotMetaspaceConstantImpl::compressed(constant)) {
!   if (jvmci_env()->get_HotSpotMetaspaceConstantImpl_compressed(constant)) {
      NativeMovConstReg32* move = nativeMovConstReg32_at(pc);
!     narrowKlass narrowOop = record_narrow_metadata_reference(_instructions, pc, constant, JVMCI_CHECK);
      move->set_data((intptr_t)narrowOop);
      TRACE_jvmci_3("relocating (narrow metaspace constant) at " PTR_FORMAT "/0x%x", p2i(pc), narrowOop);
    } else {
      NativeMovConstReg* move = nativeMovConstReg_at(pc);
!     void* reference = record_metadata_reference(_instructions, pc, constant, JVMCI_CHECK);
      move->set_data((intptr_t)reference);
      TRACE_jvmci_3("relocating (metaspace constant) at " PTR_FORMAT "/" PTR_FORMAT, p2i(pc), p2i(reference));
    }
  }
  
! void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, JVMCI_TRAPS) {
    address pc = _instructions->start() + pc_offset;
    NativeInstruction* inst = nativeInstruction_at(pc);
    NativeInstruction* inst1 = nativeInstruction_at(pc + 4);
    if(inst->is_sethi() && inst1->is_nop()) {
        address const_start = _constants->start();

*** 98,108 ****
--- 98,108 ----
      load->set_offset(- (const_size - data_offset + Assembler::min_simm13()));
      TRACE_jvmci_3("relocating ld at " PTR_FORMAT " (+%d) with destination at %d", p2i(pc), pc_offset, data_offset);
    }
  }
  
! void CodeInstaller::pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination, JVMCI_TRAPS) {
    address pc = (address) inst;
    if (inst->is_call()) {
      NativeCall* call = nativeCall_at(pc);
      call->set_destination((address) foreign_call_destination);
      _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec());

*** 114,129 ****
--- 114,129 ----
      JVMCI_ERROR("unknown call or jump instruction at " PTR_FORMAT, p2i(pc));
    }
    TRACE_jvmci_3("relocating (foreign call) at " PTR_FORMAT, p2i(inst));
  }
  
! void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &, Handle hotspot_method, jint pc_offset, TRAPS) {
! void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &, JVMCIObject hotspot_method, jint pc_offset, JVMCI_TRAPS) {
  #ifdef ASSERT
    Method* method = NULL;
    // we need to check, this might also be an unresolved method
!   if (hotspot_method->is_a(HotSpotResolvedJavaMethodImpl::klass())) {
!     method = getMethodFromHotSpotMethod(hotspot_method());
!   if (JVMCIENV->isa_HotSpotResolvedJavaMethodImpl(hotspot_method)) {
!     method = JVMCIENV->asMethod(hotspot_method);
    }
  #endif
    switch (_next_call_type) {
      case INLINE_INVOKE:
        break;

*** 153,163 ****
--- 153,163 ----
        JVMCI_ERROR("invalid _next_call_type value");
        break;
    }
  }
  
! void CodeInstaller::pd_relocate_poll(address pc, jint mark, JVMCI_TRAPS) {
    switch (mark) {
      case POLL_NEAR:
        JVMCI_ERROR("unimplemented");
        break;
      case POLL_FAR:

*** 174,184 ****
--- 174,184 ----
        break;
    }
  }
  
  // convert JVMCI register indices (as used in oop maps) to HotSpot registers
! VMReg CodeInstaller::get_hotspot_reg(jint jvmci_reg, JVMCI_TRAPS) {
    // JVMCI Registers are numbered as follows:
    //   0..31: Thirty-two General Purpose registers (CPU Registers)
    //   32..63: Thirty-two single precision float registers
    //   64..95: Thirty-two double precision float registers
    //   96..111: Sixteen quad precision float registers