| 5 |
|
* Based (in a small way) on the default main.m, |
| 6 |
|
and on Basilisk's main_unix.cpp |
| 7 |
|
* |
| 8 |
< |
* Basilisk II (C) 1997-2002 Christian Bauer |
| 8 |
> |
* Basilisk II (C) 1997-2008 Christian Bauer |
| 9 |
|
* |
| 10 |
|
* This program is free software; you can redistribute it and/or modify |
| 11 |
|
* it under the terms of the GNU General Public License as published by |
| 21 |
|
* along with this program; if not, write to the Free Software |
| 22 |
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 |
|
*/ |
| 24 |
< |
#define PTHREADS |
| 24 |
> |
|
| 25 |
> |
#import <AppKit/AppKit.h> |
| 26 |
> |
#undef check |
| 27 |
> |
|
| 28 |
> |
#define PTHREADS // Why is this here? |
| 29 |
|
#include "sysdeps.h" |
| 30 |
|
|
| 31 |
|
#ifdef HAVE_PTHREADS |
| 36 |
|
# include <sys/mman.h> |
| 37 |
|
#endif |
| 38 |
|
|
| 39 |
+ |
#include <string> |
| 40 |
+ |
using std::string; |
| 41 |
+ |
|
| 42 |
|
#include "cpu_emulation.h" |
| 43 |
|
#include "macos_util_macosx.h" |
| 44 |
|
#include "main.h" |
| 45 |
|
#include "prefs.h" |
| 46 |
|
#include "prefs_editor.h" |
| 47 |
|
#include "rom_patches.h" |
| 48 |
+ |
#include "sigsegv.h" |
| 49 |
|
#include "sys.h" |
| 42 |
– |
#include "timer.h" |
| 50 |
|
#include "user_strings.h" |
| 51 |
|
#include "version.h" |
| 52 |
|
#include "video.h" |
| 53 |
|
#include "vm_alloc.h" |
| 54 |
|
#include "xpram.h" |
| 55 |
|
|
| 56 |
+ |
#if USE_JIT |
| 57 |
+ |
extern void flush_icache_range(uint8 *start, uint32 size); // from compemu_support.cpp |
| 58 |
+ |
#endif |
| 59 |
+ |
|
| 60 |
|
#ifdef ENABLE_MON |
| 61 |
|
# include "mon.h" |
| 62 |
|
#endif |
| 65 |
|
#include "debug.h" |
| 66 |
|
|
| 67 |
|
|
| 57 |
– |
#import <AppKit/AppKit.h> |
| 58 |
– |
|
| 68 |
|
#include "main_macosx.h" // To bridge between main() and misc. classes |
| 69 |
|
|
| 70 |
|
|
| 71 |
|
// Constants |
| 72 |
|
const char ROM_FILE_NAME[] = "ROM"; |
| 64 |
– |
const int SIG_STACK_SIZE = SIGSTKSZ; // Size of signal stack |
| 73 |
|
const int SCRATCH_MEM_SIZE = 0x10000; // Size of scratch memory area |
| 74 |
|
|
| 75 |
|
|
| 76 |
+ |
static char *bundle = NULL; // If in an OS X application bundle, its path |
| 77 |
+ |
|
| 78 |
+ |
|
| 79 |
|
// CPU and FPU type, addressing mode |
| 80 |
|
int CPUType; |
| 81 |
|
bool CPUIs68060; |
| 102 |
|
uint8 *ScratchMem = NULL; // Scratch memory for Mac ROM writes |
| 103 |
|
#endif |
| 104 |
|
|
| 94 |
– |
#if defined(HAVE_TIMER_CREATE) && defined(_POSIX_REALTIME_SIGNALS) |
| 95 |
– |
#define SIG_TIMER SIGRTMIN |
| 96 |
– |
static timer_t timer; // 60Hz timer |
| 97 |
– |
#endif |
| 98 |
– |
|
| 105 |
|
#ifdef ENABLE_MON |
| 106 |
|
static struct sigaction sigint_sa; // sigaction for SIGINT handler |
| 107 |
|
static void sigint_handler(...); |
| 112 |
|
#endif |
| 113 |
|
|
| 114 |
|
|
| 115 |
+ |
/* |
| 116 |
+ |
* Helpers to map memory that can be accessed from the Mac side |
| 117 |
+ |
*/ |
| 118 |
+ |
|
| 119 |
+ |
// NOTE: VM_MAP_32BIT is only used when compiling a 64-bit JIT on specific platforms |
| 120 |
+ |
void *vm_acquire_mac(size_t size) |
| 121 |
+ |
{ |
| 122 |
+ |
return vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT); |
| 123 |
+ |
} |
| 124 |
+ |
|
| 125 |
+ |
static int vm_acquire_mac_fixed(void *addr, size_t size) |
| 126 |
+ |
{ |
| 127 |
+ |
return vm_acquire_fixed(addr, size, VM_MAP_DEFAULT | VM_MAP_32BIT); |
| 128 |
+ |
} |
| 129 |
+ |
|
| 130 |
+ |
|
| 131 |
+ |
/* |
| 132 |
+ |
* SIGSEGV handler |
| 133 |
+ |
*/ |
| 134 |
+ |
|
| 135 |
+ |
static sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip) |
| 136 |
+ |
{ |
| 137 |
+ |
const uintptr fault_address = (uintptr)sigsegv_get_fault_address(sip); |
| 138 |
+ |
#if ENABLE_VOSF |
| 139 |
+ |
// Handle screen fault |
| 140 |
+ |
extern bool Screen_fault_handler(sigsegv_info_t *sip); |
| 141 |
+ |
if (Screen_fault_handler(sip)) |
| 142 |
+ |
return SIGSEGV_RETURN_SUCCESS; |
| 143 |
+ |
#endif |
| 144 |
+ |
|
| 145 |
+ |
#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION |
| 146 |
+ |
// Ignore writes to ROM |
| 147 |
+ |
if (((uintptr)fault_address - (uintptr)ROMBaseHost) < ROMSize) |
| 148 |
+ |
return SIGSEGV_RETURN_SKIP_INSTRUCTION; |
| 149 |
+ |
|
| 150 |
+ |
// Ignore all other faults, if requested |
| 151 |
+ |
if (PrefsFindBool("ignoresegv")) |
| 152 |
+ |
return SIGSEGV_RETURN_SKIP_INSTRUCTION; |
| 153 |
+ |
#endif |
| 154 |
+ |
|
| 155 |
+ |
return SIGSEGV_RETURN_FAILURE; |
| 156 |
+ |
} |
| 157 |
+ |
|
| 158 |
+ |
|
| 159 |
+ |
/* |
| 160 |
+ |
* Dump state when everything went wrong after a SEGV |
| 161 |
+ |
*/ |
| 162 |
+ |
|
| 163 |
+ |
static void sigsegv_dump_state(sigsegv_info_t *sip) |
| 164 |
+ |
{ |
| 165 |
+ |
const sigsegv_address_t fault_address = sigsegv_get_fault_address(sip); |
| 166 |
+ |
const sigsegv_address_t fault_instruction = sigsegv_get_fault_instruction_address(sip); |
| 167 |
+ |
fprintf(stderr, "Caught SIGSEGV at address %p", fault_address); |
| 168 |
+ |
if (fault_instruction != SIGSEGV_INVALID_ADDRESS) |
| 169 |
+ |
fprintf(stderr, " [IP=%p]", fault_instruction); |
| 170 |
+ |
fprintf(stderr, "\n"); |
| 171 |
+ |
uaecptr nextpc; |
| 172 |
+ |
extern void m68k_dumpstate(uaecptr *nextpc); |
| 173 |
+ |
m68k_dumpstate(&nextpc); |
| 174 |
+ |
#if USE_JIT && JIT_DEBUG |
| 175 |
+ |
extern void compiler_dumpstate(void); |
| 176 |
+ |
compiler_dumpstate(); |
| 177 |
+ |
#endif |
| 178 |
+ |
VideoQuitFullScreen(); |
| 179 |
+ |
#ifdef ENABLE_MON |
| 180 |
+ |
char *arg[4] = {"mon", "-m", "-r", NULL}; |
| 181 |
+ |
mon(3, arg); |
| 182 |
+ |
#endif |
| 183 |
+ |
QuitEmulator(); |
| 184 |
+ |
} |
| 185 |
+ |
|
| 186 |
+ |
|
| 187 |
+ |
/* |
| 188 |
+ |
* Screen fault handler |
| 189 |
+ |
*/ |
| 190 |
+ |
|
| 191 |
+ |
bool Screen_fault_handler(sigsegv_info_t *sip) |
| 192 |
+ |
{ |
| 193 |
+ |
return true; |
| 194 |
+ |
} |
| 195 |
+ |
|
| 196 |
|
|
| 197 |
|
/* |
| 198 |
|
* Main program |
| 203 |
|
printf("Usage: %s [OPTION...]\n", prg_name); |
| 204 |
|
printf("\nUnix options:\n"); |
| 205 |
|
printf(" --help\n display this usage message\n"); |
| 206 |
+ |
printf(" --config FILE\n read/write configuration from/to FILE\n"); |
| 207 |
|
printf(" --break ADDRESS\n set ROM breakpoint\n"); |
| 208 |
|
printf(" --rominfo\n dump ROM information\n"); |
| 209 |
+ |
LoadPrefs(); // read the prefs file so PrefsPrintUsage() will print the correct default values |
| 210 |
|
PrefsPrintUsage(); |
| 211 |
|
exit(0); |
| 212 |
|
} |
| 223 |
|
printf(GetString(STR_ABOUT_TEXT1), VERSION_MAJOR, VERSION_MINOR); |
| 224 |
|
printf(" %s\n", GetString(STR_ABOUT_TEXT2)); |
| 225 |
|
|
| 137 |
– |
// Read preferences |
| 138 |
– |
PrefsInit(argc, argv); |
| 139 |
– |
|
| 226 |
|
// Parse command line arguments |
| 227 |
|
for (int i=1; i<argc; i++) { |
| 228 |
|
if (strcmp(argv[i], "--help") == 0) { |
| 233 |
|
i++; |
| 234 |
|
if (i < argc) |
| 235 |
|
ROMBreakpoint = strtol(argv[i], NULL, 0); |
| 236 |
+ |
} else if (strcmp(argv[i], "--config") == 0) { |
| 237 |
+ |
argv[i++] = NULL; |
| 238 |
+ |
if (i < argc) { |
| 239 |
+ |
extern string UserPrefsPath; // from prefs_unix.cpp |
| 240 |
+ |
UserPrefsPath = argv[i]; |
| 241 |
+ |
argv[i] = NULL; |
| 242 |
+ |
} |
| 243 |
|
} else if (strcmp(argv[i], "--rominfo") == 0) { |
| 244 |
|
PrintROMInfo = true; |
| 245 |
|
} else if (argv[i][0] == '-') { |
| 248 |
|
} |
| 249 |
|
} |
| 250 |
|
|
| 251 |
+ |
// Read preferences |
| 252 |
+ |
PrefsInit(argc, argv); |
| 253 |
+ |
|
| 254 |
|
// Init system routines |
| 255 |
|
SysInit(); |
| 256 |
|
|
| 257 |
+ |
// Set the current directory somewhere useful. |
| 258 |
+ |
// Handy for storing the ROM file |
| 259 |
+ |
bundle = strstr(argv[0], "BasiliskII.app/Contents/MacOS/BasiliskII"); |
| 260 |
+ |
if (bundle) |
| 261 |
+ |
{ |
| 262 |
+ |
while (*bundle != '/') |
| 263 |
+ |
++bundle; |
| 264 |
+ |
|
| 265 |
+ |
*bundle = 0; // Throw away Contents/... on end of argv[0] |
| 266 |
+ |
bundle = argv[0]; |
| 267 |
+ |
|
| 268 |
+ |
chdir(bundle); |
| 269 |
+ |
} |
| 270 |
+ |
|
| 271 |
|
// Open display, attach to window server, |
| 272 |
|
// load pre-instantiated classes from MainMenu.nib, start run loop |
| 273 |
|
int i = NSApplicationMain(argc, (const char **)argv); |
| 286 |
|
|
| 287 |
|
bool InitEmulator (void) |
| 288 |
|
{ |
| 289 |
+ |
const char *vmdir = NULL; |
| 290 |
|
char str[256]; |
| 291 |
|
|
| 292 |
|
|
| 293 |
+ |
// Install the handler for SIGSEGV |
| 294 |
+ |
if (!sigsegv_install_handler(sigsegv_handler)) { |
| 295 |
+ |
sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno)); |
| 296 |
+ |
ErrorAlert(str); |
| 297 |
+ |
QuitEmulator(); |
| 298 |
+ |
} |
| 299 |
+ |
|
| 300 |
+ |
// Register dump state function when we got mad after a segfault |
| 301 |
+ |
sigsegv_set_dump_state(sigsegv_dump_state); |
| 302 |
+ |
|
| 303 |
|
// Read RAM size |
| 304 |
|
RAMSize = PrefsFindInt32("ramsize") & 0xfff00000; // Round down to 1MB boundary |
| 305 |
|
if (RAMSize < 1024*1024) { |
| 306 |
|
WarningAlert(GetString(STR_SMALL_RAM_WARN)); |
| 307 |
|
RAMSize = 1024*1024; |
| 308 |
|
} |
| 309 |
+ |
if (RAMSize > 1023*1024*1024) // Cap to 1023MB (APD crashes at 1GB) |
| 310 |
+ |
RAMSize = 1023*1024*1024; |
| 311 |
|
|
| 312 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
| 313 |
|
RAMSize = RAMSize & -getpagesize(); // Round down to page boundary |
| 319 |
|
#if REAL_ADDRESSING |
| 320 |
|
// Flag: RAM and ROM are contigously allocated from address 0 |
| 321 |
|
bool memory_mapped_from_zero = false; |
| 322 |
< |
|
| 323 |
< |
// Under Solaris/SPARC and NetBSD/m68k, Basilisk II is known to crash |
| 324 |
< |
// when trying to map a too big chunk of memory starting at address 0 |
| 325 |
< |
#if defined(OS_solaris) || defined(OS_netbsd) |
| 326 |
< |
const bool can_map_all_memory = false; |
| 204 |
< |
#else |
| 322 |
> |
|
| 323 |
> |
// Make sure to map RAM & ROM at address 0 only on platforms that |
| 324 |
> |
// supports linker scripts to relocate the Basilisk II executable |
| 325 |
> |
// above 0x70000000 |
| 326 |
> |
#if HAVE_LINKER_SCRIPT |
| 327 |
|
const bool can_map_all_memory = true; |
| 328 |
+ |
#else |
| 329 |
+ |
const bool can_map_all_memory = false; |
| 330 |
|
#endif |
| 331 |
|
|
| 332 |
|
// Try to allocate all memory from 0x0000, if it is not known to crash |
| 333 |
< |
if (can_map_all_memory && (vm_acquire_fixed(0, RAMSize + 0x100000) == 0)) { |
| 333 |
> |
if (can_map_all_memory && (vm_acquire_mac_fixed(0, RAMSize + 0x100000) == 0)) { |
| 334 |
|
D(bug("Could allocate RAM and ROM from 0x0000\n")); |
| 335 |
|
memory_mapped_from_zero = true; |
| 336 |
|
} |
| 337 |
|
|
| 338 |
+ |
#ifndef PAGEZERO_HACK |
| 339 |
|
// Otherwise, just create the Low Memory area (0x0000..0x2000) |
| 340 |
< |
else if (vm_acquire_fixed(0, 0x2000) == 0) { |
| 340 |
> |
else if (vm_acquire_mac_fixed(0, 0x2000) == 0) { |
| 341 |
|
D(bug("Could allocate the Low Memory globals\n")); |
| 342 |
|
lm_area_mapped = true; |
| 343 |
|
} |
| 348 |
|
ErrorAlert(str); |
| 349 |
|
QuitEmulator(); |
| 350 |
|
} |
| 351 |
+ |
#endif |
| 352 |
|
#else |
| 353 |
|
*str = 0; // Eliminate unused variable warning |
| 354 |
< |
#endif |
| 354 |
> |
#endif /* REAL_ADDRESSING */ |
| 355 |
|
|
| 356 |
|
// Create areas for Mac RAM and ROM |
| 357 |
|
#if REAL_ADDRESSING |
| 362 |
|
else |
| 363 |
|
#endif |
| 364 |
|
{ |
| 365 |
< |
RAMBaseHost = (uint8 *)vm_acquire(RAMSize); |
| 366 |
< |
ROMBaseHost = (uint8 *)vm_acquire(0x100000); |
| 241 |
< |
if (RAMBaseHost == VM_MAP_FAILED || ROMBaseHost == VM_MAP_FAILED) { |
| 365 |
> |
uint8 *ram_rom_area = (uint8 *)vm_acquire_mac(RAMSize + 0x100000); |
| 366 |
> |
if (ram_rom_area == VM_MAP_FAILED) { |
| 367 |
|
ErrorAlert(STR_NO_MEM_ERR); |
| 368 |
|
QuitEmulator(); |
| 369 |
|
} |
| 370 |
+ |
RAMBaseHost = ram_rom_area; |
| 371 |
+ |
ROMBaseHost = RAMBaseHost + RAMSize; |
| 372 |
|
} |
| 373 |
|
|
| 374 |
|
#if USE_SCRATCHMEM_SUBTERFUGE |
| 375 |
|
// Allocate scratch memory |
| 376 |
< |
ScratchMem = (uint8 *)vm_acquire(SCRATCH_MEM_SIZE); |
| 376 |
> |
ScratchMem = (uint8 *)vm_acquire_mac(SCRATCH_MEM_SIZE); |
| 377 |
|
if (ScratchMem == VM_MAP_FAILED) { |
| 378 |
|
ErrorAlert(STR_NO_MEM_ERR); |
| 379 |
|
QuitEmulator(); |
| 388 |
|
ROMBaseMac = Host2MacAddr(ROMBaseHost); |
| 389 |
|
#endif |
| 390 |
|
#if REAL_ADDRESSING |
| 391 |
< |
RAMBaseMac = (uint32)RAMBaseHost; |
| 392 |
< |
ROMBaseMac = (uint32)ROMBaseHost; |
| 391 |
> |
RAMBaseMac = Host2MacAddr(RAMBaseHost); |
| 392 |
> |
ROMBaseMac = Host2MacAddr(ROMBaseHost); |
| 393 |
|
#endif |
| 394 |
|
D(bug("Mac RAM starts at %p (%08x)\n", RAMBaseHost, RAMBaseMac)); |
| 395 |
|
D(bug("Mac ROM starts at %p (%08x)\n", ROMBaseHost, ROMBaseMac)); |
| 397 |
|
// Get rom file path from preferences |
| 398 |
|
const char *rom_path = PrefsFindString("rom"); |
| 399 |
|
if ( ! rom_path ) |
| 400 |
+ |
if ( bundle ) |
| 401 |
+ |
WarningAlert("No rom pathname set. Trying BasiliskII.app/ROM"); |
| 402 |
+ |
else |
| 403 |
|
WarningAlert("No rom pathname set. Trying ./ROM"); |
| 404 |
|
|
| 405 |
|
// Load Mac ROM |
| 424 |
|
|
| 425 |
|
|
| 426 |
|
// Initialize everything |
| 427 |
< |
if (!InitAll()) |
| 427 |
> |
if (!InitAll(vmdir)) |
| 428 |
|
QuitEmulator(); |
| 429 |
|
D(bug("Initialization complete\n")); |
| 430 |
|
|
| 460 |
|
|
| 461 |
|
// Free ROM/RAM areas |
| 462 |
|
if (RAMBaseHost != VM_MAP_FAILED) { |
| 463 |
< |
vm_release(RAMBaseHost, RAMSize); |
| 463 |
> |
vm_release(RAMBaseHost, RAMSize + 0x100000); |
| 464 |
|
RAMBaseHost = NULL; |
| 335 |
– |
} |
| 336 |
– |
if (ROMBaseHost != VM_MAP_FAILED) { |
| 337 |
– |
vm_release(ROMBaseHost, 0x100000); |
| 465 |
|
ROMBaseHost = NULL; |
| 466 |
|
} |
| 467 |
|
|
| 491 |
|
|
| 492 |
|
void QuitEmulator(void) |
| 493 |
|
{ |
| 367 |
– |
extern NSApplication *NSApp; |
| 368 |
– |
|
| 369 |
– |
|
| 494 |
|
QuitEmuNoExit(); |
| 495 |
|
|
| 496 |
|
// Stop run loop? |
| 507 |
|
|
| 508 |
|
void FlushCodeCache(void *start, uint32 size) |
| 509 |
|
{ |
| 510 |
+ |
#if USE_JIT |
| 511 |
+ |
if (UseJIT) |
| 512 |
+ |
flush_icache_range((uint8 *)start, size); |
| 513 |
+ |
#endif |
| 514 |
|
} |
| 515 |
|
|
| 516 |
|
|
| 532 |
|
#endif |
| 533 |
|
|
| 534 |
|
|
| 535 |
+ |
#ifdef HAVE_PTHREADS |
| 536 |
+ |
/* |
| 537 |
+ |
* Pthread configuration |
| 538 |
+ |
*/ |
| 539 |
+ |
|
| 540 |
+ |
void Set_pthread_attr(pthread_attr_t *attr, int priority) |
| 541 |
+ |
{ |
| 542 |
+ |
pthread_attr_init(attr); |
| 543 |
+ |
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) |
| 544 |
+ |
// Some of these only work for superuser |
| 545 |
+ |
if (geteuid() == 0) { |
| 546 |
+ |
pthread_attr_setinheritsched(attr, PTHREAD_EXPLICIT_SCHED); |
| 547 |
+ |
pthread_attr_setschedpolicy(attr, SCHED_FIFO); |
| 548 |
+ |
struct sched_param fifo_param; |
| 549 |
+ |
fifo_param.sched_priority = ((sched_get_priority_min(SCHED_FIFO) |
| 550 |
+ |
+ sched_get_priority_max(SCHED_FIFO)) |
| 551 |
+ |
/ 2 + priority); |
| 552 |
+ |
pthread_attr_setschedparam(attr, &fifo_param); |
| 553 |
+ |
} |
| 554 |
+ |
if (pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM) != 0) { |
| 555 |
+ |
#ifdef PTHREAD_SCOPE_BOUND_NP |
| 556 |
+ |
// If system scope is not available (eg. we're not running |
| 557 |
+ |
// with CAP_SCHED_MGT capability on an SGI box), try bound |
| 558 |
+ |
// scope. It exposes pthread scheduling to the kernel, |
| 559 |
+ |
// without setting realtime priority. |
| 560 |
+ |
pthread_attr_setscope(attr, PTHREAD_SCOPE_BOUND_NP); |
| 561 |
+ |
#endif |
| 562 |
+ |
} |
| 563 |
+ |
#endif |
| 564 |
+ |
} |
| 565 |
+ |
#endif // HAVE_PTHREADS |
| 566 |
+ |
|
| 567 |
+ |
|
| 568 |
|
/* |
| 569 |
|
* Mutexes |
| 570 |
|
*/ |
| 572 |
|
#ifdef HAVE_PTHREADS |
| 573 |
|
|
| 574 |
|
struct B2_mutex { |
| 575 |
< |
B2_mutex() { pthread_mutex_init(&m, NULL); } |
| 576 |
< |
~B2_mutex() { pthread_mutex_unlock(&m); pthread_mutex_destroy(&m); } |
| 575 |
> |
B2_mutex() { |
| 576 |
> |
pthread_mutexattr_t attr; |
| 577 |
> |
pthread_mutexattr_init(&attr); |
| 578 |
> |
// Initialize the mutex for priority inheritance -- |
| 579 |
> |
// required for accurate timing. |
| 580 |
> |
#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL |
| 581 |
> |
pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); |
| 582 |
> |
#endif |
| 583 |
> |
#if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL) |
| 584 |
> |
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); |
| 585 |
> |
#endif |
| 586 |
> |
#ifdef HAVE_PTHREAD_MUTEXATTR_SETPSHARED |
| 587 |
> |
pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE); |
| 588 |
> |
#endif |
| 589 |
> |
pthread_mutex_init(&m, &attr); |
| 590 |
> |
pthread_mutexattr_destroy(&attr); |
| 591 |
> |
} |
| 592 |
> |
~B2_mutex() { |
| 593 |
> |
pthread_mutex_trylock(&m); // Make sure it's locked before |
| 594 |
> |
pthread_mutex_unlock(&m); // unlocking it. |
| 595 |
> |
pthread_mutex_destroy(&m); |
| 596 |
> |
} |
| 597 |
|
pthread_mutex_t m; |
| 598 |
|
}; |
| 599 |
|
|
| 676 |
|
NSString *error = [NSString stringWithCString: text]; |
| 677 |
|
NSString *button = [NSString stringWithCString: GetString(STR_QUIT_BUTTON) ]; |
| 678 |
|
|
| 498 |
– |
// If we have a full screen mode, quit it here? |
| 499 |
– |
|
| 679 |
|
NSLog(error); |
| 680 |
+ |
if ( PrefsFindBool("nogui") ) |
| 681 |
+ |
return; |
| 682 |
+ |
VideoQuitFullScreen(); |
| 683 |
|
NSRunCriticalAlertPanel(title, error, button, nil, nil); |
| 684 |
|
} |
| 685 |
|
|
| 696 |
|
NSString *button = [NSString stringWithCString: GetString(STR_OK_BUTTON) ]; |
| 697 |
|
|
| 698 |
|
NSLog(warning); |
| 699 |
+ |
if ( PrefsFindBool("nogui") ) |
| 700 |
+ |
return; |
| 701 |
+ |
VideoQuitFullScreen(); |
| 702 |
|
NSRunAlertPanel(title, warning, button, nil, nil); |
| 703 |
|
} |
| 704 |
|
|
| 715 |
|
NSString *yes = [NSString stringWithCString: pos]; |
| 716 |
|
NSString *no = [NSString stringWithCString: neg]; |
| 717 |
|
|
| 533 |
– |
NSLog(warning); |
| 718 |
|
return NSRunInformationalAlertPanel(title, warning, yes, no, nil); |
| 719 |
|
} |
