jdk-sandbox: comparison src/hotspot/cpu/aarch64/sharedRuntime

equal deleted inserted replaced

-:0a8436eda2fa
+:01bca26734bb
 #include "adfiles/ad_aarch64.hpp"
 #include "opto/runtime.hpp"
 #endif
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciJavaClasses.hpp"
-#endif
-#ifdef BUILTIN_SIM
-#include "../../../../../../simulator/simulator.hpp"
 #endif
 #define __ masm->
 const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
 #endif
 __ mov(c_rarg0, rmethod);
 __ mov(c_rarg1, lr);
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::fixup_callers_callsite)));
-__ blrt(rscratch1, 2, 0, 0);
+__ blr(rscratch1);
 __ maybe_isb();
 __ pop_CPU_state();
 // restore sp
 __ leave();
 __ str(rmethod, Address(rthread, JavaThread::callee_target_offset()));
 __ br(rscratch1);
 }
-#ifdef BUILTIN_SIM
-static void generate_i2c_adapter_name(char *result, int total_args_passed, const BasicType *sig_bt)
-{
-strcpy(result, "i2c(");
-int idx = 4;
-for (int i = 0; i < total_args_passed; i++) {
-switch(sig_bt[i]) {
-case T_BOOLEAN:
-result[idx++] = 'Z';
-break;
-case T_CHAR:
-result[idx++] = 'C';
-break;
-case T_FLOAT:
-result[idx++] = 'F';
-break;
-case T_DOUBLE:
-assert((i < (total_args_passed - 1)) && (sig_bt[i+1] == T_VOID),
-"double must be followed by void");
-i++;
-result[idx++] = 'D';
-break;
-case T_BYTE:
-result[idx++] = 'B';
-break;
-case T_SHORT:
-result[idx++] = 'S';
-break;
-case T_INT:
-result[idx++] = 'I';
-break;
-case T_LONG:
-assert((i < (total_args_passed - 1)) && (sig_bt[i+1] == T_VOID),
-"long must be followed by void");
-i++;
-result[idx++] = 'L';
-break;
-case T_OBJECT:
-result[idx++] = 'O';
-break;
-case T_ARRAY:
-result[idx++] = '[';
-break;
-case T_ADDRESS:
-result[idx++] = 'P';
-break;
-case T_NARROWOOP:
-result[idx++] = 'N';
-break;
-case T_METADATA:
-result[idx++] = 'M';
-break;
-case T_NARROWKLASS:
-result[idx++] = 'K';
-break;
-default:
-result[idx++] = '?';
-break;
-}
-}
-result[idx++] = ')';
-result[idx] = '\0';
-}
-#endif
 // ---------------------------------------------------------------
 AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 int total_args_passed,
 int comp_args_on_stack,
 const BasicType *sig_bt,
 const VMRegPair *regs,
 AdapterFingerPrint* fingerprint) {
 address i2c_entry = __ pc();
-#ifdef BUILTIN_SIM
-char *name = NULL;
-AArch64Simulator *sim = NULL;
-size_t len = 65536;
-if (NotifySimulator) {
-name = NEW_C_HEAP_ARRAY(char, len, mtInternal);
-}
-if (name) {
-generate_i2c_adapter_name(name, total_args_passed, sig_bt);
-sim = AArch64Simulator::get_current(UseSimulatorCache, DisableBCCheck);
-sim->notifyCompile(name, i2c_entry);
-}
-#endif
 gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
 address c2i_unverified_entry = __ pc();
 Label skip_fixup;
 __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
 __ block_comment("} c2i_unverified_entry");
 }
 address c2i_entry = __ pc();
