From d6685f0869be350ded705a3dbddecb3cc441fc0b Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Fri, 23 Jun 2023 10:07:32 +0000 Subject: [PATCH] 8310510: Remove WordsPerLong Reviewed-by: mdoerr --- src/hotspot/cpu/ppc/frame_ppc.inline.hpp | 4 +--- src/hotspot/cpu/s390/frame_s390.inline.hpp | 4 +--- src/hotspot/share/utilities/globalDefinitions.hpp | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp index 478c0a9081a..c59aed8d77b 100644 --- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp @@ -245,9 +245,7 @@ inline intptr_t* frame::interpreter_frame_tos_address() const { } inline int frame::interpreter_frame_monitor_size() { - // Number of stack slots for a monitor. - return align_up(BasicObjectLock::size(), // number of stack slots - WordsPerLong); // number of stack slots for a Java long + return BasicObjectLock::size(); } inline int frame::interpreter_frame_monitor_size_in_bytes() { diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp index dfa68940bac..271305e37d1 100644 --- a/src/hotspot/cpu/s390/frame_s390.inline.hpp +++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp @@ -249,9 +249,7 @@ inline void frame::interpreter_frame_set_monitor_end(BasicObjectLock* monitors) } inline int frame::interpreter_frame_monitor_size() { - // Number of stack slots for a monitor - return align_up(BasicObjectLock::size() /* number of stack slots */, - WordsPerLong /* Number of stack slots for a Java long. */); + return BasicObjectLock::size(); } inline int frame::interpreter_frame_monitor_size_in_bytes() { diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp index 9216dd80502..922e852d588 100644 --- a/src/hotspot/share/utilities/globalDefinitions.hpp +++ b/src/hotspot/share/utilities/globalDefinitions.hpp @@ -243,8 +243,6 @@ const int BitsPerLong = 1 << LogBitsPerLong; const int WordAlignmentMask = (1 << LogBytesPerWord) - 1; const int LongAlignmentMask = (1 << LogBytesPerLong) - 1; -const int WordsPerLong = 2; // Number of stack entries for longs - const int oopSize = sizeof(char*); // Full-width oop extern int heapOopSize; // Oop within a java object const int wordSize = sizeof(char*);