--- trunk/src/cpus/memory_alpha.c	2007/10/08 16:20:48	31
+++ trunk/src/cpus/memory_alpha.c	2007/10/08 16:20:58	32
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: memory_alpha.c,v 1.3 2006/06/24 21:47:23 debug Exp $
+ *  $Id: memory_alpha.c,v 1.7 2006/10/08 02:28:58 debug Exp $
  */
 
 #include <stdio.h>
@@ -37,6 +37,8 @@
 #include "memory.h"
 #include "misc.h"
 
+#include "alpha_rpb.h"
+
 
 /*
  *  alpha_translate_v2p():
@@ -44,24 +46,79 @@
 int alpha_translate_v2p(struct cpu *cpu, uint64_t vaddr,
 	uint64_t *return_paddr, int flags)
 {
-	*return_paddr = vaddr & 0x000003ffffffffffULL;
+	uint64_t base = cpu->cd.alpha.pcb.apcb_ptbr << ALPHA_PAGESHIFT;
+	uint64_t addr, pte1, pte2, pte3;
+	int i1, i2, i3;
+	unsigned char *pt_entry_ptr;
+
+	/*  Kernel direct-mapped space:  */
+	if ((vaddr & ~0x1ffffffffffULL) == 0xfffffc0000000000ULL) {
+		*return_paddr = vaddr & 0x000003ffffffffffULL;
+		return 2;
+	}
+
+	i1 = (vaddr >> 33) & 0x3ff;
+	i2 = (vaddr >> 23) & 0x3ff;
+	i3 = (vaddr >> 13) & 0x3ff;
+
+	debug("base = 0x%016"PRIx64"\n", base);
+	debug("i1=0x%x i2=0x%x i3=0x%x\n", i1, i2, i3);
+
+	addr = base + i1 * sizeof(uint64_t);
+
+	pt_entry_ptr = memory_paddr_to_hostaddr(cpu->mem, addr, 0);
+	if (pt_entry_ptr == NULL)
+		goto not_found;
+
+	pte1 = *(uint64_t *)(pt_entry_ptr);
+	pte1 = LE64_TO_HOST(pte1);
+
+	debug("pte1 = 0x%016"PRIx64"\n", pte1);
+
+	addr = ((pte1 >> 32) << ALPHA_PAGESHIFT) + (i2 * sizeof(uint64_t));
 
+	pt_entry_ptr = memory_paddr_to_hostaddr(cpu->mem, addr, 0);
+	if (pt_entry_ptr == NULL)
+		goto not_found;
+
+	pte2 = *(uint64_t *)(pt_entry_ptr);
+	pte2 = LE64_TO_HOST(pte2);
+
+	debug("pte2 = 0x%016"PRIx64"\n", pte2);
+
+	addr = ((pte2 >> 32) << ALPHA_PAGESHIFT) + (i3 * sizeof(uint64_t));
+
+	pt_entry_ptr = memory_paddr_to_hostaddr(cpu->mem, addr, 0);
+	if (pt_entry_ptr == NULL)
+		goto not_found;
+
+	pte3 = *(uint64_t *)(pt_entry_ptr);
+	pte3 = LE64_TO_HOST(pte3);
+
+	debug("pte3 = 0x%016"PRIx64"\n", pte3);
+
+not_found:
+	/*  No match.  */
+	debug("[ alpha_translate_v2p: 0x%016"PRIx64" wasn't found ]\n", vaddr);
+
+#if 1
 	/*  UGLY hack for now:  */
 	/*  TODO: Real virtual memory support.  */
+	*return_paddr = vaddr & 0x000003ffffffffffULL;
+
+	if ((vaddr & ~0x7fff) == 0x0000000010000000ULL)
+		*return_paddr = (vaddr & 0x7fff) + HWRPB_PADDR;
 
-	if ((vaddr & ~0xffff) == 0xfffffc0010000000ULL ||
-	    (vaddr & ~0xffff) == 0x0000000010000000ULL)
-		*return_paddr = (vaddr & 0x0fffffff) +
-		    (cpu->machine->physical_ram_in_mb-1) * 1048576;
-
-	/*  At 0x20000000, NetBSD stores temp prom data  */
-	if ((vaddr & ~0x1fff) == 0xfffffc0020000000ULL ||
-	    (vaddr & ~0x1fff) == 0x0000000020000000ULL)
-		*return_paddr = (vaddr & 0x0fffffff) + 512*1024 +
-		    (cpu->machine->physical_ram_in_mb-1) * 1048576;
+	if ((vaddr & ~0xffffff) == 0xfffffe0000000000ULL)
+		*return_paddr = 0x7efa000 + (vaddr & 0xffffff);
 
-	/*  printf("yo %016"PRIx64" %016"PRIx64"\n", vaddr, *return_paddr);  */
+	/*  At 0x20000000, NetBSD stores 8KB temp prom data  */
+	if ((vaddr & ~0x1fff) == 0x0000000020000000ULL)
+		*return_paddr = (vaddr & 0x1fff) + PROM_ARGSPACE_PADDR;
 
 	return 2;
+#else
+	return 0;
+#endif
 }