X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Finclude%2Fkern%2Forb.h;h=f90d0512f3ee0c9355edd5a402d0611c5dd08196;hp=dc832c385c1566d0e8122c389408eea6e1d1522b;hb=f95829cb521c076eebee345a1007e9fc912a0765;hpb=b4bfc871337ca32ce83407916a87db2524729ca9

diff --git a/kernel/include/kern/orb.h b/kernel/include/kern/orb.h
index dc832c3..f90d051 100644
--- a/kernel/include/kern/orb.h
+++ b/kernel/include/kern/orb.h
@@ -2,10 +2,14 @@
 #define _KERN_ORB_H
 
 #include <kern/types.h>
+#include <kern/radix.h>
 #include <orb.h>
 
 #include <util/list.h>
 #include <util/rbtree.h>
+#include <util/radix.h>
+#include <util/bmaptree.h>
+
 #include <System/Objects.h>
 
 namespace Mem {
@@ -53,12 +57,10 @@ namespace ORB {
 	
 	struct ObjectHdr;
 	struct Object;
-	
-	typedef Util::RBTree<ObjectHdr, Object *, Object *> IDRMap;
+	typedef u32 ID;
 
 	struct ObjectHdr {
-		IDRMap::Node rbtree_node;
-		u32 id;
+		ID id;
 
 		union {
 			struct {
@@ -77,14 +79,27 @@ namespace ORB {
 	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
-		IDRMap id_rmap;
+		IDTable table;
+		IDRMap rmap;
+		IDAlloc alloc;
 	
 	public:
 		Object *lookup(u32 id);
-		u32 rlookup(Object *obj);
+		ObjectHdr *get_local_hdr(Object *obj);
+		Object *newobj(Mem::ProcAddrSpace *aspace, uintptr_t entry);
 	};
 }