-#ifdef BUILTIN_SIM
-if (name) {
-name[0] = 'c';
-name[2] = 'i';
-sim->notifyCompile(name, c2i_entry);
-FREE_C_HEAP_ARRAY(char, name, mtInternal);
-}
-#endif
 // Class initialization barrier for static methods
 address c2i_no_clinit_check_entry = NULL;
 if (VM_Version::supports_fast_class_init_checks()) {
 Label L_skip_barrier;
 __ far_call(RuntimeAddress(dest));
 } else {
 assert((unsigned)gpargs < 256, "eek!");
 assert((unsigned)fpargs < 32, "eek!");
 __ lea(rscratch1, RuntimeAddress(dest));
-if (UseBuiltinSim)   __ mov(rscratch2, (gpargs << 6) | (fpargs << 2) | type);
+__ blr(rscratch1);
-__ blrt(rscratch1, rscratch2);
 __ maybe_isb();
 }
 }
 static void verify_oop_args(MacroAssembler* masm,
 const methodHandle& method,
 int compile_id,
 BasicType* in_sig_bt,
 VMRegPair* in_regs,
 BasicType ret_type) {
-#ifdef BUILTIN_SIM
-if (NotifySimulator) {
-// Names are up to 65536 chars long.  UTF8-coded strings are up to
-// 3 bytes per character.  We concatenate three such strings.
-// Yes, I know this is ridiculous, but it's debug code and glibc
-// allocates large arrays very efficiently.
-size_t len = (65536 * 3) * 3;
-char *name = new char[len];
-strncpy(name, method()->method_holder()->name()->as_utf8(), len);
-strncat(name, ".", len);
-strncat(name, method()->name()->as_utf8(), len);
-strncat(name, method()->signature()->as_utf8(), len);
-AArch64Simulator::get_current(UseSimulatorCache, DisableBCCheck)->notifyCompile(name, __ pc());
-delete[] name;
-}
-#endif
 if (method->is_method_handle_intrinsic()) {
 vmIntrinsics::ID iid = method->intrinsic_id();
 intptr_t start = (intptr_t)__ pc();
 int vep_offset = ((intptr_t)__ pc()) - start;
 __ sub(sp, sp, stack_size - 2*wordSize);
 // Frame is now completed as far as size and linkage.
 int frame_complete = ((intptr_t)__ pc()) - start;
-// record entry into native wrapper code
-if (NotifySimulator) {
-__ notify(Assembler::method_entry);
-}
 // We use r20 as the oop handle for the receiver/klass
 // It is callee save so it survives the call to native
 const Register oop_handle_reg = r20;
 // Any exception pending?
 __ ldr(rscratch1, Address(rthread, in_bytes(Thread::pending_exception_offset())));
 __ cbnz(rscratch1, exception_pending);
 }
-// record exit from native wrapper code
-if (NotifySimulator) {
-__ notify(Assembler::method_reentry);
-}
 // We're done
 __ ret(lr);
 // Unexpected paths are out of line and go here
 if (!is_critical_native) {
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
 } else {
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans_and_transition)));
 }
