Commit Graph

2522 Commits

Author SHA1 Message Date
Alexei Svitkine
89e4234975 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:27:16 -05:00
Alexei Svitkine
0e8e0b51b7 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:12 -05:00
Alexei Svitkine
c18d6fa923 fix configure X check to not trigger if using mac gui and some
more warning fixes
2017-12-10 11:27:08 -05:00
Alexei Svitkine
a472d9ab63 fix some format warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
75324c10d0 silence some more warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
b150b42fc6 Fix some string conversion warnings. 2017-12-10 11:27:08 -05:00
Alexei Svitkine
1503c84266 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:27:08 -05:00
asvitkine
a1a48c1479 Merge pull request #145 from zydeco/master
fix for extfs on 64-bit macOS/iOS
2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
e44a75d7eb fix indentation 2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
db72f9142e fix for extfs on 64-bit macOS/iOS 2017-12-10 11:27:07 -05:00
Alexei Svitkine
1e4e7179d4 more changes needed to move STR_WINDOW_TITLE_GRABBED cross-platform code 2017-12-10 11:27:03 -05:00
Alexei Svitkine
bc7edbc677 move STR_WINDOW_TITLE_GRABBED to user_strings.h and fix header
guard for user_strings_unix.h
2017-12-10 11:26:26 -05:00
Alexei Svitkine
c9717bf331 Fix window redraw on macOS when un-minimizing. 2017-12-02 11:35:23 -05:00
Alexei Svitkine
2bdbd22e85 Fix setting window title on Mac Sierra when grabbing mouse. 2017-11-25 10:36:00 -05:00
Alexei Svitkine
7378a62032 Set Xcode to use tabs. 2017-11-25 10:27:00 -05:00
Alexei Svitkine
5256a8e6f1 Revert of 9f58eb96dc. Causes issues
with mouse coordinates under Sierra.
2017-11-25 09:40:00 -05:00
asvitkine
e07640979e
Merge pull request #42 from ifernandez/master
Added the new SheepShaver icon by Weedy Weed Smoker
2017-11-01 19:56:22 -04:00
asvitkine
f0488d8396 Merge pull request #138 from rakslice/tap_0901
Support version 0901 TAP devices in Windows
2017-10-11 21:33:01 -04:00
asvitkine
82f288f302 Merge pull request #139 from rakslice/tap_broadcast
Accept eth and atalk broadcast/multicast packets when using TAP in Windows
2017-10-11 21:31:44 -04:00
asvitkine
9a330603fd Merge pull request #136 from rickyzhang82/pr-emulated-hard-drive-in-24-bit-rom
Patch installing BII emulated hard drive in .sound driver Open call.
2017-10-11 21:30:54 -04:00
Alexei Svitkine
331556d309 use correct conversion function 2017-10-11 21:28:43 -04:00
Alexei Svitkine
e60c1aa1d7 fix ss build on newer osx 2017-10-11 21:17:14 -04:00
Andrew Tonner
6c37eb236b Accept eth and atalk broadcast/multicast packets when using TAP in Windows 2017-10-09 16:24:43 -07:00
Andrew Tonner
517e2aa7ab Support version 0901 TAP devices in Windows 2017-10-09 16:08:55 -07:00
asvitkine
6bb9d00184 Merge pull request #137 from rickyzhang82/pr-fix-sdl-in-24-bit-rom
Fix 1 bit BW guest OS frame buffer in 8 bit per pixel SDL surface.
2017-10-08 14:47:27 -04:00
Ricky Zhang
67437652cb
Fix 1 bit BW guest OS frame buffer in 8 bit per pixel SDL surface.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-07 22:56:30 -04:00
Ricky Zhang
ca11c25882 Patch install BII drive in .sound driver Open call.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-06 22:28:11 -04:00
asvitkine
8d53921b20 Merge pull request #133 from rickyzhang82/pr-enhance-rom-break-point
Enhance ROM break point feature.
2017-10-06 21:32:14 -04:00
Ricky Zhang
cba9b032fb
Fix several minor issues.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-06 20:01:55 -04:00
asvitkine
40716c7c91 Merge pull request #131 from simon-frankau/classic_video
Map framebuffer into accessible memory in 24-bit mode
2017-10-06 08:44:16 -04:00
asvitkine
66d3873cf7 Merge pull request #135 from rakslice/volumes_drag_and_drop
In the Windows GUI, allow file drag and drop into the Volumes list
2017-10-04 23:17:39 -04:00
Andrew Tonner
b72b16a775 Allow file drag and drop into the Volumes list 2017-10-04 19:46:32 -07:00
Ricky Zhang
175fbfde43 Enhance ROM break point feature.
1. Change --break input option format. Too much typing by taking decimal address. Change to hexadecimal input.
2. Allow ROM break point to continue to execution. The original ROM break point just replace instruction in ROM break point address with emul_op M68K_EMUL_BREAK. This just halts emulation right at the break point. The patch is less invasive than the original approach. It allows emulation to continue to run by pressing 'x' to exit from cxmon.
3. Add option --loadbreak which load break point from file before emulation start.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-15 21:36:16 -04:00
Simon Frankau
ec1a9418ab Map framebuffer into accessible memory in 24-bit mode 2017-09-10 20:22:46 +01:00
asvitkine
e273bb1a0b Merge pull request #129 from rickyzhang82/pr-cxmon-break-point
[Revised] Add break point functions to Basilisk II
2017-09-04 14:56:34 -04:00
Ricky Zhang
34cf1b0940
Fix indentation and a typo.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 14:35:50 -04:00
Ricky Zhang
93e800ffc7
Fix another round of suggestions.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 14:21:16 -04:00
Ricky Zhang
597ff0666c
Fix code style.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 08:00:45 -04:00
Ricky Zhang
d2bb35ee5a Fix all suggestions from asvitkine
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 07:37:29 -04:00
Ricky Zhang
93b22b8902 Add Macintosh M68k suspend program and user guide.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-03 00:26:56 -04:00
Ricky Zhang
f3895493ae Add break point function for Basilisk II in cxmon.
To enter break point, you need to run a m68k program in Macintosh guest OS. The program
executes a new emul_op instruction 0x7138. The program will be provided
in cxmon/utils folder in a separate commit. Once emulation is suspended,
you can enter below new cxmon command to manipluate break points:

