ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/rom_patches.cpp
Revision 1.46 - (view) (annotate) - [select for diffs]
2009-08-18T18:26:10Z (15 years, 2 months ago) by asvitkine
Branch: MAIN
CVS Tags: HEAD
Changes since 1.45: +53 -53 lines
Diff to previous 1.45 , to selected 1.13
[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.

Revision 1.45 - (view) (annotate) - [select for diffs]
2008-01-01T09:47:38Z (16 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.44: +1 -1 lines
Diff to previous 1.44 , to selected 1.13
Happy New Year!

Revision 1.44 - (view) (annotate) - [select for diffs]
2006-05-14T13:48:05Z (18 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 , to selected 1.13
Fix for DIRECT_ADDRESSING mode (Windows)

Revision 1.43 - (view) (annotate) - [select for diffs]
2006-05-06T10:30:00Z (18 years, 6 months ago) by gbeauche
Branch: MAIN
Changes since 1.42: +43 -2 lines
Diff to previous 1.42 , to selected 1.13
Add a few FE0A opcode patches. This slightly improves stability.

Revision 1.42 - (view) (annotate) - [select for diffs]
2005-12-12T20:46:31Z (18 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.41: +20 -24 lines
Diff to previous 1.41 , to selected 1.13
avoid unaligned memory accessed when patching the ROM (IRIX/mips)

Revision 1.41 - (view) (annotate) - [select for diffs]
2005-03-05T15:44:03Z (19 years, 8 months ago) by gbeauche
Branch: MAIN
Changes since 1.40: +9 -5 lines
Diff to previous 1.40 , to selected 1.13
Don't require an instruction skipper to fake SCSI globals

Revision 1.40 - (view) (annotate) - [select for diffs]
2005-01-30T21:48:19Z (19 years, 9 months ago) by gbeauche
Branch: MAIN
Changes since 1.39: +1 -1 lines
Diff to previous 1.39 , to selected 1.13
Happy New Year 2005!

Revision 1.39 - (view) (annotate) - [select for diffs]
2004-12-16T23:14:25Z (19 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.38: +2 -2 lines
Diff to previous 1.38 , to selected 1.13
patch the right branch instruction, it seems it doesn't much matter whether
we return success (0) or error (-1) in the previous casse.

Revision 1.38 - (view) (annotate) - [select for diffs]
2004-12-16T22:59:38Z (19 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.37: +39 -1 lines
Diff to previous 1.37 , to selected 1.13
disable power management for now (opcode fe0f)

Revision 1.37 - (view) (annotate) - [select for diffs]
2004-12-12T18:45:44Z (19 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 , to selected 1.13
fix regression introduced in the load of OldWorld ROMs when Direct Addressing
mode was impemented

Revision 1.36 - (view) (annotate) - [select for diffs]
2004-11-13T14:09:15Z (19 years, 11 months ago) by gbeauche
Branch: MAIN
Changes since 1.35: +190 -189 lines
Diff to previous 1.35 , to selected 1.13
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.

Revision 1.35 - (view) (annotate) - [select for diffs]
2004-07-14T08:24:07Z (20 years, 3 months ago) by gbeauche
Branch: MAIN
Changes since 1.34: +5 -1 lines
Diff to previous 1.34 , to selected 1.13
fix gc_mask2 patch for gossamer

Revision 1.34 - (view) (annotate) - [select for diffs]
2004-07-03T17:48:44Z (20 years, 4 months ago) by gbeauche
Branch: MAIN
Changes since 1.33: +8 -2 lines
Diff to previous 1.33 , to selected 1.13
More accurate Gestalt 'cput' values (G4, 750FX)

Revision 1.33 - (view) (annotate) - [select for diffs]
2004-07-01T22:55:00Z (20 years, 4 months ago) by gbeauche
Branch: MAIN
Changes since 1.32: +11 -0 lines
Diff to previous 1.32 , to selected 1.13
Try to recognize and handle PowerPC 970 (G5). Untested as I don't have such
platforms handy.

Revision 1.32 - (view) (annotate) - [select for diffs]
2004-06-30T08:17:12Z (20 years, 4 months ago) by gbeauche
Branch: MAIN
Changes since 1.31: +1 -1 lines
Diff to previous 1.31 , to selected 1.13
Fix Gestalt for PowerPC 745x processors.

Revision 1.31 - (view) (annotate) - [select for diffs]
2004-06-29T20:25:54Z (20 years, 4 months ago) by gbeauche
Branch: MAIN
Changes since 1.30: +6 -2 lines
Diff to previous 1.30 , to selected 1.13
Handle 750FX, 7450, 7455, 7457.

Revision 1.30 - (view) (annotate) - [select for diffs]
2004-06-22T17:10:06Z (20 years, 4 months ago) by gbeauche
Branch: MAIN
Changes since 1.29: +0 -21 lines
Diff to previous 1.29 , to selected 1.13
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.

Revision 1.29 - (view) (annotate) - [select for diffs]
2004-05-31T09:04:42Z (20 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.28: +16 -7 lines
Diff to previous 1.28 , to selected 1.13
Enable Apple DR emulator from NewWorld ROMs only.

Revision 1.28 - (view) (annotate) - [select for diffs]
2004-05-15T16:36:41Z (20 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.27: +5 -4 lines
Diff to previous 1.27 , to selected 1.13
"idlewait" support for Linux and NewWorld ROMs

Revision 1.27 - (view) (annotate) - [select for diffs]
2004-02-24T11:12:51Z (20 years, 8 months ago) by gbeauche
Branch: MAIN
Changes since 1.26: +1 -1 lines
Diff to previous 1.26 , to selected 1.13
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

Revision 1.26 - (view) (annotate) - [select for diffs]
2004-02-15T17:20:36Z (20 years, 8 months ago) by gbeauche
Branch: MAIN
Changes since 1.25: +2 -13 lines
Diff to previous 1.25 , to selected 1.13
Now that we have AltiVec emulation, we can pretend for a G4 processor
Also make sure to actually fix PVR code for 7400

Revision 1.25 - (view) (annotate) - [select for diffs]
2004-01-31T11:10:48Z (20 years, 9 months ago) by gbeauche
Branch: MAIN
Changes since 1.24: +12 -0 lines
Diff to previous 1.24 , to selected 1.13
Recognize 7400 & 7410 cpus

Revision 1.24 - (view) (annotate) - [select for diffs]
2004-01-12T15:37:18Z (20 years, 9 months ago) by cebix
Branch: MAIN
Changes since 1.23: +1 -1 lines
Diff to previous 1.23 , to selected 1.13
Happy New Year! :)

Revision 1.23 - (view) (annotate) - [select for diffs]
2003-12-15T15:27:01Z (20 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.22: +0 -1 lines
Diff to previous 1.22 , to selected 1.13
clean-ups, going to beat myself tonight

Revision 1.22 - (view) (annotate) - [select for diffs]
2003-12-15T15:25:38Z (20 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.21: +1 -1 lines
Diff to previous 1.21 , to selected 1.13
There may be extra instructions before moving stuff to SCC registers.

Revision 1.21 - (view) (annotate) - [select for diffs]
2003-12-15T15:23:59Z (20 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.20: +23 -6 lines
Diff to previous 1.20 , to selected 1.13
Fix SCC initialization code detection. Move up AddrMap patch space since
we clobber 40 bytes below it and it may intersect with GetScrap patch space.

Revision 1.20 - (view) (annotate) - [select for diffs]
2003-12-14T14:23:46Z (20 years, 10 months ago) by gbeauche
Branch: MAIN
Changes since 1.19: +227 -133 lines
Diff to previous 1.19 , to selected 1.13
Generic ROM patches from ROMTYPE_PARCELS experiments, no apparent
regession. There is no improvement either.

Revision 1.19 - (view) (annotate) - [select for diffs]
2003-12-05T12:37:14Z (20 years, 11 months ago) by gbeauche
Branch: MAIN
Changes since 1.18: +11 -2 lines
Diff to previous 1.18 , to selected 1.13
Fake reading from [HpChk]+4 (FIXME: the callchain reports some function
from DriverServicesLib). Also make fake SCSIGlobals map to zero page.

Revision 1.18 - (view) (annotate) - [select for diffs]
2003-12-04T17:26:35Z (20 years, 11 months ago) by gbeauche
Branch: MAIN
Changes since 1.17: +150 -216 lines
Diff to previous 1.17 , to selected 1.13
Add new thunking system for 64-bit fixes.

Revision 1.17 - (view) (annotate) - [select for diffs]
2003-10-07T19:28:09Z (21 years ago) by gbeauche
Branch: MAIN
Changes since 1.16: +4 -4 lines
Diff to previous 1.16 , to selected 1.13
Adapt ROM patches space to Gossamer ROMs layout. Weird that it passed the
other day.

Revision 1.16 - (view) (annotate) - [select for diffs]
2003-10-06T21:23:53Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 , to selected 1.13
fix parcels decoder

Revision 1.15 - (view) (annotate) - [select for diffs]
2003-10-06T21:01:22Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.14: +0 -1 lines
Diff to previous 1.14 , to selected 1.13
cleanups :-)

Revision 1.14 - (view) (annotate) - [select for diffs]
2003-10-06T21:00:48Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.13: +13 -2 lines
Diff to previous 1.13
- Add checks against ROM patches space
- Make sure to also load the floppy disk driver with Gossamer ROMs so
  that exfs feature can work too

Revision 1.13 - (view) (annotate) - [selected]
2003-10-05T23:49:19Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.12: +3 -11 lines
Diff to previous 1.12
tm_task is actually correct for both nw & gossamer ROMs

Revision 1.12 - (view) (annotate) - [select for diffs]
2003-10-05T23:38:07Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.11: +1 -1 lines
Diff to previous 1.11 , to selected 1.13
fix tm_task patch for Gossamer ROMs

Revision 1.11 - (view) (annotate) - [select for diffs]
2003-10-05T23:05:03Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.10: +71 -24 lines
Diff to previous 1.10 , to selected 1.13
Add support for Gossamer ROMs (DTG3)

Revision 1.10 - (view) (annotate) - [select for diffs]
2003-09-29T22:49:23Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.9: +7 -7 lines
Diff to previous 1.9 , to selected 1.13
Little endian fixes to Serial trampolines.

Revision 1.9 - (view) (annotate) - [select for diffs]
2003-09-29T20:30:19Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.8: +21 -4 lines
Diff to previous 1.8 , to selected 1.13
first round of little endian fixes

Revision 1.8 - (view) (annotate) - [select for diffs]
2003-09-28T21:27:33Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.7: +28 -6 lines
Diff to previous 1.7 , to selected 1.13
Try to handle XLM_IRQ_NEST atomically in emulated PPC views. Fix placement
of fake SCSIGlobals (disabled for now). Switch back to mono core emulation
until things are debugged enough. Implement get_resource() et al.

Revision 1.7 - (view) (annotate) - [select for diffs]
2003-09-07T14:33:51Z (21 years, 1 month ago) by gbeauche
Branch: MAIN
Changes since 1.6: +45 -25 lines
Diff to previous 1.6 , to selected 1.13
- 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

Revision 1.6 - (view) (annotate) - [select for diffs]
2003-05-21T19:31:57Z (21 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.5: +3 -1 lines
Diff to previous 1.5 , to selected 1.13
Don't call FE0A opcode in Shutdown Manager: handle better NewWorld ROMs.
i.e. don't force a "bra" if there was no "beq" beforehand.

Revision 1.5 - (view) (annotate) - [select for diffs]
2003-05-21T18:57:17Z (21 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.4: +14 -0 lines
Diff to previous 1.4 , to selected 1.13
Force installation of floppy driver with NewWorld ROMs otherwise we fail
to open it and further install ExtFS & NQD acceleration.

Revision 1.4 - (view) (annotate) - [select for diffs]
2003-05-17T08:42:34Z (21 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.3: +10 -7 lines
Diff to previous 1.3 , to selected 1.13
Finally enable boot on MacOS 8.6 Update CD from iMac DV
- Don't read PVR at ROM_BASE + 0x314600
- Generated code for FC1E and FE0A don't really match comments
- Move FC1E routine base to ROM_BASE + 0x36fb00
- Recognize iMacUpdate 1.1 ROM (nwrom v1.2.1)

Revision 1.3 - (view) (annotate) - [select for diffs]
2003-05-14T22:11:59Z (21 years, 5 months ago) by gbeauche
Branch: MAIN
Changes since 1.2: +2 -1 lines
Diff to previous 1.2 , to selected 1.13
Correctly print offset to current parcel, not next

Revision 1.2 - (view) (annotate) - [select for diffs]
2002-04-21T15:07:07Z (22 years, 6 months ago) by gbeauche
Branch: MAIN
Changes since 1.1: +123 -0 lines
Diff to previous 1.1 , to selected 1.13
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().

Revision 1.1.1.1 - (view) (annotate) - [select for diffs] (vendor branch)
2002-02-04T16:58:13Z (22 years, 9 months ago) by cebix
Branch: cebix
CVS Tags: start
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 , to next main 1.46 , to selected 1.13
Imported sources

Revision 1.1 - (view) (annotate) - [select for diffs]
2002-02-04T16:58:13Z (22 years, 9 months ago) by cebix
Branch: MAIN
Branch point for: cebix
Diff to selected 1.13
Initial revision

Convenience Links

Links to HEAD: (view) (annotate)

Compare Revisions

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.

  Diffs between and
  Type of Diff should be a