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

Fix for forward reference in REPT block and assigning section relative address to symbol

Browse Source 
- Remember the REPT index for values that can't be evaluated yet
- Remember section reference when evaluating symbols dependent on
address labels.
This commit is contained in:
Carl-Henrik Skårstedt 2015-11-02 23:14:01 -08:00
parent 81e71acea5
commit 95e22ae7a2
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@ -825,6 +825,7 @@ Fish food! Assembler has all important features and switching to make a 6502 pro
* irp (indefinite repeat)
**FIXED**
* rept and symbol reference with forward reference label was not taking section into account
* Link append sections target confusion cleared up (caused crash/link errors/freeze)
* XREF prevented linking with same name symbol included from .x65 object causing a linker failure
* << was mistakenly interpreted as shift right
@ -852,29 +853,8 @@ Fish food! Assembler has all important features and switching to make a 6502 pro
* Added 6502 illegal opcodes (cpu=6502ill)
* 65816
* 65C02 enabled through directives ([**PROCESSOR**/**CPU**](#cpu)/[**XC**](#merlin))
* 65c02 (currently only through command line, not as a directive)
* Now accepts negative numbers, Merlin LUP and MAC keyword support
* Merlin syntax fixes (no '!' in labels, don't skip ':' if first character of label), symbol file fix for included object files with resolved labels for relative sections. List output won't disassemble lines that wasn't built from source code.
* Export full memory of fixed sections instead of a single section
* Option to source disasm output and option to dump all opcodes as a source file for tests
* Object file format so sections can be saved for later linking
* Added relative sections and relocatable references
* Added Apple II Dos 3.3 Binary Executable output (-a2b)
* Added more Merlin rules
* Added directives from older assemblers
* Added ENUM, sharing some functionality with STRUCT
* Added INCDIR and command line options
* [**REPT**](#rept)
* fixed a flaw in expressions that ignored the next operator after raw hex values if no whitespace
* expressions now handles high byte/low byte (\>, \<) as RPN tokens and not special cased.
* structs
* ifdef / if / elif / else / endif conditional code generation directives
* Label Pools added
* Bracket scoping closure ('}') cleans up local variables within that scope (better handling of local variables within macros).
* Context stack cleanup
* % in expressions is interpreted as binary value if immediately followed by 0 or 1
* Add a const directive for labels that shouldn't be allowed to change (currently ignoring const)
* TEXT directive converts ascii to petscii (respect uppercase or lowercase petscii) (simplistic)
[(older fixes)](../../wiki/fixes)
Revisions:
* 8 - Fish food / Linking tested and passed with external project (Apple II gs Rastan)

3
dump_x65/dump_x65.cpp
View File

@ -97,8 +97,9 @@ struct ObjFileLateEval {
struct ObjFileStr label;
struct ObjFileStr expression;
int address; // PC relative to section or fixed
int target; // offset into section memory
short section; // section to target
short target; // offset into section memory
short rept; // value of rept for this late eval
short scope; // PC start of scope
short type; // label, byte, branch, word (LateEval::Type)
};

17
x65.cpp
View File

@ -1252,7 +1252,8 @@ typedef struct {
int target; // offset into output buffer
int address; // current pc
int scope; // scope pc
int section; // which section to apply to.
short section; // which section to apply to.
short rept; // value of rept
int file_ref; // -1 if current or xdef'd otherwise index of file for label
strref label; // valid if this is not a target but another label
strref expression;
@ -2948,6 +2949,7 @@ void Asm::AddLateEval(int target, int pc, int scope_pc, strref expression, strre
le.scope = scope_pc;
le.target = target;
le.section = (int)(&CurrSection() - &allSections[0]);
le.rept = contextStack.curr().repeat_total - contextStack.curr().repeat;
le.file_ref = -1; // current or xdef'd
le.label.clear();
le.expression = expression;
@ -2964,6 +2966,8 @@ void Asm::AddLateEval(strref label, int pc, int scope_pc, strref expression, Lat
le.scope = scope_pc;
le.target = 0;
le.label = label;
le.section = (int)(&CurrSection() - &allSections[0]);
le.rept = contextStack.curr().repeat_total - contextStack.curr().repeat;
le.file_ref = -1; // current or xdef'd
le.expression = expression;
le.source_file.clear();
@ -3008,8 +3012,11 @@ StatusCode Asm::CheckLateEval(strref added_label, int scope_end, bool print_miss
if (check) {
struct EvalContext etx(i->address, i->scope, scope_end,
i->type == LateEval::LET_BRANCH ? SectionId() : -1);
SourceContext &ctx = contextStack.curr();
etx.file_ref = i->file_ref;
int r = ctx.repeat, rt = ctx.repeat_total; ctx.repeat = 0; ctx.repeat_total = i->rept;
StatusCode ret = EvalExpression(i->expression, etx, value);
ctx.repeat = r; ctx.repeat_total = rt;
if (ret == STATUS_OK || ret==STATUS_RELATIVE_SECTION) {
// Check if target section merged with another section
int trg = i->target;
@ -3102,6 +3109,7 @@ StatusCode Asm::CheckLateEval(strref added_label, int scope_end, bool print_miss
return ERROR_LABEL_MISPLACED_INTERNAL;
label->value = value;
label->evaluated = true;
label->section = ret==STATUS_RELATIVE_SECTION ? i->section : -1;
if (num_new_labels<MAX_LABELS_EVAL_ALL)
new_labels[num_new_labels++] = label->label_name;
evaluated_label = true;
@ -5332,8 +5340,9 @@ struct ObjFileLateEval {
struct ObjFileStr label;
struct ObjFileStr expression;
int address; // PC relative to section or fixed
int target; // offset into section memory
short section; // section to target
short target; // offset into section memory
short rept; // value of rept for this late eval
short scope; // PC start of scope
short type; // label, byte, branch, word (LateEval::Type)
};
@ -5495,6 +5504,7 @@ StatusCode Asm::WriteObjectFile(strref filename)
le.label.offs = _AddStrPool(lei->label, &stringArray, &stringPool, hdr.stringdata, stringPoolCap);
le.expression.offs = _AddStrPool(lei->expression, &stringArray, &stringPool, hdr.stringdata, stringPoolCap);
le.section = lei->section;
le.rept = lei->rept;
le.target = (short)lei->target;
le.address = lei->address;
le.scope = lei->scope;
@ -5675,12 +5685,15 @@ StatusCode Asm::ReadObjectFile(strref filename)
AddLateEval(name, le.address, le.scope, strref(str_pool + le.expression.offs), (LateEval::Type)le.type);
LateEval &last = lateEval[lateEval.size()-1];
last.section = le.section >= 0 ? aSctRmp[le.section] : le.section;
last.rept = le.rept;
last.source_file = strref();
last.file_ref = file_index;
}
} else {
AddLateEval(le.target, le.address, le.scope, strref(str_pool + le.expression.offs), strref(), (LateEval::Type)le.type);
LateEval &last = lateEval[lateEval.size()-1];
last.section = le.section >= 0 ? aSctRmp[le.section] : le.section;
last.rept = le.rept;
last.file_ref = file_index;
}
}