random kernel stuff

diff --git a/kernel/include/kern/orb.h b/kernel/include/kern/orb.h
index e420fc77e11f72e10597797808a6146b36288f49..f90d0512f3ee0c9355edd5a402d0611c5dd08196 100644 (file)
--- a/kernel/include/kern/orb.h
+++ b/kernel/include/kern/orb.h
@@ -7,6 +7,9 @@
 
 #include <util/list.h>
 #include <util/rbtree.h>
 
 #include <util/list.h>
 #include <util/rbtree.h>

+#include <util/radix.h>
+#include <util/bmaptree.h>
+

 #include <System/Objects.h>
 
 namespace Mem {
 #include <System/Objects.h>
 
 namespace Mem {


@@ -54,9 +57,7 @@ namespace ORB {
        
        struct ObjectHdr;
        struct Object;
        
        struct ObjectHdr;
        struct Object;

-       

        typedef u32 ID;
        typedef u32 ID;

-       typedef Util::RadixTree<ObjectHdr, ID> IDRMap;

 
        struct ObjectHdr {
                ID id;
 
        struct ObjectHdr {
                ID id;


@@ -78,14 +79,27 @@ namespace ORB {
        struct ObjectPtr : public ObjectHdr {
                Object *object;
        };
        struct ObjectPtr : public ObjectHdr {
                Object *object;
        };

+       
+       union ObjTableEntry {
+               ObjectHdr hdr;
+               Object obj;
+               ObjectPtr ptr;
+       };
+
+       typedef Util::RadixTree<ObjTableEntry, ID, 6> IDTable;
+       typedef Util::RadixTree<ObjectHdr *, ID, 4> IDRMap;
+       typedef Util::BitmapTree<ID> IDAlloc;

 
        class IDSpace {
                // Reverse mapping of object pointers to local IDs
 
        class IDSpace {
                // Reverse mapping of object pointers to local IDs

-               IDRMap idrmap;
+               IDTable table;
+               IDRMap rmap;
+               IDAlloc alloc;

        
        public:
                Object *lookup(u32 id);
                ObjectHdr *get_local_hdr(Object *obj);
        
        public:
                Object *lookup(u32 id);
                ObjectHdr *get_local_hdr(Object *obj);

+               Object *newobj(Mem::ProcAddrSpace *aspace, uintptr_t entry);

        };
 }
 
        };
 }
 

diff --git a/kernel/include/kern/radix.h b/kernel/include/kern/radix.h
index 1399356b589bc9167cb5e21247e49d8551452560..f596fea6f4b46403a6448a01d191511fb4b9ce7f 100644 (file)
--- a/kernel/include/kern/radix.h
+++ b/kernel/include/kern/radix.h
@@ -1,7 +1,7 @@
-// Generic radix tree implementation.  It's only kernel-specific because
-// it uses the kernel page allocator; each node takes up one page.  The
-// depth of the tree is dynamically growable (but not currently
-// shrinkable).
+// This is like RadixTree, but it uses the kernel page allocator; each
+// node takes up one page.  The depth of the tree is dynamically growable
+// (but not currently shrinkable).  It also auto-guesses radix_bits based
+// on the size of T, so as to fit a page.

 
 #ifndef _KERN_RADIX_H
 #define _KERN_RADIX_H
 
 #ifndef _KERN_RADIX_H
 #define _KERN_RADIX_H


@@ -17,7 +17,7 @@
 namespace Util {
        // Key must be an integer.
        template <typename T, typename Key>
 namespace Util {
        // Key must be an integer.
        template <typename T, typename Key>

-       class RadixTree {
+       class PageRadixTree {

                void *toplevel;
                uint depth; // in bits
                
                void *toplevel;
                uint depth; // in bits
                


@@ -85,11 +85,12 @@ namespace Util {
                                node = new_node;
                        }
                        
                                node = new_node;
                        }
                        

-                       assert(shift == RADIX_final_shift - dir_shift);
-                       return static_cast<T *>(node) + key_to_offset(key);
+                       assert(shift == 0 || shift == RADIX_final_shift - dir_shift);
+                       return (T *)((unsigned long)node +
+                                    (key_to_offset(key) << RADIX_data_bits));

                }
                
                }
                

-               RadixTree()
+               PageRadixTree()

                {
                        toplevel = Mem::alloc_pages(1);
                        bzero(toplevel, Arch::page_size);
                {
                        toplevel = Mem::alloc_pages(1);
                        bzero(toplevel, Arch::page_size);

diff --git a/kernel/include/kern/rmap.h b/kernel/include/kern/rmap.h
index 86dacd6febf352d550ef8209380c704aab31bfde..6124fdf00e31fb56a3e6b7e8b99f23ee1fb76be0 100644 (file)
--- a/kernel/include/kern/rmap.h
+++ b/kernel/include/kern/rmap.h
@@ -3,6 +3,7 @@
 
 #include <kern/mem.h>
 #include <kern/radix.h>
 
 #include <kern/mem.h>
 #include <kern/radix.h>

+#include <util/radix.h>

 
 namespace Mem {
        struct RMapNode {
 
 namespace Mem {
        struct RMapNode {


@@ -32,7 +33,12 @@ namespace Mem {
        class Page;
        
        class RMapTable {
        class Page;
        
        class RMapTable {

-               Util::RadixTree<RMapNode, u64> tree;
+               Util::PageRadixTree<RMapNode, u64> tree;
+               
+               RMapNode *lookup(u64 vaddr, bool add = false)
+               {
+                       return tree.lookup(vaddr >> Arch::page_shift, add);
+               }

                
        public:
                // rmap_lock must be held.
                
        public:
                // rmap_lock must be held.

diff --git a/kernel/lib/libc.cc b/kernel/lib/libc.cc
index 60bdee24305d2151edbdcb21ddde258e41c5d3f5..e571384048458bf9d9ee49e0e593900affd30fe4 100644 (file)
--- a/kernel/lib/libc.cc
+++ b/kernel/lib/libc.cc
@@ -539,6 +539,8 @@ void *memset(void *b, int ch, size_t len)
 
 void *malloc(size_t len)
 {
 
 void *malloc(size_t len)
 {

+       assert(len <= Arch::page_size - sizeof(size_t));
+

        len = (len + sizeof(size_t) + Arch::page_size - 1) / Arch::page_size;
        Mem::Page *page = Mem::PageAlloc::alloc(len);
        
        len = (len + sizeof(size_t) + Arch::page_size - 1) / Arch::page_size;
        Mem::Page *page = Mem::PageAlloc::alloc(len);
        


@@ -551,8 +553,7 @@ void *malloc(size_t len)
 void free(void *addr)
 {
        if (addr) {
 void free(void *addr)
 {
        if (addr) {

-               size_t *ptr = (size_t *)addr;
-               ptr--;
+               size_t *ptr = (size_t *)addr - 1;

                size_t len = *ptr;
                Mem::Page *page = Mem::kvirt_to_page(addr);
                Mem::PageAlloc::free(page, len);
                size_t len = *ptr;
                Mem::Page *page = Mem::kvirt_to_page(addr);
                Mem::PageAlloc::free(page, len);

diff --git a/kernel/mem/orbmm.cc b/kernel/mem/orbmm.cc
index 49502d2f49e5603552629afcbbcdd1241e98683b..deb868932636f40790ffabf304239fd22ac88425 100644 (file)
--- a/kernel/mem/orbmm.cc
+++ b/kernel/mem/orbmm.cc
@@ -25,17 +25,22 @@ namespace RunTime {
                priv = NULL;
        }
 
                priv = NULL;
        }
 

-       void *ORBMM::alloc(size_t size, AllocGroup *group)
+       void *ORBMM::alloc(size_t size, int refs)

        {
                return reinterpret_cast<void *>(new u8[size]);
        }
        
        {
                return reinterpret_cast<void *>(new u8[size]);
        }
        

-       void ORBMM::retain(Region region)
+       void ORBMM::retain(void *ptr, int refs)

        {
                // FIXME
        }
 
        {
                // FIXME
        }
 

-       void ORBMM::release(Region region)
+       void ORBMM::release(void *ptr, int refs)
+       {
+               // FIXME
+       }
+
+       void ORBMM::add_region(Region rgn, bool unmap, int refs)

        {
                // FIXME
        }
        {
                // FIXME
        }

diff --git a/kernel/mem/rmap.cc b/kernel/mem/rmap.cc
index 2ef4a035b8ad7e5e61b1d62e7e5376f34ea7b8a8..dc9e2563efb23885d78eaec8c2cc424cb374b5a3 100644 (file)
--- a/kernel/mem/rmap.cc
+++ b/kernel/mem/rmap.cc
@@ -28,7 +28,7 @@ namespace Mem {
                                 u64 dsvaddr, u64 usvaddr)
        {
                RMapNode *dsrmap = dsva->aspace->page_table->
                                 u64 dsvaddr, u64 usvaddr)
        {
                RMapNode *dsrmap = dsva->aspace->page_table->

-                                  rmap_table.tree.lookup(dsvaddr, true);
+                                  rmap_table.lookup(dsvaddr, true);

 
                assert(!dsrmap->va);
                dsrmap->va = dsva;
 
                assert(!dsrmap->va);
                dsrmap->va = dsva;


@@ -37,7 +37,7 @@ namespace Mem {
                dsrmap->tail.init();
                
                if (usptbl) {
                dsrmap->tail.init();
                
                if (usptbl) {

-                       RMapNode *usrmap = usptbl->rmap_table.tree.lookup(usvaddr);
+                       RMapNode *usrmap = usptbl->rmap_table.lookup(usvaddr);

                        assert(usrmap);
                        assert(usrmap->va->aspace->page_table == usptbl);
 
                        assert(usrmap);
                        assert(usrmap->va->aspace->page_table == usptbl);
 


@@ -53,7 +53,7 @@ namespace Mem {
        void RMapTable::unmap(u64 virtaddr)
        {
                Lock::AutoLock autolock(rmap_lock);
        void RMapTable::unmap(u64 virtaddr)
        {
                Lock::AutoLock autolock(rmap_lock);

-               RMapNode *head = tree.lookup(virtaddr);
+               RMapNode *head = lookup(virtaddr);

                
                if (!head || !head->va)
                        return;
                
                if (!head || !head->va)
                        return;


@@ -87,7 +87,7 @@ namespace Mem {
        void RMapTable::break_copy_on_write(u64 virtaddr, Page *new_page)
        {
                assert(rmap_lock.held_by_curthread());
        void RMapTable::break_copy_on_write(u64 virtaddr, Page *new_page)
        {
                assert(rmap_lock.held_by_curthread());

-               RMapNode *head = tree.lookup(virtaddr);
+               RMapNode *head = lookup(virtaddr);

                RMapNode *still_cow = NULL;
                
                assert(head && head->va);
                RMapNode *still_cow = NULL;
                
                assert(head && head->va);

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index 27a1ebe1612a2a1a1ffc7e2fec0f8888c38ff5b7..102ea95ba40704e26c850c8a968cb02adedcf7f1 100644 (file)
--- a/kernel/orb/invoke.cc
+++ b/kernel/orb/invoke.cc
@@ -46,31 +46,50 @@ namespace ORB {
                
                return &hdr->frames[++thread->orbstack_top];
        }
                
                return &hdr->frames[++thread->orbstack_top];
        }

-       
+

        ObjectHdr *IDSpace::get_local_hdr(Object *obj)
        {
        ObjectHdr *IDSpace::get_local_hdr(Object *obj)
        {

-               ObjectHdr *hdr = idrmap.lookup(obj->id);
+               ObjectHdr *hdr = *rmap.lookup(obj->id);
+               if (hdr)
+                       return hdr;

                
                

-               if (!hdr)
-                       return 0;
+               int id = alloc.alloc();
+               ObjectPtr *ptr = &table.lookup(id, true)->ptr;
+
+               ptr->id = id;
+               ptr->flags = 0;
+               ptr->Pointer = 1;
+               ptr->object = obj;
+
+               *rmap.lookup(id, true) = ptr;
+               return ptr;
+       }
+
+       Object *IDSpace::newobj(Mem::ProcAddrSpace *aspace, uintptr_t entry)
+       {
+               int id = alloc.alloc();
+               Object *obj = &table.lookup(id, true)->obj;
+
+               obj->id = id;
+               obj->flags = 0;
+               obj->aspace = aspace;
+               obj->entry = entry;

                
                

-               return hdr->id;
+               return obj;

        }
 }
 
        }
 }
 

-extern "C" void invoke_method(u32 objid, u32 methid, ParamInfoBlock *user_pib,
-                              ulong ret_pc)
+extern "C" void invoke_method(ParamInfoBlock *user_pib, ulong ret_pc)

 {
        ParamInfoBlock pib = Arch::copyin(user_pib);
        CallFrame *frame = new_frame(curthread);
        
 {
        ParamInfoBlock pib = Arch::copyin(user_pib);
        CallFrame *frame = new_frame(curthread);
        

-       frame->object = objid;
-       frame->method = methid;
+//     frame->object = objid;

        frame->caller_user_pib = user_pib;
        frame->ret_pc = ret_pc;
        
        frame->caller_user_pib = user_pib;
        frame->ret_pc = ret_pc;
        

-       printf("invoke_method: frame %p object %x method %x pib %p ret %lx\n",
-              frame, frame->object, frame->method, frame->caller_user_pib,
+       printf("invoke_method: frame %p pib %p ret %lx\n",
+              frame, frame->caller_user_pib,

               frame->ret_pc);
        
        
               frame->ret_pc);
        
        

diff --git a/kernel/tests/aspace.cc b/kernel/tests/aspace.cc
index 694021ebc507dd16c7bab594d3dc1a1c2cebb902..8471c37883fd7f644e249a1c44b6364c46c13550 100644 (file)
--- a/kernel/tests/aspace.cc
+++ b/kernel/tests/aspace.cc
@@ -57,7 +57,8 @@ void thread(void *arg)
               (void *)stacked[0], (void *)stacked[1],
               (void *)mappables[0], (void *)mappables[1]);
                
               (void *)stacked[0], (void *)stacked[1],
               (void *)mappables[0], (void *)mappables[1]);
                

-       char *buf = new char[100000];
+//     char *buf = new char[100000];
+       char *buf = (char *)alloc_pages(25);

        printf("buf %p\n", buf);
        
        char *abuf = (char *)((((ulong)buf) + 4095) & ~4095);
        printf("buf %p\n", buf);
        
        char *abuf = (char *)((((ulong)buf) + 4095) & ~4095);