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

Added a helper switch to show XREFs/XDEFs before linking

Browse Source
This commit is contained in:
Carl-Henrik Skårstedt 2020-04-01 16:19:48 +02:00
parent c1de91e3f1
commit 1f6956c1ec
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
x65.cpp
View File

@ -64,6 +64,7 @@ static const strref cmdarg_sym("sym"); // -sym (file.sym) : generate symbol fi
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 static const strref cmdarg_xrefimp("xrefimp"); // -xrefimp : import directive means xref, not include/incbin
static const strref cmdarg_references("refs"); // -refs: show label dependencies before linking
// 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.
@ -1861,6 +1862,8 @@ public:
void AddTriple(int l) { CurrSection().AddTriple(l); } void AddTriple(int l) { CurrSection().AddTriple(l); }
void AddBin(const uint8_t *p, int size) { CurrSection().AddBin(p, size); } void AddBin(const uint8_t *p, int size) { CurrSection().AddBin(p, size); }
void ShowReferences();
// Object file handling // Object file handling
StatusCode WriteObjectFile(strref filename); // write x65 object file StatusCode WriteObjectFile(strref filename); // write x65 object file
StatusCode ReadObjectFile(strref filename, int link_to_section = -1); // read x65 object file StatusCode ReadObjectFile(strref filename, int link_to_section = -1); // read x65 object file
@ -7224,6 +7227,23 @@ static int _AddStrPool(const strref str, pairArray<uint32_t, int> *pLookup, char
return strOffs; return strOffs;
} }
void Asm::ShowReferences()
{
size_t num = labels.count();
const Label* lbl = labels.getValues();
printf("LABEL REFERENCE SUMMARY:\n");
for (size_t l = 0; l < num; ++l) {
if (lbl[l].external) {
printf(" * >" STRREF_FMT " Sect: " STRREF_FMT " Offs: $%0x\n",
STRREF_ARG(lbl[l].label_name), STRREF_ARG(lbl[l].section >= 0 ? allSections[lbl[l].section].name : strref("fixed")), lbl[l].value);
}
if (lbl[l].reference) {
printf(" * <" STRREF_FMT " Sect: " STRREF_FMT " Offs: $%0x\n",
STRREF_ARG(lbl[l].label_name), STRREF_ARG(lbl[l].section >= 0 ? allSections[lbl[l].section].name : strref("fixed")), lbl[l].value);
}
}
}
StatusCode Asm::WriteObjectFile(strref filename) { StatusCode Asm::WriteObjectFile(strref filename) {
if (allSections.size()==0) if (allSections.size()==0)
return ERROR_NOT_A_SECTION; return ERROR_NOT_A_SECTION;
@ -7852,6 +7872,7 @@ int main(int argc, char **argv) {
bool force_merge_sections = false; bool force_merge_sections = false;
bool list_output = false; bool list_output = false;
bool tass_list_output = false; bool tass_list_output = false;
bool show_refs_before_link = false;
Asm assembler; Asm assembler;
@ -7897,6 +7918,8 @@ int main(int argc, char **argv) {
assembler.end_macro_directive = true; assembler.end_macro_directive = true;
} else if (arg.same_str(cmdarg_xrefimp)) { } else if (arg.same_str(cmdarg_xrefimp)) {
assembler.import_means_xref = true; assembler.import_means_xref = true;
} else if (arg.same_str(cmdarg_references)) {
show_refs_before_link = 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;
@ -7991,6 +8014,9 @@ int main(int argc, char **argv) {
// if source_filename contains a path add that as a search path for include files // if source_filename contains a path add that as a search path for include files
assembler.AddIncludeFolder(srcname.before_last('/', '\\')); assembler.AddIncludeFolder(srcname.before_last('/', '\\'));
assembler.Assemble(strref(buffer, strl_t(size)), srcname, obj_out_file != nullptr); assembler.Assemble(strref(buffer, strl_t(size)), srcname, obj_out_file != nullptr);
if (show_refs_before_link) {
assembler.ShowReferences();
}
if (assembler.error_encountered) { if (assembler.error_encountered) {
return_value = 1; return_value = 1;
} else { } else {