Skip to content

Commit 8d6d9ba

Browse files
rakachanrakachan
committed
Undo merging of 'classfile' and 'shared' project.
1 parent f544836 commit 8d6d9ba

File tree

285 files changed

+2331
-2343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+2331
-2343
lines changed

‎espresso/mx.espresso/suite.py‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
"license": "UPL",
117117
},
118118

119-
# Shared .class file parser, link resolver
120-
"com.oracle.truffle.espresso.shared": {
119+
# Shared .class file parser
120+
"com.oracle.truffle.espresso.classfile": {
121121
"subDir": "src",
122122
"sourceDirs": ["src"],
123123
"dependencies": [
@@ -129,6 +129,19 @@
129129
"checkstyle": "com.oracle.truffle.espresso",
130130
},
131131

132+
# Shared link resolver
133+
"com.oracle.truffle.espresso.shared": {
134+
"subDir": "src",
135+
"sourceDirs": ["src"],
136+
"dependencies": [
137+
"com.oracle.truffle.espresso.classfile",
138+
],
139+
"requires": [
140+
],
141+
"javaCompliance" : "17+",
142+
"checkstyle": "com.oracle.truffle.espresso",
143+
},
144+
132145
"com.oracle.truffle.espresso": {
133146
"subDir": "src",
134147
"sourceDirs": ["src"],
@@ -137,6 +150,7 @@
137150
"truffle:TRUFFLE_NFI",
138151
"com.oracle.truffle.espresso.jdwp",
139152
"com.oracle.truffle.espresso.shadowed.asm",
153+
"com.oracle.truffle.espresso.shared",
140154
],
141155
"requires": [
142156
"java.logging",
@@ -204,7 +218,7 @@
204218
"subDir": "src",
205219
"sourceDirs": ["src"],
206220
"dependencies": [
207-
"com.oracle.truffle.espresso.shared",
221+
"com.oracle.truffle.espresso.classfile",
208222
"truffle:TRUFFLE_API",
209223
"truffle:TRUFFLE_NFI",
210224
],

‎espresso/src/com.oracle.truffle.espresso.shared/src/com/oracle/truffle/espresso/shared/classfile/ClassfileParser.java‎ renamed to ‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClassfileParser.java‎

Lines changed: 81 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,37 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.shared.classfile;
24-
25-
import static com.oracle.truffle.espresso.shared.classfile.ConstantPool.Tag.MODULE;
26-
import static com.oracle.truffle.espresso.shared.classfile.ConstantPool.Tag.PACKAGE;
27-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_ABSTRACT;
28-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_ANNOTATION;
29-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_CALLER_SENSITIVE;
30-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_DONT_INLINE;
31-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_ENUM;
32-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_FINAL;
33-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_FINALIZER;
34-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_FORCE_INLINE;
35-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_HIDDEN;
36-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_INTERFACE;
37-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_LAMBDA_FORM_COMPILED;
38-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_MODULE;
39-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_NATIVE;
40-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_PRIVATE;
41-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_PROTECTED;
42-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_PUBLIC;
43-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_SCOPED;
44-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_STABLE;
45-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_STATIC;
46-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_STRICT;
47-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_SUPER;
48-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_SYNCHRONIZED;
49-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_SYNTHETIC;
50-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_VARARGS;
51-
import static com.oracle.truffle.espresso.shared.classfile.Constants.ACC_VOLATILE;
52-
import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_RECOGNIZED_CLASS_MODIFIERS;
53-
import static com.oracle.truffle.espresso.shared.classfile.Constants.JVM_RECOGNIZED_METHOD_MODIFIERS;
23+
package com.oracle.truffle.espresso.classfile;
24+
25+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.MODULE;
26+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.PACKAGE;
27+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_ABSTRACT;
28+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_ANNOTATION;
29+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_CALLER_SENSITIVE;
30+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_DONT_INLINE;
31+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_ENUM;
32+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_FINAL;
33+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_FINALIZER;
34+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_FORCE_INLINE;
35+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
36+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_INTERFACE;
37+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_LAMBDA_FORM_COMPILED;
38+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_MODULE;
39+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_NATIVE;
40+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_PRIVATE;
41+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_PROTECTED;
42+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_PUBLIC;
43+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_SCOPED;
44+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_STABLE;
45+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_STATIC;
46+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_STRICT;
47+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_SUPER;
48+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_SYNCHRONIZED;
49+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_SYNTHETIC;
50+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_VARARGS;
51+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_VOLATILE;
52+
import static com.oracle.truffle.espresso.classfile.Constants.JVM_RECOGNIZED_CLASS_MODIFIERS;
53+
import static com.oracle.truffle.espresso.classfile.Constants.JVM_RECOGNIZED_METHOD_MODIFIERS;
5454

5555
import java.io.IOException;
5656
import java.lang.reflect.Modifier;
@@ -62,56 +62,55 @@
6262

6363
import org.graalvm.collections.EconomicMap;
6464

65-
import com.oracle.truffle.espresso.shared.JavaKind;
66-
import com.oracle.truffle.espresso.shared.attributes.Attribute;
67-
import com.oracle.truffle.espresso.shared.attributes.BootstrapMethodsAttribute;
68-
import com.oracle.truffle.espresso.shared.attributes.CodeAttribute;
69-
import com.oracle.truffle.espresso.shared.attributes.ConstantValueAttribute;
70-
import com.oracle.truffle.espresso.shared.attributes.EnclosingMethodAttribute;
71-
import com.oracle.truffle.espresso.shared.attributes.ExceptionsAttribute;
72-
import com.oracle.truffle.espresso.shared.attributes.InnerClassesAttribute;
73-
import com.oracle.truffle.espresso.shared.attributes.LineNumberTableAttribute;
74-
import com.oracle.truffle.espresso.shared.attributes.Local;
75-
import com.oracle.truffle.espresso.shared.attributes.LocalVariableTable;
76-
import com.oracle.truffle.espresso.shared.attributes.MethodParametersAttribute;
77-
import com.oracle.truffle.espresso.shared.attributes.NestHostAttribute;
78-
import com.oracle.truffle.espresso.shared.attributes.NestMembersAttribute;
79-
import com.oracle.truffle.espresso.shared.attributes.PermittedSubclassesAttribute;
80-
import com.oracle.truffle.espresso.shared.attributes.RecordAttribute;
81-
import com.oracle.truffle.espresso.shared.attributes.SignatureAttribute;
82-
import com.oracle.truffle.espresso.shared.attributes.SourceDebugExtensionAttribute;
83-
import com.oracle.truffle.espresso.shared.attributes.SourceFileAttribute;
84-
import com.oracle.truffle.espresso.shared.attributes.StackMapTableAttribute;
85-
import com.oracle.truffle.espresso.shared.classfile.ConstantPool.Tag;
86-
import com.oracle.truffle.espresso.shared.constantpool.ClassConstant;
87-
import com.oracle.truffle.espresso.shared.constantpool.ClassMethodRefConstant;
88-
import com.oracle.truffle.espresso.shared.constantpool.DoubleConstant;
89-
import com.oracle.truffle.espresso.shared.constantpool.DynamicConstant;
90-
import com.oracle.truffle.espresso.shared.constantpool.FieldRefConstant;
91-
import com.oracle.truffle.espresso.shared.constantpool.FloatConstant;
92-
import com.oracle.truffle.espresso.shared.constantpool.IntegerConstant;
93-
import com.oracle.truffle.espresso.shared.constantpool.InterfaceMethodRefConstant;
94-
import com.oracle.truffle.espresso.shared.constantpool.InvalidConstant;
95-
import com.oracle.truffle.espresso.shared.constantpool.InvokeDynamicConstant;
96-
import com.oracle.truffle.espresso.shared.constantpool.LongConstant;
97-
import com.oracle.truffle.espresso.shared.constantpool.MethodHandleConstant;
98-
import com.oracle.truffle.espresso.shared.constantpool.MethodTypeConstant;
99-
import com.oracle.truffle.espresso.shared.constantpool.NameAndTypeConstant;
100-
import com.oracle.truffle.espresso.shared.constantpool.PoolConstant;
101-
import com.oracle.truffle.espresso.shared.constantpool.StringConstant;
102-
import com.oracle.truffle.espresso.shared.constantpool.Utf8Constant;
103-
import com.oracle.truffle.espresso.shared.descriptors.ByteSequence;
104-
import com.oracle.truffle.espresso.shared.descriptors.ModifiedUtf8;
105-
import com.oracle.truffle.espresso.shared.descriptors.Signatures;
106-
import com.oracle.truffle.espresso.shared.descriptors.Symbol;
107-
import com.oracle.truffle.espresso.shared.descriptors.Symbol.Name;
108-
import com.oracle.truffle.espresso.shared.descriptors.Symbol.Signature;
109-
import com.oracle.truffle.espresso.shared.descriptors.Symbol.Type;
110-
import com.oracle.truffle.espresso.shared.descriptors.Types;
111-
import com.oracle.truffle.espresso.shared.descriptors.ValidationException;
112-
import com.oracle.truffle.espresso.shared.perf.DebugCloseable;
113-
import com.oracle.truffle.espresso.shared.perf.DebugCounter;
114-
import com.oracle.truffle.espresso.shared.perf.DebugTimer;
65+
import com.oracle.truffle.espresso.classfile.ConstantPool.Tag;
66+
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
67+
import com.oracle.truffle.espresso.classfile.attributes.BootstrapMethodsAttribute;
68+
import com.oracle.truffle.espresso.classfile.attributes.CodeAttribute;
69+
import com.oracle.truffle.espresso.classfile.attributes.ConstantValueAttribute;
70+
import com.oracle.truffle.espresso.classfile.attributes.EnclosingMethodAttribute;
71+
import com.oracle.truffle.espresso.classfile.attributes.ExceptionsAttribute;
72+
import com.oracle.truffle.espresso.classfile.attributes.InnerClassesAttribute;
73+
import com.oracle.truffle.espresso.classfile.attributes.LineNumberTableAttribute;
74+
import com.oracle.truffle.espresso.classfile.attributes.Local;
75+
import com.oracle.truffle.espresso.classfile.attributes.LocalVariableTable;
76+
import com.oracle.truffle.espresso.classfile.attributes.MethodParametersAttribute;
77+
import com.oracle.truffle.espresso.classfile.attributes.NestHostAttribute;
78+
import com.oracle.truffle.espresso.classfile.attributes.NestMembersAttribute;
79+
import com.oracle.truffle.espresso.classfile.attributes.PermittedSubclassesAttribute;
80+
import com.oracle.truffle.espresso.classfile.attributes.RecordAttribute;
81+
import com.oracle.truffle.espresso.classfile.attributes.SignatureAttribute;
82+
import com.oracle.truffle.espresso.classfile.attributes.SourceDebugExtensionAttribute;
83+
import com.oracle.truffle.espresso.classfile.attributes.SourceFileAttribute;
84+
import com.oracle.truffle.espresso.classfile.attributes.StackMapTableAttribute;
85+
import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
86+
import com.oracle.truffle.espresso.classfile.constantpool.ClassMethodRefConstant;
87+
import com.oracle.truffle.espresso.classfile.constantpool.DoubleConstant;
88+
import com.oracle.truffle.espresso.classfile.constantpool.DynamicConstant;
89+
import com.oracle.truffle.espresso.classfile.constantpool.FieldRefConstant;
90+
import com.oracle.truffle.espresso.classfile.constantpool.FloatConstant;
91+
import com.oracle.truffle.espresso.classfile.constantpool.IntegerConstant;
92+
import com.oracle.truffle.espresso.classfile.constantpool.InterfaceMethodRefConstant;
93+
import com.oracle.truffle.espresso.classfile.constantpool.InvalidConstant;
94+
import com.oracle.truffle.espresso.classfile.constantpool.InvokeDynamicConstant;
95+
import com.oracle.truffle.espresso.classfile.constantpool.LongConstant;
96+
import com.oracle.truffle.espresso.classfile.constantpool.MethodHandleConstant;
97+
import com.oracle.truffle.espresso.classfile.constantpool.MethodTypeConstant;
98+
import com.oracle.truffle.espresso.classfile.constantpool.NameAndTypeConstant;
99+
import com.oracle.truffle.espresso.classfile.constantpool.PoolConstant;
100+
import com.oracle.truffle.espresso.classfile.constantpool.StringConstant;
101+
import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
102+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
103+
import com.oracle.truffle.espresso.classfile.descriptors.ModifiedUtf8;
104+
import com.oracle.truffle.espresso.classfile.descriptors.Signatures;
105+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
106+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
107+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Signature;
108+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
109+
import com.oracle.truffle.espresso.classfile.descriptors.Types;
110+
import com.oracle.truffle.espresso.classfile.descriptors.ValidationException;
111+
import com.oracle.truffle.espresso.classfile.perf.DebugCloseable;
112+
import com.oracle.truffle.espresso.classfile.perf.DebugCounter;
113+
import com.oracle.truffle.espresso.classfile.perf.DebugTimer;
115114

116115
@SuppressWarnings("try")
117116
public final class ClassfileParser {
@@ -216,7 +215,7 @@ private ClassfileParser(ParsingContext parsingContext, ClassfileStream stream) {
216215
}
217216

218217
void handleBadConstant(Tag tag, ClassfileStream s) {
219-
if (tag == MODULE || tag == PACKAGE) {
218+
if (tag == Tag.MODULE || tag == Tag.PACKAGE) {
220219
if (majorVersion >= JAVA_9_VERSION) {
221220
s.readU2();
222221
badConstantSeen = tag;

‎espresso/src/com.oracle.truffle.espresso.shared/src/com/oracle/truffle/espresso/shared/classfile/ClassfileStream.java‎ renamed to ‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClassfileStream.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.shared.classfile;
23+
package com.oracle.truffle.espresso.classfile;
24+
25+
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
26+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
2427
import java.nio.BufferUnderflowException;
2528
import java.nio.ByteBuffer;
2629
import java.nio.ByteOrder;
2730

28-
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
29-
import com.oracle.truffle.espresso.shared.descriptors.ByteSequence;
30-
3131
/**
3232
* Operations for sequentially scanning data items in a class file. Any IO exceptions that occur
3333
* during scanning are converted to {@link ParserException.ClassFormatError}s.

‎espresso/src/com.oracle.truffle.espresso.shared/src/com/oracle/truffle/espresso/shared/classfile/ClasspathEntry.java‎ renamed to ‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathEntry.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.shared.classfile;
23+
package com.oracle.truffle.espresso.classfile;
2424

25-
import java.io.File;
25+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
2626

27-
import com.oracle.truffle.espresso.shared.descriptors.ByteSequence;
27+
import java.io.File;
2828

2929
/**
3030
* An entry in a classpath is a file system path that denotes an existing directory, an existing

‎espresso/src/com.oracle.truffle.espresso.shared/src/com/oracle/truffle/espresso/shared/classfile/ClasspathFile.java‎ renamed to ‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathFile.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.shared.classfile;
23+
package com.oracle.truffle.espresso.classfile;
2424

25-
import java.io.File;
25+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
2626

27-
import com.oracle.truffle.espresso.shared.descriptors.ByteSequence;
27+
import java.io.File;
2828

2929
/**
3030
* Encapsulates the contents of a file loaded from an {@linkplain ClasspathEntry entry} on a

0 commit comments

Comments
 (0)