Commit graph

2319 commits

Author SHA1 Message Date
tomcw
40522204ad Joystick: support redefined button0/1 keys when not using keyboard for joystick 2020-01-09 22:04:26 +00:00
Andrea Odetti
efec61caba Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/StdAfx.h
2020-01-09 09:30:23 +00:00
tomcw
29c0f1e4f0 Cmd line support for remapping button0&1: (#743)
. -left-control-alt-buttons : l-ctrl=button0, l-alt=button1
. -right-alt-control-buttons : r-alt=button0, r-ctrl=button1
. -swap-buttons
2020-01-07 22:04:37 +00:00
tomcw
0f473d44b6 VS2019: include <stdexcept> for std::runtime_error 2020-01-06 21:08:00 +00:00
tomcw
087616db29 Fixed Coverity 'High Impact Outstanding' issues:
1489113
1489111
1489105
1489096
1489093
1489092
1486059
1486055 (false positive)
1486054
1486051 (false positive)
1486050
1486047 (false positive)
1486043
1446684
2020-01-04 17:43:20 +00:00
tomcw
edf65762cd CardManager refactor:
. replaced most GetObj() with GetRef()
. so dynamic_cast'ing to a reference now (instead of a pointer)
2020-01-04 13:58:59 +00:00
tomcw
d3faae69fb CardManager:
. added GetRef(), which can throw a std::runtime_error
. NB. dynamic_cast for a reference will throw a std::bad_cast error on failure
Added try/catch around main VM restart loop
. split the loop into ProcessCmdLine(), GetAppleWinVersion(), OneTimeInitialization() RepeatInitialization() & Shutdown()
. catch std::runtime_error & std::exception
2020-01-04 12:32:13 +00:00
tomcw
c280d43e75 DiskImageHelper: small refactor 2020-01-02 21:01:10 +00:00
tomcw
8ec8fa6c5b Debugger: Correctly repaint AppleII screen when showing it from debugger. (Fixed #746) 2020-01-02 20:49:07 +00:00
Andrea Odetti
2d1021c629 Need some of Debug.cpp to link now.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-31 18:34:16 +00:00
Andrea Odetti
0191652565 First part of merge of new CardManager code.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-31 18:19:45 +00:00
Andrea Odetti
9ef028fac6 Merge remote-tracking branch 'upstream/master' 2019-12-31 16:54:58 +00:00
tomcw
ce1a549bea Updated History.txt 2019-12-31 13:24:15 +00:00
tomcw
b37095715f Save-state: refactor: added a LoadMemory() specialisation for vector<BYTE> 2019-12-31 12:52:47 +00:00
tomcw
a28803cbf9 WOZ: Support large tracks (fixes #745) 2019-12-31 12:07:45 +00:00
tomcw
183ec2bc8c WOZ: Alternate fix for Wasteland (#733)
. apply extraLatchDelay on the last bitCell (if there's a latchDelay)
Debugger: Extended 'videoinfo' command to show cycles as absolute or relative.
2019-12-30 19:52:49 +00:00
tomcw
960af9bda0 MB: Moved MB_StartOfCpuExecute() to Snapshot_LoadState_v2(), since it's only needed there 2019-12-24 13:58:20 +00:00
tomcw
e03b68b7f0 MB: removed redundant g_n6522TimerPeriod variable 2019-12-24 13:19:35 +00:00
tomcw
8567f0a651 MB: include 1-cycle 65C02 opcodes 2019-12-24 12:51:43 +00:00
tomcw
c11301ff4e VS2017 & VS2019: removed deprecated /Gm (Enable Minimal Rebuild) option 2019-12-24 12:34:48 +00:00
tomcw
75bc648f01 1.29.7.0: Updated version, History.txt and Help 2019-12-20 15:23:54 +00:00
tomcw
7eee2467c5 Disk2: DumpTrackWOZ() - extended to start each line with bitOffset 2019-12-20 12:49:02 +00:00
tomcw
418687e3d8 Debugger: 'cycles' now shows step-cycle-count (before was abs cumulative cycles) (Fixes #737)
And fixed single-step to only UpdateDisplay() once.
2019-12-20 09:15:24 +00:00
tomcw
82f6bf35a5 Debugger: GR/HGR/DGR/DHGR cmds should honour the MIXED mode. (Fixes #740) 2019-12-19 20:45:55 +00:00
TomCh
769d4c6927
Support 2nd Disk][ card and improved card management (#726) (PR #741)
Support 2nd Disk][ in slot-5, via command line:
- -s5 diskii
- -s5d1 \<imagefile\>
- -s5d2 \<imagefile\>

NB. there's currently no Configuration UI support, except the Drive icons' tooltips show what's in slot-5 & slot-6 (for drive-n). So there's no way to eject the disks or insert new disks. The use-case I'm supporting it Wasteland which just has the 4 disks in the 4 drives.

Improved card management:
- Added `class Card` (in Card.h) which all other cards (that exist as classes) derive from (eg. LC,SSC,Mouse,Disk2).
- Added `class CardManager` (in CardManager.cpp\h) which now manages the 8 slots (and aux slot).
- Added `class Disk2CardManager` (in Disk2CardManager.cpp\h) which provides methods for operations that act on all Disk2 instances at the same time.
- Currently limited to just 1x SSC and 1x Mouse card (why would you need more?). This simplifies things, meaning there's no need to have dedicated SSCManager / MouseCardManager objects.
- Currently the 2nd Disk2 card can only be put into slot-5. This limitation is just due to the complexity of the Configuration UI. Having a more general drop-down per slot UI would remove this limitation.
2019-12-19 19:42:30 +00:00
Andrea
68b19b332f Add speed statistics to linux.md.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-14 21:18:00 +00:00
Andrea Odetti
24e0b17135 Works on Raspbian.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-14 21:18:00 +00:00
Andrea Odetti
849482ea65 Add list of packages required on Raspbian.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-14 21:18:00 +00:00
Andrea Odetti
2b40967589 Merge remote-tracking branch 'upstream/master' into newmaster 2019-12-14 21:17:01 +00:00
Andrea Odetti
ea044268de Small "const" addition.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-12 20:19:25 +00:00
Andrea Odetti
e49275ee9d Ensure keys are visible.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-12 20:19:10 +00:00
Andrea Odetti
2462743edd Save and restore geometry.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-12 20:18:58 +00:00
tomcw
d2010860ef Debugger: refactor common code into GetTargets_IgnoreDirectJSRJMP() 2019-12-09 21:00:58 +00:00
tomcw
87677ed4c3 Debugger: In _6502_GetTargets() removed the bool bIgnoreJSRJMP parameter. 2019-12-09 20:42:16 +00:00
tomcw
f0e840f8e0 Debugger: Support BPMR for JMP (abs) and JMP (abs,x). (#451) 2019-12-09 19:13:24 +00:00
tomcw
b1316dc3da Debugger: Fixed regression at prior commit dd274bc000 for bpm addr16 not triggering.
. Extended debugger regression tests to catch this (and test many other variants).
2019-12-09 16:27:13 +00:00
Andrea Odetti
20852fcb2a Add a few command line options to run the tests automatically.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-08 20:21:35 +00:00
Andrea Odetti
900c9ab40b Merge remote-tracking branch 'upstream/master' 2019-12-08 19:14:51 +00:00
tomcw
ba7a4005b0 DiskII: fixes for Wasteland for both .nib & .woz images (#733) 2019-12-08 16:23:29 +00:00
Andrea Odetti
f50d303765 Correct video load/save state.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-07 15:26:45 +00:00
Andrea Odetti
20a01a5ea9 Keyboard load/save state from yaml file.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-07 15:25:12 +00:00
Andrea Odetti
874f4be666 Single keyboard handler.
Seems to work...

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-07 11:20:37 +00:00
Andrea Odetti
84332ada39 Minor change.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-06 20:36:28 +00:00
Andrea Odetti
187739f913 Forgotten destructors...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-06 20:00:16 +00:00
Andrea Odetti
45721b3fc5 Allow to change monochrome color.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-05 21:37:39 +00:00
Andrea Odetti
35765e23e4 Fix a bug when a file canno tbe opened.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-05 20:59:00 +00:00
Andrea Odetti
77490c6d48 Update QHexView
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-02 20:54:13 +00:00
Andrea Odetti
eb3c11c672 Add option for 50Hz video.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-02 20:50:51 +00:00
Andrea Odetti
7c90b040ef Reduce some boilerplate with global and aw's options.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 19:49:11 +00:00
Andrea Odetti
177f345861 Cap time in each slice to avoid pathological cases.
E.g. when debugging.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 18:59:20 +00:00