Skip to content

Commit e364b16

Browse files
gilles-duboscqjormundur00
authored andcommitted
Move shared table code to classfile
1 parent d9475c8 commit e364b16

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/shared/EntryTable.java renamed to espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/EntryTable.java

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

2525
import java.util.HashMap;
2626
import java.util.Objects;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/shared/ModuleTable.java renamed to espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/ModuleTable.java

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

2525
import java.util.ArrayList;
2626
import java.util.concurrent.locks.ReadWriteLock;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/shared/PackageTable.java renamed to espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/tables/PackageTable.java

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

2525
import java.util.ArrayList;
2626
import java.util.concurrent.locks.ReadWriteLock;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.oracle.truffle.espresso.meta.Meta;
3131
import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
3232

33-
public final class ModuleTable extends com.oracle.truffle.espresso.impl.shared.ModuleTable<StaticObject, ModuleTable.ModuleEntry> {
33+
public final class ModuleTable extends com.oracle.truffle.espresso.classfile.tables.ModuleTable<StaticObject, ModuleTable.ModuleEntry> {
3434
public ModuleTable(ReadWriteLock lock) {
3535
super(lock);
3636
}
@@ -40,7 +40,7 @@ protected ModuleEntry createEntry(Symbol<Name> name, ModuleData<StaticObject> da
4040
return new ModuleEntry(name, data);
4141
}
4242

43-
public static final class ModuleEntry extends com.oracle.truffle.espresso.impl.shared.ModuleTable.ModuleEntry<StaticObject> implements ModuleRef {
43+
public static final class ModuleEntry extends com.oracle.truffle.espresso.classfile.tables.ModuleTable.ModuleEntry<StaticObject> implements ModuleRef {
4444
ModuleEntry(Symbol<Name> name, ModuleData<StaticObject> data) {
4545
super(name, data);
4646
}

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PackageTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.oracle.truffle.espresso.impl.ModuleTable.ModuleEntry;
3030
import com.oracle.truffle.espresso.runtime.staticobject.StaticObject;
3131

32-
public final class PackageTable extends com.oracle.truffle.espresso.impl.shared.PackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {
32+
public final class PackageTable extends com.oracle.truffle.espresso.classfile.tables.PackageTable<StaticObject, PackageTable.PackageEntry, ModuleEntry> {
3333
public PackageTable(ReadWriteLock lock) {
3434
super(lock);
3535
}
@@ -39,7 +39,7 @@ protected PackageEntry createEntry(Symbol<Name> name, ModuleEntry data) {
3939
return new PackageEntry(name, data);
4040
}
4141

42-
public static final class PackageEntry extends com.oracle.truffle.espresso.impl.shared.PackageTable.PackageEntry<StaticObject, ModuleEntry> {
42+
public static final class PackageEntry extends com.oracle.truffle.espresso.classfile.tables.PackageTable.PackageEntry<StaticObject, ModuleEntry> {
4343
public PackageEntry(Symbol<Name> name, ModuleEntry module) {
4444
super(name, module);
4545
}

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/GuestAllocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
import com.oracle.truffle.api.nodes.ExplodeLoop;
4343
import com.oracle.truffle.espresso.EspressoLanguage;
4444
import com.oracle.truffle.espresso.classfile.JavaKind;
45+
import com.oracle.truffle.espresso.classfile.tables.EntryTable;
4546
import com.oracle.truffle.espresso.impl.ArrayKlass;
4647
import com.oracle.truffle.espresso.impl.ClassRegistries;
4748
import com.oracle.truffle.espresso.impl.ContextAccessImpl;
48-
import com.oracle.truffle.espresso.impl.shared.EntryTable;
4949
import com.oracle.truffle.espresso.impl.Field;
5050
import com.oracle.truffle.espresso.impl.Klass;
5151
import com.oracle.truffle.espresso.impl.LanguageAccess;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
105105
import com.oracle.truffle.espresso.classfile.descriptors.Types;
106106
import com.oracle.truffle.espresso.classfile.descriptors.Validation;
107+
import com.oracle.truffle.espresso.classfile.tables.EntryTable;
107108
import com.oracle.truffle.espresso.constantpool.RuntimeConstantPool;
108109
import com.oracle.truffle.espresso.ffi.NativeSignature;
109110
import com.oracle.truffle.espresso.ffi.NativeType;
@@ -123,7 +124,6 @@
123124
import com.oracle.truffle.espresso.impl.PackageTable;
124125
import com.oracle.truffle.espresso.impl.PackageTable.PackageEntry;
125126
import com.oracle.truffle.espresso.impl.SuppressFBWarnings;
126-
import com.oracle.truffle.espresso.impl.shared.EntryTable;
127127
import com.oracle.truffle.espresso.jni.JniEnv;
128128
import com.oracle.truffle.espresso.jni.JniVersion;
129129
import com.oracle.truffle.espresso.jni.NativeEnv;

0 commit comments

Comments
 (0)