Skip to content

Commit e57efa8

Browse files
mcimadamoremcimadamore
committed
Refresh libclang (take three)
Reviewed-by: jvernee
1 parent 456632d commit e57efa8

File tree

9 files changed

+3577
-1230
lines changed

9 files changed

+3577
-1230
lines changed

‎src/main/java/org/openjdk/jextract/clang/libclang/CXCursor.java

Lines changed: 101 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,30 @@ public static final GroupLayout layout() {
6565
return $LAYOUT;
6666
}
6767

68-
private static final long kind$OFFSET = 0;
6968
private static final OfInt kind$LAYOUT = (OfInt)$LAYOUT.select(groupElement("kind"));
7069

70+
/**
71+
* Layout for field:
72+
* {@snippet lang=c :
73+
* enum CXCursorKind kind
74+
* }
75+
*/
76+
public static final OfInt kind$layout() {
77+
return kind$LAYOUT;
78+
}
79+
80+
private static final long kind$OFFSET = 0;
81+
82+
/**
83+
* Offset for field:
84+
* {@snippet lang=c :
85+
* enum CXCursorKind kind
86+
* }
87+
*/
88+
public static final long kind$offset() {
89+
return kind$OFFSET;
90+
}
91+
7192
/**
7293
* Getter for field:
7394
* {@snippet lang=c :
@@ -88,9 +109,30 @@ public static void kind(MemorySegment struct, int fieldValue) {
88109
struct.set(kind$LAYOUT, kind$OFFSET, fieldValue);
89110
}
90111

91-
private static final long xdata$OFFSET = 4;
92112
private static final OfInt xdata$LAYOUT = (OfInt)$LAYOUT.select(groupElement("xdata"));
93113

114+
/**
115+
* Layout for field:
116+
* {@snippet lang=c :
117+
* int xdata
118+
* }
119+
*/
120+
public static final OfInt xdata$layout() {
121+
return xdata$LAYOUT;
122+
}
123+
124+
private static final long xdata$OFFSET = 4;
125+
126+
/**
127+
* Offset for field:
128+
* {@snippet lang=c :
129+
* int xdata
130+
* }
131+
*/
132+
public static final long xdata$offset() {
133+
return xdata$OFFSET;
134+
}
135+
94136
/**
95137
* Getter for field:
96138
* {@snippet lang=c :
@@ -111,8 +153,29 @@ public static void xdata(MemorySegment struct, int fieldValue) {
111153
struct.set(xdata$LAYOUT, xdata$OFFSET, fieldValue);
112154
}
113155

156+
private static final SequenceLayout data$LAYOUT = (SequenceLayout)$LAYOUT.select(groupElement("data"));
157+
158+
/**
159+
* Layout for field:
160+
* {@snippet lang=c :
161+
* const void *data[3]
162+
* }
163+
*/
164+
public static final SequenceLayout data$layout() {
165+
return data$LAYOUT;
166+
}
167+
114168
private static final long data$OFFSET = 8;
115-
private static final long data$SIZE = 24;
169+
170+
/**
171+
* Offset for field:
172+
* {@snippet lang=c :
173+
* const void *data[3]
174+
* }
175+
*/
176+
public static final long data$offset() {
177+
return data$OFFSET;
178+
}
116179

117180
/**
118181
* Getter for field:
@@ -121,7 +184,7 @@ public static void xdata(MemorySegment struct, int fieldValue) {
121184
* }
122185
*/
123186
public static MemorySegment data(MemorySegment struct) {
124-
return struct.asSlice(data$OFFSET, data$SIZE);
187+
return struct.asSlice(data$OFFSET, data$LAYOUT.byteSize());
125188
}
126189

127190
/**
@@ -131,7 +194,40 @@ public static MemorySegment data(MemorySegment struct) {
131194
* }
132195
*/
133196
public static void data(MemorySegment struct, MemorySegment fieldValue) {
134-
MemorySegment.copy(fieldValue, 0L, struct, data$OFFSET, data$SIZE);
197+
MemorySegment.copy(fieldValue, 0L, struct, data$OFFSET, data$LAYOUT.byteSize());
198+
}
199+
200+
private static long[] data$DIMS = { 3 };
201+
202+
/**
203+
* Dimensions for array field:
204+
* {@snippet lang=c :
205+
* const void *data[3]
206+
* }
207+
*/
208+
public static long[] data$dimensions() {
209+
return data$DIMS;
210+
}
211+
private static final VarHandle data$ELEM_HANDLE = data$LAYOUT.varHandle(sequenceElement());
212+
213+
/**
214+
* Indexed getter for field:
215+
* {@snippet lang=c :
216+
* const void *data[3]
217+
* }
218+
*/
219+
public static MemorySegment data(MemorySegment struct, long index0) {
220+
return (MemorySegment)data$ELEM_HANDLE.get(struct, 0L, index0);
221+
}
222+
223+
/**
224+
* Indexed setter for field:
225+
* {@snippet lang=c :
226+
* const void *data[3]
227+
* }
228+
*/
229+
public static void data(MemorySegment struct, long index0, MemorySegment fieldValue) {
230+
data$ELEM_HANDLE.set(struct, 0L, index0, fieldValue);
135231
}
136232

