| 40 |
|
using std::string; |
| 41 |
|
|
| 42 |
|
#include "cpu_emulation.h" |
| 43 |
< |
#include "macos_util_macosx.h" |
| 44 |
< |
#include "main.h" |
| 43 |
> |
#include "sys.h" |
| 44 |
> |
#include "rom_patches.h" |
| 45 |
> |
#include "xpram.h" |
| 46 |
> |
#include "video.h" |
| 47 |
|
#include "prefs.h" |
| 48 |
|
#include "prefs_editor.h" |
| 49 |
< |
#include "rom_patches.h" |
| 48 |
< |
#include "sigsegv.h" |
| 49 |
< |
#include "sys.h" |
| 49 |
> |
#include "macos_util_macosx.h" |
| 50 |
|
#include "user_strings.h" |
| 51 |
|
#include "version.h" |
| 52 |
< |
#include "video.h" |
| 52 |
> |
#include "main.h" |
| 53 |
|
#include "vm_alloc.h" |
| 54 |
< |
#include "xpram.h" |
| 54 |
> |
#include "sigsegv.h" |
| 55 |
|
|
| 56 |
|
#if USE_JIT |
| 57 |
< |
extern void flush_icache_range(uint8 *start, uint32 size); // from compemu_support.cpp |
| 57 |
> |
extern void flush_icache_range(uint8 *start, uint32 size); // from compemu_support.cpp |
| 58 |
|
#endif |
| 59 |
|
|
| 60 |
|
#ifdef ENABLE_MON |
| 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; |
| 155 |
|
return SIGSEGV_RETURN_FAILURE; |
| 156 |
|
} |
| 157 |
|
|
| 155 |
– |
|
| 158 |
|
/* |
| 159 |
|
* Dump state when everything went wrong after a SEGV |
| 160 |
|
*/ |
| 184 |
|
|
| 185 |
|
|
| 186 |
|
/* |
| 187 |
+ |
* Screen fault handler |
| 188 |
+ |
*/ |
| 189 |
+ |
|
| 190 |
+ |
bool Screen_fault_handler(sigsegv_info_t *sip) |
| 191 |
+ |
{ |
| 192 |
+ |
return true; |
| 193 |
+ |
} |
| 194 |
+ |
|
| 195 |
+ |
|
| 196 |
+ |
/* |
| 197 |
|
* Main program |
| 198 |
|
*/ |
| 199 |
|
|
| 200 |
|
static void usage(const char *prg_name) |
| 201 |
|
{ |
| 202 |
< |
printf("Usage: %s [OPTION...]\n", prg_name); |
| 203 |
< |
printf("\nUnix options:\n"); |
| 204 |
< |
printf(" --help\n display this usage message\n"); |
| 205 |
< |
printf(" --config FILE\n read/write configuration from/to FILE\n"); |
| 206 |
< |
printf(" --break ADDRESS\n set ROM breakpoint\n"); |
| 207 |
< |
printf(" --rominfo\n dump ROM information\n"); |
| 208 |
< |
LoadPrefs(); // read the prefs file so PrefsPrintUsage() will print the correct default values |
| 202 |
> |
printf( |
| 203 |
> |
"Usage: %s [OPTION...]\n" |
| 204 |
> |
"\nUnix options:\n" |
| 205 |
> |
" --config FILE\n read/write configuration from/to FILE\n" |
| 206 |
> |
" --break ADDRESS\n set ROM breakpoint\n" |
| 207 |
> |
" --rominfo\n dump ROM information\n", prg_name |
| 208 |
> |
); |
| 209 |
> |
LoadPrefs(NULL); // read the prefs file so PrefsPrintUsage() will print the correct default values |
| 210 |
|
PrefsPrintUsage(); |
| 211 |
|
exit(0); |
| 212 |
|
} |
| 213 |
|
|
| 214 |
|
int main(int argc, char **argv) |
| 215 |
|
{ |
| 216 |
+ |
const char *vmdir = NULL; |
| 217 |
+ |
char str[256]; |
| 218 |
+ |
|
| 219 |
|
// Initialize variables |
| 220 |
|
RAMBaseHost = NULL; |
| 221 |
|
ROMBaseHost = NULL; |
| 231 |
|
if (strcmp(argv[i], "--help") == 0) { |
| 232 |
|
usage(argv[0]); |
| 233 |
|
} else if (strncmp(argv[i], "-psn_", 5) == 0) {// OS X process identifier |
| 234 |
< |
i++; |
| 234 |
> |
argv[i++] = NULL; |
| 235 |
|
} else if (strcmp(argv[i], "--break") == 0) { |
| 236 |
< |
i++; |
| 237 |
< |
if (i < argc) |
| 236 |
> |
argv[i++] = NULL; |
| 237 |
> |
if (i < argc) { |
| 238 |
|
ROMBreakpoint = strtol(argv[i], NULL, 0); |
| 239 |
+ |
argv[i] = NULL; |
| 240 |
+ |
} |
| 241 |
|
} else if (strcmp(argv[i], "--config") == 0) { |
| 242 |
|
argv[i++] = NULL; |
| 243 |
|
if (i < argc) { |
| 246 |
|
argv[i] = NULL; |
| 247 |
|
} |
| 248 |
|
} else if (strcmp(argv[i], "--rominfo") == 0) { |
| 249 |
+ |
argv[i] = NULL; |
| 250 |
|
PrintROMInfo = true; |
| 251 |
< |
} else if (argv[i][0] == '-') { |
| 252 |
< |
fprintf(stderr, "Unrecognized option '%s'\n", argv[i]); |
| 253 |
< |
usage(argv[0]); |
| 251 |
> |
} |
| 252 |
> |
} |
| 253 |
> |
|
| 254 |
> |
// Remove processed arguments |
| 255 |
> |
for (int i=1; i<argc; i++) { |
| 256 |
> |
int k; |
| 257 |
> |
for (k=i; k<argc; k++) |
| 258 |
> |
if (argv[k] != NULL) |
| 259 |
> |
break; |
| 260 |
> |
if (k > i) { |
| 261 |
> |
k -= i; |
| 262 |
> |
for (int j=i+k; j<argc; j++) |
| 263 |
> |
argv[j-k] = argv[j]; |
| 264 |
> |
argc -= k; |
| 265 |
|
} |
| 266 |
|
} |
| 267 |
|
|
| 268 |
|
// Read preferences |
| 269 |
< |
PrefsInit(argc, argv); |
| 269 |
> |
PrefsInit(vmdir, argc, argv); |
| 270 |
> |
|
| 271 |
> |
// Any command line arguments left? |
| 272 |
> |
for (int i=1; i<argc; i++) { |
| 273 |
> |
if (argv[i][0] == '-') { |
| 274 |
> |
fprintf(stderr, "Unrecognized option '%s'\n", argv[i]); |
| 275 |
> |
usage(argv[0]); |
| 276 |
> |
} |
| 277 |
> |
} |
| 278 |
|
|
| 279 |
|
// Init system routines |
| 280 |
|
SysInit(); |
| 281 |
|
|
| 282 |
+ |
// Set the current directory somewhere useful. |
| 283 |
+ |
// Handy for storing the ROM file |
| 284 |
+ |
bundle = strstr(argv[0], "BasiliskII.app/Contents/MacOS/BasiliskII"); |
| 285 |
+ |
if (bundle) |
| 286 |
+ |
{ |
| 287 |
+ |
while (*bundle != '/') |
| 288 |
+ |
++bundle; |
| 289 |
+ |
|
| 290 |
+ |
*bundle = 0; // Throw away Contents/... on end of argv[0] |
| 291 |
+ |
bundle = argv[0]; |
| 292 |
+ |
|
| 293 |
+ |
chdir(bundle); |
| 294 |
+ |
} |
| 295 |
+ |
|
| 296 |
|
// Open display, attach to window server, |
| 297 |
|
// load pre-instantiated classes from MainMenu.nib, start run loop |
| 298 |
|
int i = NSApplicationMain(argc, (const char **)argv); |
| 311 |
|
|
| 312 |
|
bool InitEmulator (void) |
| 313 |
|
{ |
| 314 |
+ |
const char *vmdir = NULL; |
| 315 |
|
char str[256]; |
| 316 |
|
|
| 317 |
|
|
| 422 |
|
// Get rom file path from preferences |
| 423 |
|
const char *rom_path = PrefsFindString("rom"); |
| 424 |
|
if ( ! rom_path ) |
| 425 |
+ |
if ( bundle ) |
| 426 |
+ |
WarningAlert("No rom pathname set. Trying BasiliskII.app/ROM"); |
| 427 |
+ |
else |
| 428 |
|
WarningAlert("No rom pathname set. Trying ./ROM"); |
| 429 |
|
|
| 430 |
|
// Load Mac ROM |
| 449 |
|
|
| 450 |
|
|
| 451 |
|
// Initialize everything |
| 452 |
< |
if (!InitAll()) |
| 452 |
> |
if (!InitAll(vmdir)) |
| 453 |
|
QuitEmulator(); |
| 454 |
|
D(bug("Initialization complete\n")); |
| 455 |
|
|
| 533 |
|
void FlushCodeCache(void *start, uint32 size) |
| 534 |
|
{ |
| 535 |
|
#if USE_JIT |
| 536 |
< |
if (UseJIT) |
| 536 |
> |
if (UseJIT) |
| 537 |
|
flush_icache_range((uint8 *)start, size); |
| 538 |
|
#endif |
| 539 |
|
} |
