--- src/io/prom/promboot.cc	2007/09/05 17:11:21	1
+++ src/io/prom/promboot.cc	2007/09/05 18:52:58	8
@@ -491,7 +491,7 @@
 bool mapped_load_elf_from_chrp(File &f, uint disp_off)
 {
 	String fn;
-	PROMBOOT_OUTPUT("ELF: trying to load '%y'\n", &f.getDesc(fn));
+	PROMBOOT_OUTPUT("ELF: trying to load '%y' (CHRP)\n", &f.getDesc(fn));
 	try {
 		ELF_HEADER32 hdr;
 		ELF_PROGRAM_HEADER32 *phdr;
@@ -703,6 +703,7 @@
 			return false;
 		}
 
+		uint32 entry;
 		uint32 la = ELF_LOAD_ADDRESS;
 		f.seek(0x2c);
 		uint16 program_hdrs;
@@ -711,19 +712,21 @@
 		uint32 stack=0;
 		uint32 stackp=0;
 		for (int i=0; i<program_hdrs; i++) {
-//			IO_PROM_TRACE("program header %d:\n", i);
+			IO_PROM_TRACE("program header %d:\n", i);
 			ELF_PROGRAM_HEADER32 program_hdr;
 			f.seek(0x34+i*sizeof program_hdr);
 			f.readx(&program_hdr, sizeof program_hdr);
 			createHostStructx(&program_hdr, sizeof program_hdr, ELF_PROGRAM_HEADER32_struct, big_endian);
 			uint32 pages_from_file = program_hdr.p_filesz / 4096;
 			uint32 ea = program_hdr.p_vaddr;
+			ea = 0x00000000; // XXX force load to beginning of RAM
+			entry = ea;
 			sint32 vs = program_hdr.p_memsz;
 			f.seek(program_hdr.p_offset);
 			uint32 fo = program_hdr.p_offset;
 			byte page[4096];
 			while (pages_from_file) {
-//				IO_PROM_TRACE("loading from %08x to ea:%08x (pa:%08x)\n", fo, ea, la);
+				IO_PROM_TRACE("loading from %08x to ea:%08x (pa:%08x)\n", fo, ea, la);
 				f.readx(page, sizeof page);
 		    		if (!init_page_create(ea, la)) return false;
 				if (!ppc_dma_write(la, page, 4096)) {
@@ -736,7 +739,7 @@
 				vs -= 4096;
 			}
 			if (program_hdr.p_filesz % 4096) {
-//		  		ht_printf("loading remaining from %08x to ea:%08x (pa:%08x)\n", fo, ea, la);
+		  		ht_printf("loading remaining from %08x to ea:%08x (pa:%08x)\n", fo, ea, la);
 				f.read(page, program_hdr.p_filesz % 4096);
 				if (!init_page_create(ea, la)) return false;
 				if (!ppc_dma_write(la+(ea&0xfff), page, program_hdr.p_filesz % 4096)) {
@@ -748,7 +751,7 @@
 				vs -= 4096;
 			}
 			while (vs > 0) {
-//  				ht_printf("creating for ea:%08x (pa:%08x)\n", ea, la);
+  				ht_printf("creating for ea:%08x (pa:%08x)\n", ea, la);
 				if (!init_page_create(ea, la)) return false;
 				la += 4096;
 				ea += 4096;
@@ -768,10 +771,7 @@
 		}
 	
 	
-		f.seek(0x18);
-		uint32 entry;
-		f.readx(&entry, 4);
-		entry = createHostInt(&entry, 4, big_endian);	
+		IO_PROM_TRACE("starting program from PC %08x\n", entry);
 
 		// turn on address translation
 		ppc_cpu_set_msr(0, MSR_IR | MSR_DR | MSR_FP);