From 69832e87b97fb7482ddb5a578cdf0720725a1c37 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Tue, 19 Oct 2021 10:39:59 +0200
Subject: [PATCH] Updated dependent libraries.

---
 ... => Maven__info_picocli_picocli_4_6_1.xml} |  8 ++--
 ...org_apiguardian_apiguardian_api_1_1_2.xml} |  8 ++--
 ...junit_jupiter_junit_jupiter_api_5_8_1.xml} |  8 ++--
 ...it_jupiter_junit_jupiter_engine_5_8_1.xml} |  8 ++--
 ...platform_junit_platform_commons_1_8_1.xml} |  8 ++--
 ..._platform_junit_platform_engine_1_8_1.xml} |  8 ++--
 kickc.iml                                     | 12 +++---
 pom.xml                                       | 11 +++---
 .../cache/fragment-cache-mega45gs02.asm       | 37 +++++++++++++++++++
 9 files changed, 72 insertions(+), 36 deletions(-)
 rename .idea/libraries/{Maven__info_picocli_picocli_4_5_2.xml => Maven__info_picocli_picocli_4_6_1.xml} (68%)
 rename .idea/libraries/{Maven__org_apiguardian_apiguardian_api_1_1_0.xml => Maven__org_apiguardian_apiguardian_api_1_1_2.xml} (60%)
 rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml => Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml} (57%)
 rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml => Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml} (67%)
 rename .idea/libraries/{Maven__org_junit_platform_junit_platform_commons_1_6_2.xml => Maven__org_junit_platform_junit_platform_commons_1_8_1.xml} (67%)
 rename .idea/libraries/{Maven__org_junit_platform_junit_platform_engine_1_6_2.xml => Maven__org_junit_platform_junit_platform_engine_1_8_1.xml} (67%)

diff --git a/.idea/libraries/Maven__info_picocli_picocli_4_5_2.xml b/.idea/libraries/Maven__info_picocli_picocli_4_6_1.xml
similarity index 68%
rename from .idea/libraries/Maven__info_picocli_picocli_4_5_2.xml
rename to .idea/libraries/Maven__info_picocli_picocli_4_6_1.xml
index 85754e65a..fe0b627f8 100644
--- a/.idea/libraries/Maven__info_picocli_picocli_4_5_2.xml
+++ b/.idea/libraries/Maven__info_picocli_picocli_4_6_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: info.picocli:picocli:4.5.2">
+  <library name="Maven: info.picocli:picocli:4.6.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.6.1/picocli-4.6.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.6.1/picocli-4.6.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.6.1/picocli-4.6.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
similarity index 60%
rename from .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
rename to .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
index f854ab00f..6ac1c42c6 100644
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
+  <library name="Maven: org.apiguardian:apiguardian-api:1.1.2">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml
similarity index 57%
rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml
index ef160d242..4910ca992 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.1/junit-jupiter-api-5.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.1/junit-jupiter-api-5.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.1/junit-jupiter-api-5.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml
similarity index 67%
rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml
index fc4c644ed..85ab9ade1 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.1/junit-jupiter-engine-5.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.1/junit-jupiter-engine-5.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.1/junit-jupiter-engine-5.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml
similarity index 67%
rename from .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
rename to .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml
index f2699b952..341720888 100644
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2">
+  <library name="Maven: org.junit.platform:junit-platform-commons:1.8.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.1/junit-platform-commons-1.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.1/junit-platform-commons-1.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.1/junit-platform-commons-1.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml
similarity index 67%
rename from .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
rename to .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml
index c13a302c4..f19b408df 100644
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2">
+  <library name="Maven: org.junit.platform:junit-platform-engine:1.8.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/kickc.iml b/kickc.iml
index e9abf2081..6fe07e291 100644
--- a/kickc.iml
+++ b/kickc.iml
@@ -17,13 +17,13 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:61.1" level="project" />
     <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.9.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
-    <orderEntry type="library" name="Maven: info.picocli:picocli:4.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
+    <orderEntry type="library" name="Maven: info.picocli:picocli:4.6.1" level="project" />
     <orderEntry type="library" name="Maven: javax.json:javax.json-api:1.1.4" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.1.4" level="project" />
     <orderEntry type="library" name="Maven: cml.kickass:kickassembler:5.22-65ce02.a" level="project" />
diff --git a/pom.xml b/pom.xml
index 8c633b857..590ba23d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.5.2</version>
+            <version>4.6.1</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
@@ -118,7 +118,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
+                <version>0.8.7</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -138,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -150,7 +150,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <finalName>kickc</finalName>
                     <tarLongFileMode>posix</tarLongFileMode>
@@ -171,5 +171,4 @@
         </plugins>
     </build>
 
-
 </project>
\ No newline at end of file
diff --git a/src/main/fragment/cache/fragment-cache-mega45gs02.asm b/src/main/fragment/cache/fragment-cache-mega45gs02.asm
index 0228252a7..c2c92cc1c 100644
--- a/src/main/fragment/cache/fragment-cache-mega45gs02.asm
+++ b/src/main/fragment/cache/fragment-cache-mega45gs02.asm
@@ -2440,3 +2440,40 @@ sta {z1}+3
 NO_SYNTHESIS
 //FRAGMENT vduz1=vwsc1
 NO_SYNTHESIS
+//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
+inc {c1}
+//FRAGMENT _deref_pbuc1_eq_vbuz1_then_la1
+lda {c1}
+cmp {z1}
+beq {la1}
+//FRAGMENT _deref_pbuc1=_dec__deref_pbuc1
+dec {c1}
+//FRAGMENT pbuc1_derefidx_vbuz1=_inc_pbuc1_derefidx_vbuz1
+ldx {z1}
+inc {c1},x
+//FRAGMENT _deref_pbuc1_eq_vbuaa_then_la1
+cmp {c1}
+beq {la1}
+//FRAGMENT pbuc1_derefidx_vbuaa=_inc_pbuc1_derefidx_vbuaa
+tax
+inc {c1},x
+//FRAGMENT pbuc1_derefidx_vbuxx=_inc_pbuc1_derefidx_vbuxx
+inc {c1},x
+//FRAGMENT pbuc1_derefidx_vbuyy=_inc_pbuc1_derefidx_vbuyy
+lda {c1},y
+inc
+sta {c1},y
+//FRAGMENT pbuc1_derefidx_vbuzz=_inc_pbuc1_derefidx_vbuzz
+tza
+tax
+inc {c1},x
+//FRAGMENT _deref_pbuc1_eq_vbuxx_then_la1
+cpx {c1}
+beq {la1}
+//FRAGMENT _deref_pbuc1_eq_vbuyy_then_la1
+tya
+cmp {c1}
+beq {la1}
+//FRAGMENT _deref_pbuc1_eq_vbuzz_then_la1
+cpz {c1}
+beq {la1}