From 550f9a075207b6b3f398d292ccae7335eba38189 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Wed, 1 Apr 2015 14:01:14 +0200
Subject: XXX pmm from x15, userspace crashes soon

---
 i386/i386at/biosmem.c | 65 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 23 deletions(-)

(limited to 'i386/i386at/biosmem.c')

diff --git a/i386/i386at/biosmem.c b/i386/i386at/biosmem.c
index bdffc33..e412d98 100644
--- a/i386/i386at/biosmem.c
+++ b/i386/i386at/biosmem.c
@@ -16,23 +16,33 @@
  */
 
 #include <kern/assert.h>
-#include <kern/init.h>
 #include <kern/macros.h>
-#include <kern/panic.h>
-#include <kern/param.h>
-#include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
-#include <kern/types.h>
-#include <machine/biosmem.h>
-#include <machine/boot.h>
-#include <machine/cpu.h>
-#include <machine/elf.h>
-#include <machine/multiboot.h>
-#include <vm/vm_kmem.h>
+#include <kern/debug.h>
+#include <kern/printf.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
 #include <vm/vm_page.h>
 
+#include "biosmem.h"
+#include "x15/elf.h"
+#include "x15/multiboot.h"
+
+/* Mach glue.  */
+#define __bootdata	/* nothing */
+#define __boot		/* nothing */
+#define __init		/* nothing */
+#define boot_memmove	memmove
+#define boot_memset(P,C,S)	memset(phystokv(P), C, S)
+#define boot_strlen(P)	strlen(phystokv(P))
+#define boot_panic	panic
+#define printk		printf
+#define BOOT_VTOP(addr) _kvtophys(addr)
+
+/* XXX */
+extern char _boot;
+extern char _end;
+
 /*
  * Maximum number of entries in the BIOS memory map.
  *
@@ -115,7 +125,7 @@ biosmem_map_build(const struct multiboot_raw_info *mbi)
     struct biosmem_map_entry *start, *entry, *end;
     unsigned long addr;
 
-    addr = mbi->mmap_addr;
+    addr = phystokv(mbi->mmap_addr);
     mb_entry = (struct multiboot_raw_mmap_entry *)addr;
     mb_end = (struct multiboot_raw_mmap_entry *)(addr + mbi->mmap_length);
     start = biosmem_map;
@@ -378,7 +388,7 @@ biosmem_save_cmdline_sizes(struct multiboot_raw_info *mbi)
     if (mbi->flags & MULTIBOOT_LOADER_MODULES) {
         unsigned long addr;
 
-        addr = mbi->mods_addr;
+        addr = phystokv(mbi->mods_addr);
 
         for (i = 0; i < mbi->mods_count; i++) {
             mod = (struct multiboot_raw_module *)addr + i;
@@ -391,6 +401,8 @@ static void __boot
 biosmem_find_boot_data_update(uint32_t min, uint32_t *start, uint32_t *end,
                               uint32_t data_start, uint32_t data_end)
 {
+    assert (data_start < data_end);
+
     if ((min <= data_start) && (data_start < *start)) {
         *start = data_start;
         *end = data_end;
@@ -419,21 +431,20 @@ biosmem_find_boot_data(const struct multiboot_raw_info *mbi, uint32_t min,
     struct elf_shdr *shdr;
     uint32_t i, start, end = end;
     unsigned long tmp;
-
     start = max;
 
-    biosmem_find_boot_data_update(min, &start, &end, (unsigned long)&_boot,
+    biosmem_find_boot_data_update(min, &start, &end,
+                                  BOOT_VTOP((unsigned long)&_boot),
                                   BOOT_VTOP((unsigned long)&_end));
 
     if ((mbi->flags & MULTIBOOT_LOADER_CMDLINE) && (mbi->cmdline != 0))
         biosmem_find_boot_data_update(min, &start, &end, mbi->cmdline,
                                       mbi->cmdline + mbi->unused0);
-
     if (mbi->flags & MULTIBOOT_LOADER_MODULES) {
         i = mbi->mods_count * sizeof(struct multiboot_raw_module);
         biosmem_find_boot_data_update(min, &start, &end, mbi->mods_addr,
                                       mbi->mods_addr + i);
-        tmp = mbi->mods_addr;
+        tmp = phystokv(mbi->mods_addr);
 
         for (i = 0; i < mbi->mods_count; i++) {
             mod = (struct multiboot_raw_module *)tmp + i;
@@ -450,7 +461,7 @@ biosmem_find_boot_data(const struct multiboot_raw_info *mbi, uint32_t min,
         tmp = mbi->shdr_num * mbi->shdr_size;
         biosmem_find_boot_data_update(min, &start, &end, mbi->shdr_addr,
                                       mbi->shdr_addr + tmp);
-        tmp = mbi->shdr_addr;
+        tmp = phystokv(mbi->shdr_addr);
 
         for (i = 0; i < mbi->shdr_num; i++) {
             shdr = (struct elf_shdr *)(tmp + (i * mbi->shdr_size));
@@ -458,7 +469,6 @@ biosmem_find_boot_data(const struct multiboot_raw_info *mbi, uint32_t min,
             if ((shdr->type != ELF_SHT_SYMTAB)
                 && (shdr->type != ELF_SHT_STRTAB))
                 continue;
-
             biosmem_find_boot_data_update(min, &start, &end, shdr->addr,
                                           shdr->addr + shdr->size);
         }
@@ -516,6 +526,10 @@ biosmem_setup_allocator(struct multiboot_raw_info *mbi)
     biosmem_heap_start = max_heap_start;
     biosmem_heap_end = max_heap_end;
     biosmem_heap_cur = biosmem_heap_end;
+
+    /* Mach pmap glue.  */
+    extern vm_offset_t phys_last_addr;
+    phys_last_addr = (vm_offset_t) max_heap_end;
 }
 
 void __boot
@@ -688,10 +702,15 @@ biosmem_setup(void)
 
     biosmem_map_show();
 
+#if notyet
     cpu = cpu_current();
     max_phys_end = (cpu->phys_addr_width == 0)
                    ? (uint64_t)-1
                    : (uint64_t)1 << cpu->phys_addr_width;
+#else
+    max_phys_end = (uint64_t)1 << 32;
+    (void) cpu;
+#endif
 
     for (i = 0; i < ARRAY_SIZE(biosmem_segments); i++) {
         if (biosmem_segment_size(i) == 0)
@@ -715,7 +734,7 @@ biosmem_free_usable_range(phys_addr_t start, phys_addr_t end)
            (unsigned long long)((end - start) >> 10));
 
     while (start < end) {
-        page = vm_page_lookup(start);
+        page = vm_page_lookup_pa(start);
         assert(page != NULL);
         vm_page_manage(page);
         start += PAGE_SIZE;
-- 
cgit v1.2.3