6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-02-27 01:29:37 +00:00
Code Issues Projects Releases Wiki Activity

Updated to KickAss 5.21

Browse Source
This commit is contained in:
jespergravgaard 2021-09-26 00:34:10 +02:00
parent d09f4e2219
commit 04734ee965
15 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/Maven__cml_kickass_kickassembler_5_19_65ce02_a.xml → .idea/libraries/Maven__cml_kickass_kickassembler_5_21_65ce02_a.xml generated
View File

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

2
kickc.iml
View File

@ -26,7 +26,7 @@
<orderEntry type="library" name="Maven: info.picocli:picocli:4.5.2" level="project" /> <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: 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: org.glassfish:javax.json:1.1.4" level="project" />
<orderEntry type="library" name="Maven: cml.kickass:kickassembler:5.19-65ce02.a" level="project" /> <orderEntry type="library" name="Maven: cml.kickass:kickassembler:5.21-65ce02.a" level="project" />
<orderEntry type="library" name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.3" level="project" /> <orderEntry type="library" name="Maven: dk.camelot64.kickass.xexplugin:kickassxexformat:1.3" level="project" />
<orderEntry type="library" name="Maven: se.triad.kickass:kickass-cruncher-plugins:2.0" level="project" /> <orderEntry type="library" name="Maven: se.triad.kickass:kickass-cruncher-plugins:2.0" level="project" />
</component> </component>

2
pom.xml
View File

@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>cml.kickass</groupId> <groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId> <artifactId>kickassembler</artifactId>
<version>5.19-65ce02.a</version> <version>5.21-65ce02.a</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dk.camelot64.kickass.xexplugin</groupId> <groupId>dk.camelot64.kickass.xexplugin</groupId>

4
repo/cml/kickass/kickassembler/5.21-65ce02.a/_remote.repositories Normal file
View File

@ -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>=

BIN
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar Normal file
View File

Binary file not shown.

1
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.md5 Normal file
View File

@ -0,0 +1 @@
b8ae2e9df64328928df1cc680df8fd1f

1
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5635c4fdce42d1cea1f368adcf1ff3f36a5c2f82

9
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom Normal file
View File

@ -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.21-65ce02.a</version>
<description>POM was created from install:install-file</description>
</project>

1
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.md5 Normal file
View File

@ -0,0 +1 @@
82e130da13c6cd2bcda772f345e50aec

1
repo/cml/kickass/kickassembler/5.21-65ce02.a/kickassembler-5.21-65ce02.a.pom.sha1 Normal file
View File

@ -0,0 +1 @@
90ac86f6cca7134edc8db16e6d583ca3b21d956c

5
repo/cml/kickass/kickassembler/maven-metadata.xml
View File

@ -3,7 +3,7 @@
<groupId>cml.kickass</groupId> <groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId> <artifactId>kickassembler</artifactId>
<versioning> <versioning>
<release>5.19-65ce02.a</release> <release>5.21-65ce02.a</release>
<versions> <versions>
<version>4.19</version> <version>4.19</version>
<version>5.7</version> <version>5.7</version>
@ -24,7 +24,8 @@
<version>5.16-65ce02.i</version> <version>5.16-65ce02.i</version>
<version>5.17-65ce02.a</version> <version>5.17-65ce02.a</version>
<version>5.19-65ce02.a</version> <version>5.19-65ce02.a</version>
<version>5.21-65ce02.a</version>
</versions> </versions>
<lastUpdated>20210207141130</lastUpdated> <lastUpdated>20210925220943</lastUpdated>
</versioning> </versioning>
</metadata> </metadata>

2
repo/cml/kickass/kickassembler/maven-metadata.xml.md5
View File

@ -1 +1 @@
b0f7d5b7df04f8d330058b6a490db3a5 8c3501fcaf618a7db6c3eebce25d33f8

2
repo/cml/kickass/kickassembler/maven-metadata.xml.sha1
View File

@ -1 +1 @@
a1d6346b17b671b19306e66f7290a0801c53d69c eeb29c51313deda389be3be8cf721bb8276a2812

2
src/main/repo/mvn-repo-install-kickass.sh
View File

@ -4,7 +4,7 @@
cp ./repo/cml/kickass/kickassembler/maven-metadata.xml ./repo/cml/kickass/kickassembler/maven-metadata-local.xml 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=/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 # Finalize by making the local metadata official
pushd ./repo/cml/kickass/kickassembler pushd ./repo/cml/kickass/kickassembler

17
src/test/java/dk/camelot64/cpufamily6502/TestCpuFamilyKickAssCompatibility.java
View File

@ -38,12 +38,23 @@ public class TestCpuFamilyKickAssCompatibility {
private void assertOpcodesMatch(Cpu65xx kcCpu, Cpu kaCpu) { private void assertOpcodesMatch(Cpu65xx kcCpu, Cpu kaCpu) {
final Collection<CpuOpcode> kcAllOpcodes = kcCpu.getAllOpcodes(); final Collection<CpuOpcode> kcAllOpcodes = kcCpu.getAllOpcodes();
final Map<String, int[]> kaAllMnemonics = kaCpu.mnemonics; final List<MnemonicDefinition> kaAllMnemonics = kaCpu.mnemonics;
final Map<CpuAddressingMode, List<_65xxArgType>> kaAddressingModeMap = getKAAddressingModeMap(); final Map<CpuAddressingMode, List<_65xxArgType>> kaAddressingModeMap = getKAAddressingModeMap();
// Test that each KickC opcode has a matching KickAss opcode // Test that each KickC opcode has a matching KickAss opcode
for(CpuOpcode kcOpcode : kcAllOpcodes) { 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"); assertNotNull(kcOpcode.getMnemonic(), "KickAss CPU " + kaCpu.name + " does not know the KickC CPU " + kcCpu.getName() + " mnemonic");
final List<_65xxArgType> kaArgTypes = kaAddressingModeMap.get(kcOpcode.getAddressingMode()); final List<_65xxArgType> kaArgTypes = kaAddressingModeMap.get(kcOpcode.getAddressingMode());
assertNotNull(kaArgTypes, "KickAss addressing mode not found " + kcOpcode.getAddressingMode().getName()); 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()); assertTrue(found, "KickAss opcode not found for mnemonic " + kcOpcode.toString());
} }