New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add unsigned adapter handles #173
Closed
ChrisHegarty
wants to merge
14
commits into
openjdk:foreign-memaccess
from
ChrisHegarty:unsigned-adapters
Closed
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
c56ee65
Initial MemoryHandles::asUnsigned prototype
ChrisHegarty 6cd1181
unsigned-adapters partial udpate
ChrisHegarty 9168839
more asUnsigned changes
ChrisHegarty 73bced4
Merge branch 'foreign-memaccess' into unsigned-adapters
ChrisHegarty 2e9ee34
template the adapter classes
ChrisHegarty 72baece
Merge branch 'foreign-memaccess' into unsigned-adapters
ChrisHegarty a42d516
test cleanup
ChrisHegarty 2cc2a05
test cleanup and spec fix
ChrisHegarty e4fb28f
Merge branch 'unsigned-adapters' of https://github.com/ChrisHegarty/p…
ChrisHegarty 62597e5
Thanks @Jorn and @Maurizio for your comments.
ChrisHegarty 73fab54
remove additional whitespace and comment line
ChrisHegarty 1270931
Merge all changes into MemoryHandles.
ChrisHegarty 1daa509
Remove erroneous import statement
ChrisHegarty b8d7e65
Updated values in data providers. They now cover a more structured se…
ChrisHegarty File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/UnsignedAdapters.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
/* | ||
* Copyright (c) 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 | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
package jdk.internal.foreign; | ||
|
||
import jdk.incubator.foreign.MemoryHandles; | ||
import sun.invoke.util.Wrapper; | ||
import java.lang.invoke.MethodHandle; | ||
import java.lang.invoke.MethodHandles; | ||
import java.lang.invoke.MethodType; | ||
import java.lang.invoke.VarHandle; | ||
import java.util.Objects; | ||
|
||
public class UnsignedAdapters { | ||
|
||
private static final MethodHandle INT_TO_BYTE; | ||
private static final MethodHandle BYTE_TO_UNSIGNED_INT; | ||
private static final MethodHandle INT_TO_SHORT; | ||
private static final MethodHandle SHORT_TO_UNSIGNED_INT; | ||
private static final MethodHandle LONG_TO_BYTE; | ||
private static final MethodHandle BYTE_TO_UNSIGNED_LONG; | ||
private static final MethodHandle LONG_TO_SHORT; | ||
private static final MethodHandle SHORT_TO_UNSIGNED_LONG; | ||
private static final MethodHandle LONG_TO_INT; | ||
private static final MethodHandle INT_TO_UNSIGNED_LONG; | ||
|
||
static { | ||
try { | ||
INT_TO_BYTE = MethodHandles.explicitCastArguments(MethodHandles.identity(byte.class), | ||
MethodType.methodType(byte.class, int.class)); | ||
BYTE_TO_UNSIGNED_INT = MethodHandles.lookup().findStatic(Byte.class, "toUnsignedInt", | ||
MethodType.methodType(int.class, byte.class)); | ||
INT_TO_SHORT = MethodHandles.explicitCastArguments(MethodHandles.identity(short.class), | ||
MethodType.methodType(short.class, int.class)); | ||
SHORT_TO_UNSIGNED_INT = MethodHandles.lookup().findStatic(Short.class, "toUnsignedInt", | ||
MethodType.methodType(int.class, short.class)); | ||
LONG_TO_BYTE = MethodHandles.explicitCastArguments(MethodHandles.identity(byte.class), | ||
MethodType.methodType(byte.class, long.class)); | ||
BYTE_TO_UNSIGNED_LONG = MethodHandles.lookup().findStatic(Byte.class, "toUnsignedLong", | ||
MethodType.methodType(long.class, byte.class)); | ||
LONG_TO_SHORT = MethodHandles.explicitCastArguments(MethodHandles.identity(short.class), | ||
MethodType.methodType(short.class, long.class)); | ||
SHORT_TO_UNSIGNED_LONG = MethodHandles.lookup().findStatic(Short.class, "toUnsignedLong", | ||
MethodType.methodType(long.class, short.class)); | ||
LONG_TO_INT = MethodHandles.explicitCastArguments(MethodHandles.identity(int.class), | ||
MethodType.methodType(int.class, long.class)); | ||
INT_TO_UNSIGNED_LONG = MethodHandles.lookup().findStatic(Integer.class, "toUnsignedLong", | ||
MethodType.methodType(long.class, int.class)); | ||
} catch (Throwable ex) { | ||
throw new ExceptionInInitializerError(ex); | ||
} | ||
} | ||
|
||
public static VarHandle asUnsigned(VarHandle target, final Class<?> adaptedType) { | ||
Objects.requireNonNull(target); | ||
Objects.requireNonNull(adaptedType); | ||
final Class<?> carrier = target.varType(); | ||
checkWidenable(carrier); | ||
checkNarrowable(adaptedType); | ||
checkTargetWiderThanCarrier(carrier, adaptedType); | ||
|
||
if (adaptedType == int.class && carrier == byte.class) { | ||
return intToUnsignedByte(target); | ||
} else if (adaptedType == int.class && carrier == short.class) { | ||
return intToUnsignedShort(target); | ||
} else if (adaptedType == long.class && carrier == byte.class) { | ||
return longToUnsignedByte(target); | ||
} else if (adaptedType == long.class && carrier == short.class) { | ||
return longToUnsignedShort(target); | ||
} else if (adaptedType == long.class && carrier == int.class) { | ||
return longToUnsignedInt(target); | ||
} else { | ||
throw new InternalError("should not reach here"); | ||
} | ||
} | ||
|
||
// int to byte | ||
private static VarHandle intToUnsignedByte(VarHandle target) { | ||
if (target.varType() != byte.class) | ||
throw new InternalError("expected byte carrier, but got: " + target.varType()); | ||
return MemoryHandles.filterValue(target, INT_TO_BYTE, BYTE_TO_UNSIGNED_INT); | ||
} | ||
|
||
// int to short | ||
private static VarHandle intToUnsignedShort(VarHandle target) { | ||
if (target.varType() != short.class) | ||
throw new InternalError("expected byte carrier, but got: " + target.varType()); | ||
return MemoryHandles.filterValue(target, INT_TO_SHORT, SHORT_TO_UNSIGNED_INT); | ||
} | ||
|
||
// long to byte | ||
private static VarHandle longToUnsignedByte(VarHandle target) { | ||
if (target.varType() != byte.class) | ||
throw new InternalError("expected byte carrier, but got: " + target.varType()); | ||
return MemoryHandles.filterValue(target, LONG_TO_BYTE, BYTE_TO_UNSIGNED_LONG); | ||
} | ||
|
||
// long to short | ||
private static VarHandle longToUnsignedShort(VarHandle target) { | ||
if (target.varType() != short.class) | ||
throw new InternalError("expected byte carrier, but got: " + target.varType()); | ||
return MemoryHandles.filterValue(target, LONG_TO_SHORT, SHORT_TO_UNSIGNED_LONG); | ||
} | ||
|
||
//long to int | ||
private static VarHandle longToUnsignedInt(VarHandle target) { | ||
if (target.varType() != int.class) | ||
throw new InternalError("expected byte carrier, but got: " + target.varType()); | ||
return MemoryHandles.filterValue(target, LONG_TO_INT, INT_TO_UNSIGNED_LONG); | ||
} | ||
|
||
private static void checkWidenable(Class<?> carrier) { | ||
if (!(carrier == byte.class || carrier == short.class || carrier == int.class)) { | ||
throw newIllegalArgumentException("illegal carrier", carrier.getSimpleName()); | ||
} | ||
} | ||
|
||
private static void checkNarrowable(Class<?> type) { | ||
if (!(type == int.class || type == long.class)) { | ||
throw newIllegalArgumentException("illegal adapter type", type.getSimpleName()); | ||
} | ||
} | ||
|
||
private static void checkTargetWiderThanCarrier(Class<?> carrier, Class<?> target) { | ||
if (Wrapper.forPrimitiveType(target).bitWidth() <= Wrapper.forPrimitiveType(carrier).bitWidth()) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note that MemoryHandles has already a routine to retrieve carrier size - maybe there's some reuse possible there |
||
throw newIllegalArgumentException( | ||
target.getSimpleName() + " is not wider than: ", carrier.getSimpleName()); | ||
} | ||
} | ||
|
||
static RuntimeException newIllegalArgumentException(String message, Object obj) { | ||
return new IllegalArgumentException(message(message, obj)); | ||
} | ||
private static String message(String message, Object obj) { | ||
if (obj != null) message = message + ": " + obj; | ||
return message; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not super sure of the added value of these - the check is essentially a no op, since you already have a switch where, based on the var handle carrier, you decide which method to call. So perhaps we can just inline the right MH filter inside the switch above?