Commit Graph

1648 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
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 4da2082c07 The mono palette hack isn't needed for SheepShaver. 2020-08-23 16:47:48 +01: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
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
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
Ricky Zhang 98f3cab953 Fix indentation.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-03 10:00:15 -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
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
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 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 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
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
Roland Illig 8a4b84b9d7
src/Unix/Darwin/testlmem.sh: make code shorter
The old code used the `[[` shell keyword, which is only available in bash.
The interpreter in line 1 is `/bin/sh` though.
This confused my shell portability check in pkgsrc, since that check neither guesses the target platform from the filename, nor assumes that `/bin/sh` is actually bash, even though this may be true on macOS.

The change makes the code shorter with the well-known `${var:-default}` pattern.
Since `$1` is now only accessed when it is defined, this allows the program to have a `set -eu` at the top.
This in turn would make all the `&&` redundant since it applies automatic error checking.

The `{ ... } 1>&2` could also be replaced with a single `exec 1>&2` at the top.
2020-05-05 19:48:35 +02:00
bolt c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt 767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
asvitkine a4a2c88ed7
Merge pull request #190 from fragglet/patch-1
configure: Enable /dev/ptmx for Linux, Darwin.
2020-03-15 19:04:20 -04:00
anabate123 00f02d9d0c
Added more Mac models to the ModelID string 2020-03-14 18:59:27 -04:00
Simon Howard 507508b66d
configure: Enable /dev/ptmx for Linux, Darwin.
Both of these systems have /dev/ptmx for creating pseudoterminals.
OS X Leopard (10.5) added it in 2007, and Linux has had support for
it since v2.1 (1998).

This fixes a bug with pseudoterminal creation on Linux and macOS
where a new pseudoterminal cannot be created because the wrong
method is being used to find one.
2020-01-25 01:05:52 -05:00
asvitkine 01052ca89d
Merge pull request #181 from atsampson/scsifix
Remove obsolete sg.h workaround.
2019-04-05 01:12:49 -04:00
Vladimir Serbinenko 6267af0315 sigsegv.cpp: Add addr32 decode
With this fix I can compile with ./configure --enable-addressing=direct,0x100000
and then I don't need to change vm.mmap_min_addr and hence without root
privileges
2019-03-21 15:13:53 +01:00
Adam Sampson 668c2ba107 Remove obsolete sg.h workaround.
This is no longer necessary as of glibc 2.2 (released in November 2000),
and it causes breakage when /usr/include/linux is installed using a
symlink-based system like stow.
2018-10-31 12:43:55 +00:00
Adam Sampson 5d77f86575 Make vdeplug support optional.
Linking with -lvdeplug without checking whether it exists causes
failures from later configure tests; this makes it an optional
dependency in the same way as other libraries.
2018-10-31 12:36:35 +00:00
MSharq e583d05868 fixed vde_sock pointer 2018-10-29 21:14:25 +01:00
MSharq 242e8af3a7 fixed a bug 2018-10-29 15:44:53 +01:00
MSharq 2bc581d4f6 fixed indentation ether_unix 2018-10-28 19:42:04 +01:00
MSharq cf406ec953 fixed indentation ether_unix 2018-10-28 19:40:08 +01:00
MSharq 0c622863cf fixed a bug 2018-10-23 15:37:09 +02:00
MSharq 30fdd103a2 changed vde switch to vde_switch in the usage function 2018-10-20 15:11:40 +02:00
MSharq 50c98de60f a few indentation fixes 2018-10-20 15:07:38 +02:00
MSharq e4332cc72a added the printf statement for all Ethernet devices 2018-10-20 11:18:08 +02:00
MSharq 90b65715ae added VDE functionality 2018-09-28 16:14:14 +02:00
Alexei Svitkine 588a2ae9cd don't try to run diskutil eject (null) 2018-01-01 15:42:53 -05:00