6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-07-03 05:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Added support for -emu option specifying which emulator to execute.

Browse Source
This commit is contained in:
jespergravgaard 2020-05-09 00:04:03 +02:00
parent 6aa88fe3e6
commit 7e859fa8ae
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,9 @@ public class KickC implements Callable<Void> {
@CommandLine.Option(names = {"-e"}, description = "Execute the assembled prg file using VICE. Implicitly assembles the output.")
private boolean execute = false;
@CommandLine.Option(names = {"-emu"}, description = "Execute the assembled program file by passing it to the named emulator. Implicitly assembles the output.")
private String emulator = null;
@CommandLine.Option(names = {"-d"}, description = "Debug the assembled prg file using C64Debugger. Implicitly assembles the output.")
private boolean debug = false;
@ -390,7 +393,7 @@ public class KickC implements Callable<Void> {
// Assemble the asm-file if instructed
String prgFileName = outputFileNameBase + ".prg";
Path prgPath = outputDir.resolve(prgFileName);
if(assemble || execute || debug) {
if(assemble || execute || debug || (emulator != null)) {
Path kasmLogPath = outputDir.resolve(outputFileNameBase + ".klog");
System.out.println("Assembling to " + prgPath.toString());
String[] assembleCommand = {asmPath.toString(), "-log", kasmLogPath.toString(), "-o", prgPath.toString(), "-vicesymbols", "-showmem", "-debugdump"};
@ -419,30 +422,34 @@ public class KickC implements Callable<Void> {
}
}
// Debug the prg-file if instructed
if(debug) {
System.out.println("Debugging " + prgPath);
emulator = "C64Debugger";
}
if(execute) {
emulator = "x64sc";
}
String emuOptions = "";
if(emulator.equals("C64Debugger")) {
Path viceSymbolsPath = outputDir.resolve(outputFileNameBase + ".vs");
String debugCommand = "C64Debugger " + "-symbols " + viceSymbolsPath + " -wait 2500" + " -prg " + prgPath.toString();
if(verbose) {
System.out.println("Debugging command: " + debugCommand);
}
Process process = Runtime.getRuntime().exec(debugCommand);
process.waitFor();
emuOptions = "-symbols " + viceSymbolsPath + " -wait 2500" + " ";
}
// The program names used by VICE emulators
List<String> viceEmus = Arrays.asList("x64", "x64sc", "x128", "x64dtv", "xcbm2", "xcbm5x0", "xpet", "xplus4", "xscpu64", "xvic");
if(viceEmus.contains(emulator)) {
Path viceSymbolsPath = outputDir.resolve(outputFileNameBase + ".vs");
emuOptions = "-moncommands " + viceSymbolsPath.toAbsolutePath().toString() + " ";
}
// Execute the prg-file if instructed
if(execute) {
System.out.println("Executing " + prgPath);
Path viceSymbolsPath = outputDir.resolve(outputFileNameBase + ".vs");
String executeCommand = "x64sc " + "-moncommands " + viceSymbolsPath + " " + prgPath.toString();
if(emulator != null) {
System.out.println("Executing " + prgPath + " using " + emulator);
String executeCommand = emulator + " " + emuOptions + prgPath.toAbsolutePath().toString();
if(verbose) {
System.out.println("Executing command: " + executeCommand);
}
Process process = Runtime.getRuntime().exec(executeCommand);
process.waitFor();
}
}
return null;

4
src/main/java/dk/camelot64/kickc/model/TargetCpu.java
View File

@ -11,7 +11,7 @@ import java.util.List;
public enum TargetCpu {
/** Vanilla MOS 6502 CPU running in ROM - no illegal opcodes, no self-modifying code. */
ROM6502("rom6502", Collections.singletonList(Feature.MOS6502_COMMON)),
/** MOS 6502 CPU - allows illegal instructions, no self-modifying code. */
/** MOS 6502 CPU running in ROM - allows illegal instructions, no self-modifying code. */
ROM6502X("rom6502x", Arrays.asList(Feature.MOS6502_COMMON, Feature.MOS6502_UNODC)),
/** Vanilla MOS 6502 CPU - no illegal opcodes, allows self-modifying code. */
MOS6502("mos6502", Arrays.asList(Feature.MOS6502_COMMON, Feature.MOS6502_SELFMOD)),
@ -29,7 +29,7 @@ public enum TargetCpu {
public static final TargetCpu DEFAULT = MOS6502X;
/** Feature of a CPU. A feature is represented by a folder containing a number of fragments. */
public static enum Feature {
public enum Feature {
/** Official Instruction Set of the MOS6502 CPU. https://www.masswerk.at/6502/6502_instruction_set.html */
MOS6502_COMMON("mos6502-common"),
/** The Undocumented Opcodes of the MOS6502 CPU. http://www.oxyron.de/html/opcodes02.html */