Compare commits

...

279 Commits

Author SHA1 Message Date
Tamas Rudnai 3a353185b8 Adjusted Main & Debugger Storyboards 2024-05-07 20:10:46 -07:00
Tamas Rudnai 68ef567994 Woz 2.0 + Better HiRes + Better Sound + Hard Hat Mack disk 2024-05-07 20:10:16 -07:00
Tamas Rudnai 41cfb1efde WOZ 2.0 Disk Image Format 2024-05-07 20:05:39 -07:00
Tamas Rudnai 67cc9d2359 Rudimentary implementation of DGR / Double LoRes 2024-01-14 20:48:18 -08:00
Tamas Rudnai 8cafeff4d9 Preparation for DGR / Double LoRes rendering 2024-01-14 18:38:13 -08:00
Tamas Rudnai 5e272a9686 Preparing for DGR / Double LoRes support 2024-01-14 18:25:46 -08:00
Tamas Rudnai 112f43fafe Video Text/LoRes mem fix for Int/Aux mempry select 2024-01-14 07:45:11 -08:00
Tamas Rudnai 39f6bdc1bd BugFix: RAM does not saved at AUX selection 2024-01-13 17:47:42 -08:00
Tamas Rudnai 711b68608d BugFix: ZeroPage Memory 2024-01-09 20:24:58 -08:00
Tamas Rudnai 176d0afa2a Bugfix: Zeropage memory 2024-01-09 13:42:20 -08:00
Tamas Rudnai 393fefd342 bugfix: Zeropage memory 2024-01-09 13:41:23 -08:00
Tamas Rudnai 1d7c47e630 Merged from Fake Scroller 2024-01-06 07:11:52 -08:00
tudnai 0beecc2d36 - Fixed GR not cleared when Powered Off
- Fixed Video Mode did not go back to Text when Reset pressed
- Fixed some Memory Handling issues
- Internal Cx ROM being copied to RAM to eliminate some problems
2020-08-04 00:20:55 -07:00
tudnai 9741a49b80 Fixed some MMU issues 2020-08-03 22:16:11 -07:00
tudnai 15a2fd84ac - Fixed: 80col text mode
- Fixed: Video mode indicators
2020-08-02 16:37:08 -07:00
tudnai 6889eafb0b Fixed CxROM handling & Fixed Language Card RAM Write enable feature 2020-08-02 15:00:42 -07:00
tudnai 8e6617bcee More reliable way to determine if disk image has a .po file extension 2020-07-31 14:19:31 -07:00
Tamas Rudnai bd764cf909
Delete Steve2.pkg 2020-07-30 17:01:22 -07:00
tudnai 68bd815419 Merge branch 'work' of https://github.com/trudnai/Steve2 into work 2020-07-30 16:55:53 -07:00
tudnai 06a0e1c9b4 v0.85-beta.1 2020-07-30 16:54:52 -07:00
Tamas Rudnai 7ca5b082dc
Update README.md
typo
2020-07-30 14:53:54 -07:00
Tamas Rudnai bbd00aef46
Update README.md
typo
2020-07-30 14:26:15 -07:00
Tamas Rudnai 420234fe97
Update README.md
typo
2020-07-30 14:25:49 -07:00
Tamas Rudnai 73a67d45d4
Update README.md
Added Copyright info
2020-07-30 13:13:02 -07:00
Tamas Rudnai 0e00827a08
Add files via upload
GPL v3 License should be at the root folder
2020-07-30 13:09:05 -07:00
Tamas Rudnai 7f62887402
Update README.md
Typos
2020-07-30 13:01:27 -07:00
Tamas Rudnai 6d72a3e2f5
Update README.md
Typos
2020-07-30 12:59:24 -07:00
Tamas Rudnai 90f746b5c0
Update README.md
Minor Tweaks
2020-07-28 17:46:49 -07:00
Tamas Rudnai 7bf5944573
Update README.md
Tiny tweaks
2020-07-28 17:41:12 -07:00
tudnai b8d1e1cf78 Merge remote-tracking branch 'refs/remotes/origin/work' 2020-07-28 17:39:27 -07:00
tudnai bca5d074db 65C02 Instructions 2020-07-28 17:37:27 -07:00
tudnai c948865ece First preparations for configurable CPU definitions 2020-07-27 23:55:55 -07:00
tudnai 675959e389 Updated Splash Screen to match with Icon Design 2020-07-27 22:25:40 -07:00
tudnai 5453fdf5fb Added Icon Set 2020-07-27 21:46:32 -07:00
Tamas Rudnai c08cecbbf9
Update README.md
typo
2020-07-26 18:22:25 -07:00
Tamas Rudnai 9353ad517a
Update README.md
typo
2020-07-26 18:21:39 -07:00
Tamas Rudnai 2b8bbfb606
Update README.md
Small typo and grammar fix
2020-07-26 18:18:09 -07:00
Tamas Rudnai 200bb8c125
Update README.md
Typo and formatting fixes.
Added a memoriam to my Father
2020-07-26 18:16:06 -07:00
Tamas Rudnai 1c7c0d3648
Update README.md
Changed 'simulating' to 'emulating'
2020-07-26 17:35:23 -07:00
tudnai f39b3cdad5 Merge remote-tracking branch 'refs/remotes/origin/work' 2020-07-26 17:33:02 -07:00
tudnai 2e1f0cf2d0 Kelvin Sherlock's fix to avoid uninstalled font problem 2020-07-26 17:31:56 -07:00
Tamas Rudnai 58f9f11bd1
Create README.md
Initial README
2020-07-26 17:27:53 -07:00
tudnai 61a81ccaf8 Disk sfx source files moved to audacity folder 2020-07-26 16:09:49 -07:00
tudnai 7498489282 Merge branch 'work' of https://github.com/trudnai/Steve2 into work 2020-07-26 16:08:03 -07:00
tudnai 7fa1f3c13f Audacity source files moved to folder 2020-07-26 16:07:04 -07:00
Tamas Rudnai 7b5721e7fd
Delete fail1.txt
removed
2020-07-26 15:56:35 -07:00
Tamas Rudnai 943c7f4480
Delete woz_backup.c
removed
2020-07-26 15:54:32 -07:00
Tamas Rudnai 47c718f5bc
Delete 1
removed
2020-07-26 15:53:26 -07:00
Tamas Rudnai 9631e62c9a
Delete ssasa
removed
2020-07-26 15:53:01 -07:00
Tamas Rudnai cd09a0bd04
Delete DISK_II_C600.ROM
removed
2020-07-26 15:52:46 -07:00
Tamas Rudnai b389ab63f3
Delete disksectorload_vii.csv
removed
2020-07-26 15:52:36 -07:00
Tamas Rudnai de57ef906d
Delete DOS_3_3_boot_trace.txt
removed
2020-07-26 15:52:25 -07:00
Tamas Rudnai 55a0ccf472
Delete DOS_3_3_boot_trace_filtered.txt
removed
2020-07-26 15:52:12 -07:00
Tamas Rudnai 794afd46f7
Delete disksectorload_5.marked
removed
2020-07-26 15:51:57 -07:00
Tamas Rudnai 5c1d9a096d
Delete DOS boot full trace.marked3
removed
2020-07-26 15:51:46 -07:00
Tamas Rudnai 0e9cd203f2
Delete disksectorload_4.marked
removed
2020-07-26 15:51:35 -07:00
Tamas Rudnai 7a5dfcd84e
Delete disassembly_new.marked
removed
2020-07-26 15:51:22 -07:00
Tamas Rudnai 5ef282d943
Delete Apple_II_ROM.s
removed
2020-07-26 15:51:09 -07:00
Tamas Rudnai c1e1c940eb
Delete apple.rom
removed
2020-07-26 15:50:55 -07:00
Tamas Rudnai c1953a1711
Delete DOS boot full trace.marked2
removed
2020-07-26 15:50:27 -07:00
Tamas Rudnai b16fa135b6
Delete a
removed
2020-07-26 15:50:14 -07:00
Tamas Rudnai 0e853dba55
Delete .disksectorload.log.swo
removed
2020-07-26 15:49:36 -07:00
Tamas Rudnai b73368b111
Delete .Apple_II_ROM.s.swp
removed
2020-07-26 15:49:18 -07:00
tudnai 244af5ca55 Merge branch 'work' of https://github.com/trudnai/Steve2 into work 2020-07-26 15:43:54 -07:00
tudnai 6b43345ca2 Merge remote-tracking branch 'refs/remotes/origin/master' 2020-07-26 15:31:45 -07:00
tudnai 7cad219957 Fixed some build issues 2020-07-26 15:29:24 -07:00
tudnai defb426aa2 Added Audacity project files for Disk Sound Effects (SFX) 2020-07-26 15:04:49 -07:00
tudnai a4260e6417 Removed files no longer used 2020-07-26 15:04:14 -07:00
Tamas Rudnai 0199e6397b
Delete Merlin Pro 2.45 (DOS) Disk 2-2.dsk
All disk images moved to dsk folder
2020-07-26 14:44:48 -07:00
Tamas Rudnai 73df543d44
Delete Merlin Pro v2.23 DOS3.3 (The Yegg-Men Crack).DSK
All disk images moved to dsk folder
2020-07-26 14:44:39 -07:00
Tamas Rudnai cfdcdb2f31
Delete Merlin Pro 2.45 (DOS) Disk 1-2.dsk
All disk images moved to dsk folder
2020-07-26 14:44:26 -07:00
Tamas Rudnai 46a793ba46
Delete .DISK_II_C600.ROM.swp
We do not need swp file
2020-07-26 14:43:57 -07:00
Tamas Rudnai 3d3c3803f3
Delete apple-rainbow.png
We no longer use this as splash screen
2020-07-26 14:43:23 -07:00
Tamas Rudnai 8102a9e662
Delete apple-rainbow.jpg
We do not use this splash screen anymore
2020-07-26 14:42:56 -07:00
tudnai afdf82d620 apple-rainbow artwork 2020-07-26 14:34:47 -07:00
tudnai 2265ad7376 apple-rainbow splash screen is no longer used 2020-07-26 14:34:28 -07:00
Tamas Rudnai 62c80ed9fb
Delete qbit.woz
There is an image with same name but capital Q -- we will use that instead
2020-07-26 14:28:16 -07:00
tudnai 0b2fded774 Merlin Assembler disk image 2020-07-26 14:23:28 -07:00
tudnai 108da5db09 Replaced A2MAC and A2iOS references in comments 2020-07-13 10:23:33 -07:00
tudnai 1355ab215d Added space between 2019 and 2020 in the copyright field 2020-07-13 10:16:37 -07:00
tudnai f09585176c Added GPL v3 License 2020-07-13 10:10:33 -07:00
tudnai c7e76ff9e8 MouseMoved now works 2020-07-12 21:40:08 -07:00
tudnai 6e69b2bf5d Disable Keyboard 2 Joystick button polling -- that should work through normal event handler 2020-07-12 17:54:48 -07:00
tudnai 99656013ee Shuffled Modules around to gain back speed 2020-07-11 19:06:34 -07:00
tudnai d8d406a044 disk_accelerator_speedup is exposed to the public so we can use it for paste function -- later we need to implement a proper paste accelerator 2020-07-11 18:46:55 -07:00
tudnai 84e10b33d4 - Speed up Paste
- CMD+A
- Toolbar Copy+Paste buttons connected
2020-07-11 16:33:29 -07:00
tudnai 5e7116aba0 Removed Invalid Menu System 2020-07-11 14:15:58 -07:00
tudnai ce6435cf05 Fixed unfocused TextField causing input issues 2020-07-11 13:16:10 -07:00
tudnai e875521dc9 Adjusted sound continuity for 2MHz 2020-07-09 14:15:00 -07:00
tudnai e6de74d5a1 Optimized Disk Menus onto the Side Panel 2020-07-08 13:12:46 -07:00
tudnai eb3ac8ff94 Toolbar Fully Implemented 2020-07-08 00:56:45 -07:00
tudnai 6ebe88794c - New floppy drive icons for light and dark modes
- Input modifiers polling
2020-07-06 12:16:09 -07:00
tudnai ebdc0b045d Sound fixes
WOZ fixes
Load DSK fixes
2020-07-04 10:13:12 -07:00
tudnai b31c138604 More buttons on toolbar 2020-07-01 23:08:33 -07:00
tudnai 8318b362fb Toolbar 2020-07-01 17:47:43 -07:00
tudnai ea089cd7c5 - DSK, DO, PO formats converted internally to WOZ
- Joystick button assignment corrected
- Adjusted speaker dumping
- WOZ image can be opened from a memory buffer
2020-06-28 21:00:25 -07:00
tudnai ad19b6504b - Speaker quality improvements
- Initial steps for WOZ2 format
2020-06-27 20:29:53 -07:00
tudnai cb498c415c Fixed sound issues and resource leaks related to that 2020-06-27 16:54:02 -07:00
tudnai 4751c59fad Better Disk SFX 2020-06-26 23:24:01 -07:00
tudnai 8a94024636 Play / Pause / Stop / Reset menus connected 2020-06-25 20:23:08 -07:00
tudnai 73078e1a9e Save, SaveAs 2020-06-25 19:52:23 -07:00
tudnai 5374c8f035 Fixed WOZ file save 2020-06-25 16:33:15 -07:00
tudnai 34bd53d9be Disk Save 2020-06-25 16:23:20 -07:00
tudnai b67c69a660 - Mouse clicks to Joystick button
- Better sound in Game Mode: It would not shut off the sound system, therefore no "Fade In" or "Soft Start" effect by OpenAL
2020-06-24 21:05:55 -07:00
tudnai fb85a5f122 - App renamed to Steve ][
- Resource Folders in the App bundle
- Fixed: Custom Fonts
2020-06-24 15:44:15 -07:00
tudnai 72930227f4 - Fixed Game Mode Speaker Simulation 2020-06-23 22:59:20 -07:00
tudnai ec2617c7ae Game mode selectable from UI 2020-06-22 19:23:41 -07:00
tudnai 15b4b3252e Selectable Mono Color 2020-06-20 22:14:39 -07:00
tudnai ac36139d0d - Removed some unused code
- Color / Mono selector
- Mono HiRes
2020-06-20 18:46:26 -07:00
tudnai c467b8223c - Trace Enabler from UI
- Disk optimization tweaks
- Disk Drive selector
- Aux Memory handling fix
2020-06-19 15:16:27 -07:00
tudnai 7f6ade463b - Disk Write!!!
- Some Debug code
- Super low power ECO mode
2020-06-18 15:14:54 -07:00
tudnai 0ebc75c931 - CPU Mode from UI
- Scan Lines (CRT Monitor) mode from UI
- Echo Mode (pauses machine when just waiting for keyboard input)
2020-06-17 09:46:17 -07:00
tudnai e6e43df201 Clean up woz_read() 2020-06-13 20:21:31 -07:00
tudnai e414e13ad4 Hertz to MHz 2020-06-13 20:13:20 -07:00
tudnai eea48cb7a0 Mark disks as write protected 2020-06-12 07:29:14 -07:00
tudnai c88a7a33a8 Disk acceleration is turned off by default 2020-06-12 07:15:06 -07:00
tudnai 3f38d61bf6 Named values for the OpenAL arrays 2020-06-11 23:37:18 -07:00
tudnai b5b555a04b Renamed Disk SFX files 2020-06-11 23:19:03 -07:00
tudnai 2df593f105 Adjusted decibel 2020-06-11 23:16:48 -07:00
tudnai 6f78b92344 Disk Sound Effect enable button 2020-06-11 23:16:26 -07:00
tudnai 3ef337771b Disk Accelerator enable soft switch 2020-06-11 22:44:53 -07:00
tudnai ccf53fa6a6 Default speed acceleration was accidentally turned off 2020-06-11 22:39:14 -07:00
tudnai 96ae85ec71 - Fixed disk sfx buffer initialization error
- disk sfx only allowed at lower speed
2020-06-11 22:38:03 -07:00
tudnai 2dc3040dc5 Sample Rate adjusted back to original, so pitch is a bit more realistic 2020-06-11 22:08:48 -07:00
tudnai f09a78c0c8 All SFX moved to one queue buffer array 2020-06-11 21:53:53 -07:00
tudnai 9e6aebeaa8 Floppy Disk Drive Sound Effects 2020-06-11 18:29:26 -07:00
tudnai 00d8b14770 Updated appname, Steve ][ it is 2020-06-11 14:51:21 -07:00
tudnai 3d8f8f3faf Do not generate debug output file by default 2020-06-11 14:50:51 -07:00
tudnai 25d4ca31fd Disk read optimization 2020-06-11 14:50:07 -07:00
tudnai fad4956135 New Splash Screen 2020-06-10 19:12:08 -07:00
tudnai 4106a7ec36 New Splash Screen 2020-06-10 19:11:27 -07:00
tudnai bc2ab8512d - Moved to SRGB color space so colors will actually match with one used by StoryBoard and GIMP
- Render function from Update
2020-06-10 17:48:37 -07:00
tudnai 8dca81904a better scanline Y offset 2020-06-10 08:31:27 -07:00
tudnai d1d984e33f old monitor effects 2020-06-10 08:30:52 -07:00
tudnai 7940373a0d Scanlines 2020-06-10 00:22:46 -07:00
tudnai 93fce5e51c load sfx function 2020-06-09 00:54:36 -07:00
tudnai 55bb6b5fd5 Few bugfixes 2020-06-09 00:54:06 -07:00
tudnai 94aeaaefaa Organized Resources 2020-06-09 00:23:05 -07:00
tudnai 145ee55a4d Faster disk io 2020-06-09 00:22:33 -07:00
tudnai a73fb79792 - Adjusted disk accelerator (back to 2 frames)
- Removed some debug prints
- Adjusted speaker extra buffer
2020-06-08 21:12:40 -07:00
tudnai f2f725b8c5 - Speed up disk read
- Less overshot with accelerated disk read
- woz_LoadTrack to see where are the sectors
- Removed some unused code
2020-06-08 20:52:10 -07:00
tudnai 19ebe351b5 Removed unused ViewController and Window 2020-06-06 21:18:32 -07:00
tudnai 23bc243a1b Disk magnet management moved from mmio.h to disk.c 2020-06-06 21:09:00 -07:00
tudnai bfc010901c KIL instruction renamed to HLT 2020-06-06 20:19:44 -07:00
tudnai 68a57a4e67 Removed old test code, no longer needed 2020-06-06 13:26:16 -07:00
tudnai 81a929a889 Undocumented instructions 2020-06-06 13:19:29 -07:00
tudnai 16aa7a8d69 Added few undocumented instructions 2020-06-05 23:20:32 -07:00
tudnai 71348d606d - Removed some debug prints
- Renamed an addressing function
2020-06-05 23:18:39 -07:00
tudnai b6873a3136 Added a comment 2020-06-05 23:17:12 -07:00
tudnai b91fab6066 Removed some debug prints 2020-06-05 23:16:17 -07:00
tudnai 469da345f4 6502_pure renamed to 6502_vanilla 2020-06-05 17:12:15 -07:00
tudnai 4e8cebab37 Preferences Dialog Box 2020-06-05 17:11:22 -07:00
tudnai 0aa6098846 - Default ROM is //e, instead of Enhanced version
- WOZ file load error handling
- Only place filename to recents when load was successful
2020-06-04 11:37:35 -07:00
tudnai b6f67f981c - File Open
- Recent Files
- Disk Menus moved to File Menu
2020-06-03 10:23:55 -07:00
tudnai 697fc3171d - Joystick On / Off from UI
- Aux Memory switches
- Open any files using Open File Dialog
2020-06-02 10:10:18 -07:00
tudnai 2d58c13376 LoRes Graphics 2020-05-29 08:50:47 -07:00
tudnai b9efc3e009 - True Virtual ][ style logging so we can compare logs easier
- Fix: RAM Expansion Card now works
2020-05-28 12:37:32 -07:00
tudnai f79be51bb1 - Mouse Button / Paddle 3 is inverted
- Reset Paddle / Joystick / Mouse buttons
2020-05-28 09:35:17 -07:00
tudnai 04d9ca20eb Game Controller Combined Buttons 2020-05-28 09:19:07 -07:00
tudnai bb42837894 Removed unused WAV files 2020-05-28 08:16:46 -07:00
tudnai cc99e2eba3 Diagnostic Disks 2020-05-28 08:15:41 -07:00
tudnai add26cffc0 - Added UI Control over Disk Acceleration
- Effort to make sound smoother on higher frequencies
2020-05-27 19:12:28 -07:00
tudnai 17927f4ab0 Turn off disk acceleration immediately when there is a sound 2020-05-27 17:27:11 -07:00
tudnai d008094078 - Fixed RAM expansion handling w/Bank switching 2020-05-27 17:16:49 -07:00
tudnai e18173605b - Fixed 80 col rendering issue
- Interestingly speed bumped up a bit too
2020-05-26 21:13:31 -07:00
tudnai 0e1fc3e44b Adjusted edge curves, it gives us better sound, closer to original... 2020-05-25 20:53:42 -07:00
tudnai cc6b3e27d4 Added some WOZ disk images for testing Merlin Assembler 2020-05-25 19:41:37 -07:00
tudnai 5a0a23f048 Added Merlin Assembler versions for testing 2020-05-25 19:34:33 -07:00
tudnai 3042a98d64 - Removed Up and Down Arrow Keys to better support of Keyboard 2 Joystick
- Fix: Inverted Up and Down Keyboard 2 Mouse
2020-05-25 19:34:02 -07:00
tudnai c5f16cd15a Display Text Page 2 2020-05-24 21:04:34 -07:00
tudnai ef4e124043 - Adjusting Colors
- Fixing some pixel rendering issues with the green color
2020-05-24 20:26:54 -07:00
tudnai 7758fe3c33 - Adjustable edge curve
- Better speaker flip-flop simulation
2020-05-24 13:07:34 -07:00
tudnai ab120dc459 - Keyboard 2 Mouse
- FPS set back to 30
- 16 bit PCM
- Smoother speaker level fade out
- Faster keyboard poll query -- This is for checking only, should be either removed or the entire ioRead should based on binary search, whatever is faster
2020-05-24 12:14:09 -07:00
tudnai 0aea0b9c84 emoving unwanted log files 2020-05-21 22:13:00 -07:00
tudnai 4773c534f1 - foundation for the predictive input controller
- 60 FPS for better joystick reposne
2020-05-21 22:09:57 -07:00
tudnai 26341faff2 Mouse 2 JoyStick 2020-05-20 22:22:44 -07:00
tudnai 1b4985d3c8 First implementation of Game Controller (Joystick / Paddle) 2020-05-20 09:56:35 -07:00
tudnai 0fef4708f8 Optimized handling video mode changes 2020-05-18 21:17:19 -07:00
tudnai 9c4abe97c5 Fixed Full graphics screen clearing issues 2020-05-18 09:27:34 -07:00
tudnai 9871cb3886 Adjusted Audio Play 2020-05-17 22:08:23 -07:00
tudnai bde4c4d941 - spkr_switch renamed to spkr_toggle and moved to speaker.c
- Also some minor tweaks and cosmetics
2020-05-17 19:32:45 -07:00
tudnai ae5d8211fb Fixed hang when Power On pressed multiple times 2020-05-17 18:31:41 -07:00
tudnai c8f09f878d - Reducing Clicks and Humps on the Speaker 2020-05-17 16:01:15 -07:00
tudnai 846df28a07 Code cleanup and unsuccessfully trying to fix alSourcePlay issues 2020-05-17 13:48:35 -07:00
tudnai cf23cc7983 Sound works 2020-05-17 07:49:05 -07:00
tudnai aaf7c0ca83 Exponential signal edges for speaker 2020-05-13 20:40:54 -07:00
tudnai 82e07b5652 Make sound louder and cleaner 2020-05-10 15:38:42 -07:00
tudnai ca2f023c8c - Improved sound quality
- Eliminating sound playing when there was no speaker toggling in a frame
2020-05-10 15:30:29 -07:00
tudnai b746b1ee5c Speaker sound buffer to generate perfect square waves 2020-05-10 10:54:34 -07:00
tudnai cf2325e6fa Speaker - First implementation 2020-05-09 23:40:37 -07:00
tudnai e96f7bafc9 Fixed blue rendering 2020-05-09 20:57:56 -07:00
tudnai 7b51c83da2 - Initial ROM acceleration removed from the Power Cycle to have a better feeling of a retro computer
- Improved Power Cycle animation
2020-05-09 14:40:42 -07:00
tudnai 293ba80f41 Removed prevPrev (not needed) 2020-05-09 13:51:34 -07:00
tudnai 889b31803a HiRes render improvements - sharp image! 2020-05-09 13:45:41 -07:00
tudnai 6abcba032d - Splash screen
- HiRes pixel rendering improvements
2020-05-09 03:39:55 -07:00
tudnai bfb226d415 Speed improvements to 1300MHz 2020-05-08 19:47:19 -07:00
tudnai c6a7f211dc - White reduced to get a better retro feeling
- HiRes Color restoration adjusted so no more green stuff in Donkey Kong
2020-05-07 23:54:11 -07:00
tudnai c996f0ce14 Immediate value should be 8 bit 2020-05-07 13:21:43 -07:00
tudnai afc8c6d8d1 Fixed 4 line Text screen position in Mixed mode 2020-05-07 13:20:46 -07:00
tudnai 572977f5f8 Disk adjustment magic numbers lifted out as variables so it will be easier to remember them and adjust them 2020-05-06 20:49:15 -07:00
tudnai 5051c0f8c7 Removed dead code 2020-05-06 20:24:22 -07:00
tudnai 49a9dff6da Adjusted Disk properties to work with the new instruction clock counter 2020-05-06 20:07:09 -07:00
tudnai 386d3ea979 Speed bumped to 1244MHz!
Fixed CPU initialization
2020-05-06 16:07:19 -07:00
tudnai 4a5b482efa Link time optimization 2020-05-06 10:12:04 -07:00
tudnai 4017d12dc8 - Optimized Text Rendering
- Optimized HiRes screen hiding
2020-05-06 09:56:21 -07:00
tudnai 303de91fc6 - Startup speed is set by ColdReset, so it will work always
- HiRes screen is being cleared when switched back to text mode
- Turned off Debug app for Release mode
2020-05-05 23:03:36 -07:00
tudnai 961708373c - Speed improvements
- Keyboard Up
- HiRes optimized (battery save) refresh / Refresh by blocks that modified
2020-05-05 08:35:57 -07:00
tudnai fd63ce5bca Optimized color management 2020-05-04 13:54:04 -07:00
tudnai 5afcb161b6 Optimizing HiRes screen updates - do not refresh HiRes when it is in TextMode 2020-05-04 13:53:36 -07:00
tudnai b993009859 Slight speed improvements 2020-05-04 13:52:52 -07:00
tudnai 303c0f7f95 Simplifying reset + Cleanup code 2020-05-02 22:39:54 -07:00
tudnai 393b28ab3d Interrupt handling outside of the instruction loop 2020-05-02 22:35:59 -07:00
tudnai 368dd13309 - Fixed disk acceleration algorithm
- Some tiny speed optimizations
2020-05-02 22:04:22 -07:00
tudnai e18bc9653e - Removed some dead code
- Disk accelerator reset moved to a function
- Some tiny speed optimizations
2020-05-02 21:26:24 -07:00
tudnai e871c32202 Limit increased to allow sheer power 2020-05-02 21:07:02 -07:00
tudnai 1cbc67c0eb Code Cleaning 2020-05-02 21:06:34 -07:00
tudnai 040ee3af43 Fixed Text Page switching 2020-05-02 10:36:21 -07:00
tudnai 54a02f3ea1 Milestone! GHz reached! & Removing large files 2020-05-01 23:35:17 -07:00
tudnai 424a65e074 Shadow memory direct access for all instructions & flags promoted to uint8_t instead of bitfield 2020-05-01 21:52:51 -07:00
tudnai 75e0f5d528 Not sure why it got removed 2020-05-01 20:16:41 -07:00
tudnai 77bcdc3e73 Merge branch 'speedbump' 2020-05-01 20:13:01 -07:00
tudnai e7dcfd1184 added schemas 2020-05-01 20:12:01 -07:00
tudnai 5ee910b681 Merge branch 'speedbump' 2020-05-01 19:54:40 -07:00
tudnai d2f455575d Removing log files 2020-05-01 19:49:31 -07:00
tudnai 1b2cf4d74e Page Table removed 2020-05-01 19:33:14 -07:00
tudnai 7e6ea1dc32 Getting rid of Page Table 2020-05-01 19:24:09 -07:00
tudnai db8c657d0e Rendering running independently on the main thread 2020-05-01 19:10:44 -07:00
tudnai ef6ae3ccc5 Shadow memory kinda works 2020-05-01 18:56:30 -07:00
tudnai 315e1aec12 Started to come alive 2020-05-01 14:43:41 -07:00
tudnai 8f80ff59f0 Update qbit.woz 2020-04-30 22:36:47 -07:00
tudnai fc32252815 Further steps to implement Shadow Memory 2020-04-30 19:33:59 -07:00
tudnai e3d97a05ae removed functiontest.bin from build 2020-04-30 12:41:08 -07:00
tudnai 1b95e22568 Bugfixes merged from Master 2020-04-30 12:01:35 -07:00
tudnai 016a132ba7 Merge branch 'master'
Conflicts:
	src/cpu/6502.c
	src/dev/mem/mmio.h
2020-04-30 11:49:52 -07:00
tudnai 5443d91fc7 Fixed Reset issues on //e
Performance enhancements
2020-04-30 07:26:46 -07:00
tudnai a70937b321 First steps for the Shadow Memory implementation 2020-04-29 19:58:03 -07:00
tudnai 53f81555ea - Removed 16K LC RAM -- using 64K AUX to emulate it
- Removed 12K ROM -- using 16K ROM to emulate it
2020-04-29 16:18:27 -07:00
tudnai f56a2cb8c6 Speed bump (2x)
- Precise MHz measurements
2020-04-29 15:35:54 -07:00
tudnai deb6373f18 Code polishing 2020-04-27 20:32:58 -07:00
tudnai 9e32839a4d - use outdev file for dbgPrintf 2020-04-27 20:31:16 -07:00
tudnai d1f0c8e1db Fix text screen rendering in graphics mode 2020-04-27 12:38:07 -07:00
tudnai d786f4a594 Fixed bad commit with the io address checking and super slowness 2020-04-27 12:27:57 -07:00
tudnai 72dc8dfa99 Fixed PR#3 initialization issue (added support for text mode query) 2020-04-27 11:58:38 -07:00
tudnai 8e61a3403b Moving to a unified 64K expansion memory instead of small fragments 2020-04-27 08:15:36 -07:00
tudnai 4ecbc13628 Cleanup 2020-04-27 08:02:17 -07:00
tudnai 91fd9ac8f9 80 column video 2020-04-27 07:26:04 -07:00
tudnai 15911de276 Added ROM changing Menu
Added ROMs
Added fonts for 80 col PR#3
Fixed Memory Init issues when Cold Reset
Fixed Dummy Memory issues
2020-04-26 00:23:05 -07:00
tudnai da27a21a88 Cursor character for the //e 2020-04-25 21:28:18 -07:00
tudnai 06df29930f Side panel View and other things 2020-04-25 21:27:25 -07:00
tudnai f12368037e HIRESLOWCOLOR turned on 2020-04-25 19:01:57 -07:00
tudnai 11cd400afb Adjusted size of buttons and CPU speed selectors
Moved buttons to spacer
2020-04-25 19:00:43 -07:00
tudnai 126f76c9a4 - Paste into VM
- HiRes (HIRESOWCOLOR) now respects pages and mixed mode
2020-04-22 19:18:28 -07:00
Tamas Rudnai 3a01ee2934 Reduce color bleeding on Black 2020-02-28 21:57:23 -08:00
Tamas Rudnai 06b911be9c Color bleeding removal 2020-02-28 00:28:22 -08:00
Tamas Rudnai 44681298c1 Color fix 2 -- Better handling Bleeding colors 2020-02-26 06:27:27 -08:00
Tamas Rudnai 4f5e7aef1c - Fixing Color calculations 2020-02-25 23:54:08 -08:00
Tamas Rudnai 206b5a1163 - HIRESLOWCOLOR -- Color Hires Implementation 2020-02-25 00:14:05 -08:00
Tamas Rudnai 44debeb2d1 Fix Selectable DIsk 2020-02-22 22:19:51 -08:00
Tamas Rudnai cf5f390ed2 - Selectable Disk from Config menu
- KBDSTRB from ioWrite
2020-02-22 22:16:41 -08:00
Tamas Rudnai a1038b80dc Include file location paths fixed 2020-02-22 16:41:17 -08:00
Tamas Rudnai 44968a5db3 - Proper Graphics - Text switching
- Suports graphics buffer (Page) changes
- Supports Mixed mode
2020-02-22 16:37:54 -08:00
Tamas Rudnai 16cc896c0c Added iOS platform 2020-02-17 22:33:27 -08:00
Tamas Rudnai 76ad2cfc59 - fps set to 15
- First effort for the track preloading
- Disk accelerator back to 25 MHz
2020-02-17 22:22:14 -08:00
Tamas Rudnai 9b3b79cca0 - Disk read huge speed bump by accelerating CPU clock for 200ms 2020-02-16 23:09:29 -08:00
Tamas Rudnai 0c72992e8a Source code organizing 2 2020-02-16 21:17:28 -08:00
Tamas Rudnai 7e2d93f043 - Disk read acceleration
- Source code organization 1
2020-02-16 20:38:38 -08:00
Tamas Rudnai e33c1dc34b - Speed Enhancement of Disk II reading
- Precise Clock calculation to determine disk rotation for the CPU cycles
- Memory Page Tables
- Language Card Emulation -- needs some more work on it
2020-02-07 00:40:31 -08:00
Tamas Rudnai cea4eed922 - Disk Track and stepper motor phase limit adjustment so that all 40 tracks can be accessed 2020-01-28 14:00:04 -08:00
Tamas Rudnai ace3a8f68e - Reads WOZ files! DOS compatibility only for now
- MHz can be changed from GUI
2020-01-27 22:54:03 -08:00
Tamas Rudnai fddb1d9642 - WOZ Disk initial Try
- HiRes support
- Reset Vector fixes
- ROM read from file
- Better MMIO Handling
- BugFixes
- Shader Metal try
2019-11-27 20:27:32 -08:00
Tamas Rudnai 1e455a011e - Disassembler
- HiRes graphics
2019-09-22 01:31:09 -07:00
Tamas Rudnai 8f914756eb - Apple ][ Font
- Inverse characters
- Flashing characters
- Boot - RAM size detection bug fixed
- Frame around Text Field
- Fixed BRK
- Debug Target
- Speed Test target
2019-09-19 02:27:56 -07:00
Tamas Rudnai fe5f30114d - Added debug breakpoints for 6502 function test
- Fixed ADC/SBC in BCD mode
- Added "burst" mode with sync to screen refresh
- Reduced power consumption significantly
- Speedometer on Screen
2019-09-17 02:12:05 -07:00
Tamas Rudnai 26c413df6b - Unified inline
- "breakpoints" for debugging
- BugFixes
2019-09-15 04:02:22 -07:00
Tamas Rudnai f2e5b49a6e - Speed optimizations
- Carry Flag bugfix
2019-09-12 00:30:22 -07:00
Tamas Rudnai 08327ef0a4 - Speed optimization: It is unlikely that one would poke I/O address space with indexed memory access, so those no need to check 2019-09-11 19:08:55 -07:00
Tamas Rudnai 80d6190fa1 - Address mode adjustments
- Some fine tunings
- Stack PUSH/POP address fix
- DispatchWorkItem to be able to kill emulator thread
2019-09-11 18:36:30 -07:00
Tamas Rudnai 8a6f1654ee Refactoring instruction handler in switch
Fixed some issues
2019-09-11 00:11:45 -07:00
Tamas Rudnai 5ad28e911e Instruction BugFixes 2019-09-10 00:00:00 -07:00
505 changed files with 351385 additions and 3787 deletions

34
.gitignore vendored Normal file
View File

@ -0,0 +1,34 @@
# gitignore for A2MAC project
@ (c) by Tamas Rudnai
# logfiles
*.log
**/*.log
# XCode debugger settings
A2Mac.xcodeproj/xcuserdata/trudnai.xcuserdatad/xcdebugger/
convert_spkr_buf_to_wav.wav
steve2_audio_debug_ema.wav
steve2_audio_debug_raw.wav
steve2_audio_debug.wav
XPS_Aux_Mem_test.txt
XPS_Aux_Mem_test.txt.dis
Resources/rom/Downloads/Apple II ROMs.zip
Resources/rom/Downloads/Apple II ROMs.zip
Resources/rom/Downloads/apple_2e_unenhanced_rom.zip
Resources/rom/Downloads/APPLE_IIe_ROM_KRK.zip
Resources/rom/Downloads/APPLE_IIe_ROM_KRK1.zip
Resources/rom/Downloads/APPLE_IIe_ROM_KRK2.zip
Resources/rom/Downloads/apple_iie_rom.zip
Resources/rom/Downloads/077-0026-0027 for IIe.zip
**/Contents/**
.DS_Store
Brewfile
1
ssasa
*.au
*.aup
*.csv
*.swp

14360
6502_functional_test.lst Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

34
A2Mac copy-Info.plist Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.education</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 GameAlloy. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>

34
A2Mac copy2-Info.plist Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.education</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 GameAlloy. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array/>
</plist>

View File

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB6822EACC660003B53F"
BuildableName = "A2MacTests.xctest"
BlueprintName = "A2MacTests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB7322EACC660003B53F"
BuildableName = "A2MacUITests.xctest"
BlueprintName = "A2MacUITests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
disableMainThreadChecker = "YES"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
debugXPCServices = "NO"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "NO"
viewDebuggingEnabled = "No"
queueDebuggingEnabled = "No"
GPUProfilerEnabled = "No">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "325EB63F23FBBACF00C6B4A4"
BuildableName = "Steve ][ iOS.app"
BlueprintName = "Steve ][ iOS"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "325EB65423FBBAD100C6B4A4"
BuildableName = "A2iOSTests.xctest"
BlueprintName = "A2iOSTests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "325EB65F23FBBAD100C6B4A4"
BuildableName = "A2iOSUITests.xctest"
BlueprintName = "A2iOSUITests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "325EB63F23FBBACF00C6B4A4"
BuildableName = "Steve ][ iOS.app"
BlueprintName = "Steve ][ iOS"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "325EB63F23FBBACF00C6B4A4"
BuildableName = "Steve ][ iOS.app"
BlueprintName = "Steve ][ iOS"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB6822EACC660003B53F"
BuildableName = "A2MacTests.xctest"
BlueprintName = "A2MacTests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB7322EACC660003B53F"
BuildableName = "A2MacUITests.xctest"
BlueprintName = "A2MacUITests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32799F78264B1A5700255669"
BuildableName = "Steve ][ Debug.app"
BlueprintName = "Steve ][ Debug"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32C4531B2331FED90000EBA1"
BuildableName = "Functiontest.app"
BlueprintName = "Functiontest"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB6822EACC660003B53F"
BuildableName = "A2MacTests.xctest"
BlueprintName = "A2MacTests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB7322EACC660003B53F"
BuildableName = "A2MacUITests.xctest"
BlueprintName = "A2MacUITests"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32C4531B2331FED90000EBA1"
BuildableName = "Functiontest.app"
BlueprintName = "Functiontest"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32BFFB5622EACC630003B53F"
BuildableName = "Steve ][.app"
BlueprintName = "Steve ]["
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "NO"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32C453092331F7220000EBA1"
BuildableName = "Speedtest.app"
BlueprintName = "Speedtest"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32C453092331F7220000EBA1"
BuildableName = "Speedtest.app"
BlueprintName = "Speedtest"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32C453092331F7220000EBA1"
BuildableName = "Speedtest.app"
BlueprintName = "Speedtest"
ReferencedContainer = "container:A2Mac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -9,9 +9,49 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>A2iOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Debug.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Function Test.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>Speedtest.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>Steve ][ copy.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>325EB63F23FBBACF00C6B4A4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>325EB65423FBBAD100C6B4A4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>325EB65F23FBBAD100C6B4A4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32BFFB5622EACC630003B53F</key>
<dict>
<key>primary</key>
@ -27,6 +67,16 @@
<key>primary</key>
<true/>
</dict>
<key>32C453092331F7220000EBA1</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32C4531B2331FED90000EBA1</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

View File

@ -1,531 +0,0 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include "common.h"
#include "Apple2_mmio.h"
#define SOFTRESET_VECTOR 0x3F2
/**
Instruction Implementations
!!!! `his has to be here!!!
This idea is that "static inline" would work only if it is
located in the same source file -- hence the include...
**/
#include "6502_instructions.h"
/////
unsigned long long int clktime = 0;
m6502_t m6502 = {0};
static inline int m6502_step() {
// switch ( fetch16() ) {
// case 0xFCD0: // D0 FC BNE
// BNE( 0xFC ); return 2;
//
// case 0x01E9: // E9 01 SBC
// SBC( 0x01 ) ; return 6;
//
// default:
// m6502.pc -= 2;
//
switch ( fetch() ) {
case 0x00: BRK(); return 2; // BRK
case 0x01: ORA( memread( addr_X_ind() ) ); return 6; // ORA X,ind
// case 0x02: // t jams
// case 0x03: // SLO* (undocumented)
// case 0x04: // NOP* (undocumented)
case 0x05: ORA( memread_zp( fetch() ) ); return 3; // ORA zpg
case 0x06: ASL( & RAM[ fetch() ] ); return 5; // ASL zpg
// case 0x07: // SLO* (undocumented)
case 0x08: PHP(); return 3; // PHP
case 0x09: ORA( fetch() ); return 2; // ORA imm
case 0x0A: ASL( & m6502.A ); return 2; // ASL A
// case 0x0B: // ANC** (undocumented)
// case 0x0C: // NOP* (undocumented)
case 0x0D: ORA( memread( fetch16() ) ); return 4; // ORA abs
case 0x0E: ASL( & RAM[ fetch16() ] ); return 6; // ASL abs
// case 0x0F: // SLO* (undocumented)
case 0x10: BPL( (int8_t)fetch() ); return 2; // BPL rel
case 0x11: ORA( memread( addr_ind_Y() ) ); return 5; // ORA ind,Y
// case 0x12: // t jams
// case 0x13: // SLO* (undocumented)
// case 0x14: // NOP* (undocumented)
case 0x15: ORA( memread_zp( fetch() + m6502.X ) ); return 4; // ORA zpg,X
case 0x16: ASL( & RAM[ fetch() + m6502.X ] ); return 6; // ASL zpg,X
// case 0x17: // SLO* (undocumented)
case 0x18: CLC(); return 2; // CLC
case 0x19: ORA( memread( fetch16() + m6502.Y ) ); return 4; // ORA abs,Y
// case 0x1A: // NOP* (undocumented)
// case 0x1B: // SLO* (undocumented)
// case 0x1C: // NOP* (undocumented)
case 0x1D: ORA( memread( fetch16() + m6502.X ) ); return 4; // ORA abs,X
case 0x1E: ASL( & RAM[ fetch16() + m6502.X ] ); return 7; // ASL abs,X
// case 0x1F: // SLO* (undocumented)
case 0x20: JSR( fetch16() ); return 6; // JSR abs
case 0x21: AND( memread( addr_X_ind() ) ); return 6; // AND X,ind
// case 0x22:
// case 0x23:
case 0x24: BIT( memread_zp( fetch() ) ); return 3; // BIT zpg
case 0x25: AND( memread_zp( fetch() ) ); return 3; // AND zpg
case 0x26: ROL( & RAM[ fetch() ] ); return 5; // ROL zpg
// case 0x27:
case 0x28: PLP(); return 4; // PLP
case 0x29: AND( fetch() ); return 2; // AND imm
case 0x2A: ROL( & m6502.A ); return 2; // ROL A
// case 0x2B:
case 0x2C: BIT( memread( fetch16() ) ); return 4; // BIT abs
case 0x2D: AND( fetch16() ); return 4; // AND abs
case 0x2E: ROL( & RAM[ fetch16() ] ); return 6; // ROL abs
// case 0x2F:
case 0x30: BMI( (int8_t)fetch() ); return 2; // BMI rel
case 0x31: AND( memread( addr_ind_Y() ) ); return 5; // AND ind,Y
// case 0x32:
// case 0x33:
// case 0x34:
case 0x35: AND( memread_zp( addr_zp_X() ) ); return 4; // AND zpg,X
case 0x36: ROL( & RAM[ addr_zp_X() ] ); return 6; // ROL zpg,X
// case 0x37:
case 0x38: SEC(); return 2; // SEC
case 0x39: AND( memread( addr_abs_Y() ) ); return 4; // AND abs,Y
// case 0x3A:
// case 0x3B:
// case 0x3C:
case 0x3D: AND( memread( addr_abs_X() ) ); return 4; // AND abs,X
case 0x3E: ROL( & RAM[ addr_abs_X() ] ); return 7; // ROL abs,X
// case 0x3F:
case 0x40: RTI(); return 6; // RTI
case 0x41: EOR( memread( addr_X_ind() ) ); return 6; // EOR X,ind
// case 0x42:
// case 0x43:
// case 0x44:
case 0x45: EOR( memread_zp( fetch() ) ); return 3; // EOR zpg
case 0x46: LSR( & RAM[ fetch() ] ); return 5; // LSR zpg
// case 0x47:
case 0x48: PHA(); return 3; // PHA
case 0x49: EOR( fetch() ); return 2; // EOR imm
case 0x4A: LSR( & m6502.A ); return 2; // LSR A
// case 0x4B:
case 0x4C: JMP( fetch16() ); return 3; // JMP abs
case 0x4D: EOR( fetch16() ); return 4; // EOR abs
case 0x4E: LSR( & RAM[ fetch16() ] ); return 6; // LSR abs
// case 0x4F:
case 0x50: BVC( (int8_t)fetch() ); return 2; // BVC rel
case 0x51: EOR( memread( addr_ind_Y() ) ); return 5; // EOR ind,Y
// case 0x52:
// case 0x53:
// case 0x54:
case 0x55: EOR( memread_zp( addr_zp_X() ) ); return 4; // AND zpg,X
case 0x56: LSR( & RAM[ addr_zp_X() ] ); return 6; // LSR zpg,X
// case 0x57:
case 0x58: CLI(); return 2; // CLI
case 0x59: EOR( memread( addr_abs_Y() ) ); return 4; // EOR abs,Y
// case 0x5A:
// case 0x5B:
// case 0x5C:
case 0x5D: EOR( memread( addr_abs_X() ) ); return 4; // EOR abs,X
case 0x5E: LSR( & RAM[ addr_abs_X() ] ); return 7; // LSR abs,X
// case 0x5F:
case 0x60: RTS(); return 6; // RTS
case 0x61: ADC( memread( addr_X_ind() ) ); return 6; // ADC X,ind
// case 0x62:
// case 0x63:
// case 0x64:
case 0x65: ADC( memread_zp( fetch() ) ); return 3; // ADC zpg
case 0x66: ROR( & RAM[ fetch() ] ); return 5; // ROR zpg
// case 0x67:
case 0x68: PLA(); break; // PLA
case 0x69: ADC( fetch() ); return 2; // ADC imm
case 0x6A: ROR( & m6502.A ); return 2; // ROR A
// case 0x6B:
case 0x6C: JMP( memread16( fetch16() ) ); return 5; // JMP ind
case 0x6D: ADC( memread( fetch16() ) ); return 4; // ADC abs
case 0x6E: ROR( & RAM[ fetch16() ] ); return 6; // ROR abs
// case 0x6F:
case 0x70: BVS( (int8_t)fetch() ); break; // BVS rel
case 0x71: ADC( memread( addr_ind_Y() ) ); return 5; // ADC ind,Y
// case 0x72:
// case 0x73:
// case 0x74:
case 0x75: ADC( memread_zp( addr_zp_X() ) ); return 4; // ADC zpg,X
case 0x76: ROR( & RAM[ addr_zp_X() ] ); return 6; // ROR zpg,X
// case 0x77:
case 0x78: SEI(); break; // SEI
case 0x79: ADC( memread( addr_abs_Y() ) ); return 4; // ADC abs,Y
// case 0x7A:
// case 0x7B:
// case 0x7C:
case 0x7D: ADC( memread( addr_abs_X() ) ); return 4; // ADC abs,X
case 0x7E: ROR( & RAM[ addr_abs_X() ] ); return 7; // ROR abs,X
// case 0x7F:
// case 0x80:
case 0x81: STA( & RAM[ addr_X_ind() ] ) ; return 6; // STA X,ind
// case 0x82:
// case 0x83:
case 0x84: STY( & RAM[ fetch() ] ); return 3; // STY zpg
case 0x85: STA( & RAM[ fetch() ] ); return 3; // STA zpg
case 0x86: STX( & RAM[ fetch() ] ); return 3; // STX zpg
// case 0x87:
case 0x88: DEY(); return 2; // DEY
// case 0x89:
case 0x8A: TXA(); return 2; // TXA
// case 0x8B:
case 0x8C: STY( & RAM[ fetch16() ] ); return 4; // STY abs
case 0x8D: STA( & RAM[ fetch16() ] ); return 4; // STA abs
case 0x8E: STX( & RAM[ fetch16() ] ); return 4; // STX abs
// case 0x8F:
case 0x90: BCC( (int8_t)fetch() ); return 2; // BCC rel
case 0x91: STA( & RAM[ addr_ind_Y() ] ); return 6; // STA ind,Y
// case 0x92:
// case 0x93:
case 0x94: STY( & RAM[ addr_zp_X() ] ); return 4; // STY zpg,X
case 0x95: STA( & RAM[ addr_zp_X() ] ); return 4; // STA zpg,X
case 0x96: STX( & RAM[ addr_zp_Y() ] ); return 4; // STX zpg,Y
// case 0x97:
case 0x98: TYA(); return 2; // TYA
case 0x99: STA( & RAM[ addr_abs_Y() ] ); return 5; // STA abs,Y
case 0x9A: TXS(); return 2; // TXS
// case 0x9B:
// case 0x9C:
case 0x9D: STA( & RAM[ addr_abs_X() ] ); return 5; // STA abs,X
// case 0x9E:
// case 0x9F:
case 0xA0: LDY( fetch() ); return 2; // LDY imm
case 0xA1: LDA( memread( addr_X_ind() ) ) ; return 6; // LDA X,ind
case 0xA2: LDX( fetch() ); return 2; // LDX imm
// case 0xA3:
case 0xA4: LDY( memread_zp( fetch() ) ); return 3; // LDY zpg
case 0xA5: LDA( memread_zp( fetch() ) ); return 3; // LDA zpg
case 0xA6: LDX( memread_zp( fetch() ) ); return 3; // LDX zpg
// case 0xA7:
case 0xA8: TAY(); return 2; // TAY
case 0xA9: LDA( fetch() ); return 2; // LDA imm
case 0xAA: TAX(); return 2; // TAX
// case 0xAB:
case 0xAC: LDY( memread( fetch16() ) ); return 4; // LDY abs
case 0xAD: LDA( memread( fetch16() ) ); return 4; // LDA abs
case 0xAE: LDX( memread( fetch16() ) ); return 4; // LDX abs
// case 0xAF:
case 0xB0: BCS( (int8_t)fetch() ); return 2; // BCS rel
case 0xB1: LDA( memread( addr_ind_Y() ) ); return 5; // LDA ind,Y
// case 0xB2:
// case 0xB3:
case 0xB4: LDY( memread_zp( addr_zp_X() ) ); return 4; // LDY zpg,X
case 0xB5: LDA( memread_zp( addr_zp_X() ) ); return 4; // LDA zpg,X
case 0xB6: LDX( memread_zp( addr_zp_Y() ) ); return 4; // LDX zpg,Y
// case 0xB7:
case 0xB8: CLV(); return 2; // CLV
case 0xB9: LDA( memread( addr_abs_Y() ) ); return 4; // LDA abs,Y
case 0xBA: TSX(); return 2; // TSX
// case 0xBB:
case 0xBC: LDY( memread( addr_abs_X() ) ); return 4; // LDY abs,X
case 0xBD: LDA( memread( addr_abs_X() ) ); return 4; // LDA abs,X
case 0xBE: LDX( memread( addr_abs_X() ) ); return 4; // LDX abs,Y
// case 0xBF:
case 0xC0: CPY( fetch() ); break; // CPY imm
case 0xC1: CMP( memread( addr_X_ind() ) ) ; break; // LDA X,ind
// case 0xC2:
// case 0xC3:
case 0xC4: CPY( memread_zp( fetch() ) ); return 3; // CPY zpg
case 0xC5: CMP( memread_zp( fetch() ) ); return 3; // CMP zpg
case 0xC6: DEC( & RAM[ fetch() ] ); return 5; // DEC zpg
// case 0xC7:
case 0xC8: INY(); return 2; // INY
case 0xC9: CMP( fetch() ); return 2; // CMP imm
case 0xCA: DEX(); return 2; // DEX
// case 0xCB:
case 0xCC: CPY( memread( fetch16() ) ); return 4; // CPY abs
case 0xCD: CMP( fetch16() ); return 4; // CMP abs
case 0xCE: DEC( & RAM[ fetch16() ] ); return 4; // DEC abs
// case 0xCF:
case 0xD0: BNE( (int8_t)fetch() ); return 2; // BNE rel
case 0xD1: CMP( memread( addr_ind_Y() ) ); return 5; // CMP ind,Y
// case 0xD2:
// case 0xD3:
// case 0xD4:
case 0xD5: CMP( memread_zp( addr_zp_X() ) ); return 4; // CMP zpg,X
case 0xD6: DEC( & RAM[ addr_zp_X() ] ); return 6; // DEC zpg,X
// case 0xD7:
case 0xD8: CLD(); return 2; // CLD
case 0xD9: CMP( memread( addr_abs_Y() ) ); return 4; // CMP abs,Y
// case 0xDA:
// case 0xDB:
// case 0xDC:
case 0xDD: CMP( memread( addr_abs_X() ) ); return 4; // CMP abs,X
case 0xDE: DEC( & RAM[ addr_abs_X() ] ); return 7; // DEC abs,X
// case 0xDF:
case 0xE0: CPX( fetch() ); return 2; // CPX imm
case 0xE1: SBC( memread( addr_X_ind() ) ) ; return 6; // SBC (ind,X)
// case 0xE2:
// case 0xE3:
case 0xE4: CPX( memread_zp( fetch() ) ); return 3; // CPX zpg
case 0xE5: SBC( memread_zp( fetch() ) ); return 3; // SBC zpg
case 0xE6: INC( & RAM[ fetch() ] ); return 5; // INC zpg
// case 0xE7:
case 0xE8: INX(); return 2; // INX
case 0xE9: SBC( fetch() ); return 2; // SBC imm
case 0xEA: NOP(); return 2; // NOP
// case 0xEB:
case 0xEC: CPX( memread( fetch16() ) ); return 4; // CPX abs
case 0xED: SBC( fetch16() ); return 4; // SBC abs
case 0xEE: INC( & RAM[ fetch16() ] ); return 6; // INC abs
// case 0xEF:
case 0xF0: BEQ( (int8_t)fetch() ); return 2; // BEQ rel
case 0xF1: SBC( memread( addr_ind_Y() ) ); return 5; // SBC ind,Y
// case 0xF2:
// case 0xF3:
// case 0xF4:
case 0xF5: SBC( memread_zp( addr_zp_X() ) ); return 4; // SBC zpg,X
case 0xF6: INC( & RAM[ addr_zp_X() ] ); return 6; // INC zpg,X
// case 0xF7:
case 0xF8: SED(); break; // SED
case 0xF9: SBC( memread( addr_abs_Y() ) ); return 4; // SBC abs,Y
// case 0xFA:
// case 0xFB:
// case 0xFC:
case 0xFD: SBC( memread( addr_abs_X() ) ); return 4; // SBC abs,X
case 0xFE: INC( & RAM[ addr_abs_X() ] ); return 6; // INC abs,X
// case 0xFF:
default:
printf("Unimplemented Instruction 0x%02X\n", memread( m6502.pc -1 ));
break;
}
// } // fetch16
return 4;
}
const unsigned long long int iterations = G;
unsigned long long TICK_PER_SEC = G;
unsigned long long TICK_6502_PER_SEC = 0;
unsigned long long MHz_6502 = 1.023 * M;
static __inline__ unsigned long long rdtsc(void)
{
unsigned hi, lo;
__asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi) );
return ( (unsigned long long)lo) | ( ((unsigned long long)hi) << 32 );
}
static inline void m6502_run() {
uint8_t clk = 0;
// init time
// unsigned long long s = rdtsc();
unsigned long long e = (unsigned long long)-1LL;
// for ( unsigned long long int i = 0; i < iterations ; i++ ) {
// for ( ; m6502.pc ; ) {
for ( ; ; ) {
if ( m6502.interrupt_flag ) {
switch (m6502.interrupt) {
case NMI:
break;
case HARDRESET:
break;
case SOFTRESET:
m6502.pc = memread16(SOFTRESET_VECTOR);
break;
default:
break;
}
m6502.interrupt_flag = 0;
}
dbgPrintf("%04u %04X: ", clktime, m6502.pc);
clk = m6502_step();
clktime += clk;
e = TICK_6502_PER_SEC * clktime;
// query time + wait
// usleep(1);
// tight loop gives us the most precise wait time
// while ( rdtsc() - s < e ) {}
dbgPrintf("\n");
}
}
void init() {
unsigned long long s = rdtsc();
sleep(1);
unsigned long long e = rdtsc();
TICK_PER_SEC = e - s;
TICK_6502_PER_SEC = TICK_PER_SEC / MHz_6502;
memset( RAM, 0, sizeof(RAM) );
// RAM[ 0 ] = 0x4C;
// RAM[ 1 ] = 0;
// RAM[ 2 ] = 0;
//
// RAM[ 0xBFFD ] = 0x4C;
// RAM[ 0xBFFE ] = 0;
// RAM[ 0xBFFF ] = 0;
FILE * f = fopen("/Users/trudnai/Library/Containers/com.gamealloy.A2Mac/Data/apple.rom", "rb");
if (f == NULL) {
perror("Failed: ");
return;
}
fread( RAM + 0xD000, 1, 0x3000, f);
fclose(f);
// reset vector
m6502.pc = memread16( 0xFFFC );
m6502.sp = 0x01FF;
uint8_t counter[] = {
// 1 * COUNTER2
// 2
// 3 ORG $1000
// 4 SCREEN EQU $400
// 5 HOME EQU $FC58
// 6 DIGITS EQU $06
// 7 ZERO EQU $B0
// 8 CARRY EQU $BA
// 9 RDKEY EQU $FD0C
//10
// I have placed NOP to keep addresses
0xA0, 0x09, 0xEA, //11 LDY #$09 ; NOP
0x84, 0x06, //12 STY #DIGITS
0xEA, 0xEA, //13 NOP NOP
0xEA, 0xEA, 0xEA, //14 NOP NOP NOP
0xA6, 0x06, //15 LDY DIGITS
0xA9, 0xB0, //16 CLEAR LDA #ZERO
0x99, 0x00, 0x04, //17 STA SCREEN,Y
0x88, //18 DEY
0x10, 0xF8, //19 BPL CLEAR
0xA4, 0x06, //20 START LDY DIGITS
0x20, 0x36, 0x10, //21 ONES JSR INC
0xB9, 0x00, 0x04, //22 LDA SCREEN,Y
0xC9, 0xBA, //23 CMP #CARRY
0xD0, 0xF6, //24 BNE ONES
0xA9, 0xB0, //25 NEXT LDA #ZERO
0x99, 0x00, 0x04, //26 STA SCREEN,Y
0x88, //27 DEY
0x30, 0x0D, //28 BMI END
0x20, 0x36, 0x10, //29 JSR INC
0xB9, 0x00, 0x04, //30 LDA SCREEN,Y
0xC9, 0xBA, //31 CMP #CARRY
0xD0, 0xE2, //32 BNE START
0x4C, 0x20, 0x10, //33 JMP NEXT
0x60, //34 END RTS
0xB9, 0x00, 0x04, //36 INC LDA SCREEN,Y
0xAA, //37 TAX
0xE8, //38 INX
0x8A, //39 TXA
0x99, 0x00, 0x04, //40 STA SCREEN,Y
0x60, //41 RTS
};
uint8_t counter_fast[] = {
// 1 * COUNTER2
// 2
// 3 ORG $1000
// 4 SCREEN EQU $400
// 5 HOME EQU $FC58
// 6 DIGITS EQU $06
// 7 ZERO EQU $B0
// 8 CARRY EQU $BA
// 9 RDKEY EQU $FD0C
//10
// I have placed NOP to keep addresses
0xA0, 0x06, // 00 LDY #$09
0x84, 0x06, // 02 STY #DIGITS
0xA6, 0x06, // 04 LDY DIGITS
0xA9, 0xB0, // 06 CLEAR LDA #ZERO
0x99, 0x00, 0x04, // 08 STA SCREEN,Y
0x88, // 0B DEY
0x10, 0xF8, // 0C BPL CLEAR
0xA6, 0x06, // 0E START LDX DIGITS
0xA9, 0xBA, // 10 LDA #CARRY
0xFE, 0x00, 0x04, // 12 ONES INC SCREEN,X
0xDD, 0x00, 0x04, // 15 CMP SCREEN,X
0xD0, 0xF8, // 18 BNE ONES
0xA9, 0xB0, // 1A NEXT LDA #ZERO
0x9D, 0x00, 0x04, // 1C STA SCREEN,X
0xCA, // 1F DEX
0x30, 0x0C, // 20 BMI END
0xFE, 0x00, 0x04, // 22 INC SCREEN,X
0xBD, 0x00, 0x04, // 25 LDA SCREEN,X
0xC9, 0xBA, // 28 CMP #CARRY
0xD0, 0xE2, // 2A BNE START
0xF0, 0xEC, // 2C BEQ NEXT
0x60, // 2E END RTS
};
// memcpy( RAM + 0x1000, counter_fast, sizeof(counter));
// m6502.pc = 0x1000;
}
void tst6502() {
// insert code here...
printf("6502\n");
init();
// clock_t start = clock();
unsigned long long s = rdtsc();
m6502_run();
// clock_t end = clock();
// double execution_time = ((double) (end - start)) / CLOCKS_PER_SEC;
unsigned long long e = rdtsc();
unsigned long long t = e - s;
double execution_time = (double)t / TICK_PER_SEC;
double mips = iterations / (execution_time * M);
double mhz = clktime / (execution_time * M);
printf("clk:%llu Elpased time: (%llu / %llu / %llu), %.3lfs (%.3lf MIPS, %.3lf MHz)\n", clktime, TICK_PER_SEC, MHz_6502, TICK_6502_PER_SEC, execution_time, mips, mhz);
}
int ___main(int argc, const char * argv[]) {
tst6502();
return 0;
}

