6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-04-05 07:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Added support for passing command line options on to the assembler using -Xassembler. Closes #530

Browse Source
This commit is contained in:
jespergravgaard 2020-11-08 12:46:42 +01:00
parent 78571d56ee
commit 66d94d7501
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/Maven__info_picocli_picocli_4_2_0.xml → .idea/libraries/Maven__info_picocli_picocli_4_5_2.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: info.picocli:picocli:4.2.0">
<library name="Maven: info.picocli:picocli:4.5.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.2.0/picocli-4.2.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.2.0/picocli-4.2.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.2.0/picocli-4.2.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.5.2/picocli-4.5.2-sources.jar!/" />
</SOURCES>
</library>
</component>

2
kickc.iml
View File

@ -23,7 +23,7 @@
<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: cml.kickass:kickassembler:5.16-65ce02.h" level="project" />
<orderEntry type="library" name="Maven: info.picocli:picocli:4.2.0" 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: org.glassfish:javax.json:1.1.4" level="project" />
</component>

2
pom.xml
View File

@ -49,7 +49,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.2.0</version>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>

13
src/main/fragment/cache/fragment-cache-mos6502x.asm vendored
View File

@ -19956,3 +19956,16 @@ bne !-
clc
adc #2
sta {z1}
//FRAGMENT vbuz1=pbuc1_derefidx_vbum2
ldy {m2}
lda {c1},y
sta {z1}
//FRAGMENT vbuaa=pbuc1_derefidx_vbum1
ldy {m1}
lda {c1},y
//FRAGMENT vbuxx=pbuc1_derefidx_vbum1
ldy {m1}
ldx {c1},y
//FRAGMENT vbuyy=pbuc1_derefidx_vbum1
ldx {m1}
ldy {c1},x

11
src/main/java/dk/camelot64/kickc/KickC.java
View File

@ -53,6 +53,9 @@ public class KickC implements Callable<Integer> {
@CommandLine.Option(names = {"-a"}, description = "Assemble the output file using KickAssembler. Produces a binary file.")
private boolean assemble = false;
@CommandLine.Option(names = {"-Xassembler"}, description = "Passes the next option to the assembler. The option should generally be quoted. This option can be repeated to pass multiple options.")
private List<String> assemblerOptions = null;
@CommandLine.Option(names = {"-e"}, description = "Execute the assembled binary file using an appropriate emulator. The emulator chosen depends on the target platform.")
private boolean execute = false;
@ -181,6 +184,8 @@ public class KickC implements Callable<Integer> {
public static void main(String[] args) {
final CommandLine commandLine = new CommandLine(new KickC());
commandLine.setTrimQuotes(true);
commandLine.setUnmatchedOptionsAllowedAsOptionParameters(true);
final int exitCode = commandLine.execute(args);
System.exit(exitCode);
}
@ -438,6 +443,10 @@ public class KickC implements Callable<Integer> {
assembleCommand.add("-vicesymbols");
assembleCommand.add("-showmem");
assembleCommand.add("-debugdump");
// Add passed options
if(assemblerOptions !=null)
assembleCommand.addAll(assemblerOptions);
if(verbose) {
System.out.print("Assembling command: java -jar KickAss.jar ");
for(String cmd : assembleCommand) {
@ -465,7 +474,6 @@ public class KickC implements Callable<Integer> {
// Execute the binary file if instructed
if(emulator != null) {
// Find commandline options for the emulator
String emuOptions = "";
if(emulator.equals("C64Debugger")) {
@ -478,7 +486,6 @@ public class KickC implements Callable<Integer> {
Path viceSymbolsPath = outputDir.resolve(outputFileNameBase + ".vs");
emuOptions = "-moncommands " + viceSymbolsPath.toAbsolutePath().toString() + " ";
}
System.out.println("Executing " + outputBinaryFilePath + " using " + emulator);
String executeCommand = emulator + " " + emuOptions + outputBinaryFilePath.toAbsolutePath().toString();
if(verbose) {