Skip to content

Commit bdf8a2a

Browse files
tstuefetstuefe
committedApr 15, 2022
8283326: Implement SafeFetch statically
Reviewed-by: dholmes, mdoerr, akozlov, lucy
·
JEP-429-branchpoint
1 parent bb7c97b commit bdf8a2a

37 files changed

+1045
-637
lines changed
 

‎src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

-48
Original file line numberDiff line numberDiff line change
@@ -3986,46 +3986,6 @@ class StubGenerator: public StubCodeGenerator {
39863986
return start;
39873987
}
39883988

3989-
// Safefetch stubs.
3990-
void generate_safefetch(const char* name, int size, address* entry,
3991-
address* fault_pc, address* continuation_pc) {
3992-
// safefetch signatures:
3993-
// int SafeFetch32(int* adr, int errValue);
3994-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue);
3995-
//
3996-
// arguments:
3997-
// c_rarg0 = adr
3998-
// c_rarg1 = errValue
3999-
//
4000-
// result:
4001-
// PPC_RET = *adr or errValue
4002-
4003-
StubCodeMark mark(this, "StubRoutines", name);
4004-
4005-
// Entry point, pc or function descriptor.
4006-
*entry = __ pc();
4007-
4008-
// Load *adr into c_rarg1, may fault.
4009-
*fault_pc = __ pc();
4010-
switch (size) {
4011-
case 4:
4012-
// int32_t
4013-
__ ldrw(c_rarg1, Address(c_rarg0, 0));
4014-
break;
4015-
case 8:
4016-
// int64_t
4017-
__ ldr(c_rarg1, Address(c_rarg0, 0));
4018-
break;
4019-
default:
4020-
ShouldNotReachHere();
4021-
}
4022-
4023-
// return errValue or *adr
4024-
*continuation_pc = __ pc();
4025-
__ mov(r0, c_rarg1);
4026-
__ ret(lr);
4027-
}
4028-
40293989
/**
40303990
* Arguments:
40313991
*
@@ -7488,14 +7448,6 @@ class StubGenerator: public StubCodeGenerator {
74887448
if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
74897449
StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
74907450
}
7491-
7492-
// Safefetch stubs.
7493-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry,
7494-
&StubRoutines::_safefetch32_fault_pc,
7495-
&StubRoutines::_safefetch32_continuation_pc);
7496-
generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry,
7497-
&StubRoutines::_safefetchN_fault_pc,
7498-
&StubRoutines::_safefetchN_continuation_pc);
74997451
}
75007452

75017453
void generate_all() {

‎src/hotspot/cpu/arm/stubGenerator_arm.cpp

+1-48
Original file line numberDiff line numberDiff line change
@@ -2837,46 +2837,6 @@ class StubGenerator: public StubCodeGenerator {
28372837
return start;
28382838
}
28392839

2840-
// Safefetch stubs.
2841-
void generate_safefetch(const char* name, int size, address* entry, address* fault_pc, address* continuation_pc) {
2842-
// safefetch signatures:
2843-
// int SafeFetch32(int* adr, int errValue);
2844-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue);
2845-
//
2846-
// arguments:
2847-
// R0 = adr
2848-
// R1 = errValue
2849-
//
2850-
// result:
2851-
// R0 = *adr or errValue
2852-
2853-
StubCodeMark mark(this, "StubRoutines", name);
2854-
2855-
// Entry point, pc or function descriptor.
2856-
*entry = __ pc();
2857-
2858-
// Load *adr into c_rarg2, may fault.
2859-
*fault_pc = __ pc();
2860-
2861-
switch (size) {
2862-
case 4: // int32_t
2863-
__ ldr_s32(R1, Address(R0));
2864-
break;
2865-
2866-
case 8: // int64_t
2867-
Unimplemented();
2868-
break;
2869-
2870-
default:
2871-
ShouldNotReachHere();
2872-
}
2873-
2874-
// return errValue or *adr
2875-
*continuation_pc = __ pc();
2876-
__ mov(R0, R1);
2877-
__ ret();
2878-
}
2879-
28802840
void generate_arraycopy_stubs() {
28812841

28822842
// Note: the disjoint stubs must be generated first, some of
@@ -3029,16 +2989,9 @@ class StubGenerator: public StubCodeGenerator {
30292989
StubRoutines::_atomic_load_long_entry = generate_atomic_load_long();
30302990
StubRoutines::_atomic_store_long_entry = generate_atomic_store_long();
30312991

3032-
// Safefetch stubs.
3033-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry,
3034-
&StubRoutines::_safefetch32_fault_pc,
3035-
&StubRoutines::_safefetch32_continuation_pc);
3036-
assert (sizeof(int) == wordSize, "32-bit architecture");
3037-
StubRoutines::_safefetchN_entry = StubRoutines::_safefetch32_entry;
3038-
StubRoutines::_safefetchN_fault_pc = StubRoutines::_safefetch32_fault_pc;
3039-
StubRoutines::_safefetchN_continuation_pc = StubRoutines::_safefetch32_continuation_pc;
30402992
}
30412993

2994+
30422995
void generate_all() {
30432996
// Generates all stubs and initializes the entry points
30442997

‎src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

-47
Original file line numberDiff line numberDiff line change
@@ -3159,45 +3159,6 @@ class StubGenerator: public StubCodeGenerator {
31593159
#endif
31603160
}
31613161

3162-
// Safefetch stubs.
3163-
void generate_safefetch(const char* name, int size, address* entry, address* fault_pc, address* continuation_pc) {
3164-
// safefetch signatures:
3165-
// int SafeFetch32(int* adr, int errValue);
3166-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue);
3167-
//
3168-
// arguments:
3169-
// R3_ARG1 = adr
3170-
// R4_ARG2 = errValue
3171-
//
3172-
// result:
3173-
// R3_RET = *adr or errValue
3174-
3175-
StubCodeMark mark(this, "StubRoutines", name);
3176-
3177-
// Entry point, pc or function descriptor.
3178-
*entry = __ function_entry();
3179-
3180-
// Load *adr into R4_ARG2, may fault.
3181-
*fault_pc = __ pc();
3182-
switch (size) {
3183-
case 4:
3184-
// int32_t, signed extended
3185-
__ lwa(R4_ARG2, 0, R3_ARG1);
3186-
break;
3187-
case 8:
3188-
// int64_t
3189-
__ ld(R4_ARG2, 0, R3_ARG1);
3190-
break;
3191-
default:
3192-
ShouldNotReachHere();
3193-
}
3194-
3195-
// return errValue or *adr
3196-
*continuation_pc = __ pc();
3197-
__ mr(R3_RET, R4_ARG2);
3198-
__ blr();
3199-
}
3200-
32013162
// Stub for BigInteger::multiplyToLen()
32023163
//
32033164
// Arguments:
@@ -4573,14 +4534,6 @@ class StubGenerator: public StubCodeGenerator {
45734534
StubRoutines::_crc32c_table_addr = StubRoutines::ppc::generate_crc_constants(REVERSE_CRC32C_POLY);
45744535
StubRoutines::_updateBytesCRC32C = generate_CRC32_updateBytes(true);
45754536
}
4576-
4577-
// Safefetch stubs.
4578-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry,
4579-
&StubRoutines::_safefetch32_fault_pc,
4580-
&StubRoutines::_safefetch32_continuation_pc);
4581-
generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry,
4582-
&StubRoutines::_safefetchN_fault_pc,
4583-
&StubRoutines::_safefetchN_continuation_pc);
45844537
}
45854538

45864539
void generate_all() {

‎src/hotspot/cpu/riscv/stubGenerator_riscv.cpp

-47
Original file line numberDiff line numberDiff line change
@@ -2196,46 +2196,6 @@ class StubGenerator: public StubCodeGenerator {
21962196
StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
21972197
}
21982198

2199-
// Safefetch stubs.
2200-
void generate_safefetch(const char* name, int size, address* entry,
2201-
address* fault_pc, address* continuation_pc) {
2202-
// safefetch signatures:
2203-
// int SafeFetch32(int* adr, int errValue)
2204-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue)
2205-
//
2206-
// arguments:
2207-
// c_rarg0 = adr
2208-
// c_rarg1 = errValue
2209-
//
2210-
// result:
2211-
// PPC_RET = *adr or errValue
2212-
assert_cond(entry != NULL && fault_pc != NULL && continuation_pc != NULL);
2213-
StubCodeMark mark(this, "StubRoutines", name);
2214-
2215-
// Entry point, pc or function descriptor.
2216-
*entry = __ pc();
2217-
2218-
// Load *adr into c_rarg1, may fault.
2219-
*fault_pc = __ pc();
2220-
switch (size) {
2221-
case 4:
2222-
// int32_t
2223-
__ lw(c_rarg1, Address(c_rarg0, 0));
2224-
break;
2225-
case 8:
2226-
// int64_t
2227-
__ ld(c_rarg1, Address(c_rarg0, 0));
2228-
break;
2229-
default:
2230-
ShouldNotReachHere();
2231-
}
2232-
2233-
// return errValue or *adr
2234-
*continuation_pc = __ pc();
2235-
__ mv(x10, c_rarg1);
2236-
__ ret();
2237-
}
2238-
22392199
// code for comparing 16 bytes of strings with same encoding
22402200
void compare_string_16_bytes_same(Label &DIFF1, Label &DIFF2) {
22412201
const Register result = x10, str1 = x11, cnt1 = x12, str2 = x13, tmp1 = x28, tmp2 = x29, tmp4 = x7, tmp5 = x31;
@@ -3767,13 +3727,6 @@ class StubGenerator: public StubCodeGenerator {
37673727
generate_throw_exception("delayed StackOverflowError throw_exception",
37683728
CAST_FROM_FN_PTR(address,
37693729
SharedRuntime::throw_delayed_StackOverflowError));
3770-
// Safefetch stubs.
3771-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry,
3772-
&StubRoutines::_safefetch32_fault_pc,
3773-
&StubRoutines::_safefetch32_continuation_pc);
3774-
generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry,
3775-
&StubRoutines::_safefetchN_fault_pc,
3776-
&StubRoutines::_safefetchN_continuation_pc);
37773730
}
37783731

37793732
void generate_all() {

‎src/hotspot/cpu/s390/stubGenerator_s390.cpp

-42
Original file line numberDiff line numberDiff line change
@@ -1458,44 +1458,6 @@ class StubGenerator: public StubCodeGenerator {
14581458
StubRoutines::_arrayof_oop_arraycopy_uninit = generate_conjoint_oop_copy (true, "arrayof_oop_arraycopy_uninit", true);
14591459
}
14601460

1461-
void generate_safefetch(const char* name, int size, address* entry, address* fault_pc, address* continuation_pc) {
1462-
1463-
// safefetch signatures:
1464-
// int SafeFetch32(int* adr, int errValue);
1465-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue);
1466-
//
1467-
// arguments:
1468-
// Z_ARG1 = adr
1469-
// Z_ARG2 = errValue
1470-
//
1471-
// result:
1472-
// Z_RET = *adr or errValue
1473-
1474-
StubCodeMark mark(this, "StubRoutines", name);
1475-
1476-
// entry point
1477-
// Load *adr into Z_ARG2, may fault.
1478-
*entry = *fault_pc = __ pc();
1479-
switch (size) {
1480-
case 4:
1481-
// Sign extended int32_t.
1482-
__ z_lgf(Z_ARG2, 0, Z_ARG1);
1483-
break;
1484-
case 8:
1485-
// int64_t
1486-
__ z_lg(Z_ARG2, 0, Z_ARG1);
1487-
break;
1488-
default:
1489-
ShouldNotReachHere();
1490-
}
1491-
1492-
// Return errValue or *adr.
1493-
*continuation_pc = __ pc();
1494-
__ z_lgr(Z_RET, Z_ARG2);
1495-
__ z_br(Z_R14);
1496-
1497-
}
1498-
14991461
// Call interface for AES_encryptBlock, AES_decryptBlock stubs.
15001462
//
15011463
// Z_ARG1 - source data block. Ptr to leftmost byte to be processed.
@@ -2338,10 +2300,6 @@ class StubGenerator: public StubCodeGenerator {
23382300

23392301
// Comapct string intrinsics: Translate table for string inflate intrinsic. Used by trot instruction.
23402302
StubRoutines::zarch::_trot_table_addr = (address)StubRoutines::zarch::_trot_table;
2341-
2342-
// safefetch stubs
2343-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry, &StubRoutines::_safefetch32_fault_pc, &StubRoutines::_safefetch32_continuation_pc);
2344-
generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry, &StubRoutines::_safefetchN_fault_pc, &StubRoutines::_safefetchN_continuation_pc);
23452303
}
23462304

23472305

‎src/hotspot/cpu/x86/stubGenerator_x86_32.cpp

-42
Original file line numberDiff line numberDiff line change
@@ -3653,40 +3653,6 @@ class StubGenerator: public StubCodeGenerator {
36533653

36543654
}
36553655

3656-
// Safefetch stubs.
3657-
void generate_safefetch(const char* name, int size, address* entry,
3658-
address* fault_pc, address* continuation_pc) {
3659-
// safefetch signatures:
3660-
// int SafeFetch32(int* adr, int errValue);
3661-
// intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue);
3662-
3663-
StubCodeMark mark(this, "StubRoutines", name);
3664-
3665-
// Entry point, pc or function descriptor.
3666-
*entry = __ pc();
3667-
3668-
__ movl(rax, Address(rsp, 0x8));
3669-
__ movl(rcx, Address(rsp, 0x4));
3670-
// Load *adr into eax, may fault.
3671-
*fault_pc = __ pc();
3672-
switch (size) {
3673-
case 4:
3674-
// int32_t
3675-
__ movl(rax, Address(rcx, 0));
3676-
break;
3677-
case 8:
3678-
// int64_t
3679-
Unimplemented();
3680-
break;
3681-
default:
3682-
ShouldNotReachHere();
3683-
}
3684-
3685-
// Return errValue or *adr.
3686-
*continuation_pc = __ pc();
3687-
__ ret(0);
3688-
}
3689-
36903656
address generate_method_entry_barrier() {
36913657
__ align(CodeEntryAlignment);
36923658
StubCodeMark mark(this, "StubRoutines", "nmethod_entry_barrier");
@@ -3985,14 +3951,6 @@ class StubGenerator: public StubCodeGenerator {
39853951
StubRoutines::_dtan = generate_libmTan();
39863952
}
39873953
}
3988-
3989-
// Safefetch stubs.
3990-
generate_safefetch("SafeFetch32", sizeof(int), &StubRoutines::_safefetch32_entry,
3991-
&StubRoutines::_safefetch32_fault_pc,
3992-
&StubRoutines::_safefetch32_continuation_pc);
3993-
StubRoutines::_safefetchN_entry = StubRoutines::_safefetch32_entry;
3994-
StubRoutines::_safefetchN_fault_pc = StubRoutines::_safefetch32_fault_pc;
3995-
StubRoutines::_safefetchN_continuation_pc = StubRoutines::_safefetch32_continuation_pc;
39963954
}
39973955

39983956
void generate_all() {

0 commit comments

Comments
 (0)
Please sign in to comment.