137233
/**

‎src/main/java/org/openjdk/jextract/clang/libclang/CXSourceLocation.java

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,29 @@ public static final GroupLayout layout() {
6464
return $LAYOUT;
6565
}
6666

67+
private static final SequenceLayout ptr_data$LAYOUT = (SequenceLayout)$LAYOUT.select(groupElement("ptr_data"));
68+
69+
/**
70+
* Layout for field:
71+
* {@snippet lang=c :
72+
* const void *ptr_data[2]
73+
* }
74+
*/
75+
public static final SequenceLayout ptr_data$layout() {
76+
return ptr_data$LAYOUT;
77+
}
78+
6779
private static final long ptr_data$OFFSET = 0;
68-
private static final long ptr_data$SIZE = 16;
80+
81+
/**
82+
* Offset for field:
83+
* {@snippet lang=c :
84+
* const void *ptr_data[2]
85+
* }
86+
*/
87+
public static final long ptr_data$offset() {
88+
return ptr_data$OFFSET;
89+
}
6990

7091
/**
7192
* Getter for field:
@@ -74,7 +95,7 @@ public static final GroupLayout layout() {
7495
* }
7596
*/
7697
public static MemorySegment ptr_data(MemorySegment struct) {
77-
return struct.asSlice(ptr_data$OFFSET, ptr_data$SIZE);
98+
return struct.asSlice(ptr_data$OFFSET, ptr_data$LAYOUT.byteSize());
7899
}
79100

80101
/**
@@ -84,12 +105,66 @@ public static MemorySegment ptr_data(MemorySegment struct) {
84105
* }
85106
*/
86107
public static void ptr_data(MemorySegment struct, MemorySegment fieldValue) {
87-
MemorySegment.copy(fieldValue, 0L, struct, ptr_data$OFFSET, ptr_data$SIZE);
108+
MemorySegment.copy(fieldValue, 0L, struct, ptr_data$OFFSET, ptr_data$LAYOUT.byteSize());
109+
}
110+
111+
private static long[] ptr_data$DIMS = { 2 };
112+
113+
/**
114+
* Dimensions for array field:
115+
* {@snippet lang=c :
116+
* const void *ptr_data[2]
117+
* }
118+
*/
119+
public static long[] ptr_data$dimensions() {
120+
return ptr_data$DIMS;
121+
}
122+
private static final VarHandle ptr_data$ELEM_HANDLE = ptr_data$LAYOUT.varHandle(sequenceElement());
123+
124+
/**
125+
* Indexed getter for field:
126+
* {@snippet lang=c :
127+
* const void *ptr_data[2]
128+
* }
129+
*/
130+
public static MemorySegment ptr_data(MemorySegment struct, long index0) {
131+
return (MemorySegment)ptr_data$ELEM_HANDLE.get(struct, 0L, index0);
132+
}
133+
134+
/**
135+
* Indexed setter for field:
136+
* {@snippet lang=c :
137+
* const void *ptr_data[2]
138+
* }
139+
*/
140+
public static void ptr_data(MemorySegment struct, long index0, MemorySegment fieldValue) {
141+
ptr_data$ELEM_HANDLE.set(struct, 0L, index0, fieldValue);
88142
}
89143

90-
private static final long int_data$OFFSET = 16;
91144
private static final OfInt int_data$LAYOUT = (OfInt)$LAYOUT.select(groupElement("int_data"));
92145

146+
/**
147+
* Layout for field:
148+
* {@snippet lang=c :
149+
* unsigned int int_data
150+
* }
151+
*/
152+
public static final OfInt int_data$layout() {
153+
return int_data$LAYOUT;
154+
}
155+
156+
private static final long int_data$OFFSET = 16;
157+
158+
/**
159+
* Offset for field:
160+
* {@snippet lang=c :
161+
* unsigned int int_data
162+
* }
163+
*/
164+
public static final long int_data$offset() {
165+
return int_data$OFFSET;
166+
}
167+
93168
/**
94169
* Getter for field:
95170
* {@snippet lang=c :

‎src/main/java/org/openjdk/jextract/clang/libclang/CXSourceRange.java

Lines changed: 101 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,29 @@ public static final GroupLayout layout() {
6565
return $LAYOUT;
6666
}
6767

68+
private static final SequenceLayout ptr_data$LAYOUT = (SequenceLayout)$LAYOUT.select(groupElement("ptr_data"));
69+
70+
/**
71+
* Layout for field:
72+
* {@snippet lang=c :
73+
* const void *ptr_data[2]
74+
* }
75+
*/
76+
public static final SequenceLayout ptr_data$layout() {
77+
return ptr_data$LAYOUT;
78+
}
79+
6880
private static final long ptr_data$OFFSET = 0;
69-
private static final long ptr_data$SIZE = 16;
81+
82+
/**
83+
* Offset for field:
84+
* {@snippet lang=c :
85+
* const void *ptr_data[2]
86+
* }
87+
*/
88+
public static final long ptr_data$offset() {
89+
return ptr_data$OFFSET;
90+
}
7091

