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=27a1ebe1612a2a1a1ffc7e2fec0f8888c38ff5b7;hp=b2e5de80bb05d3a9304dd158e95529abe64ac915;hb=0c52a8435aa399781856869daa7ef30cef14fad5;hpb=77bf9a95a836b14a243953e1fbd28c7c1106c59a

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index b2e5de8..27a1ebe 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,12 +44,22 @@ 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 = idrmap.lookup(obj->id);
+		
+		if (!hdr)
+			return 0;
+		
+		return hdr->id;
 	}
 }
 
-extern "C" void invoke_method(ulong objid, ulong methid,
-                              ParamInfoBlock *user_pib, ulong ret_pc)
+extern "C" void invoke_method(u32 objid, u32 methid, ParamInfoBlock *user_pib,
+                              ulong ret_pc)
 {
 	ParamInfoBlock pib = Arch::copyin(user_pib);
 	CallFrame *frame = new_frame(curthread);
@@ -56,7 +69,7 @@ extern "C" void invoke_method(ulong objid, ulong methid,
 	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",
+	printf("invoke_method: frame %p object %x method %x pib %p ret %lx\n",
 	       frame, frame->object, frame->method, frame->caller_user_pib,
 	       frame->ret_pc);