Commit Graph

421 Commits

Author SHA1 Message Date
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
tomcw
7e56e93449 Always updateMonoTables() since previous video-mode could have had a non-white RGB value
. eg. when cycling backwards from Amber to TV
2016-04-04 22:18:29 +01:00
tomcw
346f45b3e9 Fixed: NTSC video mode vars not setup after loading save-state 2016-04-04 21:32:40 +01:00
tomcw
d23ae15774 Removed border from:
. final rendered window
. print-screen bmps (both sizes)
Fixed full-screen so that:
. all mode (RUNNING, DEBUG and LOGO) all occupy the same screen position
. there's no intermediate data drawn out of position when first switching to full-screen
Tested on Win7 and Win10
2016-04-04 21:05:58 +01:00
tomcw
80ad4df409 Fix scoping of variable 2016-03-28 18:02:08 +01:00
tomcw
ad55b0f136 Fix for when VideoMode = {Text_Optimized | TV} in 50% scanline mode:
. RGB arithmetic could underflow
. Now clamp to zero (ToDo: consider using SIMD)
2016-03-28 17:27:25 +01:00
tomcw
f983548819 VS2015: Fix invalid literal suffix 2016-03-24 23:05:34 +00:00
tomcw
86802bef16 Add VS2015 proj files & fix for building under VS2015 in Release (closes #296) 2016-03-24 22:55:36 +00:00
tomcw
04d35fe485 Fix: passing in a snapshot via cmd-line & reboot was reloading snapshot 2016-03-24 22:31:13 +00:00
tomcw
99219a71ec Add VS2015 proj files & fix for building under VS2015 in Release 2016-03-24 22:25:35 +00:00
tomcw
08a9f8798e Fix invalid literal error for VS2015 2016-03-22 23:34:35 +00:00
tomcw
e98de27039 Manual merge from master @ c798157 2016-03-21 23:48:02 +00:00
tomcw
e03b90fbe8 Support VS2008 2016-03-21 22:27:09 +00:00
tomcw
8462426ccd Update VS2013 sln/proj for yaml and TestCPU65C02 2016-03-05 18:31:42 +00:00
tomcw
d0243c71d7 Save-state: rename SaveHex{4|8|12|16...64} to SaveHexUint{4|8|12|16...64} 2016-03-04 21:26:14 +00:00
tomcw
33ee34b96c Save-state: SaveBool() / LoadBool() persists true,false values 2016-03-01 22:31:17 +00:00
tomcw
18feddceef Save-state: renamed SaveMapValueMemory() to SaveMemory() 2016-02-24 22:54:53 +00:00
tomcw
11789c9023 Save-state: Renamed YamlLoadHelper load-type functions to be more consistent with YamlSaveHelper functions 2016-02-24 22:38:59 +00:00
tomcw
6b07fd665f Save-state: Added save-type functions to YamlSaveHelper & use wherever saving state. Also added new cmd-line option: -load-state. 2016-02-24 21:51:20 +00:00
tomcw
8524f91495 Save-state: Yaml: Removed GetMapValueBOOL() 2016-02-20 17:57:23 +00:00
tomcw
7f50288bd9 Remove old functions from header 2016-02-16 22:11:19 +00:00
tomcw
ccac0a562d Save-state: standardise on Unit0/Unit1 for Disk2 and HDD 2016-02-15 22:33:38 +00:00
tomcw
13e7a6cc65 Fix for probing CpuType from Apple2Type 2016-02-14 17:25:58 +00:00
tomcw
37ad1ebd63 Removed redundant binary v2 save-state code
Also:
. support new CpuType independently of Apple2Type
. save-state: don't save disk track image if no disk
. save-state: re-init AppleWin internals & UI to reflect changed Apple2Type
2016-02-14 16:01:30 +00:00
tomcw
2f6e86c0fa Added libyaml 0.1.5
Added yaml save-state support for:
. Main AppleII unit
. Aux memory & RawWorksIII
. Printer
. SSC
. Z80
. Mouse
. Mockingboard
. Phasor
. Disk][
. HDD
2016-02-07 15:47:15 +00:00
tomcw
5c16c3642a Merged master to savestate branch 2015-09-13 11:39:58 +01:00
tomcw
431dcde059 Save-state: Add comments for load/save config state 2015-08-21 22:09:44 +01:00
tomcw
2f4ee9466f Save-state:
. add ConfirmReboot
. Restore saved configuration
. Moved some config to Joystick & SerialCard
. save config
2015-08-21 21:45:21 +01:00
michaelangel007
8d4cb8de35 Fix uninit var in CmdMemoryLoad() 2015-07-30 09:25:53 -07:00