--- trunk/src/emul.c	2007/10/08 16:18:31	11
+++ trunk/src/emul.c	2007/10/08 16:18:38	12
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: emul.c,v 1.211 2005/06/26 11:36:28 debug Exp $
+ *  $Id: emul.c,v 1.225 2005/08/14 19:35:54 debug Exp $
  *
  *  Emulation startup and misc. routines.
  */
@@ -709,11 +709,17 @@
 
 	len += 1048576 * m->memory_offset_in_mb;
 
-	/*  NOTE/TODO: magic 12MB end of load program area  */
+	/*
+	 *  NOTE/TODO: magic 12MB end of load program area
+	 *
+	 *  Hm. This breaks the old FreeBSD/MIPS snapshots...
+	 */
+#if 0
 	arcbios_add_memory_descriptor(cpu,
 	    0x60000 + m->memory_offset_in_mb * 1048576,
 	    start-0x60000 - m->memory_offset_in_mb * 1048576,
 	    ARCBIOS_MEM_FreeMemory);
+#endif
 	arcbios_add_memory_descriptor(cpu,
 	    start, len, ARCBIOS_MEM_LoadedProgram);
 
@@ -834,6 +840,9 @@
 
 	m->cpu_family = cpu_family_ptr_by_number(m->arch);
 
+	if (m->arch == ARCH_ALPHA)
+		m->arch_pagesize = 8192;
+
 	if (m->arch != ARCH_MIPS)
 		m->bintrans_enable = 0;
 
@@ -857,7 +866,7 @@
 		debug(" (offset by %iMB)", m->memory_offset_in_mb);
 		memory_amount += 1048576 * m->memory_offset_in_mb;
 	}
-	m->memory = memory_new(memory_amount);
+	m->memory = memory_new(memory_amount, m->arch);
 	if (m->machine_type != MACHINE_USERLAND)
 		debug("\n");
 
@@ -924,7 +933,15 @@
 	if (m->userland_emul != NULL) {
 		useremul_name_to_useremul(cpu,
 		    m->userland_emul, NULL, NULL, NULL);
-		cpu->memory_rw = userland_memory_rw;
+
+		switch (m->arch) {
+#ifdef ENABLE_ALPHA
+		case ARCH_ALPHA:
+			cpu->memory_rw = alpha_userland_memory_rw;
+			break;
+#endif
+		default:cpu->memory_rw = userland_memory_rw;
+		}
 	}
 
 	if (m->use_x11)
@@ -1124,9 +1141,17 @@
 			break;
 
 		case ARCH_ALPHA:
-		case ARCH_HPPA:
+			/*  For position-independant code:  */
+			cpu->cd.alpha.r[ALPHA_T12] = cpu->pc;
+			break;
+
 		case ARCH_SPARC:
-		case ARCH_URISC:
+			break;
+
+		case ARCH_IA64:
+			break;
+
+		case ARCH_M68K:
 			break;
 
 		case ARCH_ARM:
@@ -1203,7 +1228,7 @@
 	if (m->machine_type == MACHINE_DEC &&
 	    cpu->cd.mips.cpu_type.mmu_model == MMU3K)
 		add_symbol_name(&m->symbol_context,
-		    0x9fff0000, 0x10000, "r2k3k_cache", 0);
+		    0x9fff0000, 0x10000, "r2k3k_cache", 0, 0);
 
 	symbol_recalc_sizes(&m->symbol_context);
 
@@ -1219,8 +1244,7 @@
 	debug("starting cpu%i at ", m->bootstrap_cpu);
 	switch (m->arch) {
 	case ARCH_MIPS:
-		if (cpu->cd.mips.cpu_type.isa_level < 3 ||
-		    cpu->cd.mips.cpu_type.isa_level == 32) {
+		if (cpu->is_32bit) {
 			debug("0x%08x", (int)m->cpus[
 			    m->bootstrap_cpu]->pc);
 			if (cpu->cd.mips.gpr[MIPS_GPR_GP] != 0)
@@ -1245,30 +1269,6 @@
 		/*  ARM cpus aren't 64-bit:  */
 		debug("0x%08x", (int)entrypoint);
 		break;
-	case ARCH_URISC:
-		{
-			char tmps[100];
-			unsigned char buf[sizeof(uint64_t)];
-
-			cpu->memory_rw(cpu, m->memory, 0, buf, sizeof(buf),
-			    MEM_READ, CACHE_NONE | NO_EXCEPTIONS);
-
-			entrypoint = 0;
-			for (i=0; i<cpu->cd.urisc.wordlen/8; i++) {
-				entrypoint <<= 8;
-				if (cpu->byte_order == EMUL_BIG_ENDIAN)
-					entrypoint += buf[i];
-				else
-					entrypoint += buf[cpu->
-					    cd.urisc.wordlen/8 - 1 - i];
-			}
-
-			snprintf(tmps, sizeof(tmps), "0x%%0%illx",
-			    cpu->cd.urisc.wordlen / 4);
-			debug(tmps, (long long)entrypoint);
-			cpu->pc = entrypoint;
-		}
-		break;
 	case ARCH_X86:
 		debug("0x%04x:0x%llx", cpu->cd.x86.s[X86_S_CS],
 		    (long long)cpu->pc);
@@ -1441,9 +1441,14 @@
 		if (e == NULL)
 			continue;
 		for (j=0; j<e->n_machines; j++)
-			cpu_run_init(e, e->machines[j]);
+			cpu_run_init(e->machines[j]);
 	}
 
+	/*  TODO: Generalize:  */
+	if (emuls[0]->machines[0]->show_trace_tree)
+		cpu_functioncall_trace(emuls[0]->machines[0]->cpus[0],
+		    emuls[0]->machines[0]->cpus[0]->pc);
+
 	/*
 	 *  MAIN LOOP:
 	 *
@@ -1476,7 +1481,7 @@
 		if (e == NULL)
 			continue;
 		for (j=0; j<e->n_machines; j++)
-			cpu_run_deinit(e, e->machines[j]);
+			cpu_run_deinit(e->machines[j]);
 	}
 
 	/*  force_debugger_at_exit flag set? Then enter the debugger:  */