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=73ada0457357545d5527be12784c4e23b1339158;hb=f95829cb521c076eebee345a1007e9fc912a0765;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index 73ada04..102ea95 100644
--- a/kernel/orb/invoke.cc
+++ b/kernel/orb/invoke.cc
@@ -2,37 +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 conditions:
+// 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.
 // 
-//     * Redistributions of source code must retain the above copyright notice,
-//       this list of conditions and the following disclaimers.
-// 
-//     * Redistributions in binary form must reproduce the above copyright notice,
-//       this list of conditions and the following disclaimers in the
-//       documentation and/or other materials provided with the distribution.
-// 
-//     * The names of the Software's authors and/or contributors
-//       may not be used to endorse or promote products derived from
-//       this Software without specific prior written permission.
-// 
-// 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;
@@ -57,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);