--- SheepShaver/src/BeOS/main_beos.cpp 2004/01/07 18:24:44 1.9 +++ SheepShaver/src/BeOS/main_beos.cpp 2004/11/13 14:09:15 1.14 @@ -1,7 +1,7 @@ /* * main_beos.cpp - Emulation core, BeOS implementation * - * SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig + * SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -117,6 +117,7 @@ const char KERNEL_AREA2_NAME[] = "Macint const char RAM_AREA_NAME[] = "Macintosh RAM"; const char ROM_AREA_NAME[] = "Macintosh ROM"; const char DR_CACHE_AREA_NAME[] = "Macintosh DR Cache"; +const char DR_EMULATOR_AREA_NAME[] = "Macintosh DR Emulator"; const char SHEEP_AREA_NAME[] = "SheepShaver Virtual Stack"; const uint32 SIG_STACK_SIZE = 8192; // Size of signal stack @@ -142,7 +143,7 @@ public: // Initialize other variables sheep_fd = -1; emulator_data = NULL; - kernel_area = kernel_area2 = rom_area = ram_area = dr_cache_area = -1; + kernel_area = kernel_area2 = rom_area = ram_area = dr_cache_area = dr_emulator_area = -1; emul_thread = nvram_thread = tick_thread = -1; ReadyForSignals = false; AllowQuitting = true; @@ -190,6 +191,7 @@ private: area_id rom_area; // ROM area ID area_id ram_area; // RAM area ID area_id dr_cache_area; // DR Cache area ID + area_id dr_emulator_area; // DR Emulator area ID struct sigaction sigusr1_action; // Interrupt signal (of emulator thread) struct sigaction sigsegv_action; // Data access exception signal (of emulator thread) @@ -213,13 +215,18 @@ uint32 RAMSize; // Size of Mac RAM uint32 KernelDataAddr; // Address of Kernel Data uint32 BootGlobsAddr; // Address of BootGlobs structure at top of Mac RAM uint32 DRCacheAddr; // Address of DR Cache +uint32 DREmulatorAddr; // Address of DR Emulator uint32 PVR; // Theoretical PVR int64 CPUClockSpeed; // Processor clock speed (Hz) int64 BusClockSpeed; // Bus clock speed (Hz) +int64 TimebaseSpeed; // Timebase clock speed (Hz) system_info SysInfo; // System information +uint8 *RAMBaseHost; // Base address of Mac RAM (host address space) +uint8 *ROMBaseHost; // Base address of Mac ROM (host address space) static void *sig_stack = NULL; // Stack for signal handlers static void *extra_stack = NULL; // Stack for SIGSEGV inside interrupt handler +uint32 SheepMem::page_size; // Size of a native page uintptr SheepMem::zero_page = 0; // Address of ro page filled in with zeros uintptr SheepMem::base; // Address of SheepShaver data uintptr SheepMem::top; // Top of SheepShaver data (stack like storage) @@ -295,6 +302,7 @@ void SheepShaver::ReadyToRun(void) } CPUClockSpeed = SysInfo.cpu_clock_speed; BusClockSpeed = SysInfo.bus_clock_speed; + TimebaseSpeed = BusClockSpeed / 4; // Delete old areas area_id old_kernel_area = find_area(KERNEL_AREA_NAME); @@ -312,6 +320,9 @@ void SheepShaver::ReadyToRun(void) area_id old_dr_cache_area = find_area(DR_CACHE_AREA_NAME); if (old_dr_cache_area > 0) delete_area(old_dr_cache_area); + area_id old_dr_emulator_area = find_area(DR_EMULATOR_AREA_NAME); + if (old_dr_emulator_area > 0) + delete_area(old_dr_emulator_area); // Read preferences int argc = 0; @@ -402,7 +413,7 @@ void SheepShaver::StartEmulator(void) // Create area for SheepShaver data if (!SheepMem::Init()) { - sprintf(str, GetString(STR_NO_SHEEP_MEM_AREA_ERR)); + sprintf(str, GetString(STR_NO_SHEEP_MEM_AREA_ERR), strerror(SheepMemArea), SheepMemArea); ErrorAlert(str); PostMessage(B_QUIT_REQUESTED); return; @@ -423,7 +434,8 @@ void SheepShaver::StartEmulator(void) PostMessage(B_QUIT_REQUESTED); return; } - D(bug("RAM area %ld at %p\n", ram_area, RAMBase)); + RAMBaseHost = (uint8 *)RAMBase + D(bug("RAM area %ld at %p\n", ram_area, RAMBaseHost)); // Create area and load Mac ROM try { @@ -457,6 +469,17 @@ void SheepShaver::StartEmulator(void) } D(bug("DR Cache area %ld at %p\n", dr_cache_area, DRCacheAddr)); + // Create area for DR Emulator + DREmulatorAddr = DR_EMULATOR_BASE; + dr_emulator_area = create_area(DR_EMULATOR_AREA_NAME, (void **)&DREmulatorAddr, B_EXACT_ADDRESS, DR_EMULATOR_SIZE, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); + if (dr_emulator_area < 0) { + sprintf(str, GetString(STR_NO_KERNEL_DATA_ERR), strerror(dr_emulator_area), dr_emulator_area); + ErrorAlert(str); + PostMessage(B_QUIT_REQUESTED); + return; + } + D(bug("DR Emulator area %ld at %p\n", dr_emulator_area, DREmulatorAddr)); + // Load NVRAM XPRAMInit(); @@ -522,7 +545,7 @@ void SheepShaver::StartEmulator(void) // Clear caches (as we loaded and patched code) and write protect ROM #if !EMULATED_PPC - clear_caches((void *)ROM_BASE, ROM_AREA_SIZE, B_INVALIDATE_ICACHE | B_FLUSH_DCACHE); + clear_caches(ROMBaseHost, ROM_AREA_SIZE, B_INVALIDATE_ICACHE | B_FLUSH_DCACHE); #endif set_area_protection(rom_area, B_READ_AREA); @@ -682,6 +705,10 @@ void SheepShaver::Quit(void) // Delete SheepShaver globals SheepMem::Exit(); + // Delete DR Emulator area + if (dr_emulator_area >= 0) + delete_area(dr_emulator_area); + // Delete DR Cache area if (dr_cache_area >= 0) delete_area(dr_cache_area); @@ -726,9 +753,12 @@ void SheepShaver::Quit(void) void SheepShaver::init_rom(void) { + // Size of a native page + page_size = B_PAGE_SIZE; + // Create area for ROM - void *rom_addr = (void *)ROM_BASE; - rom_area = create_area(ROM_AREA_NAME, &rom_addr, B_EXACT_ADDRESS, ROM_AREA_SIZE, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); + ROMBaseHost = (uint8 *)ROM_BASE; + rom_area = create_area(ROM_AREA_NAME, (void **)&ROMBaseHost, B_EXACT_ADDRESS, ROM_AREA_SIZE, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); if (rom_area < 0) throw area_error(); D(bug("ROM area %ld at %p\n", rom_area, rom_addr)); @@ -1310,11 +1340,11 @@ void Dump68kRegs(M68kRegisters *r) * Make code executable */ -void MakeExecutable(int dummy, void *start, uint32 length) +void MakeExecutable(int dummy, uint32 start, uint32 length) { - if (((uint32)start >= ROM_BASE) && ((uint32)start < (ROM_BASE + ROM_SIZE))) + if ((start >= ROM_BASE) && (start < (ROM_BASE + ROM_SIZE))) return; - clear_caches(start, length, B_INVALIDATE_ICACHE | B_FLUSH_DCACHE); + clear_caches((void *)start, length, B_INVALIDATE_ICACHE | B_FLUSH_DCACHE); }