diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj index 9021d4f..3dab9ed 100644 --- a/A2Mac.xcodeproj/project.pbxproj +++ b/A2Mac.xcodeproj/project.pbxproj @@ -192,6 +192,8 @@ 32A9F74A2467B60B004902A1 /* speaker.c in Sources */ = {isa = PBXBuildFile; fileRef = 32A9F7492467B60B004902A1 /* speaker.c */; }; 32A9F74B2467B60B004902A1 /* speaker.c in Sources */ = {isa = PBXBuildFile; fileRef = 32A9F7492467B60B004902A1 /* speaker.c */; }; 32AF7C9724AD85E8002D82BF /* select_all.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 32AF7C9624AD85E8002D82BF /* select_all.png */; }; + 32B3778F291787CA0040845B /* NSLayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B3778E291787CA0040845B /* NSLayoutConstraint.swift */; }; + 32B37790291787CA0040845B /* NSLayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B3778E291787CA0040845B /* NSLayoutConstraint.swift */; }; 32BCCCE9264DBDC8002151C5 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; }; 32BCCCFC2650D275002151C5 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; }; 32BCCD192650D3B1002151C5 /* Debug-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 32BCCD182650D3B1002151C5 /* Debug-Info.plist */; }; @@ -715,6 +717,8 @@ 32AF7C9624AD85E8002D82BF /* select_all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = select_all.png; sourceTree = ""; }; 32B18435233F10BC00DBB4AB /* Shaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = Shaders.metal; sourceTree = ""; }; 32B18438233FAB3900DBB4AB /* verticies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = verticies.swift; sourceTree = ""; }; + 32B3778429177C480040845B /* debug layout bug.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "debug layout bug.rtf"; sourceTree = ""; }; + 32B3778E291787CA0040845B /* NSLayoutConstraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSLayoutConstraint.swift; sourceTree = ""; }; 32BCCD182650D3B1002151C5 /* Debug-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Debug-Info.plist"; sourceTree = ""; }; 32BFFB5722EACC630003B53F /* Steve ][.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Steve ][.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 32BFFB5A22EACC630003B53F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -1159,9 +1163,11 @@ 32BFFB5E22EACC660003B53F /* Assets.xcassets */, 32B18438233FAB3900DBB4AB /* verticies.swift */, 32BFFB5A22EACC630003B53F /* AppDelegate.swift */, + 32B3778E291787CA0040845B /* NSLayoutConstraint.swift */, 32100A8A2875387300D894EE /* CheatMenu.swift */, 32100A9E28753AAA00D894EE /* SubMenu.swift */, 32BFFB5C22EACC630003B53F /* ViewController.swift */, + 32B3778429177C480040845B /* debug layout bug.rtf */, 32E3126C24AC033A00E61891 /* ToolBarController.swift */, 32C6995127C5439300D0F25D /* Debugger.swift */, 323D042F24898AB70086A901 /* PreferencesViewController.swift */, @@ -1631,6 +1637,7 @@ files = ( 32799F7A264B1A5700255669 /* DisplayView.swift in Sources */, 32799F7B264B1A5700255669 /* AppDelegate.swift in Sources */, + 32B37790291787CA0040845B /* NSLayoutConstraint.swift in Sources */, 32C82356290888C50018438F /* DebuggerWindowController.swift in Sources */, 32799F7C264B1A5700255669 /* ToolBarController.swift in Sources */, 32799F7D264B1A5700255669 /* PreferencesViewController.swift in Sources */, @@ -1683,6 +1690,7 @@ 32A9F74A2467B60B004902A1 /* speaker.c in Sources */, 325EB63923F9E48100C6B4A4 /* common.c in Sources */, 32BFFB5D22EACC630003B53F /* ViewController.swift in Sources */, + 32B3778F291787CA0040845B /* NSLayoutConstraint.swift in Sources */, 325EB69323FE6C6200C6B4A4 /* HiRes.swift in Sources */, 32440BA32480D5C0000F9DA1 /* LoRes.swift in Sources */, 32C6995227C5439300D0F25D /* Debugger.swift 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 29ad25a..a1007a9 100644 --- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist +++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist @@ -17,10 +17,10 @@ contextName = "_fetch_dbg:mmio.c"> + value = "disassembly.pOpcode"> + value = "memread8_low(m6502.PC)"> @@ -59,7 +59,7 @@ value = "default_MHz_6502 * 1000 * 1000 / spkr_sample_rate"> + value = "( (spkr_clk + m6502.clkfrm) / ( default_MHz_6502 * 1000 * 1000 / spkr_sample_rate)) * 2"> @@ -77,7 +77,7 @@ value = "(spkr_clk + m6502.clkfrm)"> + value = "( (spkr_clk + m6502.clkfrm) / ( 1024000 / spkr_sample_rate ) ) * 2"> @@ -177,7 +177,7 @@ contextName = "closure #1 in ViewController.Update():ViewController.swift"> + value = "MEMcfg.is_80STORE"> @@ -189,7 +189,7 @@ value = "MEMcfg.txt_page_2"> + value = "txtArr"> @@ -240,7 +240,7 @@ value = "m6502.PC"> + value = "m6502.debugger.on"> @@ -249,7 +249,7 @@ value = "frameCounter"> + value = "m6502.clkfrm"> @@ -318,7 +318,7 @@ contextName = "LoRes.Update():LoRes.swift"> + value = "UInt8( (block >> 4) & 0x0F )"> @@ -327,7 +327,7 @@ value = "UInt8(block & 4)"> + value = "blockChanged[ screenIdx ]"> @@ -436,13 +436,13 @@ contextName = "m6502_Debug:6502.c"> + value = "m6502.debugger.SP"> + value = "m6502.SP"> @@ -594,10 +594,10 @@ contextName = "ToolBarController.GamePort(_:):ToolBarController.swift"> + value = "ViewController.current?.mouseCursorHidden"> + value = "ViewController.current?.mouseCursorJoystickEmulation"> @@ -636,28 +636,31 @@ contextName = "HiRes.compute():HiRes.swift"> + value = "UnsafeRawBufferPointer(result)"> + value = "computePipelineState.maxTotalThreadsPerThreadgroup"> + + + + - - + value = "WOZtmp.shift16"> @@ -741,7 +744,7 @@ value = "(1 << i) - 1"> + value = "WOZwrite.shift16"> @@ -909,10 +912,10 @@ contextName = "set_flags_NZC:common.h"> + value = "(unsigned)0xFF"> + value = "(unsigned)test "> @@ -946,14 +949,17 @@ contextName = "HiRes.draw(_:):HiRes.swift"> + value = "ctx?.bitsPerComponent"> + value = "ctx?.data"> + + @@ -964,7 +970,7 @@ value = "HiResLineAddrTbl"> + value = "HiRes.blockCols"> @@ -972,15 +978,12 @@ + + - - - - + value = "m6502.PC"> + value = "m6502.clkfrm"> @@ -1027,10 +1030,10 @@ value = "Apple2_64K_AUX + 0x3600"> + value = "(void*)Apple2_64K_RAM"> + value = "Apple2_64K_RAM + 0x3600"> @@ -1049,7 +1052,7 @@ value = "textDisplay_height_diff"> + value = "textDisplay_width_diff"> @@ -1061,7 +1064,7 @@ value = "frame.size"> + value = "textDisplay.frame"> @@ -1179,7 +1182,7 @@ value = "pdl_value[pdl]"> + value = "normalized_time"> @@ -1191,7 +1194,7 @@ value = "1 * 512 * (1 - ( 3300 / 3300.0 ))"> + value = "normalized_time >= pdl_value[pdl] ? 255 : 0"> @@ -1262,10 +1265,10 @@ value = "Apple2_64K_AUX + 0xC600"> + value = "Apple2_64K_RAM + 0xC600"> + value = "(void*)rom"> diff --git a/A2Mac/Base.lproj/Debugger.storyboard b/A2Mac/Base.lproj/Debugger.storyboard index 98ecdf8..fcd75f7 100644 --- a/A2Mac/Base.lproj/Debugger.storyboard +++ b/A2Mac/Base.lproj/Debugger.storyboard @@ -198,16 +198,16 @@ - + - + - + - + @@ -215,18 +215,18 @@ - - - - + + + + - - + + - + @@ -325,24 +325,22 @@ C20D: 4C C5 FE JMP $FEC5 - - - - - + + - - - - + + + + + @@ -353,14 +351,14 @@ C20D: 4C C5 FE JMP $FEC5 - - + + - - + + - + @@ -376,13 +374,13 @@ C20D: 4C C5 FE JMP $FEC5 - + - + - + @@ -403,10 +401,6 @@ C20D: 4C C5 FE JMP $FEC5 - - - - - - - - - + + + + + @@ -447,14 +441,14 @@ C20D: 4C C5 FE JMP $FEC5 - + - + - - + + @@ -474,24 +468,21 @@ C20D: 4C C5 FE JMP $FEC5 - - - - + - - - - + + + + @@ -504,16 +495,15 @@ C20D: 4C C5 FE JMP $FEC5 - - - - - - - - - - + + + + + + + + + @@ -525,42 +515,87 @@ C20D: 4C C5 FE JMP $FEC5 - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + @@ -588,38 +623,29 @@ C20D: 4C C5 FE JMP $FEC5 - - - - - - - - - - - + + + + + + - - - - - - - - - + + + + + @@ -651,25 +677,24 @@ C20D: 4C C5 FE JMP $FEC5 - - - - - - - - + + + + + + + + - - - - - - - + + + + + + diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard index 15a9ba4..8e7d3bf 100644 --- a/A2Mac/Base.lproj/Main.storyboard +++ b/A2Mac/Base.lproj/Main.storyboard @@ -1525,7 +1525,7 @@ Gw - + @@ -1805,14 +1805,14 @@ Gw -