Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,669 Commits 5 Branches 17 Tags 20 MiB
Commit Graph

2669 Commits

Author SHA1 Message Date
Seg 7d87addf22 Don't use linker script on x86_64, there is no need for it and it 
breaks flatpak builds
 2020-12-11 18:02:12 -08:00
Seg afe93778ca Update config.guess and config.sub 2020-12-11 17:26:27 -08:00
Seg 54ea2c9354 Fix slirp crash on 64bit 2020-12-11 17:15:53 -08:00
Seg 226a3845e0 Fix crash on linux aarch64 2020-12-11 16:54:16 -08:00
asvitkine d684527b27
Merge pull request #220 from atsampson/fixsdl 
Update SheepShaver for SDL2 support
 2020-11-22 22:53:25 -05:00
asvitkine 6c38946bf0
Merge pull request #221 from atsampson/openpty 
Use openpty if possible
 2020-11-22 22:52:21 -05:00
Adam Sampson 413190d12f Use openpty if possible. 
The code this affects in sshpty.c originally came from OpenSSH, which
now uses openpty by preference when it's available. openpty is a
BSD-ism, but it's been provided by glibc on Linux with the BSD
semantics since 1998.
 2020-08-23 17:26:15 +01:00
Adam Sampson 0eae77599e Update SheepShaver for SDL2 support. 
This imports the SDL2-related changes from BasiliskII.
 2020-08-23 16:59:42 +01:00
Adam Sampson 4da2082c07 The mono palette hack isn't needed for SheepShaver. 2020-08-23 16:47:48 +01:00
asvitkine 29bb3d5a5a
Merge pull request #215 from rickyzhang82/pr-support-system6-vscreen 
Port mini vMac guest OS screen ROM patch.
 2020-07-15 22:57:38 -04:00
Ricky Zhang 13017f711f
Fix a weird whitespace. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:56:00 -04:00
Ricky Zhang 82524ba034
Unwrap the formula. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:54:06 -04:00
Ricky Zhang 2e96512f26
Fix if/else format. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:42:59 -04:00
Ricky Zhang 5f1b41eb42
Improve the comment readability. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:14:20 -04:00
Ricky Zhang 03ebc5375b
Fix comment. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 20:55:34 -04:00
asvitkine 8f12a0fffb
Merge pull request #216 from rickyzhang82/pr-add-xwidnow-to-travis 
Beef up Travis CI with XWindows backend.
 2020-07-15 20:18:36 -04:00
Ricky Zhang 7513fab5ad
Beef up Travis CI with XWindows backend. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 19:59:46 -04:00
Ricky Zhang 342fbbce34
Port mini vMac guest OS screen ROM patch. 
- Added Mac SE 24 bit ROM screen patch from mini vMac.
  The guest OS resolution in System 6 can be defined
  at an arbitrary combination.
- Mac frame buffer base mapping is moved out from guest RAM.
  This creates more leg room for the host frame buffer.
- Enable System 6 vscreen support in SDL2. Passed build and test.
- Enable System 6 vscreen support in SDL1. Passed build and test.
- Eanble System 6 vscreen support in XWidnow. Passed build and test.

