Commit Graph

449 Commits

Author SHA1 Message Date
michaelangel007
afa681ea9e Move Memory Flags to .h since debugger needs them 2017-04-27 09:18:37 -07:00
tomcw
d11f0a222d Fix the discontinuous whole screen redraw bug in full-speed mode (#405) 2017-04-23 21:37:01 +01:00
tomcw
d9669fa45b Printscreen: Fix for missing half-top line for B&W TV and Color TV (#403) 2017-04-22 22:22:29 +01:00
tomcw
41286cd29f Debugger: Remove DebugDisplay()'s unused first parameter: bDrawBackground because it was unused and in some cases it was being passed a bitfield, not a BOOL 2017-04-22 20:52:21 +01:00
tomcw
124eca4546 Debugger: Allow MODE_DEBUG and MODE_STEPPING states to persist across an F2 ResetMachineState() call (#217) 2017-04-22 20:42:42 +01:00
tomcw
5e6a445bab Debugger: When MODE_STEPPING (eg. g or gg mode), prevent ESC from exiting back to the debugger. F7 or Pause keys can still be used. (#217) 2017-04-22 17:13:41 +01:00
Michaelangel007
a5274ca7d0 Fix comment typo 2017-04-17 21:44:30 -07:00
tomcw
a5cffc7441 NTSC: Removed the redundant per-line caching of video mode & video function. Tested with ANSI STORY (end credits) and Rainbow. 2017-04-14 20:59:43 +01:00
michaelangel007
27cd3fa0ea Merge branch 'master' of https://github.com/AppleWin/AppleWin
Conflicts:
	AppleWinExpress2010.vcxproj
2017-04-13 10:18:35 -07:00
Nick Westgate
a2f015882e Fix language card switch behaviour - fixes #400 2017-04-08 09:38:13 +12:00
Michaelangel007
4325900b2d DOC: Fix 6502 cheat sheet x2 x6 ZP 2017-04-05 07:51:16 -07:00
tomcw
1bd85e123e SSC: Added -modem switch (for dcd,dsr,dtr) and removed invert switches (#386) 2017-03-23 21:36:26 +00:00
tomcw
82302c19ce Fixed #387: Added support for up to 40-track .nib images 2017-03-21 22:06:56 +00:00
tomcw
3db755c2b4 Fixed #316 - For g cmd: don't set regular BP when also doing g_nDebugStepUntil 2017-03-21 21:25:24 +00:00
tomcw
abd99d109e SSC: Experimental support for 6551's status bits: DCD and DSR via -dcd[-invert] and -dsr[-invert] args (#386) 2017-03-19 21:44:20 +00:00
tomcw
b377dc8afb Savestate: SSC - DTR : added a todo comment 2017-03-19 17:27:07 +00:00
tomcw
49752ff7c3 LC 0xC08n.b0=1: After write-enable RAM, STA doesn't write-protect (#395) 2017-03-18 21:33:45 +00:00
tomcw
6d55634281 Debugger: fix for MODE_STEPPING at was falsely breaking on floating bus 2017-03-18 15:18:14 +00:00
tomcw
6063d8e96f SSC: Experimental support for 6551's DTR via -dtr or -dtr-invert args (#386) 2017-03-18 13:56:18 +00:00
tomcw
5470febbf8 Fix for write to 0xCFFF (wasn't implemented), and clear IO_SELECT_InternalROM on 0xC006 (SLOTCXROM) access (#392) 2017-03-16 22:28:18 +00:00
tomcw
87862bcf28 Fix for 2x read access to (odd addr) to enable write access (#392) 2017-03-15 21:42:06 +00:00
tomcw
1c3838ab8f Debugger: removed unused var 2017-03-12 21:56:42 +00:00
tomcw
30d8b7716a Debugger: Mute sound when entering debugger from MODE_STEPPING:
. ie: ESC, F7 and Pause key
Debugger: Fix for MODE_STEPPING when jump from $C3xx to $C8xx:
. Don't break on floating-bus, as Expansion ROM will be switched in on
this access.
IORead_Cxxx(): Fix the logic for IO_SELECT when not slot-3
2017-03-12 21:54:08 +00:00
tomcw
3a2313c52e Debugger:
. Improved break on FB or IO: account for slot empty (or not) & if expansion ROM enable
Memory:
. IORead_Cxxx(): Fix for Apple II support for when slot-3 is empty
. Apple II type was erroneously testing //e soft-switches
2017-03-10 22:00:01 +00:00
Nick Westgate
16b81133e0 Allow disk write protect read with drive off - Fixes #389
- Added comments
- Removed mistaken check for writing nibbles < 0x80
- Reset forces all switches off
2017-03-08 23:13:56 +13:00
tomcw
3d6c10bad9 Debugger:
. Move the BRK and invalid opcodes checks out of main emulation's Fetch() and into DebugContinueStepping()
. Added a new break condition: when PC reads floating bus or I/O memory
. On a break condition, output a 'Stop Reason' message to the console
2017-03-07 21:35:38 +00:00
tomcw
743add80f0 Improve ContinueExecution() whilst MODE_STEPPING:
. GetKeyState(VK_SCROLL) is slow, so only call periodically
. Account for g_nCpuCyclesFeedback before calling SpkrUpdate()
2017-02-26 13:45:06 +00:00
tomcw
29b7fa15b8 Merge branch 'master' of https://github.com/AppleWin/AppleWin 2017-02-25 22:48:07 +00:00
tomcw
0b6c5bbb91 Support for #384:
. Debug 'G(o)' cmd now defaults to normal speed (and precise video updates)
. New debug 'GG' cmd enables full speed (and periodic video updates)
. Single-stepping (normal or full speed) now routed through ContinueExecution()
. Removed Cpu6502()/Cpu65C02() check for debug breakpoints
. Removed the (undocumented) SHIFT+F7 feature to exit debugger for 'normal speed breakpoints'
. Removed the g_bDebugNormalSpeedBreakpoints variable
2017-02-25 22:32:46 +00:00
tomcw
8c4f451557 Remove old, unused _Video_SetupBanks() 2017-02-17 16:00:22 +00:00
tomcw
fc781cdd47 Remove old, unused Video.cpp var/code:
. g_VideoForceFullRedraw
. VideoApparentlyDirty()
2017-02-17 15:37:37 +00:00
tomcw
a6bfe4cfe9 1.26.1.1: Fix #382 - CTRL+RESET not re-init'ing correct 40/80 text rendering routine when in mixed mode 2017-02-17 14:55:04 +00:00
Kelvin Lee
56570960ef Renamed g_restart to g_bRestart. 2016-12-29 12:10:25 -05:00
Kelvin Lee
e0cac15ede Renamed global variable restart to g_restart. Made it proper bool. 2016-12-29 12:10:03 -05:00
Kelvin Lee
0992cf16c4 Added variadic variants of ConsolePrint(), ConsoleBufferPush() to make code cleaner. Also added ConsoleColorizePrint() and variants. 2016-12-29 12:07:54 -05:00
Kelvin Lee
5e59f11625 Fixed a compiler warning. 2016-12-29 11:37:54 -05:00
Kelvin Lee
bb25fb702e Fixed compiler warning about too many arguments for sprintf. 2016-12-29 11:36:43 -05:00
Kelvin Lee
65e253f312 Fixed indentation with tabs. 2016-12-29 11:36:21 -05:00
Kelvin Lee
20a1a9a884 Fixed compiler warnings about adding integer to char. 2016-12-29 11:35:09 -05:00
Kelvin Lee
03996c45a8 Fixed to safely sscanf. 2016-12-29 11:34:39 -05:00
Kelvin Lee
9ec4012209 Fixed format typo. 2016-12-29 11:01:46 -05:00
Kelvin Lee
c0736aaabf Print pointers in correct way. 2016-12-29 11:01:12 -05:00
tomcw
ab04e46f61 Save-state: Draw the frame,buttons,etc as soon as we know the Apple2Type, to remove the issue where the drive buttons appear before the rest of the buttons. (Repro: Loading a 32MB gzip'ed HDD image from the command line.) 2016-12-11 16:31:25 +00:00
tomcw
345200972b NTSC: Removed g_aHorzClockMemAddress[] for caching the horz video scanner addr 2016-12-11 15:27:07 +00:00
tomcw
3e0d399665 Some video-related comment clean up & simplified VideoGetVblBar() 2016-12-11 15:02:12 +00:00
tomcw
b8b90a6bd9 NTSC_VideoGetScannerAddress(): remove redundant 'long cycle6502' parameter
MemReadFloatingBus(): Make consistent by making one call the other
2016-11-17 19:52:49 +00:00
tomcw
8447a22942 VBlank tweaks:
. Removed NTSC_VideoVbl(), since it's not accurate during full-speed. (Nothing was using it)
. Renamed VideoGetVbl() to VideoGetVblBar()
. Correctly pass Vbl (not VblBar) to Mouse's SetVBlank()
2016-11-16 11:18:41 +00:00
tomcw
002af587d4 Fix #372: do IRQ() before NTSC_VideoUpdateCycles() 2016-11-14 22:23:30 +00:00
tomcw
074acce2ae Debugger: Extend tf cmd to optionally output video scanner info: tf <file.txt> [v] (#359) 2016-11-07 21:48:17 +00:00
tomcw
ab8ae7f3a0 Debugger: tf cmd - add video scanner addr & floating bus data (#359) 2016-11-07 21:12:18 +00:00
tomcw
981b711fef Refactor: int bVideoMode -> uint32_t uVideoMode 2016-11-06 21:59:45 +00:00
tomcw
421d9a77f6 VideoRefreshScreen(): Use default args instead of passing 0 for arg0 2016-11-06 14:33:14 +00:00
tomcw
1bb60026a5 Debugger - Fix #345: wrap and protect debugger's video mode 2016-11-06 14:23:23 +00:00
tomcw
c146587b8e Save-state: Fix for loading state when TEXT40 changes to TEXT80 or v.v. 2016-10-31 21:05:10 +00:00
tomcw
d2efba4959 Fix for NTSC_VideoUpdateCycles() where Z80 updates in units of ~1000 cycles (#371) 2016-10-30 12:31:29 +00:00
tomcw
3edb78203e Refactor: polymorphically call CImageHelperBase Open() & Close() 2016-10-25 22:26:28 +01:00
tomcw
31483b33b9 Refactor: Get rid of HIMAGE handle for disk images 2016-10-25 21:09:48 +01:00
tomcw
d7937dc58c Fix for Advanced config tab's Clone drop-down menu 2016-10-23 19:27:26 +01:00
tomcw
d9246c0841 Save-state: support TK3000 clone 2016-10-23 10:35:18 +01:00
tomcw
86ba0b0407 Apply fixes and enhancements to PR #285 (Support for TK3000 //e) 2016-10-22 23:20:23 +01:00
tomcw
58671545bb Fix #366 (IRQ erroreously deducting extra cycles) 2016-10-22 19:50:35 +01:00
tomcw
7f3cc09217 Fix #363: Redraw screen whilst debug stepping 2016-10-17 22:10:33 +01:00
TomCh
bcd4c7c7fa Merge pull request #362 from AppleWin/Release-1.26.0.1
Merge all the changes & fixes from the Release-1.26.0.1 branch back into master.
2016-10-16 21:15:03 +01:00
michaelangel007
75d56cad97 Fix GR colors gray1 gray2 #253 2016-10-14 22:28:39 -07:00
michaelangel007
515e66ca7d Debugger: NTSC: Import 16x1 and 64x1 bmp for palette for #357 2016-10-14 12:12:19 -07:00
tomcw
a58f990ab8 Fix PrintScreen for Color TV and B&W TV (fix #356) 2016-10-11 21:52:11 +01:00
tomcw
ef9bb822fa Bump to 1.26.0.5: Restore the y-shift for TV Color + TV B&W 2016-10-06 22:23:06 +01:00
tomcw
3e51f2f02f Extend quick fix for #341 (ANSI STORY - end credits) 2016-10-02 22:22:10 +01:00
tomcw
63789e525a Quick fix for #341 (alignment of NTSC Monitor/TV video modes) 2016-10-01 15:24:20 +01:00
tomcw
9b8d5b94af Reworked NTSC_VideoRedrawWholeScreen(): now precisely call the update funcs for lines0-159 and line160-261, so that video V/H positions remain the same they were on entry (bug #352) 2016-09-25 21:50:07 +01:00
tomcw
700a9e9f3f Fix for previous commit's regression - random data being drawn on line 0 (#352) 2016-09-25 19:58:51 +01:00
tomcw
5f0ccfc75c Added new function NTSC_VideoRedrawWholeScreen() to fix #352 2016-09-25 10:42:14 +01:00
tomcw
30160583cb For full-speed: update every 16ms of real-time (close #351) 2016-09-22 22:34:16 +01:00
tomcw
626965109a Bump to 1.26.0.4, fix #350 (50% Scan line checkbox wasn't working), tweaked History.txt 2016-09-20 21:47:43 +01:00
michaelangel007
c96b935fff Fix Bug #349 [Debugger] NTSC LOAD or SAVE without filename crash 2016-09-20 10:03:13 -07:00
tomcw
0a7a0e9e5c Fixed #348 (>800KiB HDD images not mountable) 2016-09-19 22:14:57 +01:00
tomcw
1d34497d2d Speed-up booting AZTEC.DSK (#347) 2016-09-18 15:56:22 +01:00
tomcw
f559deddc3 Fix for flickery/bad video updates when MODE_RUNNING and full-speed (broken in previous 09fa6cc) 2016-09-17 21:26:45 +01:00
tomcw
41b2547acb Fix to get GR2 working, but #345 still not complete 2016-09-17 10:04:32 +01:00
tomcw
09fa6ccef5 Fixed #342 2016-09-16 23:05:39 +01:00
tomcw
8c3a2148e9 Small simplification to Memory interface (directly unmap cards' ROMs if internal ROM is enabled) 2016-09-11 20:16:19 +01:00
tomcw
cf0cd37d9e . Fixed #309: Support 6522 TIMER1 at $Cs80 as in interrupt source
. Fixed save-state v2 bug where Mockingboard's card ROM was erroneously mapped in (instead of internal $C100-CFFF ROM)
. Added Cybernoid-TimerAtC480.aws.yaml to test both
2016-09-08 22:36:16 +01:00
tomcw
efcf06c285 Removed unsupported PC speaker sound types 2016-09-07 22:20:15 +01:00
tomcw
31ba57b7c7 Debug logging: add log message for time from boot until first key read (for AZTEC.DSK).
+ Remove an unused var.
2016-09-06 21:38:00 +01:00
tomcw
20ed6607e5 Prepare for RC:
. Removed title screen's "NTSC alpha v18" text
. Updated History.txt
. Updated Help html files
2016-09-05 22:36:24 +01:00
tomcw
5fdc879a05 Merge from branch 'NTSC_PreMerge':
1.26.0.1
. NTSC video modes (TV Color, TV B&W, Monitor Color, Monitor B&W)
. Full Screen using native resolution (not 640x480)

NB. 6502 emulation is slower now, which means disk loading (ie. full-speed) is slower.
. EG. Aztec.dsk: from F2 boot to "Press any key". (Release build, 50% "TV Color", not run in VS, VAIO laptop)
  ~4 secs: AppleWin 1.25.0.3 (built with VS2005)
  ~7 secs: AppleWin 1.26.0.1 (built with VS2008 or VS015)
2016-09-04 21:14:26 +01:00
tomcw
af196ac8ae Tidy-up for full-screen vars 2016-07-26 22:33:45 +01:00
tomcw
94b8e76e3b Small tidy-up for NTSC_CharSet.cpp, and fix-up the VS2008/2013/2015 projects 2016-07-26 19:14:06 +01:00
tomcw
3cf54e6fa3 Calculate full-screen scale using borderless dimensions & allow more than 2x scale 2016-07-25 21:19:00 +01:00
tomcw
02b0d7419a Fixed screen update when running at full-speed
. Specifically IBIZA.DSK demo which streams data from the disk throughout (ie. so runs at full-speed all the time)
. Update the screen every frame, but only if video memory has changed (check AZTEC.DSK loading time)
. NB. When running at full-speed, then 6502 emulation doesn't do cycle-accurate video updates
Fixed crash that could occur when switch video mode (F9) when running at full-speed
. Occured when g_nVideoClockVert was >= 192
2016-07-23 22:53:29 +01:00
tomcw
66e468db65 Merged in Nick's new native resolution full-screen
- old 640x480 full-screen deprecated

Fixes for:
. Logo & Debug window scaled/positioned correctly
. Buttons & disk activity (on RHS) drawn in correct position
. Crosshairs for mouse (and when using mouse as joystick)drawn in correct position
2016-07-12 22:43:31 +01:00
tomcw
04c9d09e38 When FullSpeed: don't do cycle-accurate graphics update
. means that disk accesses (eg. loading) is much quicker
Correct naming of video modes (in UI and code)
Pixel adjust for NTSC B&W and Color video modes to align with other video modes
2016-05-17 22:07:27 +01:00
Michaelangel007
8a1d39104b Fix #317 -- some .img using version 0 instead of version 1 2016-04-28 16:08:08 -07:00
tomcw
e12366e7ac -load-state: set CWD to path of .aws.yaml file 2016-04-21 22:13:24 +01:00
tomcw
c4dfbaf988 -load-state: set CWD to path of .aws.yaml file 2016-04-20 22:46:12 +01:00
tomcw
749e1514bd Use correct resource BMP for each model's character set (Apple ][, original //e and Pravets)
Also resized the Pravets BMPs to be either 256 or 512 pixels in height.
2016-04-12 23:21:05 +01:00
tomcw
8033455706 Use resource CHARSET40.BMP for character set (ToDo: Apple][, Original //e and Pravets) 2016-04-08 22:44:07 +01:00
tomcw
9adbb1e8e6 Added NTSC_Reinitialize() to re-init NTSC state after loading a save-state file 2016-04-05 22:17:29 +01:00
tomcw
0451a3c7aa Fixed: AltCharSet flag was inverted 2016-04-04 22:47:02 +01:00
tomcw
7ccf722200 Fixed: AltCharSet flag was inverted 2016-04-04 22:38:01 +01:00