6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-06-12 23:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse Source 
Escape '_' in filenames for the recents menu.

Fix status flag update for ROL.
This commit is contained in:
Andy McFadden 2021-12-23 11:29:29 -08:00
parent 27b47b9783
commit 92f304a030
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Asm65/OpDef.cs
View File

@ -802,25 +802,25 @@ namespace Asm65 {
} }
private static StatusFlags FlagUpdater_ROL(StatusFlags flags, int immVal, private static StatusFlags FlagUpdater_ROL(StatusFlags flags, int immVal,
ref StatusFlags condBranchTakenFlags) { ref StatusFlags condBranchTakenFlags) {
// this rotates the N flag into C, so set C=N // In immediate mode we effectively rotate the N flag into C, but we can't know
// if carry is one, set Z=0; otherwise set Z/N=indeterminate // whether the flags were set for the value in the acc, so that doesn't help us.
// (if Z=1 we should set Z=C, but this seems rare and I don't entirely trust Z) // Ditto for the Z flag, which we could otherwise combine with the C flag in
// certain situations.
//
// if carry is set, set Z=0 (N/C indeterminate);
// otherwise set Z/N=indeterminate
if (flags.C == 1) { if (flags.C == 1) {
flags.C = flags.N;
flags.Z = 0; flags.Z = 0;
flags.N = TriState16.INDETERMINATE; flags.C = flags.N = TriState16.INDETERMINATE;
} else { } else {
flags.C = flags.N; flags.C = flags.Z = flags.N = TriState16.INDETERMINATE;
flags.Z = flags.N = TriState16.INDETERMINATE;
} }
return flags; return flags;
} }
private static StatusFlags FlagUpdater_ROR(StatusFlags flags, int immVal, private static StatusFlags FlagUpdater_ROR(StatusFlags flags, int immVal,
ref StatusFlags condBranchTakenFlags) { ref StatusFlags condBranchTakenFlags) {
// if carry is set, set Z=0 and N=1; // if carry is set, set Z=0 and N=1 (C indeterminate);
// if carry is clear, set N=0; // if carry is clear, set N=0 (Z/C indeterminate);
// if carry is clear and Z=1, everything is zero and no flags change
// (this seems unlikely, so I'm going to assume we've mis-read a flag and ignore this)
// otherwise, Z/N/C=indeterminate // otherwise, Z/N/C=indeterminate
if (flags.C == 1) { if (flags.C == 1) {
flags.Z = 0; flags.Z = 0;

10
SourceGen/WpfGui/MainWindow.xaml.cs
View File

@ -1567,6 +1567,13 @@ namespace SourceGen.WpfGui {
mMainCtrl.HandleCodeListDoubleClick(row, col); mMainCtrl.HandleCodeListDoubleClick(row, col);
} }
/// <summary>
/// Escapes a generated string for use as a WPF menu item.
/// </summary>
private string EscapeMenuString(string instr) {
return instr.Replace("_", "__");
}
private void RecentProjectsMenu_SubmenuOpened(object sender, RoutedEventArgs e) { private void RecentProjectsMenu_SubmenuOpened(object sender, RoutedEventArgs e) {
MenuItem recents = (MenuItem)sender; MenuItem recents = (MenuItem)sender;
recents.Items.Clear(); recents.Items.Clear();
@ -1579,7 +1586,8 @@ namespace SourceGen.WpfGui {
} else { } else {
for (int i = 0; i < mMainCtrl.RecentProjectPaths.Count; i++) { for (int i = 0; i < mMainCtrl.RecentProjectPaths.Count; i++) {
MenuItem mi = new MenuItem(); MenuItem mi = new MenuItem();
mi.Header = string.Format("{0}: {1}", i + 1, mMainCtrl.RecentProjectPaths[i]); mi.Header = EscapeMenuString(string.Format("{0}: {1}", i + 1,
mMainCtrl.RecentProjectPaths[i]));
mi.Command = recentProjectCmd.Command; mi.Command = recentProjectCmd.Command;
mi.CommandParameter = i; mi.CommandParameter = i;
recents.Items.Add(mi); recents.Items.Add(mi);