File jdk-8354941.patch of Package java-1_7_0-openjdk
--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp 2025-08-27 16:56:07.872780173 +0200
+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp 2025-08-27 18:09:30.664590706 +0200
@@ -1453,7 +1453,7 @@
bool Assembler::operand_valid_for_add_sub_immediate(long imm) {
bool shift = false;
- unsigned long uimm = uabs(imm);
+ unsigned long uimm = g_uabs(imm);
if (uimm < (1 << 12))
return true;
if (uimm < (1 << 24)
@@ -3476,7 +3476,7 @@
if (operand_valid_for_add_sub_immediate((int)imm)) {
(this->*insn1)(Rd, Rn, imm);
} else {
- if (uabs(imm) < (1 << 24)) {
+ if (g_uabs(imm) < (1 << 24)) {
(this->*insn1)(Rd, Rn, imm & -(1 << 12));
(this->*insn1)(Rd, Rd, imm & ((1 << 12)-1));
} else {
--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp 2025-08-27 16:56:07.872901474 +0200
+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp 2025-08-27 18:09:26.710561663 +0200
@@ -324,7 +324,7 @@
// abs methods which cannot overflow and so are well-defined across
// the entire domain of integer types.
-static inline unsigned int uabs(unsigned int n) {
+static inline unsigned int g_uabs(unsigned int n) {
union {
unsigned int result;
int value;
@@ -333,7 +333,7 @@
if (value < 0) result = -result;
return result;
}
-static inline unsigned long uabs(unsigned long n) {
+static inline unsigned long g_uabs(unsigned long n) {
union {
unsigned long result;
long value;
@@ -342,8 +342,8 @@
if (value < 0) result = -result;
return result;
}
-static inline unsigned long uabs(long n) { return uabs((unsigned long)n); }
-static inline unsigned long uabs(int n) { return uabs((unsigned int)n); }
+static inline unsigned long g_uabs(long n) { return g_uabs((unsigned long)n); }
+static inline unsigned long g_uabs(int n) { return g_uabs((unsigned int)n); }
// Addressing modes
class Address VALUE_OBJ_CLASS_SPEC {
@@ -572,7 +572,7 @@
static bool offset_ok_for_immed(long offset, int shift = 0) {
unsigned mask = (1 << shift) - 1;
if (offset < 0 || offset & mask) {
- return (uabs(offset) < (1 << (20 - 12))); // Unscaled offset
+ return (g_uabs(offset) < (1 << (20 - 12))); // Unscaled offset
} else {
return ((offset >> shift) < (1 << (21 - 10 + 1))); // Scaled, unsigned offset
}
@@ -852,7 +852,7 @@
static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
static bool reachable_from_branch_at(address branch, address target) {
- return uabs(target - branch) < branch_range;
+ return g_uabs(target - branch) < branch_range;
}
// Unconditional branch (immediate)
--- openjdk/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp 2025-08-27 16:56:07.875188652 +0200
+++ openjdk/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp 2025-08-27 18:09:34.821621240 +0200
@@ -973,7 +973,7 @@
void copy_memory_small(Register s, Register d, Register count, Register tmp, int step) {
bool is_backwards = step < 0;
- size_t granularity = uabs(step);
+ size_t granularity = g_uabs(step);
int direction = is_backwards ? -1 : 1;
int unit = wordSize * direction;
@@ -1029,7 +1029,7 @@
Register count, Register tmp, int step) {
copy_direction direction = step < 0 ? copy_backwards : copy_forwards;
bool is_backwards = step < 0;
- int granularity = uabs(step);
+ int granularity = g_uabs(step);
const Register t0 = r3, t1 = r4;
if (is_backwards) {