6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2024-06-11 16:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Source level debugging info wip

Browse Source
This commit is contained in:
Carl-Henrik Skårstedt 2021-01-13 17:42:18 +01:00
parent 5c98f7c7e8
commit 56fb34c64b
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
x65.cpp
View File

@ -1411,6 +1411,7 @@ struct ListLine {
}; };
strref source_name; // source file index name strref source_name; // source file index name
strref code; // line of code this represents strref code; // line of code this represents
int column; // column of line
int address; // start address of this line int address; // start address of this line
int size; // number of bytes generated for this line int size; // number of bytes generated for this line
int line_offs; // offset into code int line_offs; // offset into code
@ -6543,6 +6544,7 @@ StatusCode Asm::BuildLine(strref line) {
int start_section = SectionId(); int start_section = SectionId();
int start_address = CurrSection().address; int start_address = CurrSection().address;
strref code_line = line; strref code_line = line;
const char* data_line = line.get(); // code_line is current line, data_line is where data is generated
list_flags = 0; list_flags = 0;
while (line && error == STATUS_OK) { while (line && error == STATUS_OK) {
@ -6611,9 +6613,11 @@ StatusCode Asm::BuildLine(strref line) {
line.skip_whitespace(); line.skip_whitespace();
} }
if (aInstructions[op_idx].type==OT_DIRECTIVE) { if (aInstructions[op_idx].type==OT_DIRECTIVE) {
data_line = operation.get();
error = ApplyDirective((AssemblerDirective)aInstructions[op_idx].index, line, contextStack.curr().source_file); error = ApplyDirective((AssemblerDirective)aInstructions[op_idx].index, line, contextStack.curr().source_file);
list_flags |= ListLine::KEYWORD; list_flags |= ListLine::KEYWORD;
} else if (ConditionalAsm() && aInstructions[op_idx].type == OT_MNEMONIC) { } else if (ConditionalAsm() && aInstructions[op_idx].type == OT_MNEMONIC) {
data_line = operation.get();
error = AddOpcode(line, aInstructions[op_idx].index, contextStack.curr().source_file); error = AddOpcode(line, aInstructions[op_idx].index, contextStack.curr().source_file);
list_flags |= ListLine::MNEMONIC; list_flags |= ListLine::MNEMONIC;
} }
@ -6716,6 +6720,7 @@ StatusCode Asm::BuildLine(strref line) {
lst.address = start_address - curr.start_address; lst.address = start_address - curr.start_address;
lst.size = curr.address - start_address; lst.size = curr.address - start_address;
lst.code = contextStack.curr().source_file; lst.code = contextStack.curr().source_file;
lst.column = (uint16_t)(data_line - code_line.get());
lst.source_name = contextStack.curr().source_name; lst.source_name = contextStack.curr().source_name;
lst.line_offs = int(code_line.get() - lst.code.get()); lst.line_offs = int(code_line.get() - lst.code.get());
lst.flags = list_flags; lst.flags = list_flags;
@ -7219,6 +7224,7 @@ struct ObjFileSection {
int end_address; // address size int end_address; // address size
int output_size; // assembled binary size int output_size; // assembled binary size
int align_address; int align_address;
int list_count; // how many addresses included in debugger listing
int16_t next_group; // next section of group int16_t next_group; // next section of group
int16_t first_group; // first section of group int16_t first_group; // first section of group
int16_t relocs; int16_t relocs;
@ -7226,6 +7232,10 @@ struct ObjFileSection {
int8_t flags; int8_t flags;
}; };
struct ObjFileSource {
struct ObjFileStr file;
};
struct ObjFileReloc { struct ObjFileReloc {
int base_value; int base_value;
int section_offset; int section_offset;
@ -7266,6 +7276,21 @@ struct ObjFileMapSymbol {
bool local; // local labels are probably needed bool local; // local labels are probably needed
}; };
// this struct is follwed by numSources x ObjFileStr
struct ObjFileSourceList {
uint32_t numSources;
};
// after that one long array of all sections worth of source references
struct ObjFileSrcRef {
uint16_t addr; // relative to section
uint16_t src_idx;
uint16_t size;
uint16_t _pad;
uint32_t file_offs; // byte offset into file to row/column where op starts1
};
// Simple string pool, converts strref strings to zero terminated strings and returns the offset to the string in the pool. // Simple string pool, converts strref strings to zero terminated strings and returns the offset to the string in the pool.
static int _AddStrPool(const strref str, pairArray<uint32_t, int> *pLookup, char **strPool, uint32_t &strPoolSize, uint32_t &strPoolCap) { static int _AddStrPool(const strref str, pairArray<uint32_t, int> *pLookup, char **strPool, uint32_t &strPoolSize, uint32_t &strPoolCap) {
if (!str.get()||!str.get_len()) { return -1; } // empty string if (!str.get()||!str.get_len()) { return -1; } // empty string
@ -7530,7 +7555,7 @@ StatusCode Asm::ReadObjectFile(strref filename, int link_to_section)
int prevSection = SectionId(); int prevSection = SectionId();
int16_t *aSctRmp = (int16_t*)malloc(hdr.sections * sizeof(int16_t)); int16_t *aSctRmp = (int16_t*)malloc(hdr.sections * sizeof(int16_t));
int last_linked_section = link_to_section; int last_linked_section = link_to_section;
while (last_linked_section>=0&&allSections[last_linked_section].next_group>=0) { while (last_linked_section>=0 && allSections[last_linked_section].next_group>=0) {
last_linked_section = allSections[last_linked_section].next_group; last_linked_section = allSections[last_linked_section].next_group;
} }