Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for linux build

This commit is contained in:
kanjitalk755 2018-06-23 14:59:07 +09:00
parent 9c0886b2b8
commit 949e07e4eb
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BasiliskII/src/uae_cpu/compiler/compemu_support.cpp
View File

@ -72,27 +72,25 @@
#include "fpu/fpu.h"
#include "fpu/flags.h"
#define DEBUG 1
#define DEBUG 0
#include "debug.h"
#ifdef ENABLE_MON
#include "mon.h"
#endif
#ifndef WIN32
#define PROFILE_COMPILE_TIME 1
#define PROFILE_UNTRANSLATED_INSNS 1
#endif
#define PROFILE_COMPILE_TIME 0
#define PROFILE_UNTRANSLATED_INSNS 0
#if defined(__x86_64__) && 0
#define RECORD_REGISTER_USAGE 1
#endif
#ifdef WIN32
//#ifdef WIN32
#undef write_log
#define write_log dummy_write_log
static void dummy_write_log(const char *, ...) { }
#endif
//#endif
#if JIT_DEBUG
#undef abort

17
SheepShaver/src/Unix/main_unix.cpp
View File

@ -1005,22 +1005,16 @@ int main(int argc, char **argv)
goto quit;
}
// Create area for SheepShaver data
if (!SheepMem::Init()) {
sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno));
ErrorAlert(str);
goto quit;
}
// Create area for Mac ROM
if (!ram_rom_areas_contiguous) {
if (vm_mac_acquire_fixed(ROM_BASE, ROM_AREA_SIZE) < 0) {
if (vm_mac_acquire_fixed(ROM_BASE, ROM_AREA_SIZE + SIG_STACK_SIZE) < 0) {
sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
ErrorAlert(str);
goto quit;
}
ROMBase = ROM_BASE;
ROMBaseHost = Mac2HostAddr(ROMBase);
ROMEnd = ROMBase + ROM_AREA_SIZE;
}
#if !EMULATED_PPC
if (vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
@ -1037,6 +1031,13 @@ int main(int argc, char **argv)
goto quit;
}
// Create area for SheepShaver data
if (!SheepMem::Init()) {
sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno));
ErrorAlert(str);
goto quit;
}
// Load Mac ROM
if (!load_mac_rom())
goto quit;