curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 11:51:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

graal update; 'No language for id regex found.' when you build the jar because there are some package conflicts on graal

Browse Source
This commit is contained in:
minjaesong
2021-07-20 16:18:41 +09:00
parent abc466667e
commit 139930732b
33 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
.idea/artifacts/TSVM_Executable.xml generated
View File

@@ -6,36 +6,6 @@
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
</element>
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-test.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jnlp.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-20.3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-67.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-20.3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-20.3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/TerranVirtualDisk.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-20.3.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-67.1-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-20.3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-1.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-20.3.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-20.3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-20.3.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-common-1.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-20.3.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-1.4.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlinx-coroutines-core-1.4.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-20.3.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-common-1.4.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlinx-coroutines-core-1.4.1-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/annotations-13.0-javadoc.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-codec-1.10.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.10.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.10.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.2.3.jar" path-in-jar="/" />
@@ -77,6 +47,23 @@
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jorbis-0.0.17.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.10.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.10.0-natives-desktop.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-test.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlinx-coroutines-core-1.4.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-1.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/kotlin-stdlib-common-1.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/TerranVirtualDisk.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-21.1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-21.1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-21.1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-21.1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-21.1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-68.2.jar" path-in-jar="/" />
</root>
</artifact>
</component>

9
.idea/libraries/GetCpuName.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="GetCpuName">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/GetCpuName.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

7
.idea/libraries/KotlinJavaRuntime.xml generated
View File

@@ -6,21 +6,14 @@
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar!/" />
<root url="file://$PROJECT_DIR$/lib" />
</CLASSES>
<JAVADOC />
<NATIVE>
<root url="file://$PROJECT_DIR$/lib" />
</NATIVE>
<SOURCES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8-sources.jar!/" />
<root url="file://$PROJECT_DIR$/lib" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" type="SOURCES" />
</library>
</component>

9
.idea/libraries/TerranVirtualDisk.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="TerranVirtualDisk">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/TerranVirtualDisk.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/gdx_platform_1_10_0_natives_desktop.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="gdx-platform-1.10.0-natives-desktop">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.10.0-natives-desktop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

20
.idea/libraries/org_graalvm_js_js_20_3_0.xml generated
View File

@@ -1,20 +0,0 @@
<component name="libraryTable">
<library name="org.graalvm.js:js:20.3.0" type="repository">
<properties maven-id="org.graalvm.js:js:20.3.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/js-20.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-20.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-20.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-20.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-67.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/js-20.3.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-20.3.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-20.3.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-20.3.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-67.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

26
.idea/libraries/org_graalvm_js_js_21_1_0.xml generated Normal file
View File

@@ -0,0 +1,26 @@
<component name="libraryTable">
<library name="org.graalvm.js:js:21.1.0" type="repository">
<properties maven-id="org.graalvm.js:js:21.1.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/js-21.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-21.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-21.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-68.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/js-21.1.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-21.1.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-21.1.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-68.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/js-21.1.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-21.1.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-21.1.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-68.2-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/org_graalvm_js_js_scriptengine_20_3_0.xml generated
View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="org.graalvm.js:js-scriptengine:20.3.0" type="repository">
<properties maven-id="org.graalvm.js:js-scriptengine:20.3.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-20.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-20.3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-20.3.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-20.3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

17
.idea/libraries/org_graalvm_js_js_scriptengine_21_1_0.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<component name="libraryTable">
<library name="org.graalvm.js:js-scriptengine:21.1.0" type="repository">
<properties maven-id="org.graalvm.js:js-scriptengine:21.1.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-21.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-21.1.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-21.1.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-21.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

8
META-INF/MANIFEST.MF
View File

@@ -1,11 +1,3 @@
Manifest-Version: 1.0
Main-Class: net.torvald.tsvm.AppLoader
Class-Path: GetCpuName.jar TerranVirtualDisk.jar annotations-13.0.jar co
mmons-codec-1.10.jar commons-csv-1.2.jar gdx-backend-lwjgl-natives.jar
gdx-backend-lwjgl.jar gdx-natives.jar gdx.jar graal-sdk-20.3.0.jar icu4
j-67.1.jar jnlp.jar js-20.3.0.jar js-scriptengine-20.3.0.jar kotlin-ref
lect.jar kotlin-stlib-1.4.0.jar kotlin-stdlib-common-1.4.0.jar kotlin-s
tdlib-jdk7.jar kotlin-stdlib-jdk8.jar kotlin-stdlib.jar kotlin-test.jar
kotlinx-coroutines-core-1.4.1.jar regex-20.3.0.jar truffle-api-20.3.0.
jar

BIN
lib/commons-codec-1.10.jar
View File

Binary file not shown.

BIN
lib/commons-csv-1.2.jar
View File

