stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8248404: AArch64: Remove uses of long and unsigned long

Browse Source 
Reviewed-by: kbarrett
This commit is contained in:
Coleen Phillimore 2022-01-18 21:56:40 +00:00
parent 46fd683820
commit 1a20628757
4 changed files with 16 additions and 26 deletions

20
src/hotspot/cpu/aarch64/assembler_aarch64.hpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -27,6 +27,7 @@
#define CPU_AARCH64_ASSEMBLER_AARCH64_HPP
#include "asm/register.hpp"
#include "metaprogramming/enableIf.hpp"
#ifdef __GNUC__
@ -404,18 +405,11 @@ class Address {
: _mode(no_mode) { }
Address(Register r)
: _base(r), _index(noreg), _offset(0), _mode(base_plus_offset), _target(0) { }
Address(Register r, int o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, long o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, long long o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, unsigned int o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, unsigned long o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, unsigned long long o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
template<typename T, ENABLE_IF(std::is_integral<T>::value)>
Address(Register r, T o)
: _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) {}
Address(Register r, ByteSize disp)
: Address(r, in_bytes(disp)) { }
Address(Register r, Register r1, extend ext = lsl())

16
src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -27,6 +27,7 @@
#define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
#include "asm/assembler.inline.hpp"
#include "metaprogramming/enableIf.hpp"
#include "oops/compressedOops.hpp"
#include "runtime/vm_version.hpp"
#include "utilities/powerOfTwo.hpp"
@ -493,17 +494,10 @@ public:
inline void mov(Register dst, address addr) { mov_immediate64(dst, (uint64_t)addr); }
inline void mov(Register dst, int imm64) { mov_immediate64(dst, (uint64_t)imm64); }
inline void mov(Register dst, long imm64) { mov_immediate64(dst, (uint64_t)imm64); }
inline void mov(Register dst, long long imm64) { mov_immediate64(dst, (uint64_t)imm64); }
inline void mov(Register dst, unsigned int imm64) { mov_immediate64(dst, (uint64_t)imm64); }
inline void mov(Register dst, unsigned long imm64) { mov_immediate64(dst, (uint64_t)imm64); }
inline void mov(Register dst, unsigned long long imm64) { mov_immediate64(dst, (uint64_t)imm64); }
template<typename T, ENABLE_IF(std::is_integral<T>::value)>
inline void mov(Register dst, T o) { mov_immediate64(dst, (uint64_t)o); }
inline void movw(Register dst, uint32_t imm32)
{
mov_immediate32(dst, imm32);
}
inline void movw(Register dst, uint32_t imm32) { mov_immediate32(dst, imm32); }
void mov(Register dst, RegisterOrConstant src) {
if (src.is_register())

3
src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp

@ -297,7 +297,8 @@ void MacroAssembler::fast_log(FloatRegister vtmp0, FloatRegister vtmp1,
bind(MAIN);
fmovs(tmp3, vtmp5); // int intB0 = AS_INT_BITS(B);
mov(tmp5, 0x3FE0);
mov(rscratch1, 0xffffe00000000000);
uint64_t mask = UCONST64(0xffffe00000000000);
mov(rscratch1, mask);
andr(tmp2, tmp2, tmp1, LSR, 48); // hiWord & 0x7FF0
sub(tmp2, tmp2, tmp5); // tmp2 = hiWord & 0x7FF0 - 0x3FE0
scvtfwd(vtmp5, tmp2); // vtmp5 = (double)tmp2;

3
src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp

@ -71,7 +71,8 @@ address ProgrammableUpcallHandler::generate_upcall_stub(jobject rec, jobject jab
// Capture prev stack pointer (stack arguments base)
__ add(rscratch1, rfp, 16); // Skip saved FP and LR
__ str(rscratch1, Address(sp, layout.stack_args));
Address slot = __ legitimize_address(Address(sp, layout.stack_args), wordSize, rscratch2);
__ str(rscratch1, slot);
// Call upcall helper
__ ldr(c_rarg0, rec_adr);