6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2024-12-28 19:32:25 +00:00
Code Issues Projects Releases Wiki Activity

ca65 uses import/export instead of xref/xdef, section export is not available in this case

Browse Source
This commit is contained in:
Carl-Henrik Skårstedt 2020-01-08 17:04:42 -08:00
parent e192c25b62
commit 40512e1b64
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x65.cpp
View File

@ -62,6 +62,7 @@ static const strref cmdarg_sect("sect"); // -sect: display sections loaded and
static const strref cmdarg_sym("sym"); // -sym (file.sym) : generate symbol file static const strref cmdarg_sym("sym"); // -sym (file.sym) : generate symbol file
static const strref cmdarg_obj("obj"); // -obj (file.x65) : generate object file for later linking static const strref cmdarg_obj("obj"); // -obj (file.x65) : generate object file for later linking
static const strref cmdarg_vice("vice"); // -vice (file.vs) : export a vice symbol file static const strref cmdarg_vice("vice"); // -vice (file.vs) : export a vice symbol file
static const strref cmdarg_xrefimp("xrefimp"); // -xrefimp : import directive means xref, not include/incbin
// if the number of resolved labels exceed this in one late eval then skip // if the number of resolved labels exceed this in one late eval then skip
// checking for relevance and just eval all unresolved expressions. // checking for relevance and just eval all unresolved expressions.
@ -1559,6 +1560,7 @@ public:
bool error_encountered; // if any error encountered, don't export binary bool error_encountered; // if any error encountered, don't export binary
bool list_assembly; // generate assembler listing bool list_assembly; // generate assembler listing
bool end_macro_directive; // whether to use { } or macro / endmacro for macro scope bool end_macro_directive; // whether to use { } or macro / endmacro for macro scope
bool import_means_xref;
// Convert source to binary // Convert source to binary
void Assemble(strref source, strref filename, bool obj_target); void Assemble(strref source, strref filename, bool obj_target);
@ -1773,6 +1775,7 @@ void Asm::Cleanup() {
error_encountered = false; error_encountered = false;
list_assembly = false; list_assembly = false;
end_macro_directive = false; end_macro_directive = false;
import_means_xref = false;
accumulator_16bit = false; // default 65816 8 bit immediate mode accumulator_16bit = false; // default 65816 8 bit immediate mode
index_reg_16bit = false; // other CPUs won't be affected. index_reg_16bit = false; // other CPUs won't be affected.
cycle_counter_level = 0; cycle_counter_level = 0;
@ -4646,7 +4649,7 @@ StatusCode Asm::Directive_Incbin(strref line, int skip, int len)
StatusCode Asm::Directive_Import(strref line) StatusCode Asm::Directive_Import(strref line)
{ {
line.skip_whitespace(); line.skip_whitespace();
int skip = 0; // binary import skip this amount int skip = 0; // binary import skip this amount
int len = 0; // binary import load up to this amount int len = 0; // binary import load up to this amount
strref param; // read out skip & max len parameters strref param; // read out skip & max len parameters
@ -5051,6 +5054,7 @@ StatusCode Asm::ApplyDirective(AssemblerDirective dir, strref line, strref sourc
return ERROR_CPU_NOT_SUPPORTED; return ERROR_CPU_NOT_SUPPORTED;
case AD_EXPORT: case AD_EXPORT:
if (import_means_xref) { return Directive_XDEF(line); }
line.trim_whitespace(); line.trim_whitespace();
CurrSection().export_append = line.split_label(); CurrSection().export_append = line.split_label();
break; break;
@ -5208,6 +5212,7 @@ StatusCode Asm::ApplyDirective(AssemblerDirective dir, strref line, strref sourc
return Directive_Incbin(line); return Directive_Incbin(line);
case AD_IMPORT: case AD_IMPORT:
if (import_means_xref) { return Directive_XREF(line); }
return Directive_Import(line); return Directive_Import(line);
case AD_LABEL: case AD_LABEL:
@ -7294,6 +7299,8 @@ int main(int argc, char **argv) {
info = true; info = true;
} else if (arg.same_str(cmdarg_endmacro)) { } else if (arg.same_str(cmdarg_endmacro)) {
assembler.end_macro_directive = true; assembler.end_macro_directive = true;
} else if (arg.same_str(cmdarg_xrefimp)) {
assembler.import_means_xref = true;
} else if (arg.has_prefix(cmdarg_listing)&&(arg.get_len()==cmdarg_listing.get_len()||arg[cmdarg_listing.get_len()]=='=')) { } else if (arg.has_prefix(cmdarg_listing)&&(arg.get_len()==cmdarg_listing.get_len()||arg[cmdarg_listing.get_len()]=='=')) {
assembler.list_assembly = true; assembler.list_assembly = true;
list_output = true; list_output = true;