Upgraded to Atari XE/XL Format plugin 1.3 (adding support for "_Order") in the linker file. Upgraded to KickAss 65CE02 5.16.h (Fixing off-by-one bugin long branches.)

.idea/libraries/Maven__cml_kickass_kickassembler_5_16_65ce02_i.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: cml.kickass:kickassembler:5.16-65ce02.h">
+  <library name="Maven: cml.kickass:kickassembler:5.16-65ce02.i">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.h/kickassembler-5.16-65ce02.h.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.h/kickassembler-5.16-65ce02.h-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.h/kickassembler-5.16-65ce02.h-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__dk_camelot64_kickass_xexplugin_kickassxexformat_1_3.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.2">
+  <library name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.3">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.2/kickassxexformat-1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.2/kickassxexformat-1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.2/kickassxexformat-1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

kickc.iml

@@ -25,7 +25,7 @@
     <orderEntry type="library" name="Maven: info.picocli:picocli:4.5.2" 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.16-65ce02.h" level="project" />
-    <orderEntry type="library" name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.2" level="project" />
+    <orderEntry type="library" name="Maven: cml.kickass:kickassembler:5.16-65ce02.i" level="project" />
+    <orderEntry type="library" name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.3" level="project" />
   </component>
 </module>

pom.xml

@@ -59,12 +59,12 @@
         <dependency>
             <groupId>cml.kickass</groupId>
             <artifactId>kickassembler</artifactId>
-            <version>5.16-65ce02.h</version>
+            <version>5.16-65ce02.i</version>
         </dependency>
         <dependency>
             <groupId>dk.camelot64.kickass.xexplugin</groupId>
             <artifactId>kickassxexformat</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
         </dependency>
     </dependencies>
 

repo/cml/kickass/kickassembler/5.16-65ce02.i/_remote.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Fri Dec 11 00:10:35 CET 2020
+kickassembler-5.16-65ce02.i.pom>=
+kickassembler-5.16-65ce02.i.jar>=

repo/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.jar.md5

@@ -0,0 +1 @@
+9939a94952b0afb477b1aa9f0f1d8069

repo/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.jar.sha1

@@ -0,0 +1 @@
+c5b4e43e39dca9b6b2498f1b2a95154aaa32edbc

repo/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cml.kickass</groupId>
+  <artifactId>kickassembler</artifactId>
+  <version>5.16-65ce02.i</version>
+  <description>POM was created from install:install-file</description>
+</project>

repo/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.pom.md5

@@ -0,0 +1 @@
+9b96c6c655d517bd5faf62df3d42e1bb

repo/cml/kickass/kickassembler/5.16-65ce02.i/kickassembler-5.16-65ce02.i.pom.sha1

@@ -0,0 +1 @@
+0acf064b20c5cd7ffb93b260f5256904edddc10f

repo/cml/kickass/kickassembler/maven-metadata.xml

@@ -3,7 +3,7 @@
   <groupId>cml.kickass</groupId>
   <artifactId>kickassembler</artifactId>
   <versioning>
-    <release>5.16-65ce02.h</release>
+    <release>5.16-65ce02.i</release>
     <versions>
       <version>4.19</version>
       <version>5.7</version>
@@ -21,7 +21,8 @@
       <version>5.16-65ce02.f</version>
       <version>5.16-65ce02.g</version>
       <version>5.16-65ce02.h</version>
+      <version>5.16-65ce02.i</version>
     </versions>
-    <lastUpdated>20200823155410</lastUpdated>
+    <lastUpdated>20201210231035</lastUpdated>
   </versioning>
 </metadata>

repo/cml/kickass/kickassembler/maven-metadata.xml.md5

@@ -1 +1 @@
-289ab34afa6747528faf80fa7b14a634
+8cbbf626a98238bb0297e7fa01f08c80

repo/cml/kickass/kickassembler/maven-metadata.xml.sha1

