fix some unused vars warnings
remove some code that was accidentally committed
better cleanup of shared memory on failure
wrap init_sdl() in USE_SDL ifdef
fix compile error introduced by my recent refactoring
fix ppc build breakage
refactor init_sdl() into a function
refactor install_signal_handlers() into its own function
refactor load_mac_rom() into a function
refactor get_system_info() into a function
delete unused vars
correct whitespace
[Douglas Mencken] Add recognition for 970MP processors. I took these values from this kernel patch from year 2005: http://lists.ozlabs.org/pipermail/linuxppc64-dev/2005-July/004688.html
fix printf safety warning
use setenv in preference of putenv
fixed warnings
[Michael Schmitt] Attached is a patch to SheepShaver, to fix a problem where the ROM file can only be found on the first boot. When a user creates a new SheepShaver machine, there is no preference file, so there is not ROM path preference. SheepShaver has logic so that in this case, it will look for a ROM file named "ROM" or "Mac OS ROM" in the current directory. The user starts SheepShaver in order to get to the built-in Preferences Editor, and changes various settings (such as creation of a hard disk). Then the user reboots. If the user forgot to set the ROM path at this time, then SheepShaver can no longer boot. The only recourse is for the user to find and delete the preferences file, or use an external preferences editor to set the ROM path. The fix is to change SheepShaver to use the default ROM names when either the rom path is null (no preference) OR an empty string (preference exists with no rom path).
[Michael Schmitt]
Attached is a patch to SheepShaver to fix memory allocation problems when OS X 10.5 is the host. It also relaxes the 512 MB RAM limit on OS X hosts.
Problem
-------
Some users have been unable to run SheepShaver on OS X 10.5 (Leopard) hosts. The symptom is error "ERROR: Cannot map RAM: File already exists".
SheepShaver allocates RAM at fixed addresses. If it is running in "Real" addressing mode, and can't allocate at address 0, then it was hard-coded to allocate the RAM area at 0x20000000. The ROM area as allocated at 0x40800000.
The normal configuration is for SheepShaver to run under SDL, which is a Cocoa wrapper. By the time SheepShaver does its memory allocations, the Cocoa application has already started. The result is the SheepShaver memory address space already contains libraries, fonts, Input Managers, and IOKit areas.
On Leopard hosts these areas can land on the same addresses SheepShaver needs, so SheepShaver's memory allocation fails.
Solution
--------
The approach is to change SheepShaver (on Unix & OS X hosts) to allocate the RAM area anywhere it can find the space, rather than at a fixed address.
This could result in the RAM allocated higher than the ROM area, which causes a crash. To prevent this from occurring, the RAM and ROM areas are allocated contiguously.
Previously the ROM starting address was a constant ROM_BASE, which was used throughout the source files. The ROM start address is now a variable ROMBase. ROMBase is allocated and set by main_*.cpp just like RAMBase.
A side-effect of this change is that it lifts the 512 MB RAM limit for OS X hosts. The limit was because the fixed RAM and ROM addresses were such that the RAM could only be 512 MB before it overlapped the ROM area.
Impact
------
The change to make ROMBase a variable is throughout all hosts & addressing modes.
The RAM and ROM areas will only shift when run on Unix & OS X hosts, otherwise the same fixed allocation address is used as before.
This change is limited to "Real" addressing mode. Unlike Basilisk II, SheepShaver *pre-calculates* the offset for "Direct" addressing mode; the offset is compiled into the program. If the RAM address were allowed to shift, it could result in the RAM area wrapping around address 0.
Changes to main_unix.cpp
------------------------
1. Real addressing mode no longer defines a RAM_BASE constant.
2. The base address of the Mac ROM (ROMBase) is defined and exported by this program.
3. Memory management helper vm_mac_acquire is renamed to vm_mac_acquire_fixed. Added a new memory management helper vm_mac_acquire, which allocates memory at any address.
4. Changed and rearranged the allocation of RAM and ROM areas.
Before it worked like this:
- Allocate ROM area
- If can, attempt to allocate RAM at address zero
- If RAM not allocated at 0, allocate at fixed address
We still want to try allocating the RAM at zero, and if using DIRECT addressing we're still going to use the fixed addresses. So we don't know where the ROM should be until after we do the RAM. The new logic is:
- If can, attempt to allocate RAM at address zero
- If RAM not allocated at 0
if REAL addressing
allocate RAM and ROM together. The ROM address is aligned to a 1 MB boundary
else (direct addressing)
allocate RAM at fixed address
- If ROM hasn't been allocated yet, allocate at fixed address
5. Calculate ROMBase and ROMBaseHost based on where the ROM was loaded.
6. There is a crash if the RAM is allocated too high. To try and catch this, check if it was allocated higher than the kernel data address.
7. Change subsequent code from using constant ROM_BASE to variable ROMBase.
Changes to Other Programs
-------------------------
emul_op.cpp, main.cpp, name_registery.cpp, rom_patches.cpp, rsrc_patches.cpp, emul_ppc.cpp, sheepshaver_glue.cpp, ppc-translate-cpp:
Change from constant ROM_BASE to variable ROMBase.
ppc_asm.S: It was setting register to a hard-coded literal address: 0x40b0d000. Changed to set it to ROMBase + 0x30d000.
ppc_asm.tmpl: It defined a macro ASM_LO16 but it assumed that the macro would always be used with operands that included a register specification. This is not true. Moved the register specification from the macro to the macro invocations.
main_beos.cpp, main_windows.cpp: Since the subprograms are all expecting a variable ROMBase, all the main_*.cpp pgrams have to define and export it. The ROM_BASE constant is moved here for consistency. The mains for beos and windows just allocate the ROM at the same fixed address as before, set ROMBaseHost and ROMBase to that address, and then use ROMBase for the subsequent code.
cpu_emulation.h: removed ROM_BASE constant. This value is moved to the main_*.cpp modules, to be consistent with RAM_BASE.
user_strings_unix.cpp, user_strings_unix.h: Added new error messages related to errors that occur when the RAM and ROM are allocated anywhere.
support both foo.sheepvm and foo.sheepvm/ command-line parameters
support for .sheepvm bundles on macosx, containing "prefs" and "nvram" files
don't re-declare sigsegv_info_t, instead use the one from the header
[Patch from Mike Sliczniak] This first patch gets B2 and SS to build under Leopard and Tiger. I tested this on a 32-bit intel 10.5.6 mac like so: B2 ./autogen.sh --disable-standalone-gui --enable-vosf --enable-sdl-video --enable-sdl-audio --enable-addressing=real --without-esd --without-gtk --without-mon --without-x SS ./autogen.sh --disable-standalone-gui --enable-vosf -enable-sdl-video --disable-sdl-audio --enable-addressing=real --without-esd --without-gtk --without-mon --without-x --enable-jit There is also a little tweak so that you can use sdl audio in SheepShaver when building for Mac OS X.
[patch from Kelvin Delbarre] SDL's Quartz video implementation maps command clicks to right-clicks and option-clicks to middle-clicks, a feature intended for Mac users with single-button mice who are running SDL-based games that require a multi-button mouse. This is unhelpful in SheepShaver, where we want command-clicks and option-clicks to be passed through unchanged to the emulated Mac OS. We can disable the unwanted behavior by setting an environment variable SDL_HAS3BUTTONMOUSE intended for this very purpose. A similar change in main_windows.cpp is NOT required, because only the Quartz video implementation is involved. By SDL convention, putenv is used in preference to setenv, although for Unix platforms it doesn't matter.
Happy New Year!
Sync with new SIGSEGV API.
use the new SDL 1.2.12 env variable to allow the OS to launch the screensaver when sheepshaver is running - must be linking to sdl 1.2.12 or later for it to take effect
Update CPU table to kernel 2.6.17+ code (POWER6, Cell, PA6T). Fix detection of the CPU string (separator is actually ','). Fix detection of CPU clock frequency when it is expressed as a float.
Don't let SDL catch SIGINT and SIGTERM signals. This is not suitable for SheepShaver since we are typically translating SDL_QUIT events to PowerOff() on MacOS side. And, if MacOS is not fully booted, it's not really convenient to shut it down, even with ctrl-C. i.e. you had to kill -9 it.
Add linker scripts from Basilisk II and make it possible to allocate up to 1 GB of Mac memory. Only tested on Linux/x86_64 so far but with a somewhat interesting (MacOS, ROM, RAM size) matrix. XXX: It should be possible to allocate up to 1.5 GB by relocating the ROM base to something like 0x60800000.
Port --enable-standalone-gui support to SheepShaver Others changes include: - Factor out STR_SIG_INSTALL_ERR messages - Process command line arguments early (prior to calling PrefsInit()) - GUI: set start_clicked only if the "Start" button was clicked - GUI: save changes to the "Input" pane when the "Start" button was clicked
recognize POWER5+ CPUs (e.g. p5-520)
remove obsolete cygwin bits and fix allocation of NanoKernel region on IRIX (aka make it POSIX compliant)
Add upcoming 7448 and new PPC970FX CPU ids.
Map latest 7447A CPU to a plain G4 (7400)
Move sigregs handling to dedicated header
Restore clobbered registers before calling SDL_PumpEvents().
Improve idle wait mechanism. Now, the emulator thread can be suspended (idle_wait) until events arrived and notified through TriggerInterrupt(). i.e. we no longer sleep a fixed amount of time on platforms that support a thread wait/signal mechanism.
Clean-ups: comments, ticks per sec output, don't restore r13 twice.
The alternate stack trick never worked as you can't modify an active stack. i.e. it returned EPERM and ran into stack corruption to eventually crash the emulator. This is noticeable in !hw_mac_cursor_accl mode (e.g. fullscreen DGA). In order to the sigalstack() to be effective, we must kludge the kernel to think it's running on another stack. In practise, we provide another stack for the SIGUSR2 handler. sigusr2_handler_init() fulfills that purpose. I hope this fixes remaining issues forever. At some point, I had multiple *_init() handlers in case this is necessary.
Don't fake the TVECT value on non-BeOS native systems. This is important for systems that use a global r2 as the TLS register, e.g. Linux/ppc with newer glibc. Also remove the syscall junk which were simply workarounds for this bug. Remove a duplicate r2 restoration in EmulOp. BTW, it's possible to get SheepShaver running on Linux/ppc systems with NPTL rather than SheepThreads.
Recognize POWER5 CPUs. ;-)
better logics in sigstack allocation on native platforms
- Implement fullscreen DGA via fbdev access under Linux. Besides, r/w access to /dev/mem is required on Linux to use XF86 DGA mode. Otherwise, there is now a fallback to fbdev. - Forward port some features from Basilisk II (set_window_name, disable_mouse_accel). - Don't SIGSTOP the emulation thread on suspend since that would completely stop the process on Linux. Use a frame buffer lock instead (as B2 does)
Fix native Linux/ppc with recent enough glibc that supports TLS; r2 is used in that case. Tell me if I broke other arches, e.g. r13 is no longer saved in Video and Ethernet stubs, though it seems to be OK. Colateral feature: SheepShaver should now run on Linux/ppc64 with relevant 32-bit runtime. Native Linux/ppc64 support is harder as low mem globals are 32-bit in mind and e.g. the TLS register there is %r13, %r2 is the TOC (PowerOpen/AIX ABI)
Initial support for NetBSD/ppc in native mode (some crashes occur but I could boot MacOS 9.0.4)
Happy New Year 2005!
really invalidate caches when ROM was patched in native mode
Add InitAll() which covers common initializations so that to avoid duplicate code and possible bugs (e.g. on BeOS/PPC). Likewise for ExitAll().
Fix Kernel Data for Gossamer ROMs: PVR, CPUClockSpeed et al.
fix build on unixish platforms
New SheepShaver globals layout, move ZeroPage into the middle. Since it is a read-only page, it can also be used to detect overlaps between Procedure space and Data space. Provide native Windows implementation of shared MacOS KernelData allocation. This is moved under main() so that to avoid a weird linking error. This native implementation is independent of Cygwin IPC (and possible background server)
Implement Direct Addressing mode similarly to Basilisk II. This is to get SheepShaver working on OSes that don't support maipping of Low Memory globals at 0x00000000, e.g. Windows.
SDL audio support
Better PowerPC / POWER CPU detection from Linux cpu_specs[] table.
Remap any newer G4/G5 processor to plain G4 for compatibility
get timebase-frequency on osx too.
Introducce TimebaseSpeed which represents exact timebase-frequency instead of supposing it to be (BusClockSpeed/4), which is no longer true on G5 et al.
Try to recognize and handle PowerPC 970 (G5). Untested as I don't have such platforms handy.
Handle 750FX, 7450, 7455, 7457.
Make sure to initialize alt stacks before SIGSEGV handlers
Performance of VOSF is heuristically determined at run-time, so have to initialize SIGSEGV handlers early, as in Basilisk II. Besides, also add missing call to vm_init() in case host system doesn't have MAP_ANON.
SDL support in SheepShaver too, though it doesn't work in native mode on Linux/ppc as libSDL is pulling in libpthread which conflicts with our sheepthreads.
Don't handle XLM_IRQ_NEST atomically in emulated mode. That's useless since this variable is modified only within a single thread and interrupts are not handled asynchronously.
Improve timing of periodic threads (from Basilisk II), aka. make 10 seconds really last 10 seconds, not 18. ;-)
Get PVR information et al. through (slow) ioreg -c IOPlatformDevice
Make DR Cache executable by default in native PowerPC mode.
Enable DR emulator with OldWorld ROMs too. It turned out that translated code was also trying to access Serial memory. Note however that I noticed some rare crashes with the DR emulator. Probably caused by nested runs from EmulOps? We'd really want a native 68k emulator too for Execute68k() things.
Enable Apple DR emulator from NewWorld ROMs only.
Get rid of old (and broken) ASYNC_IRQ / MUTICORE code
Fix bus frequency detection for more realistic timers. Also add bus-frequency and timebase-frequency values to the Name Registry.
Fix nested ppc_interrupt() stack corruption problem by allocating yet another stack when next signal is triggered. I am still unsure if even MacOS would normally handle nested calls to NanoKernel interrupt routine.
Load XPRAM default values if signature not found. i.e. don't hang on first boot.
Make SheepShaver work with OS 8.6 out-of-the-box with no extra patch for the time being. i.e. ignore writes to the zero page when faking SCSIGlobals
Now that we have AltiVec emulation, we can pretend for a G4 processor Also make sure to actually fix PVR code for 7400
Recognize 7400 & 7410 cpus
Post-merge fixups: machine state wrappers, Apple assembler perticularities.
No need to map ROM executable on emulated/ppc. Make sure to detect unaligned EA for lmw/stmw with real addr instead of relying on the signal number.
Wrappers around machine state registers within signal handlers.
Happy New Year! :)
Also cache native routine descriptor instead of recreating them at each invokation to ExecuteNative().
Emulated lmw/stmw with unaligned EA. e.g. for BBEdit under MacOS 8.6. This may be due to some switch mode that needs to save r13 and upwards. The faultive code seems to explicitly add 0xee to r1, which causes it to be unaligned for upcoming lmw/stmw.
Fix ADB problems with unitinialized mutex
Add fast X11 display locking routines based on spinlocks, or on pthreads
in the worst case. Optimize out GetScrap() case when we already own the
selection. i.e. make it smoother. Use our own XDisplay{Un,}Lock() routines.
Use an alternate stack base while servicing PowerPC interrupts.
Really clear the zero page.
Add XLM_ZERO_PAGE globals which points to a read-only page with all bits set to zero.
Use a unique ExecuteNative() interface in any case, i.e. native & emulated
Fix ExecutePPC() merge with new SheepRoutineDescriptor
Add new thunking system for 64-bit fixes.
Merge Set_pthread_attr() from Basilisk II.
Implement partial block cache invalidation. Rewrite core cached blocks execution loop with a Duff's device. Gather some predecode time statistics. This shows that only around 2% of total emulation time is spent for predecoding the instructions.
- enable multicore cpu emulation with ASYNC_IRQ - move atomic_* operations to main_unix so that they could use spinlocks or other platform-specific locking mechanisms
allow DGA & Xshm only on local displays
- fixed compilation problems under BeOS - boot drive wasn't set correctly
- Handle MakeExecutable() replacement - Disable predecode cache in CVS for now - Fix flight recorder ordering in predecode cache mode
- Share EmulatorData & KernelData struct definitions - Introduce new SheepShaver data area for alternate stacks, thunks, etc. - Experimental asynchronous interrupts handling. This improves performance by 30% but some (rare) lockups may occur. To be debugged!
Disable SIGUSR2 handler in EMULATED_PPC mode for now
- Integrate new NativeOp instructions to be used as trampolines to call native functions from ppc code. - Little endian fixes in emul_op.cpp - Add new 'gpch' 750 patch to workaround crash with MacOS 8.6 - Don't crash in Process Manager on reset/shutdown with MacOS 8.6 - We also have an experimental interrupt thread in emulation mode
Import VOSF from Basilisk II for faster and more accurate video refresh. There may be some bugs left though. Rework sigsegv_handler() a little to accomodate VOSF way of life. TODO: merge video drivers infrastructure from B2.
Use vm_acquire/vm_acquire_fixed/vm_release API. Prepare use of SIGSEGV handlers and instruction skippers. Fix test prior to including posix_sem.cpp.
Add support to decode parcels-based ROMs - include/rom_patches.h (DecodeROM): Declare. - rom_patches.cpp (DecodeROM): Define. - Unix/main_unix.cpp, BeOS/main_beos.cpp (decode_lzss): Move to... - rom_patches.cpp (decode_lzss): ... here. - Unix/main_unix.cpp (main): Call DecodeROM(). - BeOS/main_beos.cpp (SheepShaver::load_rom): Call DecodeROM().
added dummy Set_pthread_attr()
Imported sources
Initial revision
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.