X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Forb%2Finvoke.cc;fp=kernel%2Forb%2Finvoke.cc;h=57097c55e0bc15a2500e3887eada0c677c8b533a;hp=b2e5de80bb05d3a9304dd158e95529abe64ac915;hb=b4bfc871337ca32ce83407916a87db2524729ca9;hpb=1096537bdc1c23affc5eedfba311d37c7bf647bf diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc index b2e5de8..57097c5 100644 --- a/kernel/orb/invoke.cc +++ b/kernel/orb/invoke.cc @@ -41,12 +41,25 @@ namespace ORB { return &hdr->frames[0]; } - return &hdr->frames[thread->orbstack_top += 1]; + return &hdr->frames[++thread->orbstack_top]; + } + + u32 IDSpace::rlookup(Object *obj) + { +#if 0 + ObjectHdr *hdr = idtree.find(obj); + + if (!hdr) + return 0; + + return hdr->id; +#endif + return 0; } } -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);