View File

@ -1,67 +0,0 @@
//
// 6502.h
// 6502
//
// Created by Tamas Rudnai on 7/22/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_H__
#define __6502_H__
#import "stdint.h"
#ifdef DEBUG
#define dbgPrintf(format, ...) printf (format, ## __VA_ARGS__)
#else
#define dbgPrintf(format, ...)
#endif
typedef enum {
NMI,
HARDRESET,
SOFTRESET,
} interrupt_t;
typedef struct m6502_s {
uint8_t A; // Accumulator
uint8_t X; // X index register
uint8_t Y; // Y index register
union {
uint8_t instr; // Instruction
struct {
uint8_t aaa:3;
uint8_t bbb:3;
uint8_t cc:2;
};
};
union {
uint8_t sr; // Status Register as 1 byte
struct {
uint8_t N:1; // Negative Flag
uint8_t V:1; // Overflow Flag ???
uint8_t B:2; // B Flag
uint8_t D:1; // Decimal Flag
uint8_t I:1; // Interrupt Flag
uint8_t Z:1; // Zero Flag
uint8_t C:1; // Carry Flag
} flags; // Status Register
};
uint16_t pc; // Program Counter
uint16_t sp; // Stack Pointer
unsigned clk; // Clock Counter
union {
int interrupt_flag;
interrupt_t interrupt;
};
} m6502_t;
extern m6502_t m6502;
extern uint8_t RAM[ 64 * 1024 ];
extern void tst6502();
#endif /* __6502_H__ */

