diff --git a/.idea/libraries/Maven__cml_kickass_kickassembler_5_19_65ce02_a.xml b/.idea/libraries/Maven__cml_kickass_kickassembler_5_21_65ce02_a.xml similarity index 57% rename from .idea/libraries/Maven__cml_kickass_kickassembler_5_19_65ce02_a.xml rename to .idea/libraries/Maven__cml_kickass_kickassembler_5_21_65ce02_a.xml index c7da3cde3..c99a81aa8 100644 --- a/.idea/libraries/Maven__cml_kickass_kickassembler_5_19_65ce02_a.xml +++ b/.idea/libraries/Maven__cml_kickass_kickassembler_5_21_65ce02_a.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/kickc.iml b/kickc.iml index ff146d0c0..e006ec63d 100644 --- a/kickc.iml +++ b/kickc.iml @@ -26,7 +26,7 @@ - + diff --git a/pom.xml b/pom.xml index 597d16683..3db2d5aa8 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ cml.kickass kickassembler - 5.19-65ce02.a + 5.21-65ce02.a dk.camelot64.kickass.xexplugin diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/_remote.repositories b/repo/cml/kickass/kickassembler/5.21-65ce02.a/_remote.repositories new file mode 100644 index 000000000..c847d5f54 --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/_remote.repositories @@ -0,0 +1,4 @@ +#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. +#Sun Sep 26 00:09:43 CEST 2021 +kickassembler-5.21-65ce02.a.pom>= +kickassembler-5.21-65ce02.a.jar>= diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar new file mode 100644 index 000000000..21e1c56cf Binary files /dev/null and b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar differ diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.md5 b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.md5 new file mode 100644 index 000000000..b3dad6c41 --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.md5 @@ -0,0 +1 @@ +b8ae2e9df64328928df1cc680df8fd1f \ No newline at end of file diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.sha1 b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.sha1 new file mode 100644 index 000000000..7d321eaed --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.sha1 @@ -0,0 +1 @@ +5635c4fdce42d1cea1f368adcf1ff3f36a5c2f82 \ No newline at end of file diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom new file mode 100644 index 000000000..fe2535d70 --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + cml.kickass + kickassembler + 5.21-65ce02.a + POM was created from install:install-file + diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.md5 b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.md5 new file mode 100644 index 000000000..e8494e1e0 --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.md5 @@ -0,0 +1 @@ +82e130da13c6cd2bcda772f345e50aec \ No newline at end of file diff --git a/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.sha1 b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.sha1 new file mode 100644 index 000000000..4fa1388d6 --- /dev/null +++ b/repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.sha1 @@ -0,0 +1 @@ +90ac86f6cca7134edc8db16e6d583ca3b21d956c \ No newline at end of file diff --git a/repo/cml/kickass/kickassembler/maven-metadata.xml b/repo/cml/kickass/kickassembler/maven-metadata.xml index 04db17fd1..9f0d94dbb 100644 --- a/repo/cml/kickass/kickassembler/maven-metadata.xml +++ b/repo/cml/kickass/kickassembler/maven-metadata.xml @@ -3,7 +3,7 @@ cml.kickass kickassembler - 5.19-65ce02.a + 5.21-65ce02.a 4.19 5.7 @@ -24,7 +24,8 @@ 5.16-65ce02.i 5.17-65ce02.a 5.19-65ce02.a + 5.21-65ce02.a - 20210207141130 + 20210925220943 diff --git a/repo/cml/kickass/kickassembler/maven-metadata.xml.md5 b/repo/cml/kickass/kickassembler/maven-metadata.xml.md5 index 88704e2db..47ae4e417 100644 --- a/repo/cml/kickass/kickassembler/maven-metadata.xml.md5 +++ b/repo/cml/kickass/kickassembler/maven-metadata.xml.md5 @@ -1 +1 @@ -b0f7d5b7df04f8d330058b6a490db3a5 \ No newline at end of file +8c3501fcaf618a7db6c3eebce25d33f8 \ No newline at end of file diff --git a/repo/cml/kickass/kickassembler/maven-metadata.xml.sha1 b/repo/cml/kickass/kickassembler/maven-metadata.xml.sha1 index eafc1d2b1..0cca6f532 100644 --- a/repo/cml/kickass/kickassembler/maven-metadata.xml.sha1 +++ b/repo/cml/kickass/kickassembler/maven-metadata.xml.sha1 @@ -1 +1 @@ -a1d6346b17b671b19306e66f7290a0801c53d69c \ No newline at end of file +eeb29c51313deda389be3be8cf721bb8276a2812 \ No newline at end of file diff --git a/src/main/repo/mvn-repo-install-kickass.sh b/src/main/repo/mvn-repo-install-kickass.sh index de9cebaa3..51de10fd0 100755 --- a/src/main/repo/mvn-repo-install-kickass.sh +++ b/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.19-65ce02.a +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.21-65ce02.a # Finalize by making the local metadata official pushd ./repo/cml/kickass/kickassembler diff --git a/src/test/java/dk/camelot64/cpufamily6502/TestCpuFamilyKickAssCompatibility.java b/src/test/java/dk/camelot64/cpufamily6502/TestCpuFamilyKickAssCompatibility.java index f294d66ed..91c40695b 100644 --- a/src/test/java/dk/camelot64/cpufamily6502/TestCpuFamilyKickAssCompatibility.java +++ b/src/test/java/dk/camelot64/cpufamily6502/TestCpuFamilyKickAssCompatibility.java @@ -38,12 +38,23 @@ public class TestCpuFamilyKickAssCompatibility { private void assertOpcodesMatch(Cpu65xx kcCpu, Cpu kaCpu) { final Collection kcAllOpcodes = kcCpu.getAllOpcodes(); - final Map kaAllMnemonics = kaCpu.mnemonics; + final List kaAllMnemonics = kaCpu.mnemonics; final Map> kaAddressingModeMap = getKAAddressingModeMap(); // Test that each KickC opcode has a matching KickAss opcode for(CpuOpcode kcOpcode : kcAllOpcodes) { - final int[] kaOpcodes = kaAllMnemonics.get(kcOpcode.getMnemonic()); + + int[] kaOpcodes = null; + for(MnemonicDefinition kaMnemonic : kaAllMnemonics) { + for(String kaName : kaMnemonic.namesList) { + if(kaName.equals(kcOpcode.getMnemonic())) { + kaOpcodes = kaMnemonic.opcodes; + } + } + } + + // final int[] kaOpcodes = kaAllMnemonics.get(kcOpcode.getMnemonic()); + assertNotNull(kcOpcode.getMnemonic(), "KickAss CPU " + kaCpu.name + " does not know the KickC CPU " + kcCpu.getName() + " mnemonic"); final List<_65xxArgType> kaArgTypes = kaAddressingModeMap.get(kcOpcode.getAddressingMode()); assertNotNull(kaArgTypes, "KickAss addressing mode not found " + kcOpcode.getAddressingMode().getName()); @@ -63,6 +74,8 @@ public class TestCpuFamilyKickAssCompatibility { } } } + if(!found) + System.out.println("Not found!"); assertTrue(found, "KickAss opcode not found for mnemonic " + kcOpcode.toString()); }