Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision f275cb36e9500aaf4935ed3ac6c1ed56b5a25dc3)
+++ genarch/src/mm/page_ht.c	(revision 214e89e396a9a2332bd3ffcd0a3fc259dfbafbc1)
@@ -30,8 +30,10 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/heap.h>
 #include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
 #include <arch/asm.h>
+#include <debug.h>
 
 static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
@@ -52,8 +54,19 @@
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
- * @param root Explicit PTL0 address.
+ * @param root Ignored.
  */
-void ht_mapping_insert(__address page,  asid_t asid, __address frame, int flags, __address root)
+void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
 {
+	pte_t *t, *u = NULL;
+	
+	t = HT_HASH(page, asid);
+	if (!HT_SLOT_EMPTY(t)) {
+		u = (pte_t *) malloc(sizeof(pte_t));	/* FIXME: use slab allocator for this */
+		if (!u)
+			panic("could not allocate memory for hash table\n");
+		*u = *t;
+	}
+	HT_SET_NEXT(t, u);
+	HT_SET_RECORD(t, page, asid, frame, flags);
 }
 
@@ -64,10 +77,16 @@
  * @param page Virtual page.
  * @param asid Address space to wich page belongs.
- * @param root PTL0 address if non-zero.
+ * @param root Ignored.
  *
- * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
+ * @return NULL if there is no such mapping; requested mapping otherwise.
  */
 pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
 {
-	return NULL;
+	pte_t *t;
+	
+	t = HT_HASH(page, asid);
+	while (!HT_COMPARE(page, asid, t) && HT_GET_NEXT(t))
+		t = HT_GET_NEXT(t);
+	
+	return HT_COMPARE(page, asid, t) ? t : NULL;
 }