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=ffcd8372318c4e8f581fc490602c73b750c4993b;hp=2deabe5d6b16721ef8c264e328e3309025c393f3;hb=0601614ebbcc48b961a2f0613281e6e629af29b1;hpb=2e0cf58da9949572c6e334a07bba6774fdb749f9

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index 2deabe5..ffcd837 100644
--- a/kernel/orb/invoke.cc
+++ b/kernel/orb/invoke.cc
@@ -2,29 +2,24 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following condition:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/types.h>
 #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;
@@ -49,24 +44,61 @@ namespace ORB {
 			return &hdr->frames[0];
 		}
 		
-		return &hdr->frames[thread->orbstack_top += 1];
+		return &hdr->frames[++thread->orbstack_top];
 	}
-}
 
-extern "C" void invoke_method(ulong objid, ulong methid,
-                              ParamInfoBlock *user_pib, ulong ret_pc)
-{
-	ParamInfoBlock pib = Arch::copyin(user_pib);
-	CallFrame *frame = new_frame(curthread);
-	
-	frame->object = objid;
-	frame->method = 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",
-	       frame, frame->object, frame->method, frame->caller_user_pib,
-	       frame->ret_pc);
-	
+	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;
+	}
+
+	void invoke_method(ParamInfoBlock *user_pib, uintptr_t &stack)
+	{
+		ParamInfoBlock pib = Arch::copyin(user_pib);
+		CallFrame *frame = new_frame(curthread);
+		
+//		if (pib->objlist_len == 0)
+			
+		
+//		frame->object = objid;
+		frame->caller_user_pib = user_pib;
+//		frame->ret_pc = ret_pc;
+		
+		printf("invoke_method: frame %p pib %p ret %lx\n",
+		       frame, frame->caller_user_pib,
+		       frame->ret_pc);
+		
+		
+	}
 	
+	uintptr_t return_from_method(uintptr_t &exptr, size_t &exlen)
+	{
+		return 0;
+	}
 }