Skip to content

Commit

Permalink
7903475: Jextract should use new byte-based layout methods
Browse files Browse the repository at this point in the history
Reviewed-by: jvernee
  • Loading branch information
mcimadamore committed May 30, 2023
1 parent 9feb042 commit 3f41267
Show file tree
Hide file tree
Showing 28 changed files with 97 additions and 94 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/openjdk/jextract/Type.java
Expand Up @@ -129,11 +129,11 @@ enum Kind {
/**
* {@code float} type.
*/
Float("float", ValueLayout.JAVA_FLOAT.withBitAlignment(32)),
Float("float", ValueLayout.JAVA_FLOAT),
/**
* {@code double} type.
*/
Double("double", ValueLayout.JAVA_DOUBLE.withBitAlignment(64)),
Double("double", ValueLayout.JAVA_DOUBLE),
/**
* {@code long double} type.
*/
Expand Down
Expand Up @@ -45,7 +45,7 @@ public class CXString {
static final StructLayout $struct$LAYOUT = MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
);
public static MemoryLayout $LAYOUT() {
return CXString.$struct$LAYOUT;
Expand Down
Expand Up @@ -44,7 +44,7 @@ public class CXType {

static final StructLayout $struct$LAYOUT = MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
);
public static MemoryLayout $LAYOUT() {
Expand Down
Expand Up @@ -44,7 +44,7 @@ final class Constants$root {
static final OfLong C_LONG_LONG$LAYOUT = JAVA_LONG;
static final OfFloat C_FLOAT$LAYOUT = JAVA_FLOAT;
static final OfDouble C_DOUBLE$LAYOUT = JAVA_DOUBLE;
static final AddressLayout C_POINTER$LAYOUT = ADDRESS.withBitAlignment(64)
static final AddressLayout C_POINTER$LAYOUT = ADDRESS
.withTargetLayout(MemoryLayout.sequenceLayout(C_CHAR$LAYOUT));
}

Expand Down
Expand Up @@ -40,7 +40,7 @@ final class constants$0 {
MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
)
);
static final MethodHandle clang_getCString$MH = RuntimeHelper.downcallHandle(
Expand All @@ -51,7 +51,7 @@ final class constants$0 {
MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
)
);
static final MethodHandle clang_disposeString$MH = RuntimeHelper.downcallHandle(
Expand All @@ -76,7 +76,7 @@ final class constants$0 {
static final FunctionDescriptor clang_getFileName$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_POINTER$LAYOUT
);
Expand All @@ -87,7 +87,7 @@ final class constants$0 {
static final FunctionDescriptor clang_getNullLocation$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
));
static final MethodHandle clang_getNullLocation$MH = RuntimeHelper.downcallHandle(
"clang_getNullLocation",
Expand Down
Expand Up @@ -40,12 +40,12 @@ final class constants$1 {
MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
)
);
static final MethodHandle clang_equalLocations$MH = RuntimeHelper.downcallHandle(
Expand All @@ -55,7 +55,7 @@ final class constants$1 {
static final FunctionDescriptor clang_getLocation$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_POINTER$LAYOUT,
Constants$root.C_POINTER$LAYOUT,
Expand All @@ -69,7 +69,7 @@ final class constants$1 {
static final FunctionDescriptor clang_getLocationForOffset$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_POINTER$LAYOUT,
Constants$root.C_POINTER$LAYOUT,
Expand All @@ -83,7 +83,7 @@ final class constants$1 {
MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
)
);
static final MethodHandle clang_Location_isInSystemHeader$MH = RuntimeHelper.downcallHandle(
Expand All @@ -94,7 +94,7 @@ final class constants$1 {
MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
)
);
static final MethodHandle clang_Location_isFromMainFile$MH = RuntimeHelper.downcallHandle(
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class constants$10 {
static final FunctionDescriptor clang_isVolatileQualifiedType$FUNC = FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -50,11 +50,11 @@ final class constants$10 {
static final FunctionDescriptor clang_getTypedefName$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -64,12 +64,12 @@ final class constants$10 {
);
static final FunctionDescriptor clang_getPointeeType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -84,7 +84,7 @@ final class constants$10 {
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -95,7 +95,7 @@ final class constants$10 {
static final FunctionDescriptor clang_getTypeKindSpelling$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_INT$LAYOUT
);
Expand All @@ -106,7 +106,7 @@ final class constants$10 {
static final FunctionDescriptor clang_getFunctionTypeCallingConv$FUNC = FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand Down
Expand Up @@ -38,12 +38,12 @@ final class constants$11 {
private constants$11() {}
static final FunctionDescriptor clang_getResultType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -54,7 +54,7 @@ final class constants$11 {
static final FunctionDescriptor clang_getNumArgTypes$FUNC = FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -64,12 +64,12 @@ final class constants$11 {
);
static final FunctionDescriptor clang_getArgType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
Constants$root.C_INT$LAYOUT
Expand All @@ -81,7 +81,7 @@ final class constants$11 {
static final FunctionDescriptor clang_isFunctionTypeVariadic$FUNC = FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -91,7 +91,7 @@ final class constants$11 {
);
static final FunctionDescriptor clang_getCursorResultType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Expand All @@ -106,12 +106,12 @@ final class constants$11 {
);
static final FunctionDescriptor clang_getElementType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class constants$12 {
static final FunctionDescriptor clang_getNumElements$FUNC = FunctionDescriptor.of(Constants$root.C_LONG_LONG$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -49,12 +49,12 @@ final class constants$12 {
);
static final FunctionDescriptor clang_getArrayElementType$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -65,7 +65,7 @@ final class constants$12 {
static final FunctionDescriptor clang_getArraySize$FUNC = FunctionDescriptor.of(Constants$root.C_LONG_LONG$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -76,7 +76,7 @@ final class constants$12 {
static final FunctionDescriptor clang_Type_getSizeOf$FUNC = FunctionDescriptor.of(Constants$root.C_LONG_LONG$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
)
);
Expand All @@ -87,7 +87,7 @@ final class constants$12 {
static final FunctionDescriptor clang_Type_getOffsetOf$FUNC = FunctionDescriptor.of(Constants$root.C_LONG_LONG$LAYOUT,
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
MemoryLayout.paddingLayout(32),
MemoryLayout.paddingLayout(4),
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("data")
),
Constants$root.C_POINTER$LAYOUT
Expand Down
Expand Up @@ -90,7 +90,7 @@ final class constants$13 {
static final FunctionDescriptor clang_getCursorUSR$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class constants$14 {
static final FunctionDescriptor clang_getCursorSpelling$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
Expand Down Expand Up @@ -89,7 +89,7 @@ final class constants$14 {
static final FunctionDescriptor clang_getCursorPrettyPrinted$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class constants$15 {
static final FunctionDescriptor clang_getCursorDisplayName$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
Expand Down Expand Up @@ -106,7 +106,7 @@ final class constants$15 {
static final FunctionDescriptor clang_Cursor_getMangling$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
MemoryLayout.structLayout(
Constants$root.C_INT$LAYOUT.withName("kind"),
Expand Down
Expand Up @@ -49,7 +49,7 @@ final class constants$16 {
static final FunctionDescriptor clang_getTokenSpelling$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_POINTER$LAYOUT,
MemoryLayout.structLayout(
Expand All @@ -64,7 +64,7 @@ final class constants$16 {
static final FunctionDescriptor clang_getTokenLocation$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
MemoryLayout.sequenceLayout(2, Constants$root.C_POINTER$LAYOUT).withName("ptr_data"),
Constants$root.C_INT$LAYOUT.withName("int_data"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_POINTER$LAYOUT,
MemoryLayout.structLayout(
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class constants$17 {
static final FunctionDescriptor clang_getCursorKindSpelling$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
),
Constants$root.C_INT$LAYOUT
);
Expand All @@ -50,7 +50,7 @@ final class constants$17 {
static final FunctionDescriptor clang_getClangVersion$FUNC = FunctionDescriptor.of(MemoryLayout.structLayout(
Constants$root.C_POINTER$LAYOUT.withName("data"),
Constants$root.C_INT$LAYOUT.withName("private_flags"),
MemoryLayout.paddingLayout(32)
MemoryLayout.paddingLayout(4)
));
static final MethodHandle clang_getClangVersion$MH = RuntimeHelper.downcallHandle(
"clang_getClangVersion",
Expand Down

0 comments on commit 3f41267

Please sign in to comment.