hg: panama/dev: manual merge with foreign
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Dec 12 13:04:51 UTC 2018
Changeset: c7ba162a0b9e
Author: mcimadamore
Date: 2018-12-12 12:20 +0000
URL: http://hg.openjdk.java.net/panama/dev/rev/c7ba162a0b9e
manual merge with foreign
! src/hotspot/cpu/x86/directUpcallHandler_x86.cpp
! src/hotspot/share/prims/directUpcallHandler.cpp
+ src/hotspot/share/prims/linkToNativeUpcallHandler.cpp
+ src/hotspot/share/prims/linkToNativeUpcallHandler.hpp
! src/hotspot/share/prims/nativeLookup.cpp
+ src/hotspot/share/prims/sysVx86ABI.cpp
- src/hotspot/share/prims/upcallHandler.cpp
- src/java.base/share/classes/jdk/internal/foreign/abi/AbstractABI.java
- src/java.base/share/classes/jdk/internal/foreign/abi/AbstractCallingSequenceBuilderImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/DirectNativeInvoker.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/DirectSignatureShuffler.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/DirectUpcallHandler.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/LinkToNativeInvoker.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/LinkToNativeSignatureShuffler.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/LinkToNativeUpcallHandler.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/UniversalNativeInvoker.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/UniversalUpcallHandler.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/VarargsInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/abi/sysv/x64/ArgumentClass.java
- src/java.base/share/classes/jdk/internal/foreign/abi/sysv/x64/CallingSequenceBuilderImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/sysv/x64/Constants.java
- src/java.base/share/classes/jdk/internal/foreign/abi/sysv/x64/StorageNames.java
- src/java.base/share/classes/jdk/internal/foreign/abi/sysv/x64/SysVx64ABI.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/ArgumentClass.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/Constants.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/StandardCall.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/StorageNames.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64ABI.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/DirectNativeInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/DirectSignatureShuffler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/DirectUpcallHandler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/LinkToNativeInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/LinkToNativeSignatureShuffler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/LinkToNativeUpcallHandler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/NativeInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/UniversalNativeInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/UniversalUpcallHandler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/UpcallHandler.java
- src/java.base/share/classes/jdk/internal/foreign/invokers/VarargsInvoker.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/CallbackType.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/JType2.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/PointerType.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/TypeAlias.java
- test/jdk/java/foreign/abi/sysv/x64/ArgumentClassTest.java
- test/jdk/java/foreign/abi/sysv/x64/BitMatrix.java
- test/jdk/java/foreign/abi/sysv/x64/CallingSequenceBuilderTest.java
+ test/jdk/java/foreign/abi/x64/sysv/ArgumentClassTest.java
+ test/jdk/java/foreign/abi/x64/sysv/BitMatrix.java
+ test/jdk/java/foreign/abi/x64/sysv/StandardCallTest.java
More information about the panama-dev
mailing list