X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Forb%2Finvoke.cc;h=102ea95ba40704e26c850c8a968cb02adedcf7f1;hp=b2e5de80bb05d3a9304dd158e95529abe64ac915;hb=f95829cb521c076eebee345a1007e9fc912a0765;hpb=77bf9a95a836b14a243953e1fbd28c7c1106c59a

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index b2e5de8..102ea95 100644
--- a/kernel/orb/invoke.cc
+++ b/kernel/orb/invoke.cc
@@ -16,7 +16,10 @@
 #include <kern/orb.h>
 #include <kern/pagealloc.h>
 #include <kern/compiler.h>
+#include <kern/thread.h>
+
 #include <arch/usercopy.h>
+
 #include <orb.h>
 
 using System::RunTime::ParamInfoBlock;
@@ -41,23 +44,52 @@ namespace ORB {
 			return &hdr->frames[0];
 		}
 		
-		return &hdr->frames[thread->orbstack_top += 1];
+		return &hdr->frames[++thread->orbstack_top];
+	}
+
+	ObjectHdr *IDSpace::get_local_hdr(Object *obj)
+	{
+		ObjectHdr *hdr = *rmap.lookup(obj->id);
+		if (hdr)
+			return hdr;
+		
+		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 obj;
 	}
 }
 
-extern "C" void invoke_method(ulong objid, ulong 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);
 	
-	frame->object = objid;
-	frame->method = methid;
+//	frame->object = objid;
 	frame->caller_user_pib = user_pib;
 	frame->ret_pc = ret_pc;
 	
-	printf("invoke_method: frame %p object %lx method %lx 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);