--- SheepShaver/src/Unix/main_unix.cpp 2003/11/03 21:28:25 1.13 +++ SheepShaver/src/Unix/main_unix.cpp 2004/11/22 21:33:32 1.53 @@ -1,7 +1,7 @@ /* * main_unix.cpp - Emulation core, Unix 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 @@ -65,6 +65,18 @@ * ExecutePPC (or any function that might cause a mode switch). The signal * stack is restored before exiting the SIGUSR2 handler. * + * There is apparently another problem when processing signals. In + * fullscreen mode, we get quick updates of the mouse position. This + * causes an increased number of calls to TriggerInterrupt(). And, + * since IRQ_NEST is not fully handled atomically, nested calls to + * ppc_interrupt() may cause stack corruption to eventually crash the + * emulator. + * + * FIXME: + * The current solution is to allocate another signal stack when + * processing ppc_interrupt(). However, it may be better to detect + * the INTFLAG_ADB case and handle it specifically with some extra mutex? + * * TODO: * check if SIGSEGV handler works for all registers (including FP!) */ @@ -109,12 +121,23 @@ #include "user_strings.h" #include "vm_alloc.h" #include "sigsegv.h" +#include "thunks.h" #define DEBUG 0 #include "debug.h" +#ifdef HAVE_DIRENT_H +#include +#endif + +#ifdef USE_SDL +#include +#endif + +#ifndef USE_SDL_VIDEO #include +#endif #ifdef ENABLE_GTK #include @@ -131,6 +154,9 @@ #endif +// Enable emulation of unaligned lmw/stmw? +#define EMULATE_UNALIGNED_LOADSTORE_MULTIPLE 1 + // Enable Execute68k() safety checks? #define SAFE_EXEC_68K 0 @@ -140,29 +166,109 @@ // Interrupts in native mode? #define INTERRUPTS_IN_NATIVE_MODE 1 +// Number of alternate stacks for signal handlers? +#define SIG_STACK_COUNT 4 + // Constants const char ROM_FILE_NAME[] = "ROM"; const char ROM_FILE_NAME2[] = "Mac OS ROM"; -const uint32 RAM_BASE = 0x20000000; // Base address of RAM +#if REAL_ADDRESSING +const uintptr RAM_BASE = 0x20000000; // Base address of RAM +#else +// FIXME: needs to be >= 0x04000000 +const uintptr RAM_BASE = 0x10000000; // Base address of RAM +#endif const uint32 SIG_STACK_SIZE = 0x10000; // Size of signal stack #if !EMULATED_PPC -// Structure in which registers are saved in a signal handler; -// sigcontext->regs points to it -// (see arch/ppc/kernel/signal.c) -typedef struct { - uint32 u[4]; -} __attribute((aligned(16))) vector128; -#include - struct sigregs { - elf_gregset_t gp_regs; // Identical to pt_regs - double fp_regs[ELF_NFPREG]; // f0..f31 and fpsrc - //more (uninteresting) stuff following here + uint32 nip; + uint32 link; + uint32 ctr; + uint32 msr; + uint32 xer; + uint32 ccr; + uint32 gpr[32]; }; + +#if defined(__linux__) +#include +#define MACHINE_REGISTERS(scp) ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext.regs)) + +struct machine_regs : public pt_regs +{ + u_long & cr() { return pt_regs::ccr; } + uint32 cr() const { return pt_regs::ccr; } + uint32 lr() const { return pt_regs::link; } + uint32 ctr() const { return pt_regs::ctr; } + uint32 xer() const { return pt_regs::xer; } + uint32 msr() const { return pt_regs::msr; } + uint32 dar() const { return pt_regs::dar; } + u_long & pc() { return pt_regs::nip; } + uint32 pc() const { return pt_regs::nip; } + u_long & gpr(int i) { return pt_regs::gpr[i]; } + uint32 gpr(int i) const { return pt_regs::gpr[i]; } +}; +#endif + +#if defined(__APPLE__) && defined(__MACH__) +#include +extern "C" int sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss); + +#include +#define MACHINE_REGISTERS(scp) ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext)) + +struct machine_regs : public mcontext +{ + uint32 & cr() { return ss.cr; } + uint32 cr() const { return ss.cr; } + uint32 lr() const { return ss.lr; } + uint32 ctr() const { return ss.ctr; } + uint32 xer() const { return ss.xer; } + uint32 msr() const { return ss.srr1; } + uint32 dar() const { return es.dar; } + uint32 & pc() { return ss.srr0; } + uint32 pc() const { return ss.srr0; } + uint32 & gpr(int i) { return (&ss.r0)[i]; } + uint32 gpr(int i) const { return (&ss.r0)[i]; } +}; +#endif + +static void build_sigregs(sigregs *srp, machine_regs *mrp) +{ + srp->nip = mrp->pc(); + srp->link = mrp->lr(); + srp->ctr = mrp->ctr(); + srp->msr = mrp->msr(); + srp->xer = mrp->xer(); + srp->ccr = mrp->cr(); + for (int i = 0; i < 32; i++) + srp->gpr[i] = mrp->gpr(i); +} + +static struct sigaltstack sig_stacks[SIG_STACK_COUNT]; // Stacks for signal handlers +static int sig_stack_id = 0; // Stack slot currently used + +static inline void sig_stack_acquire(void) +{ + if (++sig_stack_id == SIG_STACK_COUNT) { + printf("FATAL: signal stack overflow\n"); + return; + } + sigaltstack(&sig_stacks[sig_stack_id], NULL); +} + +static inline void sig_stack_release(void) +{ + if (--sig_stack_id < 0) { + printf("FATAL: signal stack underflow\n"); + return; + } + sigaltstack(&sig_stacks[sig_stack_id], NULL); +} #endif @@ -172,34 +278,43 @@ void *TOC; // Small data pointer (r13 #endif uint32 RAMBase; // Base address of Mac RAM uint32 RAMSize; // Size of Mac RAM -uint32 SheepStack1Base; // SheepShaver first alternate stack base -uint32 SheepStack2Base; // SheepShaver second alternate stack base -uint32 SheepThunksBase; // SheepShaver thunks base uint32 KernelDataAddr; // Address of Kernel Data uint32 BootGlobsAddr; // Address of BootGlobs structure at top of Mac RAM +uint32 DRCacheAddr; // Address of DR Cache uint32 PVR; // Theoretical PVR int64 CPUClockSpeed; // Processor clock speed (Hz) int64 BusClockSpeed; // Bus clock speed (Hz) +int64 TimebaseSpeed; // Timebase clock speed (Hz) +uint8 *RAMBaseHost; // Base address of Mac RAM (host address space) +uint8 *ROMBaseHost; // Base address of Mac ROM (host address space) // Global variables +#ifndef USE_SDL_VIDEO char *x_display_name = NULL; // X11 display name Display *x_display = NULL; // X11 display handle +#ifdef X11_LOCK_TYPE +X11_LOCK_TYPE x_display_lock = X11_LOCK_INIT; // X11 display lock +#endif +#endif static int zero_fd = 0; // FD of /dev/zero -static bool sheep_area_mapped = false; // Flag: SheepShaver data area mmap()ed static bool lm_area_mapped = false; // Flag: Low Memory area mmap()ped static int kernel_area = -1; // SHM ID of Kernel Data area static bool rom_area_mapped = false; // Flag: Mac ROM mmap()ped static bool ram_area_mapped = false; // Flag: Mac RAM mmap()ped +static bool dr_cache_area_mapped = false; // Flag: Mac DR Cache mmap()ped +static bool dr_emulator_area_mapped = false;// Flag: Mac DR Emulator mmap()ped static KernelData *kernel_data; // Pointer to Kernel Data static EmulatorData *emulator_data; static uint8 last_xpram[XPRAM_SIZE]; // Buffer for monitoring XPRAM changes static bool nvram_thread_active = false; // Flag: NVRAM watchdog installed +static volatile bool nvram_thread_cancel; // Flag: Cancel NVRAM thread static pthread_t nvram_thread; // NVRAM watchdog static bool tick_thread_active = false; // Flag: MacOS thread installed +static volatile bool tick_thread_cancel; // Flag: Cancel 60Hz thread static pthread_t tick_thread; // 60Hz thread static pthread_t emul_thread; // MacOS thread @@ -207,30 +322,39 @@ static bool ready_for_signals = false; static int64 num_segv = 0; // Number of handled SEGV signals static struct sigaction sigusr2_action; // Interrupt signal (of emulator thread) -#if !EMULATED_PPC +#if EMULATED_PPC +static uintptr sig_stack = 0; // Stack for PowerPC interrupt routine +#else static struct sigaction sigsegv_action; // Data access exception signal (of emulator thread) static struct sigaction sigill_action; // Illegal instruction signal (of emulator thread) -static void *sig_stack = NULL; // Stack for signal handlers -static void *extra_stack = NULL; // Stack for SIGSEGV inside interrupt handler static bool emul_thread_fatal = false; // Flag: MacOS thread crashed, tick thread shall dump debug output static sigregs sigsegv_regs; // Register dump when crashed +static const char *crash_reason = NULL; // Reason of the crash (SIGSEGV, SIGBUS, SIGILL) #endif +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 = 0x60000000; // Address of SheepShaver data +uintptr SheepMem::proc; // Bottom address of SheepShave procedures +uintptr SheepMem::data; // Top of SheepShaver data (stack like storage) + // Prototypes +static bool kernel_data_init(void); +static void kernel_data_exit(void); static void Quit(void); static void *emul_func(void *arg); static void *nvram_func(void *arg); static void *tick_func(void *arg); #if EMULATED_PPC -static void sigusr2_handler(int sig); extern void emul_ppc(uint32 start); extern void init_emul_ppc(void); extern void exit_emul_ppc(void); +sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t); #else -static void sigusr2_handler(int sig, sigcontext_struct *sc); -static void sigsegv_handler(int sig, sigcontext_struct *sc); -static void sigill_handler(int sig, sigcontext_struct *sc); +static void sigusr2_handler(int sig, siginfo_t *sip, void *scp); +static void sigsegv_handler(int sig, siginfo_t *sip, void *scp); +static void sigill_handler(int sig, siginfo_t *sip, void *scp); #endif @@ -252,6 +376,16 @@ extern void paranoia_check(void); #if EMULATED_PPC /* + * Return signal stack base + */ + +uintptr SignalStackBase(void) +{ + return sig_stack + SIG_STACK_SIZE; +} + + +/* * Atomic operations */ @@ -292,6 +426,21 @@ int atomic_or(int *var, int v) /* + * Memory management helpers + */ + +static inline int vm_mac_acquire(uint32 addr, uint32 size) +{ + return vm_acquire_fixed(Mac2HostAddr(addr), size); +} + +static inline int vm_mac_release(uint32 addr, uint32 size) +{ + return vm_release(Mac2HostAddr(addr), size); +} + + +/* * Main program */ @@ -307,7 +456,6 @@ static void usage(const char *prg_name) int main(int argc, char **argv) { char str[256]; - uint32 *boot_globs; int16 i16; int rom_fd; FILE *proc_file; @@ -342,16 +490,38 @@ int main(int argc, char **argv) for (int i=1; i", head, &value) == 2) + PVR = value; + else if (sscanf(line, "%[ |]\"clock-frequency\" = <%x>", head, &value) == 2) + CPUClockSpeed = value; + else if (sscanf(line, "%[ |]\"bus-frequency\" = <%x>", head, &value) == 2) + BusClockSpeed = value; + else if (sscanf(line, "%[ |]\"timebase-frequency\" = <%x>", head, &value) == 2) + TimebaseSpeed = value; + else if (strchr(line, '}')) + powerpc_node = false; + } + } + fclose(proc_file); + } else { + sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno)); + WarningAlert(str); + } +#else proc_file = fopen("/proc/cpuinfo", "r"); if (proc_file) { + // CPU specs from Linux kernel + // TODO: make it more generic with features (e.g. AltiVec) and + // cache information and friends for NameRegistry + static const struct { + uint32 pvr_mask; + uint32 pvr_value; + const char *cpu_name; + } + cpu_specs[] = { + { 0xffff0000, 0x00010000, "601" }, + { 0xffff0000, 0x00030000, "603" }, + { 0xffff0000, 0x00060000, "603e" }, + { 0xffff0000, 0x00070000, "603ev" }, + { 0xffff0000, 0x00040000, "604" }, + { 0xfffff000, 0x00090000, "604e" }, + { 0xffff0000, 0x00090000, "604r" }, + { 0xffff0000, 0x000a0000, "604ev" }, + { 0xffffffff, 0x00084202, "740/750" }, + { 0xfffff000, 0x00083000, "745/755" }, + { 0xfffffff0, 0x00080100, "750CX" }, + { 0xfffffff0, 0x00082200, "750CX" }, + { 0xfffffff0, 0x00082210, "750CXe" }, + { 0xffffff00, 0x70000100, "750FX" }, + { 0xffffffff, 0x70000200, "750FX" }, + { 0xffff0000, 0x70000000, "750FX" }, + { 0xffff0000, 0x70020000, "750GX" }, + { 0xffff0000, 0x00080000, "740/750" }, + { 0xffffffff, 0x000c1101, "7400 (1.1)" }, + { 0xffff0000, 0x000c0000, "7400" }, + { 0xffff0000, 0x800c0000, "7410" }, + { 0xffffffff, 0x80000200, "7450" }, + { 0xffffffff, 0x80000201, "7450" }, + { 0xffff0000, 0x80000000, "7450" }, + { 0xffffff00, 0x80010100, "7455" }, + { 0xffffffff, 0x80010200, "7455" }, + { 0xffff0000, 0x80010000, "7455" }, + { 0xffff0000, 0x80020000, "7457" }, + { 0xffff0000, 0x80030000, "7447A" }, + { 0x7fff0000, 0x00810000, "82xx" }, + { 0x7fff0000, 0x00820000, "8280" }, + { 0xffff0000, 0x00400000, "Power3 (630)" }, + { 0xffff0000, 0x00410000, "Power3 (630+)" }, + { 0xffff0000, 0x00360000, "I-star" }, + { 0xffff0000, 0x00370000, "S-star" }, + { 0xffff0000, 0x00350000, "Power4" }, + { 0xffff0000, 0x00390000, "PPC970" }, + { 0, 0, 0 } + }; + char line[256]; while(fgets(line, 255, proc_file)) { // Read line @@ -389,29 +699,20 @@ int main(int argc, char **argv) // Parse line int i; char value[256]; - if (sscanf(line, "cpu : %s", value) == 1) { - if (strcmp(value, "601") == 0) - PVR = 0x00010000; - else if (strcmp(value, "603") == 0) - PVR = 0x00030000; - else if (strcmp(value, "604") == 0) - PVR = 0x00040000; - else if (strcmp(value, "603e") == 0) - PVR = 0x00060000; - else if (strcmp(value, "603ev") == 0) - PVR = 0x00070000; - else if (strcmp(value, "604e") == 0) - PVR = 0x00090000; - else if (strcmp(value, "604ev5") == 0) - PVR = 0x000a0000; - else if (strcmp(value, "750") == 0) - PVR = 0x00080000; - else if (strcmp(value, "821") == 0) - PVR = 0x00320000; - else if (strcmp(value, "860") == 0) - PVR = 0x00500000; - else + if (sscanf(line, "cpu : %[0-9A-Za-a]", value) == 1) { + // Search by name + const char *cpu_name = NULL; + for (int i = 0; cpu_specs[i].pvr_mask != 0; i++) { + if (strcmp(cpu_specs[i].cpu_name, value) == 0) { + cpu_name = cpu_specs[i].cpu_name; + PVR = cpu_specs[i].pvr_value; + break; + } + } + if (cpu_name == NULL) printf("WARNING: Unknown CPU type '%s', assuming 604\n", value); + else + printf("Found a PowerPC %s processor\n", cpu_name); } if (sscanf(line, "clock : %dMHz", &i) == 1) CPUClockSpeed = BusClockSpeed = i * 1000000; @@ -421,7 +722,46 @@ int main(int argc, char **argv) sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno)); WarningAlert(str); } + + // Get actual bus frequency + proc_file = fopen("/proc/device-tree/clock-frequency", "r"); + if (proc_file) { + union { uint8 b[4]; uint32 l; } value; + if (fread(value.b, sizeof(value), 1, proc_file) == 1) + BusClockSpeed = value.l; + fclose(proc_file); + } + + // Get actual timebase frequency + TimebaseSpeed = BusClockSpeed / 4; + DIR *cpus_dir; + if ((cpus_dir = opendir("/proc/device-tree/cpus")) != NULL) { + struct dirent *cpu_entry; + while ((cpu_entry = readdir(cpus_dir)) != NULL) { + if (strstr(cpu_entry->d_name, "PowerPC,") == cpu_entry->d_name) { + char timebase_freq_node[256]; + sprintf(timebase_freq_node, "/proc/device-tree/cpus/%s/timebase-frequency", cpu_entry->d_name); + proc_file = fopen(timebase_freq_node, "r"); + if (proc_file) { + union { uint8 b[4]; uint32 l; } value; + if (fread(value.b, sizeof(value), 1, proc_file) == 1) + TimebaseSpeed = value.l; + fclose(proc_file); + } + } + } + closedir(cpus_dir); + } #endif + // Remap any newer G4/G5 processor to plain G4 for compatibility + switch (PVR >> 16) { + case 0x8000: // 7450 + case 0x8001: // 7455 + case 0x8002: // 7457 + case 0x0039: // 970 + PVR = 0x000c0000; // 7400 + break; + } D(bug("PVR: %08x (assumed)\n", PVR)); // Init system routines @@ -445,62 +785,71 @@ int main(int argc, char **argv) goto quit; } +#ifndef PAGEZERO_HACK // Create Low Memory area (0x0000..0x3000) - if (vm_acquire_fixed((char *)0, 0x3000) < 0) { + if (vm_mac_acquire(0, 0x3000) < 0) { sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } lm_area_mapped = true; +#endif // Create areas for Kernel Data - kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600); - if (kernel_area == -1) { - sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno)); + if (!kernel_data_init()) + goto quit; + kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE); + emulator_data = &kernel_data->ed; + KernelDataAddr = KERNEL_DATA_BASE; + D(bug("Kernel Data at %p (%08x)\n", kernel_data, KERNEL_DATA_BASE)); + D(bug("Emulator Data at %p (%08x)\n", emulator_data, KERNEL_DATA_BASE + offsetof(KernelData, ed))); + + // Create area for DR Cache + if (vm_mac_acquire(DR_EMULATOR_BASE, DR_EMULATOR_SIZE) < 0) { + sprintf(str, GetString(STR_DR_EMULATOR_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } - if (shmat(kernel_area, (void *)KERNEL_DATA_BASE, 0) < 0) { - sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno)); + dr_emulator_area_mapped = true; + if (vm_mac_acquire(DR_CACHE_BASE, DR_CACHE_SIZE) < 0) { + sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } - if (shmat(kernel_area, (void *)KERNEL_DATA2_BASE, 0) < 0) { - sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno)); + dr_cache_area_mapped = true; +#if !EMULATED_PPC + if (vm_protect((char *)DR_CACHE_BASE, DR_CACHE_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) { + sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } - kernel_data = (KernelData *)0x68ffe000; - emulator_data = &kernel_data->ed; - KernelDataAddr = (uint32)kernel_data; - D(bug("Kernel Data at %p, Emulator Data at %p\n", kernel_data, emulator_data)); +#endif + DRCacheAddr = DR_CACHE_BASE; + D(bug("DR Cache at %p\n", DRCacheAddr)); // Create area for SheepShaver data - if (vm_acquire_fixed((char *)SHEEP_BASE, SHEEP_SIZE) < 0) { + if (!SheepMem::Init()) { sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } - SheepStack1Base = SHEEP_BASE + 0x10000; - SheepStack2Base = SheepStack1Base + 0x10000; - SheepThunksBase = SheepStack2Base + 0x1000; - sheep_area_mapped = true; // Create area for Mac ROM - if (vm_acquire_fixed((char *)ROM_BASE, ROM_AREA_SIZE) < 0) { + if (vm_mac_acquire(ROM_BASE, ROM_AREA_SIZE) < 0) { sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } -#if !EMULATED_PPC || defined(__powerpc__) - if (vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) { + ROMBaseHost = Mac2HostAddr(ROM_BASE); +#if !EMULATED_PPC + if (vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) { sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } #endif rom_area_mapped = true; - D(bug("ROM area at %08x\n", ROM_BASE)); + D(bug("ROM area at %p (%08x)\n", ROMBaseHost, ROM_BASE)); // Create area for Mac RAM RAMSize = PrefsFindInt32("ramsize"); @@ -509,13 +858,14 @@ int main(int argc, char **argv) RAMSize = 8*1024*1024; } - if (vm_acquire_fixed((char *)RAM_BASE, RAMSize) < 0) { + if (vm_mac_acquire(RAM_BASE, RAMSize) < 0) { sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; } + RAMBaseHost = Mac2HostAddr(RAM_BASE); #if !EMULATED_PPC - if (vm_protect((char *)RAM_BASE, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) { + if (vm_protect(RAMBaseHost, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) { sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno)); ErrorAlert(str); goto quit; @@ -523,7 +873,7 @@ int main(int argc, char **argv) #endif RAMBase = RAM_BASE; ram_area_mapped = true; - D(bug("RAM area at %08x\n", RAMBase)); + D(bug("RAM area at %p (%08x)\n", RAMBaseHost, RAMBase)); if (RAMBase > ROM_BASE) { ErrorAlert(GetString(STR_RAM_HIGHER_THAN_ROM_ERR)); @@ -562,6 +912,36 @@ int main(int argc, char **argv) // Load NVRAM XPRAMInit(); + // Load XPRAM default values if signature not found + if (XPRAM[0x130c] != 0x4e || XPRAM[0x130d] != 0x75 + || XPRAM[0x130e] != 0x4d || XPRAM[0x130f] != 0x63) { + D(bug("Loading XPRAM default values\n")); + memset(XPRAM + 0x1300, 0, 0x100); + XPRAM[0x130c] = 0x4e; // "NuMc" signature + XPRAM[0x130d] = 0x75; + XPRAM[0x130e] = 0x4d; + XPRAM[0x130f] = 0x63; + XPRAM[0x1301] = 0x80; // InternalWaitFlags = DynWait (don't wait for SCSI devices upon bootup) + XPRAM[0x1310] = 0xa8; // Standard PRAM values + XPRAM[0x1311] = 0x00; + XPRAM[0x1312] = 0x00; + XPRAM[0x1313] = 0x22; + XPRAM[0x1314] = 0xcc; + XPRAM[0x1315] = 0x0a; + XPRAM[0x1316] = 0xcc; + XPRAM[0x1317] = 0x0a; + XPRAM[0x131c] = 0x00; + XPRAM[0x131d] = 0x02; + XPRAM[0x131e] = 0x63; + XPRAM[0x131f] = 0x00; + XPRAM[0x1308] = 0x13; + XPRAM[0x1309] = 0x88; + XPRAM[0x130a] = 0x00; + XPRAM[0x130b] = 0xcc; + XPRAM[0x1376] = 0x00; // OSDefault = MacOS + XPRAM[0x1377] = 0x01; + } + // Set boot volume i16 = PrefsFindInt32("bootdrive"); XPRAM[0x1378] = i16 >> 8; @@ -571,13 +951,16 @@ int main(int argc, char **argv) XPRAM[0x137b] = i16 & 0xff; // Create BootGlobs at top of Mac memory - memset((void *)(RAMBase + RAMSize - 4096), 0, 4096); + memset(RAMBaseHost + RAMSize - 4096, 0, 4096); BootGlobsAddr = RAMBase + RAMSize - 0x1c; - boot_globs = (uint32 *)BootGlobsAddr; - boot_globs[-5] = htonl(RAMBase + RAMSize); // MemTop - boot_globs[0] = htonl(RAMBase); // First RAM bank - boot_globs[1] = htonl(RAMSize); - boot_globs[2] = htonl((uint32)-1); // End of bank table + WriteMacInt32(BootGlobsAddr - 5 * 4, RAMBase + RAMSize); // MemTop + WriteMacInt32(BootGlobsAddr + 0 * 4, RAMBase); // First RAM bank + WriteMacInt32(BootGlobsAddr + 1 * 4, RAMSize); + WriteMacInt32(BootGlobsAddr + 2 * 4, (uint32)-1); // End of bank table + + // Init thunks + if (!ThunksInit()) + goto quit; // Init drivers SonyInit(); @@ -588,6 +971,9 @@ int main(int argc, char **argv) // Init external file system ExtFSInit(); + // Init ADB + ADBInit(); + // Init audio AudioInit(); @@ -615,23 +1001,24 @@ int main(int argc, char **argv) // Clear caches (as we loaded and patched code) and write protect ROM #if !EMULATED_PPC - MakeExecutable(0, (void *)ROM_BASE, ROM_AREA_SIZE); + MakeExecutable(0, ROM_BASE, ROM_AREA_SIZE); #endif - vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE); + vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE); // Initialize Kernel Data memset(kernel_data, 0, sizeof(KernelData)); if (ROMType == ROMTYPE_NEWWORLD) { - static uint32 of_dev_tree[4] = {0, 0, 0, 0}; - static uint8 vector_lookup_tbl[128]; - static uint8 vector_mask_tbl[64]; + uint32 of_dev_tree = SheepMem::Reserve(4 * sizeof(uint32)); + Mac_memset(of_dev_tree, 0, 4 * sizeof(uint32)); + uint32 vector_lookup_tbl = SheepMem::Reserve(128); + uint32 vector_mask_tbl = SheepMem::Reserve(64); memset((uint8 *)kernel_data + 0xb80, 0x3d, 0x80); - memset(vector_lookup_tbl, 0, 128); - memset(vector_mask_tbl, 0, 64); + Mac_memset(vector_lookup_tbl, 0, 128); + Mac_memset(vector_mask_tbl, 0, 64); kernel_data->v[0xb80 >> 2] = htonl(ROM_BASE); - kernel_data->v[0xb84 >> 2] = htonl((uint32)of_dev_tree); // OF device tree base - kernel_data->v[0xb90 >> 2] = htonl((uint32)vector_lookup_tbl); - kernel_data->v[0xb94 >> 2] = htonl((uint32)vector_mask_tbl); + kernel_data->v[0xb84 >> 2] = htonl(of_dev_tree); // OF device tree base + kernel_data->v[0xb90 >> 2] = htonl(vector_lookup_tbl); + kernel_data->v[0xb94 >> 2] = htonl(vector_mask_tbl); kernel_data->v[0xb98 >> 2] = htonl(ROM_BASE); // OpenPIC base kernel_data->v[0xbb0 >> 2] = htonl(0); // ADB base kernel_data->v[0xc20 >> 2] = htonl(RAMSize); @@ -644,9 +1031,9 @@ int main(int argc, char **argv) kernel_data->v[0xc50 >> 2] = htonl(RAMBase); kernel_data->v[0xc54 >> 2] = htonl(RAMSize); kernel_data->v[0xf60 >> 2] = htonl(PVR); - kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed); - kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed); - kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed); + kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed); // clock-frequency + kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed); // bus-frequency + kernel_data->v[0xf6c >> 2] = htonl(TimebaseSpeed); // timebase-frequency } else { kernel_data->v[0xc80 >> 2] = htonl(RAMSize); kernel_data->v[0xc84 >> 2] = htonl(RAMSize); @@ -658,92 +1045,52 @@ int main(int argc, char **argv) kernel_data->v[0xcb0 >> 2] = htonl(RAMBase); kernel_data->v[0xcb4 >> 2] = htonl(RAMSize); kernel_data->v[0xf80 >> 2] = htonl(PVR); - kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed); - kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed); - kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed); + kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed); // clock-frequency + kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed); // bus-frequency + kernel_data->v[0xf8c >> 2] = htonl(TimebaseSpeed); // timebase-frequency } // Initialize extra low memory D(bug("Initializing Low Memory...\n")); - memset(NULL, 0, 0x3000); + Mac_memset(0, 0, 0x3000); WriteMacInt32(XLM_SIGNATURE, FOURCC('B','a','a','h')); // Signature to detect SheepShaver - WriteMacInt32(XLM_KERNEL_DATA, (uint32)kernel_data); // For trap replacement routines + WriteMacInt32(XLM_KERNEL_DATA, KernelDataAddr); // For trap replacement routines WriteMacInt32(XLM_PVR, PVR); // Theoretical PVR WriteMacInt32(XLM_BUS_CLOCK, BusClockSpeed); // For DriverServicesLib patch WriteMacInt16(XLM_EXEC_RETURN_OPCODE, M68K_EXEC_RETURN); // For Execute68k() (RTS from the executed 68k code will jump here and end 68k mode) -#if EMULATED_PPC - WriteMacInt32(XLM_ETHER_INIT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_INIT)); - WriteMacInt32(XLM_ETHER_TERM, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_TERM)); - WriteMacInt32(XLM_ETHER_OPEN, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_OPEN)); - WriteMacInt32(XLM_ETHER_CLOSE, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_CLOSE)); - WriteMacInt32(XLM_ETHER_WPUT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_WPUT)); - WriteMacInt32(XLM_ETHER_RSRV, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_RSRV)); - WriteMacInt32(XLM_VIDEO_DOIO, POWERPC_NATIVE_OP_FUNC(NATIVE_VIDEO_DO_DRIVER_IO)); -#else - WriteMacInt32(XLM_TOC, (uint32)TOC); // TOC pointer of emulator - WriteMacInt32(XLM_ETHER_INIT, (uint32)InitStreamModule); // DLPI ethernet driver functions - WriteMacInt32(XLM_ETHER_TERM, (uint32)TerminateStreamModule); - WriteMacInt32(XLM_ETHER_OPEN, (uint32)ether_open); - WriteMacInt32(XLM_ETHER_CLOSE, (uint32)ether_close); - WriteMacInt32(XLM_ETHER_WPUT, (uint32)ether_wput); - WriteMacInt32(XLM_ETHER_RSRV, (uint32)ether_rsrv); - WriteMacInt32(XLM_VIDEO_DOIO, (uint32)VideoDoDriverIO); + WriteMacInt32(XLM_ZERO_PAGE, SheepMem::ZeroPage()); // Pointer to read-only page with all bits set to 0 +#if !EMULATED_PPC + WriteMacInt32(XLM_TOC, (uint32)TOC); // TOC pointer of emulator #endif + WriteMacInt32(XLM_ETHER_INIT, NativeFunction(NATIVE_ETHER_INIT)); // DLPI ethernet driver functions + WriteMacInt32(XLM_ETHER_TERM, NativeFunction(NATIVE_ETHER_TERM)); + WriteMacInt32(XLM_ETHER_OPEN, NativeFunction(NATIVE_ETHER_OPEN)); + WriteMacInt32(XLM_ETHER_CLOSE, NativeFunction(NATIVE_ETHER_CLOSE)); + WriteMacInt32(XLM_ETHER_WPUT, NativeFunction(NATIVE_ETHER_WPUT)); + WriteMacInt32(XLM_ETHER_RSRV, NativeFunction(NATIVE_ETHER_RSRV)); + WriteMacInt32(XLM_VIDEO_DOIO, NativeFunction(NATIVE_VIDEO_DO_DRIVER_IO)); D(bug("Low Memory initialized\n")); // Start 60Hz thread + tick_thread_cancel = false; tick_thread_active = (pthread_create(&tick_thread, NULL, tick_func, NULL) == 0); D(bug("Tick thread installed (%ld)\n", tick_thread)); // Start NVRAM watchdog thread memcpy(last_xpram, XPRAM, XPRAM_SIZE); + nvram_thread_cancel = false; nvram_thread_active = (pthread_create(&nvram_thread, NULL, nvram_func, NULL) == 0); D(bug("NVRAM thread installed (%ld)\n", nvram_thread)); #if !EMULATED_PPC - // Create and install stacks for signal handlers - sig_stack = malloc(SIG_STACK_SIZE); - D(bug("Signal stack at %p\n", sig_stack)); - if (sig_stack == NULL) { - ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR)); - goto quit; - } - extra_stack = malloc(SIG_STACK_SIZE); - D(bug("Extra stack at %p\n", extra_stack)); - if (extra_stack == NULL) { - ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR)); - goto quit; - } - struct sigaltstack new_stack; - new_stack.ss_sp = sig_stack; - new_stack.ss_flags = 0; - new_stack.ss_size = SIG_STACK_SIZE; - if (sigaltstack(&new_stack, NULL) < 0) { - sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno)); - ErrorAlert(str); - goto quit; - } -#endif - -#if !EMULATED_PPC - // Install SIGSEGV handler - sigemptyset(&sigsegv_action.sa_mask); // Block interrupts during SEGV handling - sigaddset(&sigsegv_action.sa_mask, SIGUSR2); - sigsegv_action.sa_handler = (__sighandler_t)sigsegv_handler; - sigsegv_action.sa_flags = SA_ONSTACK; - sigsegv_action.sa_restorer = NULL; - if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) { - sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno)); - ErrorAlert(str); - goto quit; - } - // Install SIGILL handler sigemptyset(&sigill_action.sa_mask); // Block interrupts during ILL handling sigaddset(&sigill_action.sa_mask, SIGUSR2); - sigill_action.sa_handler = (__sighandler_t)sigill_handler; - sigill_action.sa_flags = SA_ONSTACK; + sigill_action.sa_sigaction = sigill_handler; + sigill_action.sa_flags = SA_ONSTACK | SA_SIGINFO; +#ifdef HAVE_SIGNAL_SA_RESTORER sigill_action.sa_restorer = NULL; +#endif if (sigaction(SIGILL, &sigill_action, NULL) < 0) { sprintf(str, GetString(STR_SIGILL_INSTALL_ERR), strerror(errno)); ErrorAlert(str); @@ -751,19 +1098,20 @@ int main(int argc, char **argv) } #endif +#if !EMULATED_PPC // Install interrupt signal handler sigemptyset(&sigusr2_action.sa_mask); - sigusr2_action.sa_handler = (__sighandler_t)sigusr2_handler; - sigusr2_action.sa_flags = 0; -#if !EMULATED_PPC - sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART; -#endif + sigusr2_action.sa_sigaction = sigusr2_handler; + sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO; +#ifdef HAVE_SIGNAL_SA_RESTORER sigusr2_action.sa_restorer = NULL; +#endif if (sigaction(SIGUSR2, &sigusr2_action, NULL) < 0) { sprintf(str, GetString(STR_SIGUSR2_INSTALL_ERR), strerror(errno)); ErrorAlert(str); goto quit; } +#endif // Get my thread ID and execute MacOS thread function emul_thread = pthread_self(); @@ -789,28 +1137,38 @@ static void Quit(void) // Stop 60Hz thread if (tick_thread_active) { + tick_thread_cancel = true; pthread_cancel(tick_thread); pthread_join(tick_thread, NULL); } // Stop NVRAM watchdog thread if (nvram_thread_active) { + nvram_thread_cancel = true; pthread_cancel(nvram_thread); pthread_join(nvram_thread, NULL); } #if !EMULATED_PPC - // Uninstall SIGSEGV handler + // Uninstall SIGSEGV and SIGBUS handlers sigemptyset(&sigsegv_action.sa_mask); sigsegv_action.sa_handler = SIG_DFL; sigsegv_action.sa_flags = 0; sigaction(SIGSEGV, &sigsegv_action, NULL); + sigaction(SIGBUS, &sigsegv_action, NULL); // Uninstall SIGILL handler sigemptyset(&sigill_action.sa_mask); sigill_action.sa_handler = SIG_DFL; sigill_action.sa_flags = 0; sigaction(SIGILL, &sigill_action, NULL); + + // Delete stacks for signal handlers + for (int i = 0; i < SIG_STACK_COUNT; i++) { + void *sig_stack = sig_stacks[i].ss_sp; + if (sig_stack) + free(sig_stack); + } #endif // Save NVRAM @@ -831,6 +1189,9 @@ static void Quit(void) // Exit audio AudioExit(); + // Exit ADB + ADBExit(); + // Exit video VideoExit(); @@ -843,24 +1204,32 @@ static void Quit(void) DiskExit(); SonyExit(); + // Delete thunks + ThunksExit(); + + // Delete SheepShaver globals + SheepMem::Exit(); + // Delete RAM area if (ram_area_mapped) - vm_release((char *)RAM_BASE, RAMSize); + vm_mac_release(RAM_BASE, RAMSize); // Delete ROM area if (rom_area_mapped) - vm_release((char *)ROM_BASE, ROM_AREA_SIZE); + vm_mac_release(ROM_BASE, ROM_AREA_SIZE); + + // Delete DR cache areas + if (dr_emulator_area_mapped) + vm_mac_release(DR_EMULATOR_BASE, DR_EMULATOR_SIZE); + if (dr_cache_area_mapped) + vm_mac_release(DR_CACHE_BASE, DR_CACHE_SIZE); // Delete Kernel Data area - if (kernel_area >= 0) { - shmdt((void *)KERNEL_DATA_BASE); - shmdt((void *)KERNEL_DATA2_BASE); - shmctl(kernel_area, IPC_RMID, NULL); - } + kernel_data_exit(); // Delete Low Memory area if (lm_area_mapped) - munmap((char *)0x0000, 0x3000); + vm_mac_release(0, 0x3000); // Close /dev/zero if (zero_fd > 0) @@ -878,14 +1247,105 @@ static void Quit(void) #endif // Close X11 server connection +#ifndef USE_SDL_VIDEO if (x_display) XCloseDisplay(x_display); +#endif exit(0); } /* + * Initialize Kernel Data segments + */ + +#if defined(__CYGWIN__) +#define WIN32_LEAN_AND_MEAN +#include + +static HANDLE kernel_handle; // Shared memory handle for Kernel Data +static DWORD allocation_granule; // Minimum size of allocateable are (64K) +static DWORD kernel_area_size; // Size of Kernel Data area +#endif + +static bool kernel_data_init(void) +{ +#ifdef _WIN32 + SYSTEM_INFO si; + GetSystemInfo(&si); + allocation_granule = si.dwAllocationGranularity; + kernel_area_size = (KERNEL_AREA_SIZE + allocation_granule - 1) & -allocation_granule; + + char rcs[10]; + char str[256]; + LPVOID kernel_addr; + kernel_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, kernel_area_size, NULL); + if (kernel_handle == NULL) { + sprintf(rcs, "%d", GetLastError()); + sprintf(str, GetString(STR_KD_SHMGET_ERR), rcs); + ErrorAlert(str); + return false; + } + kernel_addr = (LPVOID)Mac2HostAddr(KERNEL_DATA_BASE & -allocation_granule); + if (MapViewOfFileEx(kernel_handle, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, kernel_area_size, kernel_addr) != kernel_addr) { + sprintf(rcs, "%d", GetLastError()); + sprintf(str, GetString(STR_KD_SHMAT_ERR), rcs); + ErrorAlert(str); + return false; + } + kernel_addr = (LPVOID)Mac2HostAddr(KERNEL_DATA2_BASE & -allocation_granule); + if (MapViewOfFileEx(kernel_handle, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, kernel_area_size, kernel_addr) != kernel_addr) { + sprintf(rcs, "%d", GetLastError()); + sprintf(str, GetString(STR_KD2_SHMAT_ERR), rcs); + ErrorAlert(str); + return false; + } +#else + kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600); + if (kernel_area == -1) { + sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno)); + ErrorAlert(str); + return false; + } + if (shmat(kernel_area, Mac2HostAddr(KERNEL_DATA_BASE), 0) < 0) { + sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno)); + ErrorAlert(str); + return false; + } + if (shmat(kernel_area, Mac2HostAddr(KERNEL_DATA2_BASE), 0) < 0) { + sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno)); + ErrorAlert(str); + return false; + } +#endif + return true; +} + + +/* + * Deallocate Kernel Data segments + */ + +static void kernel_data_exit(void) +{ +#ifdef _WIN32 + if (kernel_handle) { + UnmapViewOfFile(Mac2HostAddr(KERNEL_DATA_BASE & -allocation_granule)); + UnmapViewOfFile(Mac2HostAddr(KERNEL_DATA2_BASE & -allocation_granule)); + CloseHandle(kernel_handle); + } +#else + if (kernel_area >= 0) { + shmdt(Mac2HostAddr(KERNEL_DATA_BASE)); + shmdt(Mac2HostAddr(KERNEL_DATA2_BASE)); + shmctl(kernel_area, IPC_RMID, NULL); + } +#endif +} + + +/* * Jump into Mac ROM, start 680x0 emulator */ @@ -954,19 +1414,6 @@ void Execute68kTrap(uint16 trap, M68kReg uint16 proc[2] = {trap, M68K_RTS}; Execute68k((uint32)proc, r); } - - -/* - * Execute PPC code from EMUL_OP routine (real mode switch) - */ - -void ExecutePPC(void (*func)()) -{ - uint32 tvect[2] = {(uint32)func, 0}; // Fake TVECT - RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect); - M68kRegisters r; - Execute68k((uint32)&desc, &r); -} #endif @@ -1027,14 +1474,14 @@ void Dump68kRegs(M68kRegisters *r) * Make code executable */ -void MakeExecutable(int dummy, void *start, uint32 length) +void MakeExecutable(int dummy, uint32 start, uint32 length) { - if (((uintptr)start >= ROM_BASE) && ((uintptr)start < (ROM_BASE + ROM_SIZE))) + if ((start >= ROM_BASE) && (start < (ROM_BASE + ROM_SIZE))) return; #if EMULATED_PPC - FlushCodeCache((uintptr)start, (uintptr)start + length); + FlushCodeCache(start, start + length); #else - flush_icache_range(start, (void *)((uintptr)start + length)); + flush_icache_range(start, (void *)(start + length)); #endif } @@ -1045,11 +1492,7 @@ void MakeExecutable(int dummy, void *sta void PatchAfterStartup(void) { -#if EMULATED_PPC ExecuteNative(NATIVE_VIDEO_INSTALL_ACCEL); -#else - ExecutePPC(VideoInstallAccel); -#endif InstallExtFS(); } @@ -1058,18 +1501,20 @@ void PatchAfterStartup(void) * NVRAM watchdog thread (saves NVRAM every minute) */ -static void *nvram_func(void *arg) +static void nvram_watchdog(void) { - struct timespec req = {60, 0}; // 1 minute + if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) { + memcpy(last_xpram, XPRAM, XPRAM_SIZE); + SaveXPRAM(); + } +} - for (;;) { - pthread_testcancel(); - nanosleep(&req, NULL); - pthread_testcancel(); - if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) { - memcpy(last_xpram, XPRAM, XPRAM_SIZE); - SaveXPRAM(); - } +static void *nvram_func(void *arg) +{ + while (!nvram_thread_cancel) { + for (int i=0; i<60 && !nvram_thread_cancel; i++) + Delay_usec(999999); // Only wait 1 second so we quit promptly when nvram_thread_cancel becomes true + nvram_watchdog(); } return NULL; } @@ -1082,21 +1527,31 @@ static void *nvram_func(void *arg) static void *tick_func(void *arg) { int tick_counter = 0; - struct timespec req = {0, 16625000}; + uint64 start = GetTicks_usec(); + int64 ticks = 0; + uint64 next = GetTicks_usec(); - for (;;) { + while (!tick_thread_cancel) { // Wait - nanosleep(&req, NULL); + next += 16625; + int64 delay = next - GetTicks_usec(); + if (delay > 0) + Delay_usec(delay); + else if (delay < -16625) + next = GetTicks_usec(); + ticks++; #if !EMULATED_PPC // Did we crash? if (emul_thread_fatal) { // Yes, dump registers - pt_regs *r = (pt_regs *)&sigsegv_regs; + sigregs *r = &sigsegv_regs; char str[256]; - sprintf(str, "SIGSEGV\n" + if (crash_reason == NULL) + crash_reason = "SIGSEGV"; + sprintf(str, "%s\n" " pc %08lx lr %08lx ctr %08lx msr %08lx\n" " xer %08lx cr %08lx \n" " r0 %08lx r1 %08lx r2 %08lx r3 %08lx\n" @@ -1107,6 +1562,7 @@ static void *tick_func(void *arg) " r20 %08lx r21 %08lx r22 %08lx r23 %08lx\n" " r24 %08lx r25 %08lx r26 %08lx r27 %08lx\n" " r28 %08lx r29 %08lx r30 %08lx r31 %08lx\n", + crash_reason, r->nip, r->link, r->ctr, r->msr, r->xer, r->ccr, r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3], @@ -1142,6 +1598,9 @@ static void *tick_func(void *arg) TriggerInterrupt(); } } + + uint64 end = GetTicks_usec(); + D(bug("%Ld ticks in %Ld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); return NULL; } @@ -1152,7 +1611,30 @@ static void *tick_func(void *arg) void Set_pthread_attr(pthread_attr_t *attr, int priority) { - // nothing to do +#ifdef HAVE_PTHREADS + pthread_attr_init(attr); +#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) + // Some of these only work for superuser + if (geteuid() == 0) { + pthread_attr_setinheritsched(attr, PTHREAD_EXPLICIT_SCHED); + pthread_attr_setschedpolicy(attr, SCHED_FIFO); + struct sched_param fifo_param; + fifo_param.sched_priority = ((sched_get_priority_min(SCHED_FIFO) + + sched_get_priority_max(SCHED_FIFO)) / 2 + + priority); + pthread_attr_setschedparam(attr, &fifo_param); + } + if (pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM) != 0) { +#ifdef PTHREAD_SCOPE_BOUND_NP + // If system scope is not available (eg. we're not running + // with CAP_SCHED_MGT capability on an SGI box), try bound + // scope. It exposes pthread scheduling to the kernel, + // without setting realtime priority. + pthread_attr_setscope(attr, PTHREAD_SCOPE_BOUND_NP); +#endif + } +#endif +#endif } @@ -1168,7 +1650,7 @@ struct B2_mutex { pthread_mutexattr_init(&attr); // Initialize the mutex for priority inheritance -- // required for accurate timing. -#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL +#if defined(HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL) && !defined(__CYGWIN__) pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); #endif #if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL) @@ -1239,7 +1721,7 @@ void B2_delete_mutex(B2_mutex *mutex) * Trigger signal USR2 from another thread */ -#if !EMULATED_PPC || ASYNC_IRQ +#if !EMULATED_PPC void TriggerInterrupt(void) { if (ready_for_signals) @@ -1271,7 +1753,11 @@ void ClearInterruptFlag(uint32 flag) void DisableInterrupt(void) { +#if EMULATED_PPC + WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) + 1); +#else atomic_add((int *)XLM_IRQ_NEST, 1); +#endif } @@ -1281,7 +1767,11 @@ void DisableInterrupt(void) void EnableInterrupt(void) { +#if EMULATED_PPC + WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) - 1); +#else atomic_add((int *)XLM_IRQ_NEST, -1); +#endif } @@ -1289,18 +1779,15 @@ void EnableInterrupt(void) * USR2 handler */ -#if EMULATED_PPC -static void sigusr2_handler(int sig) +#if !EMULATED_PPC +static void sigusr2_handler(int sig, siginfo_t *sip, void *scp) { -#if ASYNC_IRQ - extern void HandleInterrupt(void); - HandleInterrupt(); + machine_regs *r = MACHINE_REGISTERS(scp); + +#ifdef USE_SDL_VIDEO + // We must fill in the events queue in the same thread that did call SDL_SetVideoMode() + SDL_PumpEvents(); #endif -} -#else -static void sigusr2_handler(int sig, sigcontext_struct *sc) -{ - pt_regs *r = sc->regs; // Do nothing if interrupts are disabled if (*(int32 *)XLM_IRQ_NEST > 0) @@ -1314,23 +1801,30 @@ static void sigusr2_handler(int sig, sig case MODE_68K: // 68k emulator active, trigger 68k interrupt level 1 WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1); - r->ccr |= ntohl(kernel_data->v[0x674 >> 2]); + r->cr() |= ntohl(kernel_data->v[0x674 >> 2]); break; #if INTERRUPTS_IN_NATIVE_MODE case MODE_NATIVE: // 68k emulator inactive, in nanokernel? - if (r->gpr[1] != KernelDataAddr) { + if (r->gpr(1) != KernelDataAddr) { + + // Set extra stack for nested interrupts + sig_stack_acquire(); + // Prepare for 68k interrupt level 1 WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1); WriteMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc, ReadMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc) | ntohl(kernel_data->v[0x674 >> 2])); // Execute nanokernel interrupt routine (this will activate the 68k emulator) - atomic_add((int32 *)XLM_IRQ_NEST, 1); + DisableInterrupt(); if (ROMType == ROMTYPE_NEWWORLD) ppc_interrupt(ROM_BASE + 0x312b1c, KernelDataAddr); else ppc_interrupt(ROM_BASE + 0x312a3c, KernelDataAddr); + + // Reset normal signal stack + sig_stack_release(); } break; #endif @@ -1341,11 +1835,7 @@ static void sigusr2_handler(int sig, sig if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) { // Set extra stack for SIGSEGV handler - struct sigaltstack new_stack; - new_stack.ss_sp = extra_stack; - new_stack.ss_flags = 0; - new_stack.ss_size = SIG_STACK_SIZE; - sigaltstack(&new_stack, NULL); + sig_stack_acquire(); #if 1 // Execute full 68k interrupt routine M68kRegisters r; @@ -1367,15 +1857,12 @@ static void sigusr2_handler(int sig, sig if (InterruptFlags & INTFLAG_VIA) { ClearInterruptFlag(INTFLAG_VIA); ADBInterrupt(); - ExecutePPC(VideoVBL); + ExecuteNative(NATIVE_VIDEO_VBL); } } #endif // Reset normal signal stack - new_stack.ss_sp = sig_stack; - new_stack.ss_flags = 0; - new_stack.ss_size = SIG_STACK_SIZE; - sigaltstack(&new_stack, NULL); + sig_stack_release(); } break; #endif @@ -1389,55 +1876,63 @@ static void sigusr2_handler(int sig, sig */ #if !EMULATED_PPC -static void sigsegv_handler(int sig, sigcontext_struct *sc) +static void sigsegv_handler(int sig, siginfo_t *sip, void *scp) { - pt_regs *r = sc->regs; + machine_regs *r = MACHINE_REGISTERS(scp); // Get effective address - uint32 addr = r->dar; + uint32 addr = r->dar(); #if ENABLE_VOSF // Handle screen fault. extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction); - if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->nip)) + if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->pc())) return; #endif num_segv++; - // Fault in Mac ROM or RAM? - bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize)); + // Fault in Mac ROM or RAM or DR Cache? + bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize)) || (r->pc() >= DR_CACHE_BASE && r->pc() < (DR_CACHE_BASE + DR_CACHE_SIZE)); if (mac_fault) { // "VM settings" during MacOS 8 installation - if (r->nip == ROM_BASE + 0x488160 && r->gpr[20] == 0xf8000000) { - r->nip += 4; - r->gpr[8] = 0; + if (r->pc() == ROM_BASE + 0x488160 && r->gpr(20) == 0xf8000000) { + r->pc() += 4; + r->gpr(8) = 0; return; // MacOS 8.5 installation - } else if (r->nip == ROM_BASE + 0x488140 && r->gpr[16] == 0xf8000000) { - r->nip += 4; - r->gpr[8] = 0; + } else if (r->pc() == ROM_BASE + 0x488140 && r->gpr(16) == 0xf8000000) { + r->pc() += 4; + r->gpr(8) = 0; return; // MacOS 8 serial drivers on startup - } else if (r->nip == ROM_BASE + 0x48e080 && (r->gpr[8] == 0xf3012002 || r->gpr[8] == 0xf3012000)) { - r->nip += 4; - r->gpr[8] = 0; + } else if (r->pc() == ROM_BASE + 0x48e080 && (r->gpr(8) == 0xf3012002 || r->gpr(8) == 0xf3012000)) { + r->pc() += 4; + r->gpr(8) = 0; return; // MacOS 8.1 serial drivers on startup - } else if (r->nip == ROM_BASE + 0x48c5e0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) { - r->nip += 4; + } else if (r->pc() == ROM_BASE + 0x48c5e0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) { + r->pc() += 4; return; - } else if (r->nip == ROM_BASE + 0x4a10a0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) { - r->nip += 4; + } else if (r->pc() == ROM_BASE + 0x4a10a0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) { + r->pc() += 4; + return; + + // MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM) + } else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(16) == 0xf3012002 || r->gpr(16) == 0xf3012000)) { + r->pc() += 4; + return; + } else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) { + r->pc() += 4; return; } // Get opcode and divide into fields - uint32 opcode = *((uint32 *)r->nip); + uint32 opcode = *((uint32 *)r->pc()); uint32 primop = opcode >> 26; uint32 exop = (opcode >> 1) & 0x3ff; uint32 ra = (opcode >> 16) & 0x1f; @@ -1526,24 +2021,52 @@ static void sigsegv_handler(int sig, sig transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_NORM; break; case 45: // sthu transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_U; break; +#if EMULATE_UNALIGNED_LOADSTORE_MULTIPLE + case 46: // lmw + if ((addr % 4) != 0) { + uint32 ea = addr; + D(bug("WARNING: unaligned lmw to EA=%08x from IP=%08x\n", ea, r->pc())); + for (int i = rd; i <= 31; i++) { + r->gpr(i) = ReadMacInt32(ea); + ea += 4; + } + r->pc() += 4; + goto rti; + } + break; + case 47: // stmw + if ((addr % 4) != 0) { + uint32 ea = addr; + D(bug("WARNING: unaligned stmw to EA=%08x from IP=%08x\n", ea, r->pc())); + for (int i = rd; i <= 31; i++) { + WriteMacInt32(ea, r->gpr(i)); + ea += 4; + } + r->pc() += 4; + goto rti; + } + break; +#endif } - // Ignore ROM writes - if (transfer_type == TYPE_STORE && addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) { -// D(bug("WARNING: %s write access to ROM at %08lx, pc %08lx\n", transfer_size == SIZE_BYTE ? "Byte" : transfer_size == SIZE_HALFWORD ? "Halfword" : "Word", addr, r->nip)); + // Ignore ROM writes (including to the zero page, which is read-only) + if (transfer_type == TYPE_STORE && + ((addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) || + (addr >= SheepMem::ZeroPage() && addr < SheepMem::ZeroPage() + SheepMem::PageSize()))) { +// D(bug("WARNING: %s write access to ROM at %08lx, pc %08lx\n", transfer_size == SIZE_BYTE ? "Byte" : transfer_size == SIZE_HALFWORD ? "Halfword" : "Word", addr, r->pc())); if (addr_mode == MODE_U || addr_mode == MODE_UX) - r->gpr[ra] = addr; - r->nip += 4; + r->gpr(ra) = addr; + r->pc() += 4; goto rti; } // Ignore illegal memory accesses? if (PrefsFindBool("ignoresegv")) { if (addr_mode == MODE_U || addr_mode == MODE_UX) - r->gpr[ra] = addr; + r->gpr(ra) = addr; if (transfer_type == TYPE_LOAD) - r->gpr[rd] = 0; - r->nip += 4; + r->gpr(rd) = 0; + r->pc() += 4; goto rti; } @@ -1551,9 +2074,9 @@ static void sigsegv_handler(int sig, sig if (!PrefsFindBool("nogui")) { char str[256]; if (transfer_type == TYPE_LOAD || transfer_type == TYPE_STORE) - sprintf(str, GetString(STR_MEM_ACCESS_ERR), transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_HALFWORD ? "halfword" : "word", transfer_type == TYPE_LOAD ? GetString(STR_MEM_ACCESS_READ) : GetString(STR_MEM_ACCESS_WRITE), addr, r->nip, r->gpr[24], r->gpr[1]); + sprintf(str, GetString(STR_MEM_ACCESS_ERR), transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_HALFWORD ? "halfword" : "word", transfer_type == TYPE_LOAD ? GetString(STR_MEM_ACCESS_READ) : GetString(STR_MEM_ACCESS_WRITE), addr, r->pc(), r->gpr(24), r->gpr(1)); else - sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode); + sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode); ErrorAlert(str); QuitEmulator(); return; @@ -1561,9 +2084,10 @@ static void sigsegv_handler(int sig, sig } // For all other errors, jump into debugger (sort of...) + crash_reason = (sig == SIGBUS) ? "SIGBUS" : "SIGSEGV"; if (!ready_for_signals) { - printf("SIGSEGV\n"); - printf(" sigcontext %p, pt_regs %p\n", sc, r); + printf("%s\n"); + printf(" sigcontext %p, machine_regs %p\n", scp, r); printf( " pc %08lx lr %08lx ctr %08lx msr %08lx\n" " xer %08lx cr %08lx \n" @@ -1575,22 +2099,23 @@ static void sigsegv_handler(int sig, sig " r20 %08lx r21 %08lx r22 %08lx r23 %08lx\n" " r24 %08lx r25 %08lx r26 %08lx r27 %08lx\n" " r28 %08lx r29 %08lx r30 %08lx r31 %08lx\n", - r->nip, r->link, r->ctr, r->msr, - r->xer, r->ccr, - r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3], - r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7], - r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11], - r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15], - r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19], - r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23], - r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27], - r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]); + crash_reason, + r->pc(), r->lr(), r->ctr(), r->msr(), + r->xer(), r->cr(), + r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3), + r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7), + r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11), + r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15), + r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19), + r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23), + r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27), + r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31)); exit(1); QuitEmulator(); return; } else { // We crashed. Save registers, tell tick thread and loop forever - sigsegv_regs = *(sigregs *)r; + build_sigregs(&sigsegv_regs, r); emul_thread_fatal = true; for (;;) ; } @@ -1602,17 +2127,17 @@ rti:; * SIGILL handler */ -static void sigill_handler(int sig, sigcontext_struct *sc) +static void sigill_handler(int sig, siginfo_t *sip, void *scp) { - pt_regs *r = sc->regs; + machine_regs *r = MACHINE_REGISTERS(scp); char str[256]; // Fault in Mac ROM or RAM? - bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize)); + bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize)); if (mac_fault) { // Get opcode and divide into fields - uint32 opcode = *((uint32 *)r->nip); + uint32 opcode = *((uint32 *)r->pc()); uint32 primop = opcode >> 26; uint32 exop = (opcode >> 1) & 0x3ff; uint32 ra = (opcode >> 16) & 0x1f; @@ -1623,7 +2148,7 @@ static void sigill_handler(int sig, sigc switch (primop) { case 9: // POWER instructions case 22: -power_inst: sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->nip, r->gpr[1], opcode); +power_inst: sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->pc(), r->gpr(1), opcode); ErrorAlert(str); QuitEmulator(); return; @@ -1631,14 +2156,14 @@ power_inst: sprintf(str, GetString(STR_ case 31: switch (exop) { case 83: // mfmsr - r->gpr[rd] = 0xf072; - r->nip += 4; + r->gpr(rd) = 0xf072; + r->pc() += 4; goto rti; case 210: // mtsr case 242: // mtsrin case 306: // tlbie - r->nip += 4; + r->pc() += 4; goto rti; case 339: { // mfspr @@ -1654,15 +2179,15 @@ power_inst: sprintf(str, GetString(STR_ case 957: // PMC3 case 958: // PMC4 case 959: // SDA - r->nip += 4; + r->pc() += 4; goto rti; case 25: // SDR1 - r->gpr[rd] = 0xdead001f; - r->nip += 4; + r->gpr(rd) = 0xdead001f; + r->pc() += 4; goto rti; case 287: // PVR - r->gpr[rd] = PVR; - r->nip += 4; + r->gpr(rd) = PVR; + r->pc() += 4; goto rti; } break; @@ -1698,7 +2223,7 @@ power_inst: sprintf(str, GetString(STR_ case 957: // PMC3 case 958: // PMC4 case 959: // SDA - r->nip += 4; + r->pc() += 4; goto rti; } break; @@ -1717,7 +2242,7 @@ power_inst: sprintf(str, GetString(STR_ // In GUI mode, show error alert if (!PrefsFindBool("nogui")) { - sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode); + sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode); ErrorAlert(str); QuitEmulator(); return; @@ -1725,9 +2250,10 @@ power_inst: sprintf(str, GetString(STR_ } // For all other errors, jump into debugger (sort of...) + crash_reason = "SIGILL"; if (!ready_for_signals) { - printf("SIGILL\n"); - printf(" sigcontext %p, pt_regs %p\n", sc, r); + printf("%s\n"); + printf(" sigcontext %p, machine_regs %p\n", scp, r); printf( " pc %08lx lr %08lx ctr %08lx msr %08lx\n" " xer %08lx cr %08lx \n" @@ -1739,22 +2265,23 @@ power_inst: sprintf(str, GetString(STR_ " r20 %08lx r21 %08lx r22 %08lx r23 %08lx\n" " r24 %08lx r25 %08lx r26 %08lx r27 %08lx\n" " r28 %08lx r29 %08lx r30 %08lx r31 %08lx\n", - r->nip, r->link, r->ctr, r->msr, - r->xer, r->ccr, - r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3], - r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7], - r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11], - r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15], - r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19], - r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23], - r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27], - r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]); + crash_reason, + r->pc(), r->lr(), r->ctr(), r->msr(), + r->xer(), r->cr(), + r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3), + r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7), + r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11), + r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15), + r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19), + r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23), + r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27), + r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31)); exit(1); QuitEmulator(); return; } else { // We crashed. Save registers, tell tick thread and loop forever - sigsegv_regs = *(sigregs *)r; + build_sigregs(&sigsegv_regs, r); emul_thread_fatal = true; for (;;) ; } @@ -1764,6 +2291,52 @@ rti:; /* + * Helpers to share 32-bit addressable data with MacOS + */ + +bool SheepMem::Init(void) +{ + // Size of a native page + page_size = getpagesize(); + + // Allocate SheepShaver globals + proc = base; + if (vm_mac_acquire(base, size) < 0) + return false; + + // Allocate page with all bits set to 0, right in the middle + // This is also used to catch undesired overlaps between proc and data areas + zero_page = proc + (size / 2); + Mac_memset(zero_page, 0, page_size); + if (vm_protect(Mac2HostAddr(zero_page), page_size, VM_PAGE_READ) < 0) + return false; + +#if EMULATED_PPC + // Allocate alternate stack for PowerPC interrupt routine + sig_stack = base + size; + if (vm_mac_acquire(sig_stack, SIG_STACK_SIZE) < 0) + return false; +#endif + + data = base + size; + return true; +} + +void SheepMem::Exit(void) +{ + if (data) { + // Delete SheepShaver globals + vm_mac_release(base, size); + +#if EMULATED_PPC + // Delete alternate stack for PowerPC interrupt routine + vm_mac_release(sig_stack, SIG_STACK_SIZE); +#endif + } +} + + +/* * Display alert */ @@ -1812,7 +2385,7 @@ void display_alert(int title_id, int pre void ErrorAlert(const char *text) { -#ifdef ENABLE_GTK +#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO) if (PrefsFindBool("nogui") || x_display == NULL) { printf(GetString(STR_SHELL_ERROR_PREFIX), text); return; @@ -1831,7 +2404,7 @@ void ErrorAlert(const char *text) void WarningAlert(const char *text) { -#ifdef ENABLE_GTK +#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO) if (PrefsFindBool("nogui") || x_display == NULL) { printf(GetString(STR_SHELL_WARNING_PREFIX), text); return;