From cc6c05064d3501d21c5ed88c3da53be44354280a Mon Sep 17 00:00:00 2001 From: tudnai Date: Sat, 5 Nov 2022 16:26:52 -0700 Subject: [PATCH] Fix: Disassembly view scroll --- .../xcdebugger/Expressions.xcexplist | 22 +++++++++++++++++++ .../xcshareddata/xcschemes/Debug.xcscheme | 10 +-------- A2Mac/Base.lproj/Debugger.storyboard | 8 +++---- A2Mac/DebuggerViewController.swift | 2 +- A2Mac/ViewController.swift | 22 +++++++++---------- src/util/disassembler.h | 15 ++++++++----- 6 files changed, 49 insertions(+), 30 deletions(-) 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 95a7993..29ad25a 100644 --- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist +++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist @@ -13,6 +13,17 @@ + + + + + + + + @@ -1147,6 +1158,17 @@ + + + + + + + + diff --git a/A2Mac.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/A2Mac.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme index 2771166..7d92390 100644 --- a/A2Mac.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme +++ b/A2Mac.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -63,8 +63,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - enableAddressSanitizer = "YES" - enableASanStackUseAfterReturn = "YES" + disableMainThreadChecker = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -91,13 +90,6 @@ ReferencedContainer = "container:A2Mac.xcodeproj"> - - - - - - + + @@ -222,7 +222,7 @@ - + @@ -454,7 +454,7 @@ C20D: 4C C5 FE JMP $FEC5 - + diff --git a/A2Mac/DebuggerViewController.swift b/A2Mac/DebuggerViewController.swift index 8c91dc2..fe700c8 100644 --- a/A2Mac/DebuggerViewController.swift +++ b/A2Mac/DebuggerViewController.swift @@ -197,7 +197,7 @@ N V - B D I Z C let disass_addr_min : UInt16 = 320 - let disass_addr_max : UInt16 = 170 + let disass_addr_max : UInt16 = 512 var disass_addr : UInt16 = 0 var line_number = 0 var current_line_number = 0 diff --git a/A2Mac/ViewController.swift b/A2Mac/ViewController.swift index 241033b..b92f007 100644 --- a/A2Mac/ViewController.swift +++ b/A2Mac/ViewController.swift @@ -1095,8 +1095,8 @@ class ViewController: NSViewController { } // display.stringValue = "testing\nit\nout" } - - + + func UpdateCPUspeed() { // under ~1.5 MHz -- 3 decimals to be able to display 1.023 MHz if ( (mhz < 1.4) && (mhz != floor(mhz)) ) { @@ -1620,15 +1620,15 @@ class ViewController: NSViewController { newUpdateTimer( timeInterval: 1 / Double(fps) ) #endif - soundGapSlider.integerValue = Int(spkr_extra_buf) - ledingInitEdgeLabel.title = "ILE: " + String( SPKR_INITIAL_LEADING_EDGE ) - initialLeadEdgeSlider.floatValue = SPKR_INITIAL_LEADING_EDGE - leadingEdgeLabel.title = "LE: " + String( SPKR_FADE_LEADING_EDGE ) - leadEdgeSlider.floatValue = SPKR_FADE_LEADING_EDGE - trailingInitEdgeLabel.title = "ITE: " + String( SPKR_INITIAL_TRAILING_EDGE ) - initialTailEdgeSlider.floatValue = SPKR_INITIAL_TRAILING_EDGE - trailingEdgeLabel.title = "TE: " + String( SPKR_FADE_TRAILING_EDGE ) - tailEdgeSlider.floatValue = SPKR_FADE_TRAILING_EDGE +// soundGapSlider.integerValue = Int(spkr_extra_buf) +// ledingInitEdgeLabel.title = "ILE: " + String( SPKR_INITIAL_LEADING_EDGE ) +// initialLeadEdgeSlider.floatValue = SPKR_INITIAL_LEADING_EDGE +// leadingEdgeLabel.title = "LE: " + String( SPKR_FADE_LEADING_EDGE ) +// leadEdgeSlider.floatValue = SPKR_FADE_LEADING_EDGE +// trailingInitEdgeLabel.title = "ITE: " + String( SPKR_INITIAL_TRAILING_EDGE ) +// initialTailEdgeSlider.floatValue = SPKR_INITIAL_TRAILING_EDGE +// trailingEdgeLabel.title = "TE: " + String( SPKR_FADE_TRAILING_EDGE ) +// tailEdgeSlider.floatValue = SPKR_FADE_TRAILING_EDGE // // BUGFIX: I am not sure why but if I do not adjust the frame and bounds size diff --git a/src/util/disassembler.h b/src/util/disassembler.h index bd72a88..4f20afb 100644 --- a/src/util/disassembler.h +++ b/src/util/disassembler.h @@ -27,16 +27,21 @@ #include "common.h" +#define DISASS_ADDR_LEN 5 // 4 digits + \0 +#define DISASS_OPCODE_LEN (4 * 3 + 1) // max 4 bytes * (2 digits + 1 space) + \0 +#define DISASS_INST_LEN (6 + 1) // 3 char (unknown instr? -- give it 6 chars) + \0 +#define DISASS_OPER_LEN (14 + 2 + 1 + 1 + 1) // 4 digits + 2 brackets + 1 comma + 1 index + \0 +#define DISASS_COMM_LEN 256 // 255 char + \0 typedef struct disassembly_s { uint64_t clk; // clock time uint8_t op; // opcode - char addr[5]; // 4 digits + \0 - char opcode[4 * 3 + 1]; // max 4 bytes * (2 digits + 1 space) + \0 + char addr[DISASS_ADDR_LEN]; // 4 digits + \0 + char opcode[DISASS_OPCODE_LEN]; // max 4 bytes * (2 digits + 1 space) + \0 char * pOpcode; // pointer for opcode string builder - char inst[6 + 1]; // 3 char (unknown instr? -- give it 6 chars) + \0 - char oper[14 + 2 + 1 + 1 + 1]; // 4 digits + 2 brackets + 1 comma + 1 index + \0 - char comment[256]; // to be able to add some comments + char inst[DISASS_INST_LEN]; // 3 char (unknown instr? -- give it 6 chars) + \0 + char oper[DISASS_OPER_LEN]; // 4 digits + 2 brackets + 1 comma + 1 index + \0 + char comment[DISASS_COMM_LEN]; // to be able to add some comments } disassembly_t; extern disassembly_t disassembly;