View File

@ -1,5 +1,44 @@
//
// A2Mac-Bridging-Header.h
// Steve ][
//
// Created by Tamas Rudnai on 2/17/20.
// Copyright © 2019, 2020 Tamas Rudnai. All rights reserved.
//
// This file is part of Steve ][ -- The Apple ][ Emulator.
//
// Steve ][ is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Steve ][ is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Steve ][. If not, see <https://www.gnu.org/licenses/>.
//
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//
#ifndef A2Mac_Bridging_Header_h
#define A2Mac_Bridging_Header_h
#import "6502.h"
#import "6502_bp.h"
#import "6502_dbg.h"
#import "6502_dis.h"
#import "6502_dis_utils.h"
#import "speaker.h" // So we can access to speaker stuff from Swift
#import "disk.h"
#import "dsk2woz.h"
#import "mmio.h"
#import "hires.h"
#import "woz.h"
#endif /* A2Mac_Bridging_Header_h */

View File

@ -2,9 +2,9 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.app-sandbox</key>
<false/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
</dict>
</plist>

File diff suppressed because it is too large Load Diff

View File

@ -1,25 +1,169 @@
//
// AppDelegate.swift
// A2Mac
// Steve ][
//
// Created by Tamas Rudnai on 7/25/19.
// Copyright © 2019 GameAlloy. All rights reserved.
// Copyright © 2019, 2020 Tamas Rudnai. All rights reserved.
//
// This file is part of Steve ][ -- The Apple ][ Emulator.
//
// Steve ][ is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Steve ][ is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Steve ][. If not, see <https://www.gnu.org/licenses/>.
//
import Cocoa
import Foundation
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
static var current : AppDelegate?
var preferencesController : PreferencesWindowController?
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
}
@IBAction func ROM_Selected(_ sender: NSMenuItem) {
if let menuIdentifier = sender.identifier {
// rom_loadFile( Bundle.main.resourcePath, menuIdentifier.rawValue + ".rom" )
ViewController.romFileName = menuIdentifier.rawValue + ".rom"
// print("Resource Path: " + Bundle.main.resourcePath!)
m6502_ColdReset( Bundle.main.resourcePath! + "/rom/", ViewController.romFileName )
}
}
@IBAction func Disk1_Selected(_ sender: NSMenuItem) {
if let menuIdentifier = sender.identifier {
let woz_err = woz_loadFile( Bundle.main.resourcePath! + "/dsk/" + menuIdentifier.rawValue + ".woz" )
ViewController.shared?.chk_woz_load(err: woz_err)
woz_flags.image_file_readonly = 1
}
}
func applicationDidFinishLaunching(_ aNotification: Notification) {
// Insert code here to initialize your application
AppDelegate.current = self
}
func applicationWillTerminate(_ aNotification: Notification) {
// Insert code here to tear down your application
}
@IBAction func selectAnImageFromFile(sender: AnyObject) {
ViewController.shared?.openDiskImageDialog()
}
func application(_ sender: NSApplication, openFile filename: String) -> Bool {
ViewController.shared?.openDiskImage(url: URL(fileURLWithPath: filename))
return true;
}
@IBAction func openFile(_ sender: NSMenuItem) {
ViewController.shared?.openDiskImageDialog()
}
@IBAction func saveFile(_ sender: NSMenuItem) {
ViewController.shared?.saveFile()
}
@IBAction func saveFileAs(_ sender: NSMenuItem) {
ViewController.shared?.saveFileAs()
}
@IBAction func Cheat_Wavy_Navy_Vitroy(_ sender: Any) {
ViewController.shared?.Cheat_Wavy_Navy_Victory()
}
@IBAction func Cheat_Wavy_Navy_Add_3_Ships(_ sender: Any) {
ViewController.shared?.Cheat_Wavy_Navy_Add_3_Ships()
}
@IBAction func Cheat_Wavy_Navy_Never_Lose(_ menuItem: NSMenuItem) {
menuItem.state = (ViewController.shared?.Cheat_Wavy_Navy_Never_Lose())!
}
@IBAction func Cheat_Wavy_Navy_Lose_To_Win(_ menuItem: NSMenuItem) {
menuItem.state = (ViewController.shared?.Cheat_Wavy_Navy_Lose_To_Win())!
}
@IBOutlet weak var MenuItem_Cheat: NSMenuItem!
@IBOutlet weak var MenuItem_Hard_Hat_Mack: NSMenuItem!
@IBOutlet weak var MenuItem_Hard_Hat_Mack_Add_3_Macks: NSMenuItem!
func Cheat_Menu() {
// print("Cheat_Menu Menu")
let ships = ViewController.shared?.Get_Hard_Hat_Mack()
MenuItem_Hard_Hat_Mack_Add_3_Macks.title = String(format: "Add 3 Macks (%d)", ships!)
}
@IBAction func Cheat_Hard_Hat_Mack(_ menuItem: NSMenuItem) {
print("Cheat_Hard_Hat_Mack SubMenu")
let ships = ViewController.shared?.Get_Hard_Hat_Mack()
MenuItem_Hard_Hat_Mack_Add_3_Macks.title = String(format: "Add 3 Macks (%d)", ships!)
}
@IBAction func Cheat_Hard_Hat_Mack_Add_3_Macks(_ menuItem: NSMenuItem) {
let _ = ViewController.shared?.Cheat_Hard_Hat_Mack(add: 3)
}
@IBAction func Cheat_Hard_Hat_Mack_Never_Lose(_ menuItem: NSMenuItem) {
menuItem.state = (ViewController.shared?.Cheat_Hard_Hat_Mack_Never_Lose())!
}
@IBAction func showPreferences(_ sender: NSMenuItem) {
if ( preferencesController == nil ) {
let storyboard = NSStoryboard(name: NSStoryboard.Name("Preferences"), bundle: nil)
preferencesController = storyboard.instantiateInitialController() as? PreferencesWindowController
}
}
@IBAction func PowerOn(_ sender: Any) {
ViewController.shared?.PowerOn(sender)
}
@IBAction func Pause(_ sender: Any) {
ViewController.shared?.Pause(sender)
}
@IBAction func PowerOff(_ sender: Any) {
ViewController.shared?.PowerOff(sender)
}
@IBAction func ColdReset(_ sender: Any) {
ViewController.shared?.Reset(sender)
}
@IBAction func WarmReset(_ sender: Any) {
ViewController.shared?.Reset(sender)
}
@IBAction func DebugContinue(_ sender: Any) {
DebuggerWindowController.shared?.ContinuePauseButton(sender)
}
@IBAction func DebugStepOver(_ sender: Any) {
DebuggerWindowController.shared?.Step_Over(sender)
}
@IBAction func DebugStepIn(_ sender: Any) {
DebuggerWindowController.shared?.Step_In(sender)
}
@IBAction func DebugStepOut(_ sender: Any) {
DebuggerWindowController.shared?.Step_Out(sender)
}
}