Binary file not shown.

BIN
lib/graal-sdk-20.3.0-javadoc.jar → lib/graal-sdk-21.1.0-javadoc.jar
View File

Binary file not shown.

BIN
lib/graal-sdk-21.1.0-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/graal-sdk-20.3.0.jar → lib/graal-sdk-21.1.0.jar
View File

Binary file not shown.

BIN
lib/icu4j-67.1-javadoc.jar
View File

Binary file not shown.

BIN
lib/icu4j-68.2-javadoc.jar Normal file
View File

Binary file not shown.

BIN
lib/icu4j-68.2-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/icu4j-67.1.jar → lib/icu4j-68.2.jar
View File

Binary file not shown.

BIN
lib/js-20.3.0-javadoc.jar → lib/js-21.1.0-javadoc.jar
View File

Binary file not shown.

BIN
lib/js-21.1.0-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/js-20.3.0.jar → lib/js-21.1.0.jar
View File

Binary file not shown.

BIN
lib/js-scriptengine-20.3.0-javadoc.jar → lib/js-scriptengine-21.1.0-javadoc.jar
View File

Binary file not shown.

BIN
lib/js-scriptengine-21.1.0-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/js-scriptengine-20.3.0.jar → lib/js-scriptengine-21.1.0.jar
View File

Binary file not shown.

BIN
lib/regex-20.3.0-javadoc.jar → lib/regex-21.1.0-javadoc.jar
View File

Binary file not shown.

BIN
lib/regex-21.1.0-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/regex-20.3.0.jar → lib/regex-21.1.0.jar
View File

Binary file not shown.

BIN
lib/truffle-api-20.3.0-javadoc.jar → lib/truffle-api-21.1.0-javadoc.jar
View File

Binary file not shown.

BIN
lib/truffle-api-21.1.0-sources.jar Normal file
View File

Binary file not shown.

BIN
lib/truffle-api-20.3.0.jar → lib/truffle-api-21.1.0.jar
View File

Binary file not shown.

10
src/net/torvald/tsvm/AppLoader.java
View File

@@ -12,8 +12,8 @@ public class AppLoader {
public static String appTitle = "Totally Simple Virtual Machine";
public static Lwjgl3ApplicationConfiguration appConfig;
public static int WIDTH = 810;//720;
public static int HEIGHT = 360;//480;
public static int WIDTH = 560;//810;//720;
public static int HEIGHT = 448;//360;//480;
public static void main(String[] args) {
ShaderProgram.pedantic = false;
@@ -31,10 +31,10 @@ public class AppLoader {
//VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, BasicRom.INSTANCE});
//VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{OEMBios.INSTANCE, BasicRom.INSTANCE});
//VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{TandemBios.INSTANCE, BasicRom.INSTANCE});
VM vm = new VM(128 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, WPBios.INSTANCE});
//VM vm = new VM(128 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, WPBios.INSTANCE});
// uncomment to target the TerranBASIC runner
//VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{TBASRelBios.INSTANCE});
VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{TBASRelBios.INSTANCE});
EmulInstance reference = new EmulInstance(vm, "net.torvald.tsvm.peripheral.ReferenceGraphicsAdapter", "assets/disk0");
EmulInstance reference2 = new EmulInstance(vm, "net.torvald.tsvm.peripheral.ReferenceLikeLCD", "assets/disk0");
@@ -43,7 +43,7 @@ public class AppLoader {
EmulInstance wp = new EmulInstance(vm, "net.torvald.tsvm.peripheral.WpTerm", "assets/wpdisk");
new Lwjgl3Application(new VMGUI(wp), appConfig);
new Lwjgl3Application(new VMGUI(reference), appConfig);
}
public static ShaderProgram loadShaderFromFile(String vert, String frag) {

7
tsvm.iml
View File

@@ -9,10 +9,13 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1" level="project" />
<orderEntry type="library" name="org.graalvm.js:js-scriptengine:20.3.0" level="project" />
<orderEntry type="library" name="org.graalvm.js:js:20.3.0" level="project" />
<orderEntry type="library" name="com.badlogicgames.gdx:gdx:1.10.0" level="project" />
<orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.10.0" level="project" />
<orderEntry type="library" name="com.badlogicgames.gdx:gdx-platform:1.10.0" level="project" />
<orderEntry type="library" name="org.graalvm.js:js:21.1.0" level="project" />
<orderEntry type="library" name="org.graalvm.js:js-scriptengine:21.1.0" level="project" />
<orderEntry type="library" name="TerranVirtualDisk" level="project" />
<orderEntry type="library" name="GetCpuName" level="project" />
<orderEntry type="library" name="gdx-platform-1.10.0-natives-desktop" level="project" />
</component>
</module>