diff --git a/.idea/artifacts/TSVM_Executable.xml b/.idea/artifacts/TSVM_Executable.xml
index 69863db..e10a3b2 100644
--- a/.idea/artifacts/TSVM_Executable.xml
+++ b/.idea/artifacts/TSVM_Executable.xml
@@ -6,36 +6,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -77,6 +47,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/GetCpuName.xml b/.idea/libraries/GetCpuName.xml
new file mode 100644
index 0000000..f0745d5
--- /dev/null
+++ b/.idea/libraries/GetCpuName.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
index 9ff8d27..1a7265d 100644
--- a/.idea/libraries/KotlinJavaRuntime.xml
+++ b/.idea/libraries/KotlinJavaRuntime.xml
@@ -6,21 +6,14 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/TerranVirtualDisk.xml b/.idea/libraries/TerranVirtualDisk.xml
new file mode 100644
index 0000000..2e09a48
--- /dev/null
+++ b/.idea/libraries/TerranVirtualDisk.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/gdx_platform_1_10_0_natives_desktop.xml b/.idea/libraries/gdx_platform_1_10_0_natives_desktop.xml
new file mode 100644
index 0000000..9938aa8
--- /dev/null
+++ b/.idea/libraries/gdx_platform_1_10_0_natives_desktop.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/org_graalvm_js_js_20_3_0.xml b/.idea/libraries/org_graalvm_js_js_20_3_0.xml
deleted file mode 100644
index 2b57961..0000000
--- a/.idea/libraries/org_graalvm_js_js_20_3_0.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/org_graalvm_js_js_21_1_0.xml b/.idea/libraries/org_graalvm_js_js_21_1_0.xml
new file mode 100644
index 0000000..9275640
--- /dev/null
+++ b/.idea/libraries/org_graalvm_js_js_21_1_0.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/org_graalvm_js_js_scriptengine_20_3_0.xml b/.idea/libraries/org_graalvm_js_js_scriptengine_20_3_0.xml
deleted file mode 100644
index 123c53c..0000000
--- a/.idea/libraries/org_graalvm_js_js_scriptengine_20_3_0.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/org_graalvm_js_js_scriptengine_21_1_0.xml b/.idea/libraries/org_graalvm_js_js_scriptengine_21_1_0.xml
new file mode 100644
index 0000000..655eddb
--- /dev/null
+++ b/.idea/libraries/org_graalvm_js_js_scriptengine_21_1_0.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 88c1d8a..b0ff1cb 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -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
diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar
deleted file mode 100644
index 1d7417c..0000000
Binary files a/lib/commons-codec-1.10.jar and /dev/null differ
diff --git a/lib/commons-csv-1.2.jar b/lib/commons-csv-1.2.jar
deleted file mode 100644
index 1b26424..0000000
Binary files a/lib/commons-csv-1.2.jar and /dev/null differ
diff --git a/lib/graal-sdk-20.3.0-javadoc.jar b/lib/graal-sdk-21.1.0-javadoc.jar
similarity index 57%
rename from lib/graal-sdk-20.3.0-javadoc.jar
rename to lib/graal-sdk-21.1.0-javadoc.jar
index 98ab6b3..72baa0e 100644
Binary files a/lib/graal-sdk-20.3.0-javadoc.jar and b/lib/graal-sdk-21.1.0-javadoc.jar differ
diff --git a/lib/graal-sdk-21.1.0-sources.jar b/lib/graal-sdk-21.1.0-sources.jar
new file mode 100644
index 0000000..0865d52
Binary files /dev/null and b/lib/graal-sdk-21.1.0-sources.jar differ
diff --git a/lib/graal-sdk-20.3.0.jar b/lib/graal-sdk-21.1.0.jar
similarity index 70%
rename from lib/graal-sdk-20.3.0.jar
rename to lib/graal-sdk-21.1.0.jar
index 7bd279d..f90e5c0 100644
Binary files a/lib/graal-sdk-20.3.0.jar and b/lib/graal-sdk-21.1.0.jar differ
diff --git a/lib/icu4j-67.1-javadoc.jar b/lib/icu4j-67.1-javadoc.jar
deleted file mode 100644
index 38518bf..0000000
Binary files a/lib/icu4j-67.1-javadoc.jar and /dev/null differ
diff --git a/lib/icu4j-68.2-javadoc.jar b/lib/icu4j-68.2-javadoc.jar
new file mode 100644
index 0000000..51e45f3
Binary files /dev/null and b/lib/icu4j-68.2-javadoc.jar differ
diff --git a/lib/icu4j-68.2-sources.jar b/lib/icu4j-68.2-sources.jar
new file mode 100644
index 0000000..ae61996
Binary files /dev/null and b/lib/icu4j-68.2-sources.jar differ
diff --git a/lib/icu4j-67.1.jar b/lib/icu4j-68.2.jar
similarity index 68%
rename from lib/icu4j-67.1.jar
rename to lib/icu4j-68.2.jar
index 06e384e..b0674fb 100644
Binary files a/lib/icu4j-67.1.jar and b/lib/icu4j-68.2.jar differ
diff --git a/lib/js-20.3.0-javadoc.jar b/lib/js-21.1.0-javadoc.jar
similarity index 66%
rename from lib/js-20.3.0-javadoc.jar
rename to lib/js-21.1.0-javadoc.jar
index f028bdd..209dae4 100644
Binary files a/lib/js-20.3.0-javadoc.jar and b/lib/js-21.1.0-javadoc.jar differ
diff --git a/lib/js-21.1.0-sources.jar b/lib/js-21.1.0-sources.jar
new file mode 100644
index 0000000..27e81e1
Binary files /dev/null and b/lib/js-21.1.0-sources.jar differ
diff --git a/lib/js-20.3.0.jar b/lib/js-21.1.0.jar
similarity index 77%
rename from lib/js-20.3.0.jar
rename to lib/js-21.1.0.jar
index 235e03c..52eb347 100644
Binary files a/lib/js-20.3.0.jar and b/lib/js-21.1.0.jar differ
diff --git a/lib/js-scriptengine-20.3.0-javadoc.jar b/lib/js-scriptengine-21.1.0-javadoc.jar
similarity index 80%
rename from lib/js-scriptengine-20.3.0-javadoc.jar
rename to lib/js-scriptengine-21.1.0-javadoc.jar
index efb6283..c1c4a24 100644
Binary files a/lib/js-scriptengine-20.3.0-javadoc.jar and b/lib/js-scriptengine-21.1.0-javadoc.jar differ
diff --git a/lib/js-scriptengine-21.1.0-sources.jar b/lib/js-scriptengine-21.1.0-sources.jar
new file mode 100644
index 0000000..179906a
Binary files /dev/null and b/lib/js-scriptengine-21.1.0-sources.jar differ
diff --git a/lib/js-scriptengine-20.3.0.jar b/lib/js-scriptengine-21.1.0.jar
similarity index 58%
rename from lib/js-scriptengine-20.3.0.jar
rename to lib/js-scriptengine-21.1.0.jar
index 376d780..b03ca7a 100644
Binary files a/lib/js-scriptengine-20.3.0.jar and b/lib/js-scriptengine-21.1.0.jar differ
diff --git a/lib/regex-20.3.0-javadoc.jar b/lib/regex-21.1.0-javadoc.jar
similarity index 52%
rename from lib/regex-20.3.0-javadoc.jar
rename to lib/regex-21.1.0-javadoc.jar
index 45e7099..8b8495d 100644
Binary files a/lib/regex-20.3.0-javadoc.jar and b/lib/regex-21.1.0-javadoc.jar differ
diff --git a/lib/regex-21.1.0-sources.jar b/lib/regex-21.1.0-sources.jar
new file mode 100644
index 0000000..77aeda5
Binary files /dev/null and b/lib/regex-21.1.0-sources.jar differ
diff --git a/lib/regex-20.3.0.jar b/lib/regex-21.1.0.jar
similarity index 66%
rename from lib/regex-20.3.0.jar
rename to lib/regex-21.1.0.jar
index a6ee1d6..ad6f2ee 100644
Binary files a/lib/regex-20.3.0.jar and b/lib/regex-21.1.0.jar differ
diff --git a/lib/truffle-api-20.3.0-javadoc.jar b/lib/truffle-api-21.1.0-javadoc.jar
similarity index 56%
rename from lib/truffle-api-20.3.0-javadoc.jar
rename to lib/truffle-api-21.1.0-javadoc.jar
index c301826..5a08350 100644
Binary files a/lib/truffle-api-20.3.0-javadoc.jar and b/lib/truffle-api-21.1.0-javadoc.jar differ
diff --git a/lib/truffle-api-21.1.0-sources.jar b/lib/truffle-api-21.1.0-sources.jar
new file mode 100644
index 0000000..19ca21f
Binary files /dev/null and b/lib/truffle-api-21.1.0-sources.jar differ
diff --git a/lib/truffle-api-20.3.0.jar b/lib/truffle-api-21.1.0.jar
similarity index 65%
rename from lib/truffle-api-20.3.0.jar
rename to lib/truffle-api-21.1.0.jar
index 723fe9c..77ba082 100644
Binary files a/lib/truffle-api-20.3.0.jar and b/lib/truffle-api-21.1.0.jar differ
diff --git a/src/net/torvald/tsvm/AppLoader.java b/src/net/torvald/tsvm/AppLoader.java
index 0371f17..ad65a4c 100644
--- a/src/net/torvald/tsvm/AppLoader.java
+++ b/src/net/torvald/tsvm/AppLoader.java
@@ -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) {
diff --git a/tsvm.iml b/tsvm.iml
index b892b76..62037d3 100644
--- a/tsvm.iml
+++ b/tsvm.iml
@@ -9,10 +9,13 @@
-
-
+
+
+
+
+
\ No newline at end of file