@@ -1 +1 @@
-a614ae6091d6bb2367e22282575417cb50a228e2
+d01231b2764f463d5c15b2d7538f561440a33914

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/_remote.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Fri Dec 11 00:13:52 CET 2020
+kickassxexformat-1.3.jar>=
+kickassxexformat-1.3.pom>=

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.jar.md5

@@ -0,0 +1 @@
+06489ff4b28a30cd08d86da47ae812c2

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.jar.sha1

@@ -0,0 +1 @@
+09065f5018c0b912dd789cb5fd8378224a4517c6

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dk.camelot64.kickass.xexplugin</groupId>
+  <artifactId>kickassxexformat</artifactId>
+  <version>1.3</version>
+  <description>POM was created from install:install-file</description>
+</project>

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.pom.md5

@@ -0,0 +1 @@
+746be49b3b8b64b2d1216ae7658dd6fd

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/1.3/kickassxexformat-1.3.pom.sha1

@@ -0,0 +1 @@
+cf684291fc78469fd2d5bf3150faf38822b740ce

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/maven-metadata.xml

@@ -3,12 +3,13 @@
   <groupId>dk.camelot64.kickass.xexplugin</groupId>
   <artifactId>kickassxexformat</artifactId>
   <versioning>
-    <release>1.2</release>
+    <release>1.3</release>
     <versions>
       <version>1.0</version>
       <version>1.1</version>
       <version>1.2</version>
+      <version>1.3</version>
     </versions>
-    <lastUpdated>20201118164828</lastUpdated>
+    <lastUpdated>20201210231352</lastUpdated>
   </versioning>
 </metadata>

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/maven-metadata.xml.md5

@@ -1 +1 @@
-b4b709d72a8051aae14cae9fb1386164
+90be2d009e5aa1b57f7825f372d6677b

repo/dk/camelot64/kickass/xexplugin/kickassxexformat/maven-metadata.xml.sha1

@@ -1 +1 @@
-980ed2ad1b45b3b008686eaedb5cffab6d468449
+f93489f54877aea19e72ead92d7b2e22fd34516f

src/main/fragment/cache/fragment-cache-mos6502x.asm

@@ -18579,3 +18579,335 @@ bmi !+
 lda #0
 !:
 sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz3
