diff --git a/SourceGen/LineListGen.cs b/SourceGen/LineListGen.cs index dfdcfb29..95817cbc 100644 --- a/SourceGen/LineListGen.cs +++ b/SourceGen/LineListGen.cs @@ -956,6 +956,7 @@ private void GenerateLineList(int startOffset, int endOffset, List lines) Line line = new Line(offset, 0, Line.Type.LocalVariableTable, i); lines.Add(line); } + lines.Add(GenerateBlankLine(offset)); } if (attr.IsInstructionStart) { diff --git a/SourceGen/RuntimeData/Apple/Applesoft.sym65 b/SourceGen/RuntimeData/Apple/Applesoft.sym65 index 9546914a..9d48cf91 100644 --- a/SourceGen/RuntimeData/Apple/Applesoft.sym65 +++ b/SourceGen/RuntimeData/Apple/Applesoft.sym65 @@ -13,7 +13,8 @@ BAS_VALTYP @ $11 ;flag for last FAC operation ($00=num, $FF=str) BAS_SUBFLG @ $14 ;subscript flag ($00=allowed, $80=not) BAS_HCOLOR1 @ $1C ;hi-res color mask BAS_COUNTH @ $1D ;hi-res high-order byte of step for line -BAS_HBASL @ $26 ;base address for hi-res drawing (2b) +BAS_HBASL @ $26 ;base address for hi-res drawing (lo part) +BAS_HBASH @ $27 ;base address for hi-res drawing (hi part) BAS_HMASK @ $30 ;hi-res graphics on-the-fly bit mask BAS_LINNUM @ $50 ;line number (2b) BAS_TEMPPT @ $52 ;temporary point (2b) diff --git a/SourceGen/RuntimeData/Apple/DOS33.sym65 b/SourceGen/RuntimeData/Apple/DOS33.sym65 index 5f851590..278d4705 100644 --- a/SourceGen/RuntimeData/Apple/DOS33.sym65 +++ b/SourceGen/RuntimeData/Apple/DOS33.sym65 @@ -5,9 +5,9 @@ *SYNOPSIS DOS 3.3 public addresses and constants. -DOSWRM @ $3d0 ;DOS warmstart entry point -DOSCLD @ $3d3 ;DOS coldstart entry point -FM @ $3d6 ;DOS file manager entry point -RWTS @ $3d9 ;RWTS entry point -LOCFPL @ $3dc ;loads Y/A with address of FM param list -LOCRPL @ $3e3 ;loads Y/A with address of RWTS IOB +DOS_WRM @ $3d0 ;DOS warmstart entry point +DOS_CLD @ $3d3 ;DOS coldstart entry point +DOS_FM @ $3d6 ;DOS file manager entry point +DOS_RWTS @ $3d9 ;RWTS entry point +DOS_LOCFPL @ $3dc ;loads Y/A with address of FM param list +DOS_LOCRPL @ $3e3 ;loads Y/A with address of RWTS IOB diff --git a/SourceGen/SymbolTable.cs b/SourceGen/SymbolTable.cs index 0f16d1df..2c03f39b 100644 --- a/SourceGen/SymbolTable.cs +++ b/SourceGen/SymbolTable.cs @@ -43,6 +43,9 @@ public class SymbolTable : IEnumerable { /// /// The type comparison ensures that project symbols appear before platform symbols, /// so that you can "overwrite" a platform symbol with the same value. + /// + /// TODO(someday): sort by symbol file load order, so you can choose which set of + /// symbols gets to represent a given address. Mostly useful for zero-page variables. /// private class CompareByValue : IComparer { public int Compare(Symbol a, Symbol b) { diff --git a/SourceGen/WpfGui/EditLongComment.xaml b/SourceGen/WpfGui/EditLongComment.xaml index 089b59d2..608c1ce6 100644 --- a/SourceGen/WpfGui/EditLongComment.xaml +++ b/SourceGen/WpfGui/EditLongComment.xaml @@ -68,7 +68,7 @@ limitations under the License. Text="{Binding TextOutput, FallbackValue=01234567890123456789012345678901234567890123456789012345678901234567890123456789}" FontFamily="{StaticResource GeneralMonoFont}" VerticalScrollBarVisibility="Visible" - IsReadOnly="True"/> + IsReadOnly="True" Background="#f8f8f8"/>