Commit Graph

2495 Commits

Author SHA1 Message Date
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
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
Jeffrey Bush
7b9612f24e Fixes #120 by adding support for v4.11 Linux Kernels which need an extra header. 2017-08-18 17:20:29 -04:00
asvitkine
5bbdb4f864 Merge pull request #116 from atsampson/master
Use ucontext_t instead of struct ucontext
2017-08-09 21:58:11 -04:00
Adam Sampson
3fc8924636 Use ucontext_t instead of struct ucontext
ucontext_t is what POSIX requires; glibc no longer provides struct
ucontext as of 2.26: https://sourceware.org/glibc/wiki/Release/2.26

(Most architectures were already using ucontext_t, so this also makes
things more consistent; only arm and mips change.)
2017-08-09 13:04:46 +01:00
Alexei Svitkine
123a23fad5 fix sequence error compiler warning 2017-08-09 00:14:05 -04:00
Alexei Svitkine
bc7cd78467 Merge branch 'master' of https://github.com/cebix/macemu 2017-08-08 23:38:41 -04:00
Alexei Svitkine
9f93648ea5 Revert "Fix build when targeting Sierra."
This reverts commit 35ca220d90.

Going with https://github.com/cebix/macemu/pull/115 instead.
2017-08-08 23:37:56 -04:00
asvitkine
8d1532ca32 Merge pull request #115 from rickyzhang82/pr-sierra-clock-gettime
Fix Mac OS X Sierra introduce clock_gettime
2017-08-08 23:35:54 -04:00
Alexei Svitkine
35ca220d90 Fix build when targeting Sierra.
Sierra now supports clock_gettime(), so fix some code that assumed
mach and HAVE_CLOCK_GETTIME where mutually exclusive.
2017-08-08 23:19:39 -04:00
Ricky Zhang
b32a8c8588 Fix Sierra clock_gettime issue
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-07 10:52:11 -04:00
asvitkine
b5820d8059 Merge pull request #113 from bvarner/bitbakeable
Changes to the Configure script to improve cross-compiling
2017-07-21 00:16:45 -04:00
asvitkine
ac4955dcb9 Merge pull request #112 from dmac100/relative_mouse
SDL: Use relative mouse values when grabbed.
2017-07-21 00:14:45 -04:00
bvarner
53e965a223 Remove unnecessary comment. 2017-07-20 23:22:10 -04:00
bvarner
2210c87233 Updates to signal handling detection, enabling vosf for cross-compiled overrides. 2017-07-20 18:53:04 -04:00
bvarner
87ae776a41 Consistency... 2017-07-20 18:28:24 -04:00
bvarner
02ec5fc7d4 Added environment variable overrides for cross-compile defaults using AC_ARG_VAR.
This lets you setup an environment to cross-compile, with extended support for how things will behave.
This should let the build play nicely with bitbake, without changing the --flags, and without breaking existing behaviors.
2017-07-20 17:18:55 -04:00
dmac
9f58eb96dc Use relative mouse values when grabbed in sdl. 2017-07-16 12:07:08 +01:00
bvarner
1eae4613c6 Added gitignores for quilt patches 2017-07-14 15:08:02 -04:00
bvarner
bd3ef905fb Don't do that. 2017-07-14 15:07:31 -04:00
bvarner
df6d21c394 I'm stashing there here, even though i probably shouldn't. 2017-07-14 15:06:12 -04:00
bvarner
1bfd163cf5 Better handling of SDL. 2017-07-14 12:50:45 -04:00
bvarner
cc3c3edcc0 Updates 2017-07-14 12:42:10 -04:00
bvarner
ca56f6f263 Ah, yeah. whoopse. 2017-07-14 12:30:53 -04:00
bvarner
35de22c444 Undo the SDL bits to favor the pkg-config bits. This should be more portable. I'm not sure if I'm breaking the cygwin build here, so I may have to give that a shot. 2017-07-14 12:25:37 -04:00
bvarner
65d44391c3 Other generated sources when not using JIT 2017-06-29 00:19:40 -04:00
bvarner
9f9893f178 move some things around here. 2017-06-28 23:37:55 -04:00
bvarner
c93058f9a6 Use SDL 1. This isn't an SDL2 App. D'oh 2017-06-28 18:06:16 -04:00