-__ blrt(rscratch1, 1, 0, 1);
+__ blr(rscratch1);
 __ maybe_isb();
 // Restore any method result value
 restore_native_result(masm, ret_type, stack_slots);
 if (is_critical_native) {
 CodeBuffer buffer("deopt_blob", 2048+pad, 1024);
 MacroAssembler* masm = new MacroAssembler(&buffer);
 int frame_size_in_words;
 OopMap* map = NULL;
 OopMapSet *oop_maps = new OopMapSet();
-#ifdef BUILTIN_SIM
-AArch64Simulator *simulator;
-if (NotifySimulator) {
-simulator = AArch64Simulator::get_current(UseSimulatorCache, DisableBCCheck);
-simulator->notifyCompile(const_cast<char*>("SharedRuntime::deopt_blob"), __ pc());
-}
-#endif
 // -------------
 // This code enters when returning to a de-optimized nmethod.  A return
 // address has been pushed on the the stack, and return values are in
 // registers.
 __ mov(c_rarg0, rthread);
 __ movw(c_rarg2, rcpool); // exec mode
 __ lea(rscratch1,
 RuntimeAddress(CAST_FROM_FN_PTR(address,
 Deoptimization::uncommon_trap)));
-__ blrt(rscratch1, 2, 0, MacroAssembler::ret_type_integral);
+__ blr(rscratch1);
 __ bind(retaddr);
 oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
 __ reset_last_Java_frame(false);
 }
 #endif // ASSERT
 __ mov(c_rarg0, rthread);
 __ mov(c_rarg1, rcpool);
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::fetch_unroll_info)));
-__ blrt(rscratch1, 1, 0, 1);
+__ blr(rscratch1);
 __ bind(retaddr);
 // Need to have an oopmap that tells fetch_unroll_info where to
 // find any register it might need.
 oop_maps->add_gc_map(__ pc() - start, map);
 __ set_last_Java_frame(sp, rfp, the_pc, rscratch1);
 __ mov(c_rarg0, rthread);
 __ movw(c_rarg1, rcpool); // second arg: exec_mode
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-__ blrt(rscratch1, 2, 0, 0);
+__ blr(rscratch1);
 // Set an oopmap for the call site
 // Use the same PC we used for the last java frame
 oop_maps->add_gc_map(the_pc - start,
 new OopMap( frame_size_in_words, 0 ));
 _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 #if INCLUDE_JVMCI
 if (EnableJVMCI || UseAOT) {
 _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
 _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
-}
-#endif
-#ifdef BUILTIN_SIM
-if (NotifySimulator) {
-unsigned char *base = _deopt_blob->code_begin();
-simulator->notifyRelocate(start, base - start);
 }
 #endif
 }
 uint SharedRuntime::out_preserve_stack_slots() {
 // Allocate space for the code
 ResourceMark rm;
 // Setup code generation tools
 CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
 MacroAssembler* masm = new MacroAssembler(&buffer);
-#ifdef BUILTIN_SIM
-AArch64Simulator *simulator;
-if (NotifySimulator) {
-simulator = AArch64Simulator::get_current(UseSimulatorCache, DisableBCCheck);
-simulator->notifyCompile(const_cast<char*>("SharedRuntime:uncommon_trap_blob"), __ pc());
-}
-#endif
 assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
 address start = __ pc();
 __ mov(c_rarg0, rthread);
 __ movw(c_rarg2, (unsigned)Deoptimization::Unpack_uncommon_trap);
 __ lea(rscratch1,
 RuntimeAddress(CAST_FROM_FN_PTR(address,
 Deoptimization::uncommon_trap)));
-__ blrt(rscratch1, 2, 0, MacroAssembler::ret_type_integral);
+__ blr(rscratch1);
 __ bind(retaddr);
 // Set an oopmap for the call site
 OopMapSet* oop_maps = new OopMapSet();
 OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
 // sp should already be aligned
 __ mov(c_rarg0, rthread);
 __ movw(c_rarg1, (unsigned)Deoptimization::Unpack_uncommon_trap);
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-__ blrt(rscratch1, 2, 0, MacroAssembler::ret_type_integral);
+__ blr(rscratch1);
 // Set an oopmap for the call site
 // Use the same PC we used for the last java frame
 oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
 // Make sure all code is generated
 masm->flush();
 _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
 SimpleRuntimeFrame::framesize >> 1);
-#ifdef BUILTIN_SIM
-if (NotifySimulator) {
-unsigned char *base = _deopt_blob->code_begin();
-simulator->notifyRelocate(start, base - start);
-}
-#endif
 }
 #endif // COMPILER2_OR_JVMCI
 //------------------------------generate_handler_blob------
 }
 // Do the call
 __ mov(c_rarg0, rthread);
 __ lea(rscratch1, RuntimeAddress(call_ptr));
-__ blrt(rscratch1, 1, 0, 1);
+__ blr(rscratch1);
 __ bind(retaddr);
 // Set an oopmap for the call site.  This oopmap will map all
 // oop-registers and debug-info registers as callee-saved.  This
 // will allow deoptimization at this safepoint to find all possible
 __ set_last_Java_frame(sp, noreg, retaddr, rscratch1);
 __ mov(c_rarg0, rthread);
 __ lea(rscratch1, RuntimeAddress(destination));
-__ blrt(rscratch1, 1, 0, 1);
+__ blr(rscratch1);
 __ bind(retaddr);
 }
 // Set an oopmap for the call site.
 // We need this not only for callee-saved registers, but also for volatile
 // the stack should always be aligned
 address the_pc = __ pc();
 __ set_last_Java_frame(sp, noreg, the_pc, rscratch1);
 __ mov(c_rarg0, rthread);
 __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
-__ blrt(rscratch1, 1, 0, MacroAssembler::ret_type_integral);
+__ blr(rscratch1);
 __ maybe_isb();
 // Set an oopmap for the call site.  This oopmap will only be used if we
 // are unwinding the stack.  Hence, all locations will be dead.
 // Callee-saved registers will be the same as the frame above (i.e.,

changeset 57565	01bca26734bb
parent 55749	cff8aad2593f
child 57710	05ff6e27de45