6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 03:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1377 from TomHarte/TidySWIs

Browse Source 
Clean up, slightly.
This commit is contained in:
Thomas Harte 2024-05-26 14:43:40 -04:00 committed by GitHub
commit f2245b8066
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Machines/Acorn/Archimedes/Archimedes.cpp
View File

@ -187,8 +187,9 @@ class ConcreteMachine:
const uint32_t swi_code = comment & static_cast<uint32_t>(~(1 << 17)); const uint32_t swi_code = comment & static_cast<uint32_t>(~(1 << 17));
switch(swi_code) { switch(swi_code) {
// To consider: catching VDU 22, though that means parsing the output stream //
// via OS_WriteC, SWI &00, sufficiently to be able to spot VDUs. // Passive monitoring traps, for automatic loading.
//
case 0x400e3: // Wimp_SetMode case 0x400e3: // Wimp_SetMode
case 0x65: // OS_ScreenMode case 0x65: // OS_ScreenMode
@ -280,25 +281,6 @@ class ConcreteMachine:
// Wimp_CreateIcon, which also adds to the icon bar. // Wimp_CreateIcon, which also adds to the icon bar.
case 0x400c2: case 0x400c2:
switch(autoload_phase_) { switch(autoload_phase_) {
// case AutoloadPhase::WaitingForStartup:
// // Creation of any icon is used to spot that RISC OS has started up.
// //
// // Wait a further second, mouse down to (32, 240), left click.
// // That'll trigger disk access. Then move up to the top left,
// // in anticipation of the appearance of a window.
// CursorActionBuilder(cursor_actions_)
// .wait(24'000'000)
// .move_to(IconBarDriveX, IconBarY)
// .click(0)
// .set_phase(
// target_program_.empty() ? AutoloadPhase::Ended : AutoloadPhase::WaitingForDiskContents
// )
// .move_to(IconBarDriveX, 36); // Just a guess of 'close' to where the program to launch
// // will probably be, to have the cursor already nearby.
//
// autoload_phase_ = AutoloadPhase::OpeningDisk;
// break;
case AutoloadPhase::OpeningProgram: { case AutoloadPhase::OpeningProgram: {
const uint32_t address = executor_.registers()[1]; const uint32_t address = executor_.registers()[1];
uint32_t handle; uint32_t handle;

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
View File

@ -62,7 +62,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES" enableASanStackUseAfterReturn = "YES"