+ldy #0
+clc
+lda {z2}
+adc ({z3}),y
+sta {z1}
+iny
+lda {z2}+1
+adc ({z3}),y
+sta {z1}+1
+//FRAGMENT vwuz1_neq_0_then_la1
+lda {z1}
+ora {z1}+1
+bne {la1}
+//FRAGMENT vwuz1=vwuz1_ror_1
+lsr {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=_deref_pwuz1
+ldy #0
+lda ({z1}),y
+pha
+iny
+lda ({z1}),y
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT vwuz1=_deref_pwuz1_plus__deref_pwuz2
+ldy #0
+clc
+lda ({z1}),y
+adc ({z2}),y
+pha
+iny
+lda ({z1}),y
+adc ({z2}),y
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz1
+ldy #0
+clc
+lda ({z1}),y
+adc {z2}
+pha
+iny
+lda ({z1}),y
+adc {z2}+1
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT pwsz1=pwsc1_plus_vwsz2
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vdsz1=vdsz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+//FRAGMENT vwsz1=_sword_vdsz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT vwsz1_neq_0_then_la1
+lda {z1}+1
+ora {z1}
+bne {la1}
+//FRAGMENT _deref_pwsz1=vwsz2
+ldy #0
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT vduz1=vduz1_sethi_vwuz2
+lda {z2}
+sta {z1}+2
+lda {z2}+1
+sta {z1}+3
+//FRAGMENT pwsz1=pwsc1_plus_vwsz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=vbuz2_word_vbuc1
+lda {z2}
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vbuz1=vbuz2_minus__deref_pbuz3
+lda {z2}
+sec
+ldy #0
+sbc ({z3}),y
+sta {z1}
+//FRAGMENT vwuz1=_neg_vwuz1
+sec
+lda #0
+sbc {z1}
+sta {z1}
+lda #0
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_ror_1
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuz2
+ldy {z2}
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_ror_2
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=vbuaa_word_vbuc1
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vbuxx_word_vbuc1
+ldy #{c1}
+txa
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vbuyy_word_vbuc1
+tya
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vbuz1=vbuxx_minus__deref_pbuz2
+txa
+sec
+ldy #0
+sbc ({z2}),y
+sta {z1}
+//FRAGMENT vbuaa=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+//FRAGMENT vbuaa=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+//FRAGMENT vbuxx=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+tax
+//FRAGMENT vbuxx=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+tax
+//FRAGMENT vbuyy=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+tay
+//FRAGMENT vbuyy=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+tay
+//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuaa
+tay
+sec
+lda {z1}
+sbc {c1},y
+sta {z1}
+lda {z1}+1
+sbc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuaa
+tay
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuxx
+clc
+lda {z1}
+adc {c1},x
+sta {z1}
+lda {z1}+1
+adc {c1}+1,x
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuyy
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT vwuz1=pwuz2_minus_pwuc1
+lda {z2}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z2}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT _deref_pwuz1_le_vwuz2_then_la1
+ldy #1
+lda ({z1}),y
+cmp {z2}+1
+bne !+
+dey
+lda ({z1}),y
+cmp {z2}
+beq {la1}
+!:
+bcc {la1}
+//FRAGMENT pwuz1=pwuz1_minus_vbuc1
+sec
+lda {z1}
+sbc #{c1}
+sta {z1}
+lda {z1}+1
+sbc #0
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuz3
+lda {z3}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz2_minus__deref_pwsz3
+sec
+lda {z2}
+ldy #0
+sbc ({z3}),y
+sta {z1}
+lda {z2}+1
+iny
+sbc ({z3}),y
+sta {z1}+1
+//FRAGMENT vwsz1_le_0_then_la1
+lda {z1}+1
+bmi {la1}
+bne !+
+lda {z1}
+beq {la1}
+!:
+//FRAGMENT pwuz1=pwuz2_plus_vbuc1
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuaa
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuxx
+txa
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuyy
+tya
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vbuxx=vbuaa_plus_1
+tax
+inx
+//FRAGMENT vbuyy=vbuaa_plus_1
+tay
+iny
+//FRAGMENT vwuz1=pwuz1_minus_pwuc1
+lda {z1}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z1}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1_eq_0_then_la1
+lda {z1}
+ora {z1}+1
+beq {la1}

src/main/repo/mvn-repo-install-kickass.sh

@@ -4,7 +4,7 @@
 cp ./repo/cml/kickass/kickassembler/maven-metadata.xml ./repo/cml/kickass/kickassembler/maven-metadata-local.xml
 
 # mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Applications/KickAssembler/KickAss.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.16
-mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.16-65ce02.h
+mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.16-65ce02.i
 
 # Finalize by making the local metadata official
 pushd ./repo/cml/kickass/kickassembler

src/main/repo/mvn-repo-install-xexplugin.sh

@@ -3,7 +3,7 @@
 # Prepare by making the "official" metadata local
 cp ./repo/dk/camelot64/kickass/xexplugin/kickassxexformat/maven-metadata.xml ./repo/dk/camelot64/kickass/xexplugin/kickassxexformat/maven-metadata-local.xml
 
-mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickass-plugin-atari-xex/bin/KickAssXexFormat-1.2.jar -DgroupId=dk.camelot64.kickass.xexplugin -DartifactId=kickassxexformat -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=1.2
+mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickass-plugin-atari-xex/bin/KickAssXexFormat-1.3.jar -DgroupId=dk.camelot64.kickass.xexplugin -DartifactId=kickassxexformat -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=1.3
 
 # Finalize by making the local metadata official
 pushd ./repo/dk/camelot64/kickass/xexplugin/kickassxexformat