Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8256009: Remove src/hotspot/share/adlc/Test/i486.ad
Backport-of: a1d4b9f
  • Loading branch information
DamonFool authored and John Jiang committed Nov 9, 2021
1 parent 299e6c8 commit 38a2505
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/hotspot/cpu/ppc/ppc.ad
Expand Up @@ -4085,7 +4085,7 @@ frame %{
// The `sig' array is to be updated. sig[j] represents the location
// of the j-th argument, either a register or a stack slot.

// Comment taken from i486.ad:
// Comment taken from x86_32.ad:
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
// of ideal registers called "sig" and a "length" count. Stack-slot
Expand All @@ -4097,7 +4097,7 @@ frame %{
SharedRuntime::java_calling_convention(sig_bt, regs, length, false);
%}

// Comment taken from i486.ad:
// Comment taken from x86_32.ad:
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
// of ideal registers called "sig" and a "length" count. Stack-slot
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
Expand Up @@ -633,7 +633,7 @@ JVM_handle_bsd_signal(int sig,
int op = pc[0];
if (op == 0xDB) {
// FIST
// TODO: The encoding of D2I in i486.ad can cause an exception
// TODO: The encoding of D2I in x86_32.ad can cause an exception
// prior to the fist instruction if there was an invalid operation
// pending. We want to dismiss that exception. From the win_32
// side it also seems that if it really was the fist causing
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
Expand Up @@ -463,7 +463,7 @@ JVM_handle_linux_signal(int sig,
int op = pc[0];
if (op == 0xDB) {
// FIST
// TODO: The encoding of D2I in i486.ad can cause an exception
// TODO: The encoding of D2I in x86_32.ad can cause an exception
// prior to the fist instruction if there was an invalid operation
// pending. We want to dismiss that exception. From the win_32
// side it also seems that if it really was the fist causing
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion src/hotspot/share/adlc/output_c.cpp
Expand Up @@ -3005,7 +3005,7 @@ void ArchDesc::define_oper_interface(FILE *fp, OperandForm &oper, FormDict &glob
// Provide a non-NULL return for disp_as_type() that will allow adr_type()
// to correctly compute the access type for alias analysis.
//
// See BugId 4796752, operand indOffset32X in i486.ad
// See BugId 4796752, operand indOffset32X in x86_32.ad
int idx = rep_var_to_constant_index(disp, oper, globals);
fprintf(fp," virtual const TypePtr *disp_as_type() const { return _c%d; }\n", idx);
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/machnode.cpp
Expand Up @@ -292,7 +292,7 @@ const Node* MachNode::get_base_and_disp(intptr_t &offset, const TypePtr* &adr_ty
}
offset = disp;

// In i486.ad, indOffset32X uses base==RegI and disp==RegP,
// In x86_32.ad, indOffset32X uses base==RegI and disp==RegP,
// this will prevent alias analysis without the following support:
// Lookup the TypePtr used by indOffset32X, a compile-time constant oop,
// Add the offset determined by the "base", or use Type::OffsetBot.
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/machnode.hpp
Expand Up @@ -150,7 +150,7 @@ class MachOper : public ResourceObj {
virtual int index_position() const; // index edge position, or -1

// Access the TypeKlassPtr of operands with a base==RegI and disp==RegP
// Only returns non-null value for i486.ad's indOffset32X
// Only returns non-null value for x86_32.ad's indOffset32X
virtual const TypePtr *disp_as_type() const { return NULL; }

// Return the label
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/opto/parse2.cpp
Expand Up @@ -2386,7 +2386,7 @@ void Parse::do_one_bytecode() {
if (Matcher::convL2FSupported()) {
a = pop_pair();
b = _gvn.transform( new ConvL2FNode(a));
// For i486.ad, FILD doesn't restrict precision to 24 or 53 bits.
// For x86_32.ad, FILD doesn't restrict precision to 24 or 53 bits.
// Rather than storing the result into an FP register then pushing
// out to memory to round, the machine instruction that implements
// ConvL2D is responsible for rounding.
Expand All @@ -2401,7 +2401,7 @@ void Parse::do_one_bytecode() {
case Bytecodes::_l2d:
a = pop_pair();
b = _gvn.transform( new ConvL2DNode(a));
// For i486.ad, rounding is always necessary (see _l2f above).
// For x86_32.ad, rounding is always necessary (see _l2f above).
// c = dprecision_rounding(b);
c = _gvn.transform(b);
push_pair(c);
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/synchronizer.cpp
Expand Up @@ -54,8 +54,8 @@

// The "core" versions of monitor enter and exit reside in this file.
// The interpreter and compilers contain specialized transliterated
// variants of the enter-exit fast-path operations. See i486.ad fast_lock(),
// for instance. If you make changes here, make sure to modify the
// variants of the enter-exit fast-path operations. See c2_MacroAssembler_x86.cpp
// fast_lock(...) for instance. If you make changes here, make sure to modify the
// interpreter, and both C1 and C2 fast-path inline locking code emission.
//
// -----------------------------------------------------------------------------
Expand Down

1 comment on commit 38a2505

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.