View File

@ -1,276 +0,0 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __APPLE2_MMIO_H__
#define __APPLE2_MMIO_H__
#include "common.h"
#include "6502.h"
enum mmio {
io_KBD = 0xC000,
io_KBDSTRB = 0xC010,
};
uint8_t RAM[ 64 * KB ] = {0};
#define PAGESIZE 256
#define PAGES 16
//uint8_t ram_0[PAGESIZE];
//uint8_t ram_1[PAGESIZE];
//uint8_t ram_2[PAGESIZE];
//uint8_t ram_3[PAGESIZE];
//uint8_t ram_4[PAGESIZE];
//uint8_t ram_5[PAGESIZE];
//uint8_t ram_6[PAGESIZE];
//uint8_t ram_7[PAGESIZE];
//uint8_t ram_8[PAGESIZE];
//uint8_t ram_9[PAGESIZE];
//uint8_t ram_A[PAGESIZE];
//uint8_t ram_B[PAGESIZE];
//uint8_t aui_C[PAGESIZE];
//uint8_t rom_D[PAGESIZE];
//uint8_t rom_E[PAGESIZE];
//uint8_t rom_F[PAGESIZE];
//
//uint8_t * ram[PAGES] = {
// ram_0,
// ram_1,
// ram_2,
// ram_3,
// ram_4,
// ram_5,
// ram_6,
// ram_7,
// ram_8,
// ram_9,
// ram_A,
// ram_B,
// aui_C,
// rom_D,
// rom_E,
// rom_F,
//};
//uint8_t ( * mmio_read [ 64 * KB ] )( uint16_t addr );
typedef union address16_u {
uint16_t addr;
struct {
uint8_t offs;
uint8_t page;
};
} address16_t;
static inline uint8_t ioRead( uint16_t addr ) {
// printf("mmio:%04X\n", addr);
switch (addr) {
case io_KBD:
return RAM[addr];
case io_KBDSTRB:
return RAM[io_KBD] &= 0x7F;
default:
break;
}
return 0;
}
static inline void ioWrite( uint16_t addr ) {
// printf("mmio:%04X\n", addr);
switch (addr) {
case io_KBD:
return;
default:
break;
}
return;
}
/**
Naive implementation of RAM read from address
**/
static inline uint8_t memread_zp( uint8_t addr ) {
return RAM[ addr ];
}
static inline uint8_t memread( uint16_t addr ) {
// switch ( ((address16_t)addr).page ) {
// case 0xC0:
// case 0xC1:
// case 0xC2:
// case 0xC3:
// case 0xC4:
// case 0xC5:
// case 0xC6:
// case 0xC7:
// case 0xC8:
// case 0xC9:
// case 0xCA:
// case 0xCB:
// case 0xCC:
// case 0xCD:
// case 0xCE:
// case 0xCF:
// return ioRead(addr);
//
// defaut:
// break;
// }
if ( (addr >= 0xC000) && (addr < 0xD000) ) {
ioRead(addr);
}
return RAM[ addr ];
}
/**
Naive implementation of RAM read from address
**/
static inline uint16_t memread16( uint16_t addr ) {
// if ( ( addr >= 0xC000 ) && ( addr < 0xD000 ) ) {
// return mmioRead(addr);
// }
// dbgPrintf("%04X ", * (uint16_t*) (& RAM[ addr ]));
return * (uint16_t*) (& RAM[ addr ]);
}
/**
Naive implementation of RAM read from address
**/
//static inline uint16_t memioread16( uint16_t addr ) {
// return (uint16_t)mmio_read[ addr ](addr);
//}
/**
Naive implementation of RAM write to address
**/
static void memwrite_zp( uint8_t addr, uint8_t byte ) {
RAM[ addr ] = byte;
}
/**
Naive implementation of RAM write to address
**/
static void memwrite( uint16_t addr, uint8_t byte ) {
// if ( addr >= 0xD000 ) {
// // ROM
// return;
// }
// if ( addr >= 0xC000 ) {
// return mmioWrite(addr);
// }
//
RAM[ addr ] = byte;
}
/**
Fetching 1 byte from memory address pc (program counter)
increase pc by one
**/
static inline uint8_t fetch() {
dbgPrintf("%02X ", RAM[m6502.pc]);
return memread( m6502.pc++ );
}
/**
Fetching 2 bytes as a 16 bit number from memory address pc (program counter)
increase pc by one
**/
static inline uint16_t fetch16() {
dbgPrintf("%04X ", memread16(m6502.pc));
uint16_t word = memread16( m6502.pc );
m6502.pc += 2;
return word;
}
/**
get a 16 bit address from the zp:zp+1
**/
static inline uint16_t addr_zp_ind( uint8_t addr ) {
return memread16(addr);
}
/**
X,ind .... X-indexed, indirect OPC ($LL,X)
operand is zeropage address;
effective address is word in (LL + X, LL + X + 1), inc. without carry: C.w($00LL + X)
**/
static inline uint16_t addr_X_ind() {
return addr_zp_ind( fetch() + m6502.X );
}
/**
ind,Y .... indirect, Y-indexed OPC ($LL),Y
operand is zeropage address;
effective address is word in (LL, LL + 1) incremented by Y with carry: C.w($00LL) + Y
**/
static inline uint16_t addr_ind_Y() {
uint8_t a = fetch();
// dbgPrintf("addr_ind_Y: %04X + %02X = %04X ", addr_zpg_ind( a ), m6502.Y, addr_zpg_ind( a ) + m6502.Y);
return addr_zp_ind( a ) + m6502.Y;
}
/**
abs,X .... absolute, X-indexed OPC $LLHH,X
operand is address; effective address is address incremented by X with carry **
**/
static inline uint16_t addr_abs_X() {
return fetch16() + m6502.X;
}
/**
abs,Y .... absolute, Y-indexed OPC $LLHH,Y
operand is address; effective address is address incremented by Y with carry **
**/
static inline uint16_t addr_abs_Y() {
return fetch16() + m6502.Y;
}
/**
zpg .... zeropage OPC $LL
operand is zeropage address (hi-byte is zero, address = $00LL)
**/
static inline uint16_t addr_zp() {
return fetch();
}
/**
zpg,X .... zeropage, X-indexed OPC $LL,X
operand is zeropage address;
effective address is address incremented by X without carry **
**/
static inline uint16_t addr_zp_X() {
return addr_zp() + m6502.X;
}
/**
zpg,Y .... zeropage, Y-indexed OPC $LL,Y
operand is zeropage address;
effective address is address incremented by Y without carry **
**/
static inline uint16_t addr_zp_Y() {
return addr_zp() + m6502.Y;
}
#endif // __APPLE2_MMIO_H__

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "amber.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "amber..dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "amber.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "amber..dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "chip.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "chip.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "chip.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "chip.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 922 B

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "color.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "color.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "color.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "color.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 838 B

View File

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "copy.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "copy.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "copy.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "copy.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -0,0 +1,52 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ant_dark.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "ant.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,52 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "1x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
},
{
"idiom" : "universal",
"filename" : "Apple Disk II D1 Open Light.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Apple Disk II D1 Open Dark.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "universal",
"scale" : "3x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,52 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "1x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
},
{
"idiom" : "universal",
"filename" : "Apple Disk II D2 Open Light.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Apple Disk II D2 Open Dark.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "universal",
"scale" : "3x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "green.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "green.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "green.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "green.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 810 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 810 B

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "joystick.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "joystick.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "joystick.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "joystick.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "old.monitor.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "old.monitor.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "old.monitor.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "old.monitor.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "paste.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "paste.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "paste.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "paste.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "power.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "power.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "power.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "power.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -0,0 +1,52 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "1x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
},
{
"idiom" : "universal",
"filename" : "Apple Disk II thick.light.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Apple Disk II thick.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "universal",
"scale" : "3x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

@ -0,0 +1,54 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "reset.light.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "reset.dark.64.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "reset.light.128.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "reset.dark.128.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Some files were not shown because too many files have changed in this diff Show More