7192
/**
7293
* Getter for field:
@@ -75,7 +96,7 @@ public static final GroupLayout layout() {
7596
* }
7697
*/
7798
public static MemorySegment ptr_data(MemorySegment struct) {
78-
return struct.asSlice(ptr_data$OFFSET, ptr_data$SIZE);
99+
return struct.asSlice(ptr_data$OFFSET, ptr_data$LAYOUT.byteSize());
79100
}
80101

81102
/**
@@ -85,12 +106,66 @@ public static MemorySegment ptr_data(MemorySegment struct) {
85106
* }
86107
*/
87108
public static void ptr_data(MemorySegment struct, MemorySegment fieldValue) {
88-
MemorySegment.copy(fieldValue, 0L, struct, ptr_data$OFFSET, ptr_data$SIZE);
109+
MemorySegment.copy(fieldValue, 0L, struct, ptr_data$OFFSET, ptr_data$LAYOUT.byteSize());
110+
}
111+
112+
private static long[] ptr_data$DIMS = { 2 };
113+
114+
/**
115+
* Dimensions for array field:
116+
* {@snippet lang=c :
117+
* const void *ptr_data[2]
118+
* }
119+
*/
120+
public static long[] ptr_data$dimensions() {
121+
return ptr_data$DIMS;
122+
}
123+
private static final VarHandle ptr_data$ELEM_HANDLE = ptr_data$LAYOUT.varHandle(sequenceElement());
124+
125+
/**
126+
* Indexed getter for field:
127+
* {@snippet lang=c :
128+
* const void *ptr_data[2]
129+
* }
130+
*/
131+
public static MemorySegment ptr_data(MemorySegment struct, long index0) {
132+
return (MemorySegment)ptr_data$ELEM_HANDLE.get(struct, 0L, index0);
133+
}
134+
135+
/**
136+
* Indexed setter for field:
137+
* {@snippet lang=c :
138+
* const void *ptr_data[2]
139+
* }
140+
*/
141+
public static void ptr_data(MemorySegment struct, long index0, MemorySegment fieldValue) {
142+
ptr_data$ELEM_HANDLE.set(struct, 0L, index0, fieldValue);
89143
}
90144

91-
private static final long begin_int_data$OFFSET = 16;
92145
private static final OfInt begin_int_data$LAYOUT = (OfInt)$LAYOUT.select(groupElement("begin_int_data"));
93146

147+
/**
148+
* Layout for field:
149+
* {@snippet lang=c :
150+
* unsigned int begin_int_data
151+
* }
152+
*/
153+
public static final OfInt begin_int_data$layout() {
154+
return begin_int_data$LAYOUT;
155+
}
156+
157+
private static final long begin_int_data$OFFSET = 16;
158+
159+
/**
160+
* Offset for field:
161+
* {@snippet lang=c :
162+
* unsigned int begin_int_data
163+
* }
164+
*/
165+
public static final long begin_int_data$offset() {
166+
return begin_int_data$OFFSET;
167+
}
168+
94169
/**
95170
* Getter for field:
96171
* {@snippet lang=c :
@@ -111,9 +186,30 @@ public static void begin_int_data(MemorySegment struct, int fieldValue) {
111186
struct.set(begin_int_data$LAYOUT, begin_int_data$OFFSET, fieldValue);
112187
}
113188

114-
private static final long end_int_data$OFFSET = 20;
115189
private static final OfInt end_int_data$LAYOUT = (OfInt)$LAYOUT.select(groupElement("end_int_data"));
116190

191+
/**
192+
* Layout for field:
193+
* {@snippet lang=c :
194+
* unsigned int end_int_data
195+
* }
196+
*/
197+
public static final OfInt end_int_data$layout() {
198+
return end_int_data$LAYOUT;
199+
}
200+
201+
private static final long end_int_data$OFFSET = 20;
202+
203+
/**
204+
* Offset for field:
205+
* {@snippet lang=c :
206+
* unsigned int end_int_data
207+
* }
208+
*/
209+
public static final long end_int_data$offset() {
210+
return end_int_data$OFFSET;
211+
}
212+
117213
/**
118214
* Getter for field:
119215
* {@snippet lang=c :

0 commit comments

Comments
 (0)