Skip to content

Commit f61f54a

Browse files
committed
Remove is_sigill_not_entrant.
1 parent 0950fc5 commit f61f54a

File tree

6 files changed

+0
-22
lines changed

6 files changed

+0
-22
lines changed

src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,6 @@ bool NativeInstruction::is_movk() {
340340
return Instruction_aarch64::extract(int_at(0), 30, 23) == 0b11100101;
341341
}
342342

343-
bool NativeInstruction::is_sigill_not_entrant() {
344-
return uint_at(0) == 0xd4bbd5a1; // dcps1 #0xdead
345-
}
346-
347343
void NativeIllegalInstruction::insert(address code_pos) {
348344
*(juint*)code_pos = 0xd4bbd5a1; // dcps1 #0xdead
349345
}

src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class NativeInstruction {
8383
bool is_safepoint_poll();
8484
bool is_movz();
8585
bool is_movk();
86-
bool is_sigill_not_entrant();
8786
bool is_stop();
8887

8988
protected:

src/hotspot/cpu/ppc/nativeInst_ppc.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ class NativeInstruction {
6969
return MacroAssembler::tdi_get_si16(long_at(0), Assembler::traptoUnconditional, 0);
7070
}
7171

72-
// We use an illtrap for marking a method as not_entrant.
73-
bool is_sigill_not_entrant() {
74-
// Work around a C++ compiler bug which changes 'this'.
75-
return NativeInstruction::is_sigill_not_entrant_at(addr_at(0));
76-
}
77-
static bool is_sigill_not_entrant_at(address addr);
78-
7972
#ifdef COMPILER2
8073
// SIGTRAP-based implicit range checks
8174
bool is_sigtrap_range_check() {

src/hotspot/cpu/riscv/nativeInst_riscv.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,6 @@ bool NativeInstruction::is_safepoint_poll() {
408408
return MacroAssembler::is_lwu_to_zr(address(this));
409409
}
410410

411-
// A 16-bit instruction with all bits ones is permanently reserved as an illegal instruction.
412-
bool NativeInstruction::is_sigill_not_entrant() {
413-
// jvmci
414-
return uint_at(0) == 0xffffffff;
415-
}
416-
417411
void NativeIllegalInstruction::insert(address code_pos) {
418412
assert_cond(code_pos != nullptr);
419413
Assembler::sd_instr(code_pos, 0xffffffff); // all bits ones is permanently reserved as an illegal instruction

src/hotspot/cpu/riscv/nativeInst_riscv.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class NativeInstruction {
7474
bool is_nop() const;
7575
bool is_jump_or_nop();
7676
bool is_safepoint_poll();
77-
bool is_sigill_not_entrant();
7877
bool is_stop();
7978

8079
protected:

src/hotspot/cpu/s390/nativeInst_s390.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ class NativeInstruction {
8585
// Bcrl is currently the only accepted instruction here.
8686
bool is_jump();
8787

88-
// We use an illtrap for marking a method as not_entrant.
89-
bool is_sigill_not_entrant();
90-
9188
bool is_safepoint_poll() {
9289
// Is the current instruction a POTENTIAL read access to the polling page?
9390
// The instruction's current arguments are not checked!

0 commit comments

Comments
 (0)