50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
|
index e25061f7d..2df587d96 100644
|
|
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
|
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
|
@@ -1,6 +1,6 @@
|
|
/*
|
|
* Copyright (c) 2013, Red Hat Inc.
|
|
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates.
|
|
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates.
|
|
* All rights reserved.
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
@@ -434,12 +434,9 @@ int LIR_Assembler::emit_unwind_handler() {
|
|
}
|
|
|
|
if (compilation()->env()->dtrace_method_probes()) {
|
|
- __ call_Unimplemented();
|
|
-#if 0
|
|
- __ movptr(Address(rsp, 0), rax);
|
|
- __ mov_metadata(Address(rsp, sizeof(void*)), method()->constant_encoding());
|
|
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit)));
|
|
-#endif
|
|
+ __ mov(c_rarg0, rthread);
|
|
+ __ mov_metadata(c_rarg1, method()->constant_encoding());
|
|
+ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), c_rarg0, c_rarg1);
|
|
}
|
|
|
|
if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) {
|
|
diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
|
|
index c1e48ac97..e774f2140 100644
|
|
--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
|
|
+++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
|
|
@@ -1319,6 +1319,16 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
|
|
}
|
|
break;
|
|
|
|
+ case dtrace_object_alloc_id:
|
|
+ { // c_rarg0: object
|
|
+ StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments);
|
|
+ save_live_registers(sasm);
|
|
+
|
|
+ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), c_rarg0);
|
|
+
|
|
+ restore_live_registers(sasm);
|
|
+ }
|
|
+ break;
|
|
|
|
default:
|
|
{ StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
|