--- trunk/src/main.c 2007/10/08 16:19:56 24 +++ trunk/src/main.c 2007/10/08 16:21:17 34 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2006 Anders Gavare. All rights reserved. + * Copyright (C) 2003-2007 Anders Gavare. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * - * $Id: main.c,v 1.274 2006/06/22 13:22:41 debug Exp $ + * $Id: main.c,v 1.293 2007/02/05 16:49:05 debug Exp $ */ #include @@ -37,12 +37,14 @@ #include "console.h" #include "cpu.h" +#include "debugger.h" #include "device.h" #include "diskimage.h" #include "emul.h" #include "machine.h" #include "misc.h" #include "settings.h" +#include "timer.h" extern volatile int single_step; @@ -57,7 +59,9 @@ char **extra_argv; char *progname; -int fully_deterministic = 0; +size_t dyntrans_cache_size = DEFAULT_DYNTRANS_CACHE_SIZE; +int native_code_translation_enabled = 0; +int skip_srandom_call = 0; /***************************************************************************** @@ -194,9 +198,9 @@ { printf("GXemul"); #ifdef VERSION - printf("-" VERSION); + printf(" " VERSION); #endif - printf(" Copyright (C) 2003-2006 Anders Gavare\n"); + printf(" Copyright (C) 2003-2007 Anders Gavare\n"); printf("Read the source code and/or documentation for " "other Copyright messages.\n"); @@ -221,8 +225,6 @@ "with -E.)\n"); printf("\nOther options:\n"); - printf(" -A disable alignment checks in some cases (for higher" - " speed)\n"); printf(" -C x try to emulate a specific CPU. (Use -H to get a " "list of types.)\n"); printf(" -d fname add fname as a disk image. You can add \"xxx:\"" @@ -236,18 +238,18 @@ printf(" gH;S; set geometry to H heads and S" " sectors-per-track\n"); printf(" i IDE\n"); + printf(" oOFS; set base offset to OFS (for ISO9660" + " filesystems)\n"); printf(" r read-only (don't allow changes to the" " file)\n"); printf(" s SCSI\n"); printf(" t tape\n"); printf(" 0-7 force a specific ID\n"); printf(" -G port listen to gdb remote connections on this port\n"); - printf(" -I x emulate clock interrupts at x Hz (affects" - " rtc devices only, not\n"); - printf(" actual runtime speed) (this disables automatic" - " clock adjustments)\n"); + printf(" -I hz set the main cpu frequency to hz (not used by " + "all combinations\n of machines and guest OSes)\n"); printf(" -i display each instruction as it is executed\n"); - printf(" -J disable some speed tricks\n"); + printf(" -J disable dyntrans instruction combinations\n"); printf(" -j name set the name of the kernel; for DECstation " "emulation, this passes\n the name to the bootloader," " for example:\n"); @@ -276,6 +278,17 @@ printf(" -r register dumps before every instruction\n"); printf(" -S initialize emulated RAM to random bytes, " "instead of zeroes\n"); + printf(" -s f:name write statistics to file 'name', " + "f is one or more of the following:\n"); + printf(" v virtual program counter\n"); + printf(" p physical equivalent of program counter\n"); + printf(" i internal ic->f representation of " + "the program counter\n"); + printf(" and optionally:\n"); + printf(" d disable statistics gathering at " + "startup\n"); + printf(" o overwrite instead of append\n"); + printf(" -T halt on non-existant memory accesses\n"); printf(" -t show function trace tree\n"); printf(" -U enable slow_serial_interrupts_hack_for_linux\n"); #ifdef WITH_X11 @@ -298,13 +311,18 @@ #endif printf("\nGeneral options:\n"); +#ifdef UNSTABLE_DEVEL + printf(" -b enable native code generation\n"); + printf(" -B disable native code generation\n"); +#endif printf(" -c cmd add cmd as a command to run before starting " "the simulation\n"); - printf(" -D guarantee (almost) fully deterministic " - "behaviour\n"); + printf(" -D skip the srandom call at startup\n"); printf(" -H display a list of possible CPU and " "machine types\n"); printf(" -h display this help message\n"); + printf(" -k n set dyntrans translation caches to n MB (default" + " size is %i MB)\n", DEFAULT_DYNTRANS_CACHE_SIZE / 1048576); printf(" -K force the debugger to be entered at the end " "of a simulation\n"); printf(" -q quiet mode (don't print startup messages)\n"); @@ -345,8 +363,10 @@ struct machine *m = emul_add_machine(emul, "default"); char *opts = - "A" - "C:c:Dd:E:e:G:HhI:iJj:KM:Nn:Oo:p:QqRrStU" +#ifdef UNSTABLE_DEVEL + "bB" +#endif + "C:c:Dd:E:e:G:HhI:iJj:k:KM:Nn:Oo:p:QqRrSs:TtU" #ifdef UNSTABLE_DEVEL "u:" #endif @@ -358,12 +378,19 @@ while ((ch = getopt(argc, argv, opts)) != -1) { switch (ch) { - case 'A': - fprintf(stderr, "NOTE: The -A command line option" - " is DEPRECATED and will be removed soon.\n"); - m->dyntrans_alignment_check = 0; - msopts = 1; +#ifdef UNSTABLE_DEVEL + case 'b': +#ifndef NATIVE_CODE_GENERATION + printf("-b is not available on this host arch.\n"); + exit(1); +#else + native_code_translation_enabled = 1; break; +#endif + case 'B': + native_code_translation_enabled = 0; + break; +#endif /* UNSTABLE_DEVEL */ case 'C': m->cpu_name = strdup(optarg); msopts = 1; @@ -380,7 +407,7 @@ strdup(optarg); break; case 'D': - fully_deterministic = 1; + skip_srandom_call = 1; break; case 'd': /* diskimage_add() is called further down */ @@ -418,7 +445,8 @@ m->gdb.port); exit(1); } - single_step = 1; /* implicit -V */ + /* Note: implicit -V */ + single_step = ENTER_SINGLE_STEPPING; msopts = 1; break; case 'H': @@ -429,7 +457,6 @@ exit(1); case 'I': m->emulated_hz = atoi(optarg); - m->automatic_clock_adjustment = 0; msopts = 1; break; case 'i': @@ -437,7 +464,7 @@ msopts = 1; break; case 'J': - m->speed_tricks = 0; + m->allow_instruction_combinations = 0; msopts = 1; break; case 'j': @@ -448,6 +475,14 @@ } msopts = 1; break; + case 'k': + dyntrans_cache_size = atoi(optarg) * 1048576; + if (dyntrans_cache_size < 1) { + fprintf(stderr, "The dyntrans cache size must" + " be at least 1 MB.\n"); + exit(1); + } + break; case 'K': force_debugger_at_exit = 1; break; @@ -509,6 +544,15 @@ m->random_mem_contents = 1; msopts = 1; break; + case 's': + machine_statistics_init(m, optarg); + native_code_translation_enabled = 0; + msopts = 1; + break; + case 'T': + m->halt_on_nonexistant_memaccess = 1; + msopts = 1; + break; case 't': m->show_trace_tree = 1; msopts = 1; @@ -527,7 +571,7 @@ msopts = 1; break; case 'V': - single_step = 1; + single_step = ENTER_SINGLE_STEPPING; break; case 'v': verbose ++; @@ -690,25 +734,61 @@ */ int main(int argc, char *argv[]) { + /* Setting constants: */ + const int constant_yes = 1; + const int constant_true = 1; + const int constant_no = 0; + const int constant_false = 0; + struct emul **emuls; char **diskimages = NULL; int n_diskimages = 0; int n_emuls; int i; + +#ifdef USE_PROFIL + uint16_t samples[0x100000]; + memset(samples, 0, sizeof(samples)); + profil((char *)samples, sizeof(samples), (vm_offset_t) 0x400000, 8192); +#endif + +#ifndef NATIVE_CODE_GENERATION + native_code_translation_enabled = 0; +#endif + + progname = argv[0]; - /* Create the settings object, and add global settings to it: */ + + /* + * Create the settings object, and add global settings to it: + * + * Read-only "constants": yes, no, true, false. + * Global emulator settings: verbose, single_step, ... + */ global_settings = settings_new(); + settings_add(global_settings, "yes", 0, SETTINGS_TYPE_INT, + SETTINGS_FORMAT_YESNO, (void *)&constant_yes); + settings_add(global_settings, "no", 0, SETTINGS_TYPE_INT, + SETTINGS_FORMAT_YESNO, (void *)&constant_no); + settings_add(global_settings, "true", 0, SETTINGS_TYPE_INT, + SETTINGS_FORMAT_BOOL, (void *)&constant_true); + settings_add(global_settings, "false", 0, SETTINGS_TYPE_INT, + SETTINGS_FORMAT_BOOL, (void *)&constant_false); + + /* Read-only settings: */ + settings_add(global_settings, "native_code_translation_enabled", 0, + SETTINGS_TYPE_INT, SETTINGS_FORMAT_YESNO, + (void *)&native_code_translation_enabled); settings_add(global_settings, "single_step", 0, SETTINGS_TYPE_INT, SETTINGS_FORMAT_YESNO, (void *)&single_step); + + /* Read/write settings: */ settings_add(global_settings, "force_debugger_at_exit", 1, SETTINGS_TYPE_INT, SETTINGS_FORMAT_YESNO, (void *)&force_debugger_at_exit); - settings_add(global_settings, "fully_deterministic", 0, - SETTINGS_TYPE_INT, SETTINGS_FORMAT_YESNO, - (void *)&fully_deterministic); settings_add(global_settings, "verbose", 1, SETTINGS_TYPE_INT, SETTINGS_FORMAT_YESNO, (void *)&verbose); settings_add(global_settings, "quiet_mode", 1, @@ -719,6 +799,7 @@ cpu_init(); device_init(); machine_init(); + timer_init(); useremul_init(); emuls = malloc(sizeof(struct emul *)); @@ -729,37 +810,34 @@ /* Allocate space for a simple emul setup: */ n_emuls = 1; - emuls[0] = emul_new(NULL); + emuls[0] = emul_new(NULL, 0); if (emuls[0] == NULL) { fprintf(stderr, "out of memory\n"); exit(1); } + settings_add(global_settings, "emul[0]", 1, + SETTINGS_TYPE_SUBSETTINGS, 0, emuls[0]->settings); get_cmd_args(argc, argv, emuls[0], &diskimages, &n_diskimages); - if (!fully_deterministic) { - /* TODO: More than just time(). Use gettimeofday(). */ - srandom(time(NULL) ^ (getpid() << 12)); - } else { - /* Fully deterministic. -I must have been supplied. */ - if (emuls[0]->machines[0]->automatic_clock_adjustment) { - fatal("Cannot have -D without -I.\n"); - exit(1); - } + if (!skip_srandom_call) { + struct timeval tv; + gettimeofday(&tv, NULL); + srandom(tv.tv_sec ^ getpid() ^ tv.tv_usec); } /* Print startup message: */ debug("GXemul"); #ifdef VERSION - debug("-" VERSION); + debug(" " VERSION); #endif - debug(" Copyright (C) 2003-2006 Anders Gavare\n"); + debug(" Copyright (C) 2003-2007 Anders Gavare\n"); debug("Read the source code and/or documentation for " "other Copyright messages.\n\n"); - if (emuls[0]->machines[0]->machine_type == MACHINE_NONE) + if (emuls[0]->machines[0]->machine_type == MACHINE_NONE) { n_emuls --; - else { + } else { for (i=0; imachines[0], diskimages[i]); } @@ -784,6 +862,7 @@ /* Initialize emulations from config files: */ for (i=1; isettings); } } @@ -818,11 +909,35 @@ device_set_exit_on_error(0); console_warn_if_slaves_are_needed(1); + /* Run all emulations: */ emul_run(emuls, n_emuls); + + /* + * Deinitialize everything: + */ + + console_deinit(); + + for (i=0; i