diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj index bfeda85..281dabc 100644 --- a/A2Mac.xcodeproj/project.pbxproj +++ b/A2Mac.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 320B3FC424AD88B0005EA133 /* power.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 320B3FC324AD88B0005EA133 /* power.png */; }; 320B4FC124B182DE00070038 /* Apple Disk II.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 320B4FC024B182DD00070038 /* Apple Disk II.png */; }; 320F2A8824CFD74100671B35 /* Steve2Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 320F2A8724CFD74000671B35 /* Steve2Icon.icns */; }; - 320F2A8D24D0FB9200671B35 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; }; + 320F2AAD24D53B4100671B35 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; }; 3213936624079C30007F5C4A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; }; 323D042E248980600086A901 /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 323D042D248980600086A901 /* Preferences.storyboard */; }; 323D043024898AB70086A901 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 323D042F24898AB70086A901 /* PreferencesViewController.swift */; }; @@ -313,6 +313,7 @@ 320F2A8924CFFBE300671B35 /* 6502_std.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 6502_std.h; sourceTree = ""; }; 320F2A8A24D0001600671B35 /* 6502_und.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 6502_und.h; sourceTree = ""; }; 320F2A8B24D0828600671B35 /* 6502_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_C.h; sourceTree = ""; }; + 320F2A9924D4DE8400671B35 /* 6502_C_Rockwell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_C_Rockwell.h; sourceTree = ""; }; 323D042D248980600086A901 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = ""; }; 323D042F24898AB70086A901 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = ""; }; 323D04312489BFD80086A901 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = ""; }; @@ -681,6 +682,7 @@ 320F2A8924CFFBE300671B35 /* 6502_std.h */, 320F2A8A24D0001600671B35 /* 6502_und.h */, 320F2A8B24D0828600671B35 /* 6502_C.h */, + 320F2A9924D4DE8400671B35 /* 6502_C_Rockwell.h */, 32440B69247CA1CE000F9DA1 /* 65C02.c */, 32440B67247CA1AF000F9DA1 /* 6502_vanilla.c */, ); @@ -1206,11 +1208,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 320F2AAD24D53B4100671B35 /* 6502.c in Sources */, 32BFFB5B22EACC630003B53F /* AppDelegate.swift in Sources */, 32E3126D24AC033A00E61891 /* ToolBarController.swift in Sources */, 323D043024898AB70086A901 /* PreferencesViewController.swift in Sources */, 323D04332489BFD80086A901 /* PreferencesWindowController.swift in Sources */, - 320F2A8D24D0FB9200671B35 /* 6502.c in Sources */, 32E3126924A98B9300E61891 /* dsk2woz.c in Sources */, 325EB63623F8F78300C6B4A4 /* disk.c in Sources */, 325EB62F23F8856F00C6B4A4 /* woz.c in Sources */, diff --git a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist index 4657d5b..73d371a 100644 --- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist +++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist @@ -14,13 +14,10 @@ + contextName = "specialized closure #1 in ViewController.Update():ViewController.swift"> - - + value = "self.HiRes.frame"> @@ -67,7 +64,7 @@ contextName = "closure #1 in ViewController.Update():ViewController.swift"> + value = "txtArr"> @@ -76,10 +73,10 @@ value = "txt"> + value = "MEMcfg.is_80STORE"> + value = "MEMcfg.txt_page_2"> @@ -220,27 +217,27 @@ - - - - + value = "(uint8_t)spkr_samples[452]"> + value = "(uint8_t)spkr_samples[451]"> + + + + + value = "normalized_time >= pdl_value[pdl] ? 255 : 0"> @@ -307,7 +304,7 @@ value = "1 * 512 * (1 - ( 3300 / 3300.0 ))"> + value = "normalized_time"> @@ -324,13 +321,13 @@ value = "textLines"> + value = "hires.layer"> + value = "hires.frame"> @@ -346,7 +343,7 @@ contextName = "LoRes.Update():LoRes.swift"> + value = "blockChanged[ screenIdx ]"> @@ -355,7 +352,7 @@ value = "UInt8(block & 4)"> + value = "UInt8( (block >> 4) & 0x0F )"> @@ -390,10 +387,10 @@ contextName = "set_flags_NZC:common.h"> + value = "(unsigned)test "> + value = "(unsigned)0xFF"> @@ -543,10 +540,10 @@ contextName = "HiRes.draw(_:):HiRes.swift"> + value = "linAddr"> + value = "ctx?.height"> @@ -569,14 +566,14 @@ + + - - + value = "ctx?.data"> @@ -592,13 +589,13 @@ contextName = "HiRes.compute():HiRes.swift"> + value = "computePipelineState.maxTotalThreadsPerThreadgroup"> + value = "UnsafeRawBufferPointer(result)"> @@ -640,6 +637,9 @@ + + @@ -649,9 +649,6 @@ - - + value = "WOZwrite.shift16"> @@ -718,7 +715,21 @@ value = "(1 << i) - 1"> + value = "WOZtmp.shift16"> + + + + + + + + + + @@ -740,10 +751,10 @@ value = "Apple2_64K_AUX + 0xC600"> + value = "(void*)rom"> + value = "Apple2_64K_RAM + 0xC600"> @@ -768,10 +779,13 @@ + contextName = "BRA:6502_instr_branch.h"> + value = ""> + + diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard index dfc9eb0..6da4379 100644 --- a/A2Mac/Base.lproj/Main.storyboard +++ b/A2Mac/Base.lproj/Main.storyboard @@ -1317,7 +1317,7 @@ - + @@ -1343,7 +1343,7 @@ - + @@ -1366,7 +1366,7 @@ - + @@ -1611,7 +1611,66 @@ - + +