See my [screen cast demo here](https://youtu.be/aXzM8t_u3zI)

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 19:14:36 -04:00
asvitkine 6d522db16c
Merge pull request #212 from rickyzhang82/pr-fix-sdl2-for-system-6 
Patch SDL2 for System 6 24bit ROM
 2020-07-05 19:41:46 -04:00
asvitkine 245da3b142
Merge pull request #213 from rickyzhang82/pr-add-autogen-for-cxmon 
Add autogen for cxmon
 2020-07-05 19:40:32 -04:00
Ricky Zhang 89bcd3dc3e Add autogen for cxmon 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-05 17:56:44 -04:00
Ricky Zhang 2595059146
Fix a minor bug for B/W palette. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 16:47:58 -04:00
Ricky Zhang bae7a4d16b
Explained why the magic number used in 24bit ROM frame mapping. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 14:45:21 -04:00
Ricky Zhang e63c6b91dc
Patch SDL2 palette for 24bit ROM. 
24bit ROM doesn't invoke video driver control. Therefore, a manual step
is required to add a black & white palette for guest_surface in SDL2.

Please check out [the screen cast here](https://youtu.be/br5Hjt9F6X4).

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 14:22:33 -04:00
Ricky Zhang 40f6c77775
Move the RAM debug message to the proper place. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 19:42:55 -04:00
Ricky Zhang 7e83b9c49e Fix Indentations. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 19:42:10 -04:00
asvitkine a21ad0d7c4
Merge pull request #211 from rickyzhang82/pr-fix-indentation 
Fix indentation.
 2020-07-03 17:05:58 -04:00
Ricky Zhang 98f3cab953 Fix indentation. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 10:00:15 -04:00
asvitkine ef57fd2c5f
Merge pull request #210 from rickyzhang82/pr-enhance-sdl2-scale-up 
Enhanced scale up and scale down in SDL2.
 2020-07-02 20:15:37 -04:00
Ricky Zhang 6f4da45eeb Enhanced scale up and scale down in SDL2. 
- Enable window mode to be resizable.
- When restore the window, restore the scale ratio to 1.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-02 18:35:18 -04:00
asvitkine 864b4a1652
Merge pull request #206 from rickyzhang82/pr-fix-framebuffer-bug 
Abort when frame buffer memory allocation fails.
 2020-07-01 21:36:25 -04:00
asvitkine b49d9b7485
Merge pull request #205 from rickyzhang82/pr-fix-mac-hang 
For Darwin, the default addressing mode is memory banks.
 2020-07-01 21:35:47 -04:00
asvitkine 03f5cc8c79
Merge pull request #209 from rickyzhang82/pr-travis-ci 
Beef up CI test cases
 2020-07-01 21:35:22 -04:00
Ricky Zhang 0b38469385 Add Mac OS X CI. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 21:20:22 -04:00
Ricky Zhang d30528795b
Beef up CI build cases. 
- Add addressing modes direct and memory banks.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 20:43:54 -04:00
Ricky Zhang bdf5a276d3
Abort when frame buffer memory allocation fails. 
- Remove unused code in vm_acquire_framebuffer function.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 18:25:50 -04:00
Ricky Zhang 56665d30a3
For Darwin, the default addressing mode is memory banks. 
When the host OS is Mac OS X, direct addressing in BII doesn't guarantee
that the allocated memory for frame buffer base address in the host
(FrameBaseHost) satisfies the following conditions:

- FrameBaseHost > RamBaseHost
- (FrameBaseHost - RamBaseHost) + Frame_Size < 4GiB
where RamBaseHost refers to the emulated RAM base address in the host.

This may cause the random hang problem where the allocated frame address
failed to meet the conditions above.

Because the direct addressing mapping is a simple math:

RamAddrMac = RamAddrHost - RamBaseHost.

See details: https://github.com/cebix/macemu/issues/203

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 18:07:25 -04:00
asvitkine 16081b2878
Merge pull request #202 from rickyzhang82/pr-enable-sdl2 
Enable SDL2 for Linux and Mac OS X
 2020-06-29 22:15:43 -04:00
Ricky Zhang 18701c97df
Fix year in project 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-29 22:10:27 -04:00
Ricky Zhang 8e88e462ee
Fix code review issues. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-28 18:42:14 -04:00
Ricky Zhang e6cd178881
Point CI status to upstream-master branch. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-28 10:29:52 -04:00
Ricky Zhang 1bfb0e94a3
Back out the hack from kanjitalk755 
Remove the unused header.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-27 12:13:51 -04:00
Ricky Zhang 9ef2f87adb
Add CI for SDL1 and SDL2. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-27 00:17:25 -04:00
Ricky Zhang dc8bb7e2a3
Back out the hack from kanjitalk755 
- In 8 bit color game, the hack crashed the app.
- After backing out the hack, I can play 256 color game with displaycolordepth 8.
- By default, the displaycolordepth is 0.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 16:56:40 -04:00
Ricky Zhang d28599f49d
Backport MacOSX support. 
- video_sdl2 for Mac OS X requires MacOSX update.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 15:50:40 -04:00
Ricky Zhang a46759990d
Backport SDL2 features from https://github.com/kanjitalk755/macemu 
By default, without providing `with-sdl2` in configure it uses SDL1.
Users need to explicitly request SDL2.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 15:28:41 -04:00
asvitkine 5cbf07e9f5
Merge pull request #201 from rickyzhang82/pr-revert-broken-commit 
Revert "Merge pull request #190 from fragglet/patch-1"
 2020-06-25 10:24:37 -04:00
Ricky Zhang b0bdceac34 Revert "Merge pull request #190 from fragglet/patch-1" 
This reverts commit a4a2c88ed7, reversing
changes made to 1918557e78.
 2020-06-25 09:43:20 -04:00
asvitkine b2d281e5ab
Merge pull request #200 from aviallon/patch-int-narrowing 
Fix build fail under GCC 10
 2020-06-20 13:48:03 -04:00
Antoine Viallon f13f25db3e
Fix build fail under GCC 10 
GCC fails to build because of -Wnarrowing
 2020-06-20 19:19:49 +02:00