archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8237521: Memory Access API fixes for 32-bit

Browse source 
Reviewed-by: mcimadamore, dholmes
This commit is contained in:
Nick Gasson 2020-01-24 17:41:44 +08:00
parent 44444bb249
commit 987ba9f3a4
7 changed files with 49 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/share/classes/jdk/internal/misc/Unsafe.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -583,6 +583,17 @@ public final class Unsafe {
/// wrappers for malloc, realloc, free:
/**
* Round up allocation size to a multiple of HeapWordSize.
*/
private long alignToHeapWordSize(long bytes) {
if (bytes >= 0) {
return (bytes + ADDRESS_SIZE - 1) & ~(ADDRESS_SIZE - 1);
} else {
throw invalidInput();
}
}
/**
* Allocates a new block of native memory, of the given size in bytes. The
* contents of the memory are uninitialized; they will generally be
@ -608,6 +619,8 @@ public final class Unsafe {
* @see #putByte(long, byte)
*/
public long allocateMemory(long bytes) {
bytes = alignToHeapWordSize(bytes);
allocateMemoryChecks(bytes);
if (bytes == 0) {
@ -661,6 +674,8 @@ public final class Unsafe {
* @see #allocateMemory
*/
public long reallocateMemory(long address, long bytes) {
bytes = alignToHeapWordSize(bytes);
reallocateMemoryChecks(address, bytes);
if (bytes == 0) {