diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj index 461cc69..f5d13bd 100644 --- a/A2Mac.xcodeproj/project.pbxproj +++ b/A2Mac.xcodeproj/project.pbxproj @@ -2022,7 +2022,7 @@ GCC_ENABLE_CPP_RTTI = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_MATH = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = g; GCC_UNROLL_LOOPS = NO; HEADER_SEARCH_PATHS = src/cpu; INFOPLIST_FILE = "A2Mac/Debug-Info.plist"; @@ -2042,7 +2042,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "A2Mac/A2Mac-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_OPTIMIZATION_LEVEL = "-Osize"; SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; }; @@ -2221,6 +2221,7 @@ GCC_ENABLE_CPP_RTTI = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_MATH = YES; + GCC_OPTIMIZATION_LEVEL = g; GCC_UNROLL_LOOPS = NO; HEADER_SEARCH_PATHS = src/cpu; INFOPLIST_FILE = A2Mac/Info.plist; 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 c954c5a..debe652 100644 --- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist +++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist @@ -3,16 +3,28 @@ version = "1.0"> + contextName = "woz_write:woz.c"> + value = "WOZwrite.data"> + value = "new"> + value = "WOZwrite.shift16"> + + + + + + + + @@ -20,47 +32,47 @@ contextName = "HiRes.compute():HiRes.swift"> + value = "computePipelineState.maxTotalThreadsPerThreadgroup"> + value = "UnsafeRawBufferPointer(result)"> + contextName = "HiRes.initMetal():HiRes.swift"> + value = "mtlBufferB"> + value = "addFunction"> + value = "device"> + + + + + contextName = "specialized closure #1 in DebuggerViewController.DisplayDisassembly():DebuggerViewController.swift"> + value = "line_number"> + value = "currentScrollLine"> - - - - + value = "current_line_number"> @@ -99,10 +111,10 @@ value = "disassLineRange[forLine]"> + value = "disassLineRange"> + value = "disassLineRange.count"> @@ -142,10 +154,10 @@ contextName = "HiRes.draw(_:):HiRes.swift"> + value = "linAddr"> + value = "shadowScreen"> @@ -168,14 +180,14 @@ + + - - + value = "ctx?.data"> @@ -203,7 +215,7 @@ contextName = "DebuggerViewController.DisplayDisassembly():DebuggerViewController.swift"> + value = "line_number"> @@ -212,7 +224,7 @@ value = "m6502.PC"> + value = "disass_addr_min"> @@ -241,6 +253,14 @@ + + + + + + @@ -260,14 +280,6 @@ - - - - - - @@ -277,19 +289,10 @@ + contextName = "dest_ind_Y:Apple2_mmio.h"> - - - - - - + value = "disassembly"> @@ -310,6 +313,23 @@ + + + + + + + + + + + + @@ -471,7 +491,7 @@ value = "m6502_saved.PC"> + value = "scroll_line_number"> @@ -480,7 +500,7 @@ value = "m6502.PC"> + value = "isCurrentLine"> @@ -494,7 +514,7 @@ value = "textDisplay_height_diff"> + value = "textDisplay.frame"> @@ -503,10 +523,10 @@ value = "textDisplay.bounds"> + value = "textDisplay_width_diff"> + value = "MonitorView.textViewBounds"> @@ -572,10 +592,10 @@ contextName = "set_flags_NZC:common.h"> + value = "(unsigned)test "> + value = "(unsigned)0xFF"> @@ -680,10 +700,10 @@ value = "MEMcfg.int_Cx_ROM"> + value = "(int)IOframe"> + value = "m6502.clkfrm"> @@ -694,10 +714,10 @@ value = "Apple2_64K_AUX + 0xC600"> + value = "(void*)rom"> + value = "Apple2_64K_RAM + 0xC600"> @@ -821,16 +841,16 @@ contextName = "DisplayScrollView.scrollWheel(with:):DisplayScrollView.swift"> + value = "textView.defaultParagraphStyle?.lineSpacing"> + value = "subviews[1].subviews"> + value = "documentView"> @@ -922,10 +942,10 @@ contextName = "_fetch_dbg:mmio.c"> + value = "memread8_low(m6502.PC)"> + value = "disassembly.pOpcode"> @@ -933,13 +953,13 @@ contextName = "m6502_dbg_bp_add:6502_bp.c"> + value = "bp_array"> + value = "bp"> @@ -1011,32 +1031,17 @@ contextName = "DebuggerViewController.DisplayDisassembly(scrollY:):DebuggerViewController.swift"> + value = "highlighted_line_number"> - - - - - - - - - - + value = "blockChanged[ screenIdx ]"> @@ -1160,7 +1165,7 @@ value = "UInt8(block & 4)"> + value = "UInt8( (block >> 4) & 0x0F )"> @@ -1217,22 +1222,22 @@ value = "m6502"> + value = "(void*)Apple2_64K_RAM"> + value = "Apple2_64K_RAM + 0x3600"> + + - - + value = "m6502.clkfrm"> @@ -1246,7 +1251,7 @@ value = "pdl_value[pdl]"> + value = "normalized_time >= pdl_value[pdl] ? 255 : 0"> @@ -1258,7 +1263,7 @@ value = "1 * 512 * (1 - ( 3300 / 3300.0 ))"> + value = "normalized_time"> @@ -1277,10 +1282,10 @@ contextName = "ToolBarController.GamePort(_:):ToolBarController.swift"> + value = "ViewController.current?.mouseCursorJoystickEmulation"> + value = "ViewController.current?.mouseCursorHidden"> @@ -1503,7 +1508,7 @@ value = "m6502.PC"> + value = "m6502.clkfrm"> @@ -1512,7 +1517,7 @@ value = "frameCounter"> + value = "m6502.debugger.on"> @@ -1538,6 +1543,20 @@ + + + + + + + + + + @@ -1564,7 +1583,7 @@ value = "default_MHz_6502 * 1000 * 1000 / spkr_sample_rate"> + value = "( (spkr_clk + m6502.clkfrm) / ( 1024000 / spkr_sample_rate ) ) * 2"> @@ -1582,7 +1601,7 @@ value = "(spkr_clk + m6502.clkfrm)"> + value = "( (spkr_clk + m6502.clkfrm) / ( default_MHz_6502 * 1000 * 1000 / spkr_sample_rate)) * 2"> @@ -1601,62 +1620,36 @@ contextName = "AND:6502_instr_logic.h"> + contextName = "ViewController.mouseMoved(with:):ViewController.swift"> + value = "oldLocation"> + value = "mouseLocation"> - - - - - - - - + value = "view.bounds"> + contextName = "closure #1 in ViewController.Update():ViewController.swift"> + value = "txtArr"> + value = "self.shadowTxt"> + value = "txt"> + value = "MEMcfg.is_80STORE"> - - - - - - - - - - + value = "MEMcfg.txt_page_2"> diff --git a/A2Mac/Base.lproj/Debugger.storyboard b/A2Mac/Base.lproj/Debugger.storyboard index 5db6364..e37d64d 100644 --- a/A2Mac/Base.lproj/Debugger.storyboard +++ b/A2Mac/Base.lproj/Debugger.storyboard @@ -255,6 +255,17 @@ + + + + + + + + + + + @@ -367,7 +378,7 @@ - + @@ -547,7 +558,7 @@ - + @@ -571,7 +582,7 @@ - + @@ -782,6 +793,7 @@ + @@ -789,6 +801,8 @@ + + @@ -805,6 +819,8 @@ + + diff --git a/A2Mac/DebuggerViewController.swift b/A2Mac/DebuggerViewController.swift index b31a5c1..4043028 100644 --- a/A2Mac/DebuggerViewController.swift +++ b/A2Mac/DebuggerViewController.swift @@ -37,7 +37,9 @@ class DebuggerViewController: NSViewController { @IBOutlet weak var DisassTextField: NSTextField! @IBOutlet weak var DisassHighlighter: NSTextField! @IBOutlet weak var DisassHightlighterContriant: NSLayoutConstraint! - + @IBOutlet weak var DisassCursor: NSTextField! + @IBOutlet weak var DisassCursorContraint: NSLayoutConstraint! + let textFont : NSFont = NSFont(name: "Print Char 21", size: 10.0)! let textColor : NSColor = NSColor.white