6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-10-06 02:01:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix add-label shortcut for adjusted operands

Browse Source 
When you edit the operand of an instruction that targets an in-file
address, you're given the opportunity to specify a shortcut that
applies the symbol to the instruction's target address in addition
to or instead of defining a weak symbol reference on the instruction
being edited.

This didn't work right for operands with adjustments, e.g. the store
instructions in self-modifying code.  It put the label at the
unadjusted offset, which does nothing useful.

We now correctly back up to the start of the instruction or multi-
byte data area.
This commit is contained in:
Andy McFadden 2018-10-11 16:48:55 -07:00
parent b97a25797a
commit b97f7ca3d8
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SourceGen/AppForms/EditOperand.cs
View File

@ -391,11 +391,13 @@ namespace SourceGen.AppForms {
if (mAttr.OperandOffset >= 0) {
// Operand target is inside the file. Does the target offset already have a label?
bool hasLabel = mProject.UserLabels.ContainsKey(mAttr.OperandOffset);
int targetOffset =
DataAnalysis.GetBaseOperandOffset(mProject, mAttr.OperandOffset);
bool hasLabel = mProject.UserLabels.ContainsKey(targetOffset);
labelInsteadRadioButton.Enabled = operandAndLabelRadioButton.Enabled =
!hasLabel;
operandAndProjRadioButton.Enabled = false;
ShortcutArg = mAttr.OperandOffset;
ShortcutArg = targetOffset;
} else if (mAttr.OperandAddress >= 0) {
// Operand target is outside the file.
labelInsteadRadioButton.Enabled = operandAndLabelRadioButton.Enabled = false;

19
SourceGen/DataAnalysis.cs
View File

@ -229,6 +229,25 @@ namespace SourceGen {
return operandOffset;
}
/// <summary>
/// Returns the "base" operand offset. If the byte at the specified offset is not the
/// start of a code/data/inline-data item, walk backward until the start is found.
/// </summary>
/// <param name="proj">Project reference.</param>
/// <param name="offset">Start offset.</param>
/// <returns></returns>
public static int GetBaseOperandOffset(DisasmProject proj, int offset) {
Debug.Assert(offset >= 0 && offset < proj.FileDataLength);
while (!proj.GetAnattrib(offset).IsStart) {
offset--;
// Should not be possible to walk off the top of the list, since we're in
// the middle of something.
Debug.Assert(offset >= 0);
}
return offset;
}
/// <summary>
/// Creates a FormatDescriptor in the Anattrib array at srcOffset that links to
/// targetOffset, or a nearby label. If targetOffset doesn't have a useful label,