Skip to content

Commit 5d3c383

Browse files
committed
Delete TMP and !UseNewCode
1 parent 0b0b088 commit 5d3c383

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "interpreter/interpreter.hpp"
4141
#include "interpreter/interpreterRuntime.hpp"
4242
#include "jvm.h"
43-
#include "logging/logTag.hpp"
4443
#include "memory/resourceArea.hpp"
4544
#include "memory/universe.hpp"
4645
#include "nativeInst_aarch64.hpp"
@@ -3734,9 +3733,6 @@ Address MacroAssembler::spill_address(int size, int offset, Register tmp)
37343733
// Aligned - 12 bits unsigned offset shifted
37353734
Register base = sp;
37363735
if ((offset & (size-1)) && offset >= (1<<8)) {
3737-
if ((size == StackAlignmentInBytes) && !is_aligned(offset, StackAlignmentInBytes)) {
3738-
log_develop_trace(newcode)("spill_address: unaligned vector spill (size:%d sp offset:%d)", size, offset);
3739-
}
37403736
add(tmp, base, offset & ((1<<12)-1));
37413737
base = tmp;
37423738
offset &= -1u<<12;
@@ -3762,10 +3758,6 @@ Address MacroAssembler::sve_spill_address(int sve_reg_size_in_bytes, int offset,
37623758
return Address(base, offset / sve_reg_size_in_bytes);
37633759
}
37643760

3765-
if ((sve_reg_size_in_bytes != StackAlignmentInBytes) || is_aligned(offset, StackAlignmentInBytes)) {
3766-
log_develop_trace(newcode)("sve_spill_address: unaligned vector spill (size:%d sp offset:%d)", sve_reg_size_in_bytes, offset);
3767-
}
3768-
37693761
add(tmp, base, offset);
37703762
return Address(tmp);
37713763
}

src/hotspot/cpu/ppc/ppc.ad

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,8 +1827,7 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
18271827
}
18281828
#ifndef PRODUCT
18291829
if (!masm && !do_size) {
1830-
st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy%s",
1831-
"STX", Matcher::regName[src_lo], dst_offset, is_aligned(dst_offset, 16) ? "" : " (unaligned)");
1830+
st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy", "STX", Matcher::regName[src_lo], dst_offset);
18321831
}
18331832
#endif // !PRODUCT
18341833
}
@@ -1849,8 +1848,7 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
18491848
}
18501849
#ifndef PRODUCT
18511850
if (!masm && !do_size) {
1852-
st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy%s",
1853-
"LXV", Matcher::regName[dst_lo], src_offset, is_aligned(src_offset, 16) ? "" : " (unaligned)");
1851+
st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy", "LXV", Matcher::regName[dst_lo], src_offset);
18541852
}
18551853
#endif // !PRODUCT
18561854
}

src/hotspot/share/logging/logTag.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ class outputStream;
137137
LOG_TAG(monitortable) \
138138
LOG_TAG(native) \
139139
LOG_TAG(nestmates) \
140-
LOG_TAG(newcode) \
141140
LOG_TAG(nmethod) \
142141
LOG_TAG(nmt) \
143142
LOG_TAG(normalize) \

src/hotspot/share/opto/matcher.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,8 @@ void Matcher::match( ) {
287287
// pointer have to be aligned to the size of the access. For this _new_SP is
288288
// aligned to the size of the largest register set with the stack alignment as
289289
// limit and a minimum of SlotsPerLong (2).
290-
if (UseNewCode) {
291-
int vector_aligment = MIN2(C->max_vector_size(), stack_alignment_in_bytes()) / VMRegImpl::stack_slot_size;
292-
_new_SP = OptoReg::Name(align_up(_in_arg_limit, MAX2((int)RegMask::SlotsPerLong, vector_aligment)));
293-
} else {
294-
_new_SP = OptoReg::Name(align_up(_in_arg_limit, (int)RegMask::SlotsPerLong));
295-
}
290+
int vector_aligment = MIN2(C->max_vector_size(), stack_alignment_in_bytes()) / VMRegImpl::stack_slot_size;
291+
_new_SP = OptoReg::Name(align_up(_in_arg_limit, MAX2((int)RegMask::SlotsPerLong, vector_aligment)));
296292

297293
// Compute highest outgoing stack argument as
298294
// _new_SP + out_preserve_stack_slots + max(outgoing argument size).

0 commit comments

Comments
 (0)