--- trunk/src/emul.c 2007/10/08 16:19:23 20 +++ trunk/src/emul.c 2007/10/08 16:21:17 34 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2005 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: emul.c,v 1.238 2005/11/19 18:53:06 debug Exp $ + * $Id: emul.c,v 1.278 2007/02/10 14:37:38 debug Exp $ * * Emulation startup and misc. routines. */ @@ -39,7 +39,6 @@ #include #include "arcbios.h" -#include "bintrans.h" #include "cpu.h" #include "emul.h" #include "console.h" @@ -52,17 +51,26 @@ #include "mips_cpu_types.h" #include "misc.h" #include "net.h" +#include "settings.h" #include "sgi_arcbios.h" +#include "timer.h" #include "x11.h" -extern int force_debugger_at_exit; +/* #define ISO_DEBUG */ + extern int extra_argc; extern char **extra_argv; extern int verbose; extern int quiet_mode; +extern int force_debugger_at_exit; +extern int single_step; +extern int old_show_trace_tree; +extern int old_instruction_trace; +extern int old_quiet_mode; +extern int quiet_mode; extern struct emul *debugger_emul; extern struct diskimage *diskimages[]; @@ -70,6 +78,15 @@ static char *diskimage_types[] = DISKIMAGE_TYPES; +static void print_separator(void) +{ + int i = 79; + while (i-- > 0) + debug("-"); + debug("\n"); +} + + /* * add_dump_points(): * @@ -96,12 +113,12 @@ uint64_t addr; int res = get_symbol_addr(&m->symbol_context, m->breakpoint_string[i], &addr); - if (!res) + if (!res) { fprintf(stderr, - "WARNING! Breakpoint '%s' could not be" + "ERROR! Breakpoint '%s' could not be" " parsed\n", m->breakpoint_string[i]); - else { + } else { dp = addr; string_flag = 1; } @@ -132,7 +149,7 @@ */ static void fix_console(void) { - console_deinit(); + console_deinit_main(); } @@ -152,7 +169,7 @@ int *n_loadp, char ***load_namesp) { char str[35]; - int filenr, i, ofs, dirlen, res = 0, res2, iadd = 4; + int filenr, i, ofs, dirlen, res = 0, res2, iadd = DEBUG_INDENTATION; int found_dir; uint64_t dirofs; uint64_t fileofs, filelen; @@ -161,7 +178,7 @@ char *p, *filename_orig; char *filename = strdup(cpu->machine->boot_kernel_filename); unsigned char *filebuf = NULL; - char *tmpfilename = NULL; + char *tmpfname = NULL; char **new_array; int tmpfile_handle; @@ -207,9 +224,11 @@ fatal("WARNING: Root directory length mismatch?\n"); dirofs = (int64_t)(buf[0x8c] + (buf[0x8d] << 8) + (buf[0x8e] << 16) + - (buf[0x8f] << 24)) * 2048; + ((uint64_t)buf[0x8f] << 24)) * 2048; - /* debug("root = %i bytes at 0x%llx\n", dirlen, (long long)dirofs); */ +#ifdef ISO_DEBUG + debug("root = %i bytes at 0x%llx\n", dirlen, (long long)dirofs); +#endif dirbuf = malloc(dirlen); if (dirbuf == NULL) { @@ -228,8 +247,9 @@ dp = dirbuf; filenr = 1; p = NULL; while (dp < dirbuf + dirlen) { - int i, nlen = dp[0]; - int x = dp[2] + (dp[3] << 8) + (dp[4] << 16) + (dp[5] << 24); + size_t i, nlen = dp[0]; + int x = dp[2] + (dp[3] << 8) + (dp[4] << 16) + + ((uint64_t)dp[5] << 24); int y = dp[6] + (dp[7] << 8); char direntry[65]; @@ -243,22 +263,30 @@ if (p == NULL) p = strchr(filename, '\\'); - /* debug("%i%s: %i, %i, \"", filenr, filenr == found_dir? - " [CURRENT]" : "", x, y); */ +#ifdef ISO_DEBUG + debug("%i%s: %i, %i, \"", filenr, filenr == found_dir? + " [CURRENT]" : "", x, y); +#endif for (i=0; i 2047) { @@ -364,9 +392,9 @@ } fileofs = match_entry[2] + (match_entry[3] << 8) + - (match_entry[4] << 16) + (match_entry[5] << 24); + (match_entry[4] << 16) + ((uint64_t)match_entry[5] << 24); filelen = match_entry[10] + (match_entry[11] << 8) + - (match_entry[12] << 16) + (match_entry[13] << 24); + (match_entry[12] << 16) + ((uint64_t)match_entry[13] << 24); fileofs *= 2048; /* debug("filelen=%llx fileofs=%llx\n", (long long)filelen, @@ -379,10 +407,7 @@ goto ret; } - tmpfilename = strdup("/tmp/gxemul.XXXXXXXXXXXX"); - - debug("extracting %lli bytes into %s\n", - (long long)filelen, tmpfilename); + tmpfname = strdup("/tmp/gxemul.XXXXXXXXXXXX"); res2 = diskimage_access(m, disk_id, disk_type, 0, fileofs, filebuf, filelen); @@ -391,14 +416,16 @@ goto ret; } - tmpfile_handle = mkstemp(tmpfilename); + tmpfile_handle = mkstemp(tmpfname); if (tmpfile_handle < 0) { - fatal("could not create %s\n", tmpfilename); + fatal("could not create %s\n", tmpfname); exit(1); } write(tmpfile_handle, filebuf, filelen); close(tmpfile_handle); + debug("extracted %lli bytes into %s\n", (long long)filelen, tmpfname); + /* Add the temporary filename to the load_namesp array: */ (*n_loadp)++; new_array = malloc(sizeof(char *) * (*n_loadp)); @@ -412,11 +439,11 @@ /* This adds a Backspace char in front of the filename; this is a special hack which causes the file to be removed once it has been loaded. */ - tmpfilename = realloc(tmpfilename, strlen(tmpfilename) + 2); - memmove(tmpfilename + 1, tmpfilename, strlen(tmpfilename) + 1); - tmpfilename[0] = 8; + tmpfname = realloc(tmpfname, strlen(tmpfname) + 2); + memmove(tmpfname + 1, tmpfname, strlen(tmpfname) + 1); + tmpfname[0] = 8; - (*load_namesp)[*n_loadp - 1] = tmpfilename; + (*load_namesp)[*n_loadp - 1] = tmpfname; res = 1; @@ -469,9 +496,9 @@ int ofs = 0x200 * (partnr + 1); if (partnr == 0) n_partitions = buf[ofs + 7]; - start = (buf[ofs + 8] << 24) + (buf[ofs + 9] << 16) + + start = ((uint64_t)buf[ofs + 8] << 24) + (buf[ofs + 9] << 16) + (buf[ofs + 10] << 8) + buf[ofs + 11]; - length = (buf[ofs + 12] << 24) + (buf[ofs + 13] << 16) + + length = ((uint64_t)buf[ofs+12] << 24) + (buf[ofs + 13] << 16) + (buf[ofs + 14] << 8) + buf[ofs + 15]; debug("partition %i: '%s', type '%s', start %i, length %i\n", @@ -518,15 +545,72 @@ iso_type, retval = 0; unsigned char minibuf[0x20]; unsigned char *bootblock_buf; - uint64_t bootblock_offset; + uint64_t bootblock_offset, base_offset; uint64_t bootblock_loadaddr, bootblock_pc; boot_disk_id = diskimage_bootdev(m, &boot_disk_type); if (boot_disk_id < 0) return 0; + base_offset = diskimage_get_baseoffset(m, boot_disk_id, boot_disk_type); + switch (m->machine_type) { - case MACHINE_DEC: + + case MACHINE_DREAMCAST: + if (!diskimage_is_a_cdrom(cpu->machine, boot_disk_id, + boot_disk_type)) { + fatal("The Dreamcast emulation mode can only boot" + " from CD images, not from other disk types.\n"); + exit(1); + } + + bootblock_buf = malloc(32768); + if (bootblock_buf == NULL) { + fprintf(stderr, "Out of memory.\n"); + exit(1); + } + + debug("loading Dreamcast IP.BIN from %s id %i\n", + diskimage_types[boot_disk_type], boot_disk_id); + + res = diskimage_access(m, boot_disk_id, boot_disk_type, + 0, base_offset, bootblock_buf, 0x8000); + if (!res) { + fatal("Couldn't read the disk image. Aborting.\n"); + return 0; + } + + if (strncmp((char *)bootblock_buf, "SEGA ", 5) != 0) { + fatal("This is not a Dreamcast IP.BIN header.\n"); + free(bootblock_buf); + return 0; + } + + /* Store IP.BIN at 0x8c008000, and set entry point. */ + store_buf(cpu, 0x8c008000, (char *)bootblock_buf, 32768); + cpu->pc = 0x8c008300; + + /* Remember the name of the file to boot (1ST_READ.BIN): */ + if (cpu->machine->boot_kernel_filename == NULL || + cpu->machine->boot_kernel_filename[0] == '\0') { + int i = 0x60; + while (i < 0x70) { + if (bootblock_buf[i] == ' ') + bootblock_buf[i] = 0; + i ++; + } + cpu->machine->boot_kernel_filename = strdup( + (char *)bootblock_buf + 0x60); + } + + debug("boot filename: %s\n", + cpu->machine->boot_kernel_filename); + + free(bootblock_buf); + + break; + + case MACHINE_PMAX: /* * The first few bytes of a disk contains information about * where the bootblock(s) are located. (These are all 32-bit @@ -547,18 +631,27 @@ minibuf, sizeof(minibuf)); bootblock_loadaddr = minibuf[0x10] + (minibuf[0x11] << 8) - + (minibuf[0x12] << 16) + (minibuf[0x13] << 24); + + (minibuf[0x12] << 16) + ((uint64_t)minibuf[0x13] << 24); /* Convert loadaddr to uncached: */ if ((bootblock_loadaddr & 0xf0000000ULL) != 0x80000000 && - (bootblock_loadaddr & 0xf0000000ULL) != 0xa0000000) - fatal("\nWARNING! Weird load address 0x%08x.\n\n", - (int)bootblock_loadaddr); + (bootblock_loadaddr & 0xf0000000ULL) != 0xa0000000) { + fatal("\nWARNING! Weird load address 0x%08"PRIx32 + " for SCSI id %i.\n\n", + (uint32_t)bootblock_loadaddr, boot_disk_id); + if (bootblock_loadaddr == 0) { + fatal("I'm assuming that this is _not_ a " + "DEC bootblock.\nAre you sure you are" + " booting from the correct disk?\n"); + exit(1); + } + } + bootblock_loadaddr &= 0x0fffffffULL; bootblock_loadaddr |= 0xffffffffa0000000ULL; bootblock_pc = minibuf[0x14] + (minibuf[0x15] << 8) - + (minibuf[0x16] << 16) + (minibuf[0x17] << 24); + + (minibuf[0x16] << 16) + ((uint64_t)minibuf[0x17] << 24); bootblock_pc &= 0x0fffffffULL; bootblock_pc |= 0xffffffffa0000000ULL; @@ -579,10 +672,10 @@ } n_blocks = minibuf[0] + (minibuf[1] << 8) - + (minibuf[2] << 16) + (minibuf[3] << 24); + + (minibuf[2] << 16) + ((uint64_t)minibuf[3] << 24); - bootblock_offset = (minibuf[4] + (minibuf[5] << 8) - + (minibuf[6] << 16) + (minibuf[7] << 24)) * 512; + bootblock_offset = (minibuf[4] + (minibuf[5] << 8) + + (minibuf[6]<<16) + ((uint64_t)minibuf[7]<<24)) * 512; if (n_blocks < 1) break; @@ -618,36 +711,6 @@ debug(readofs == 0x18? ": no blocks?\n" : " blocks\n"); return 1; - - case MACHINE_X86: - /* TODO: "El Torito" etc? */ - if (diskimage_is_a_cdrom(cpu->machine, boot_disk_id, - boot_disk_type)) - break; - - bootblock_buf = malloc(512); - if (bootblock_buf == NULL) { - fprintf(stderr, "Out of memory.\n"); - exit(1); - } - - debug("loading PC bootsector from %s id %i\n", - diskimage_types[boot_disk_type], boot_disk_id); - - res = diskimage_access(m, boot_disk_id, boot_disk_type, 0, 0, - bootblock_buf, 512); - if (!res) { - fatal("Couldn't read the disk image. Aborting.\n"); - return 0; - } - - if (bootblock_buf[510] != 0x55 || bootblock_buf[511] != 0xaa) - debug("WARNING! The 0x55,0xAA marker is missing! " - "Booting anyway.\n"); - store_buf(cpu, 0x7c00, (char *)bootblock_buf, 512); - free(bootblock_buf); - - return 1; } @@ -655,7 +718,7 @@ * Try reading a kernel manually from the disk. The code here * does not rely on machine-dependent boot blocks etc. */ - /* ISO9660: (0x800 bytes at 0x8000) */ + /* ISO9660: (0x800 bytes at 0x8000 + base_offset) */ bootblock_buf = malloc(0x800); if (bootblock_buf == NULL) { fprintf(stderr, "Out of memory.\n"); @@ -663,7 +726,7 @@ } res = diskimage_access(m, boot_disk_id, boot_disk_type, - 0, 0x8000, bootblock_buf, 0x800); + 0, base_offset + 0x8000, bootblock_buf, 0x800); if (!res) { fatal("Couldn't read the disk image. Aborting.\n"); return 0; @@ -678,8 +741,10 @@ iso_type = 3; if (iso_type != 0) { - /* We can't load a kernel if the name - isn't specified. */ + /* + * If the user specified a kernel name, then load it from + * disk. + */ if (cpu->machine->boot_kernel_filename == NULL || cpu->machine->boot_kernel_filename[0] == '\0') fatal("\nISO9660 filesystem, but no kernel " @@ -702,8 +767,6 @@ } if (bootblock_buf[0x000] == 'E' && bootblock_buf[0x001] == 'R' && bootblock_buf[0x200] == 'P' && bootblock_buf[0x201] == 'M') { - /* We can't load a kernel if the name - isn't specified. */ if (cpu->machine->boot_kernel_filename == NULL || cpu->machine->boot_kernel_filename[0] == '\0') fatal("\nApple partition table, but no kernel " @@ -724,7 +787,7 @@ * * Returns a reasonably initialized struct emul. */ -struct emul *emul_new(char *name) +struct emul *emul_new(char *name, int id) { struct emul *e; e = malloc(sizeof(struct emul)); @@ -735,6 +798,21 @@ memset(e, 0, sizeof(struct emul)); + e->path = malloc(15); + if (e->path == NULL) { + fprintf(stderr, "out of memory\n"); + exit(1); + } + snprintf(e->path, 15, "emul[%i]", id); + + e->settings = settings_new(); + + settings_add(e->settings, "n_machines", 0, + SETTINGS_TYPE_INT, SETTINGS_FORMAT_DECIMAL, + (void *) &e->n_machines); + + /* TODO: More settings? */ + /* Sane default values: */ e->n_machines = 0; e->next_serial_nr = 1; @@ -745,6 +823,10 @@ fprintf(stderr, "out of memory in emul_new()\n"); exit(1); } + + settings_add(e->settings, "name", 0, + SETTINGS_TYPE_STRING, SETTINGS_FORMAT_STRING, + (void *) &e->name); } return e; @@ -752,6 +834,34 @@ /* + * emul_destroy(): + * + * Destroys a previously created emul object. + */ +void emul_destroy(struct emul *emul) +{ + int i; + + if (emul->name != NULL) { + settings_remove(emul->settings, "name"); + free(emul->name); + } + + for (i=0; in_machines; i++) + machine_destroy(emul->machines[i]); + + if (emul->machines != NULL) + free(emul->machines); + + /* Remove any remaining level-1 settings: */ + settings_remove_all(emul->settings); + settings_destroy(emul->settings); + + free(emul); +} + + +/* * emul_add_machine(): * * Calls machine_new(), adds the new machine into the emul struct, and @@ -762,10 +872,14 @@ struct machine *emul_add_machine(struct emul *e, char *name) { struct machine *m; + char tmpstr[20]; + int i; - m = machine_new(name, e); + m = machine_new(name, e, e->n_machines); m->serial_nr = (e->next_serial_nr ++); + i = e->n_machines; + e->n_machines ++; e->machines = realloc(e->machines, sizeof(struct machine *) * e->n_machines); @@ -774,7 +888,12 @@ exit(1); } - e->machines[e->n_machines - 1] = m; + e->machines[i] = m; + + snprintf(tmpstr, sizeof(tmpstr), "machine[%i]", i); + settings_add(e->settings, tmpstr, 1, SETTINGS_TYPE_SUBSETTINGS, 0, + e->machines[i]->settings); + return m; } @@ -903,14 +1022,11 @@ void emul_machine_setup(struct machine *m, int n_load, char **load_names, int n_devices, char **device_names) { - struct emul *emul; struct cpu *cpu; - int i, iadd=4; + int i, iadd = DEBUG_INDENTATION; uint64_t memory_amount, entrypoint = 0, gp = 0, toc = 0; int byte_order; - emul = m->emul; - debug("machine \"%s\":\n", m->name); debug_indentation(iadd); @@ -934,9 +1050,6 @@ if (m->arch == ARCH_ALPHA) m->arch_pagesize = 8192; - if (m->arch != ARCH_MIPS) - m->bintrans_enable = 0; - machine_memsize_fix(m); /* @@ -984,18 +1097,17 @@ } memset(m->cpus, 0, sizeof(struct cpu *) * m->ncpus); - /* Initialize dynamic binary translation, if available: */ - if (m->bintrans_enable) - bintrans_init(m, m->memory); - debug("cpu0"); if (m->ncpus > 1) debug(" .. cpu%i", m->ncpus - 1); debug(": "); for (i=0; incpus; i++) { m->cpus[i] = cpu_new(m->memory, m, i, m->cpu_name); - if (m->bintrans_enable) - bintrans_init_cpu(m->cpus[i]); + if (m->cpus[i] == NULL) { + fprintf(stderr, "Unable to create CPU object. " + "Aborting."); + exit(1); + } } debug("\n"); @@ -1006,8 +1118,6 @@ m->cpus[m->ncpus] = cpu_new(m->memory, m, 0 /* use 0 here to show info with debug() */, "Allegrex" /* TODO */); - if (m->bintrans_enable) - bintrans_init_cpu(m->cpus[m->ncpus]); debug("\n"); m->ncpus ++; } @@ -1063,6 +1173,7 @@ } diskimage_dump_info(m); + console_debug_dump(m); /* Load files (ROM code, boot code, ...) into memory: */ if (n_load == 0) { @@ -1178,20 +1289,6 @@ } } - /* Special things required _before_ loading the file: */ - switch (m->arch) { - case ARCH_X86: - /* - * X86 machines normally don't need to load any files, - * they can boot from disk directly. Therefore, an x86 - * machine usually boots up in 16-bit real mode. When - * loading a 32-bit (or even 64-bit) ELF, that's not - * very nice, hence this special case. - */ - pc_bios_simple_pmode_setup(cpu); - break; - } - byte_order = NO_BYTE_ORDER_OVERRIDE; /* @@ -1233,13 +1330,8 @@ } break; - case ARCH_HPPA: - break; - - case ARCH_I960: - break; - - case ARCH_IA64: + case ARCH_RCA180X: + cpu->pc &= 0xffff; break; case ARCH_M68K: @@ -1267,7 +1359,7 @@ break; case ARCH_SH: - if (cpu->cd.sh.bits == 32) + if (cpu->cd.sh.cpu_type.bits == 32) cpu->pc &= 0xffffffffULL; cpu->pc &= ~1; break; @@ -1275,22 +1367,8 @@ case ARCH_SPARC: break; - case ARCH_X86: - /* - * NOTE: The toc field is used to indicate an ELF32 - * or ELF64 load. - */ - switch (toc) { - case 0: /* 16-bit? TODO */ - cpu->pc &= 0xffffffffULL; - break; - case 1: /* 32-bit. */ - cpu->pc &= 0xffffffffULL; - break; - case 2: /* 64-bit: TODO */ - fatal("64-bit x86 load. TODO\n"); - exit(1); - } + case ARCH_TRANSPUTER: + cpu->pc &= 0xffffffffULL; break; default: @@ -1328,8 +1406,7 @@ useremul_setup(cpu, n_load, load_names); /* Startup the bootstrap CPU: */ - cpu->bootstrap_cpu_flag = 1; - cpu->running = 1; + cpu->running = 1; /* ... or pause all CPUs, if start_paused is set: */ if (m->start_paused) { @@ -1341,31 +1418,18 @@ add_dump_points(m); /* TODO: This is MIPS-specific! */ - if (m->machine_type == MACHINE_DEC && + if (m->machine_type == MACHINE_PMAX && cpu->cd.mips.cpu_type.mmu_model == MMU3K) add_symbol_name(&m->symbol_context, 0x9fff0000, 0x10000, "r2k3k_cache", 0, 0); symbol_recalc_sizes(&m->symbol_context); - if (m->max_random_cycles_per_chunk > 0) - debug("using random cycle chunks (1 to %i cycles)\n", - m->max_random_cycles_per_chunk); - /* Special hack for ARC/SGI emulation: */ if ((m->machine_type == MACHINE_ARC || m->machine_type == MACHINE_SGI) && m->prom_emulation) add_arc_components(m); - -#if 0 -if (m->machine_type == MACHINE_IQ80321) { - store_32bit_word(cpu, 0xc0200000, 0); - store_32bit_word(cpu, 0xc0200004, 0xd0000000); -} -#endif - - debug("starting cpu%i at ", m->bootstrap_cpu); switch (m->arch) { @@ -1403,13 +1467,11 @@ debug("0x%016llx", (long long)entrypoint); break; - case ARCH_X86: - debug("0x%04x:0x%llx", cpu->cd.x86.s[X86_S_CS], - (long long)cpu->pc); - break; - default: - debug("0x%016llx", (long long)cpu->pc); + if (cpu->is_32bit) + debug("0x%08x", (int)cpu->pc); + else + debug("0x%016llx", (long long)cpu->pc); } debug("\n"); @@ -1424,7 +1486,7 @@ */ void emul_dumpinfo(struct emul *e) { - int j, nm, iadd = 4; + int j, nm, iadd = DEBUG_INDENTATION; if (e->net != NULL) net_dumpinfo(e->net); @@ -1453,7 +1515,7 @@ */ void emul_simple_init(struct emul *emul) { - int iadd=4; + int iadd = DEBUG_INDENTATION; struct machine *m; if (emul->n_machines != 1) { @@ -1469,7 +1531,9 @@ /* Create a simple network: */ emul->net = net_init(emul, NET_INIT_FLAG_GATEWAY, - "10.0.0.0", 8, NULL, 0, 0); + NET_DEFAULT_IPV4_MASK, + NET_DEFAULT_IPV4_LEN, + NULL, 0, 0, NULL); } else { /* Userland pseudo-machine: */ debug("Syscall emulation (userland-only) setup...\n"); @@ -1488,36 +1552,16 @@ * * Create an emul struct by reading settings from a configuration file. */ -struct emul *emul_create_from_configfile(char *fname) +struct emul *emul_create_from_configfile(char *fname, int id) { - int iadd = 4; - struct emul *e = emul_new(fname); - FILE *f; - char buf[128]; - size_t len; + int iadd = DEBUG_INDENTATION; + struct emul *e = emul_new(fname, id); debug("Creating emulation from configfile \"%s\":\n", fname); debug_indentation(iadd); - f = fopen(fname, "r"); - if (f == NULL) { - perror(fname); - exit(1); - } - - /* Read header: (must be !!gxemul) */ - len = fread(buf, 1, 8, f); - if (len != 8 || strncmp(buf, "!!gxemul", 8) != 0) { - fprintf(stderr, "%s: must start with '!!gxemul'\n", fname); - exit(1); - } + emul_parse_config(e, fname); - /* Restart from beginning: */ - rewind(f); - - emul_parse_config(e, f); - - fclose(f); debug_indentation(-iadd); return e; } @@ -1544,14 +1588,28 @@ atexit(fix_console); - i = 79; - while (i-- > 0) - debug("-"); - debug("\n\n"); - /* Initialize the interactive debugger: */ debugger_init(emuls, n_emuls); + /* Run any additional debugger commands before starting: */ + for (i=0; in_debugger_cmds > 0) { + int j; + if (i == 0) + print_separator(); + for (j = 0; j < emul->n_debugger_cmds; j ++) { + debug("> %s\n", emul->debugger_cmds[j]); + debugger_execute_cmd(emul->debugger_cmds[j], + strlen(emul->debugger_cmds[j])); + } + } + } + + print_separator(); + debug("\n"); + + /* * console_init_main() makes sure that the terminal is in a * reasonable state. @@ -1584,6 +1642,9 @@ cpu_functioncall_trace(emuls[0]->machines[0]->cpus[0], emuls[0]->machines[0]->cpus[0]->pc); + /* Start emulated clocks: */ + timer_start(); + /* * MAIN LOOP: * @@ -1593,23 +1654,59 @@ while (go) { go = 0; - x11_check_event(emuls, n_emuls); + /* Flush X11 and serial console output every now and then: */ + if (emuls[0]->machines[0]->ninstrs > + emuls[0]->machines[0]->ninstrs_flush + (1<<19)) { + x11_check_event(emuls, n_emuls); + console_flush(); + emuls[0]->machines[0]->ninstrs_flush = + emuls[0]->machines[0]->ninstrs; + } + + if (emuls[0]->machines[0]->ninstrs > + emuls[0]->machines[0]->ninstrs_show + (1<<25)) { + emuls[0]->machines[0]->ninstrs_since_gettimeofday += + (emuls[0]->machines[0]->ninstrs - + emuls[0]->machines[0]->ninstrs_show); + cpu_show_cycles(emuls[0]->machines[0], 0); + emuls[0]->machines[0]->ninstrs_show = + emuls[0]->machines[0]->ninstrs; + } + + if (single_step == ENTER_SINGLE_STEPPING) { + /* TODO: Cleanup! */ + old_instruction_trace = + emuls[0]->machines[0]->instruction_trace; + old_quiet_mode = quiet_mode; + old_show_trace_tree = + emuls[0]->machines[0]->show_trace_tree; + emuls[0]->machines[0]->instruction_trace = 1; + emuls[0]->machines[0]->show_trace_tree = 1; + quiet_mode = 0; + single_step = SINGLE_STEPPING; + } + + if (single_step == SINGLE_STEPPING) + debugger(); for (i=0; in_machines; j++) { - /* TODO: cpu_run() is a strange name, since - there can be multiple cpus in a machine */ - anything = cpu_run(e, e->machines[j]); + if (e->machines[j]->gdb.port > 0) + debugger_gdb_check_incoming( + e->machines[j]); + + anything = machine_run(e->machines[j]); if (anything) go = 1; } } } + /* Stop any running timers: */ + timer_stop(); + /* Deinitialize all CPUs in all machines in all emulations: */ for (i=0; in_machines; j++) @@ -1636,11 +1733,11 @@ printf("Press enter to quit.\n"); while (!console_charavail(MAIN_CONSOLE)) { x11_check_event(emuls, n_emuls); - usleep(1); + usleep(10000); } console_readchar(MAIN_CONSOLE); } - console_deinit(); + console_deinit_main(); }