ba [address]             Add a break point
br [breakpoints#]        Remove a break point. If # is 0, remove all break points.
bd [breakpoints#]        Disable a break point. If # is 0, disable all break points.
be [breakpoints#]        Enable a break point. If # is 0, enable all break points.
bi                       List all break points
bs "file"                Save all break points to a file
bl "file"                Load break points from a file

Once emulation PC reach break point address, it automatically suspends
and traps into cxmon.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-03 00:26:01 -04:00
asvitkine
723bedd55a Merge pull request #127 from rickyzhang82/pr-fix-mixed-space-tab
Fix mixed spaces and indentation
2017-08-31 22:34:32 -04:00
Ricky Zhang
54680714e3
Fix mixed spaces and indentation
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-29 21:11:07 -04:00
asvitkine
da5ea79a0f Merge pull request #124 from rickyzhang82/pr-fix-mon-for-bii
Fix mon option
2017-08-26 23:53:09 -04:00
Ricky Zhang
6dbfa73dbd Fix mon option
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-21 17:14:07 -04:00
asvitkine
c6e04efa11 Merge pull request #122 from coderforlife/fix-107
Fixes #107 by automatically using the precompiled opcodes when approp…
2017-08-18 19:49:47 -04:00
asvitkine
452b1a534b Merge pull request #121 from coderforlife/fix-120
Fixes #120 by adding support for v4.11 Linux Kernels which need an ex…
2017-08-18 19:48:36 -04:00
asvitkine
6f934d7695 Merge pull request #123 from coderforlife/fix-bincue
Fixing bincue support when compiling --with-bincue and --enable-stand…
2017-08-18 19:47:31 -04:00
Jeffrey Bush
dee8ed76ab Fixing bincue support when compiling --with-bincue and --enable-standalone-gui in both SheepSaver and BasiliskII by adding bincue_unix.o to list of objects compiled with the GUI application and adjusting the libs slightly (note that having extra libs listed should't neagtively effect anything). Without these changes those command line arguments cannot both be used. 2017-08-18 17:52:58 -04:00
Jeffrey Bush
b14bcdcf91 Fixes #107 by automatically using the precompiled opcodes when appropiate. 2017-08-18 17:38:34 -04:00