minor orb stuff

diff --git a/doc/abi/x86 b/doc/abi/x86
index 805eb76a630f16fa019b67b3e493c509c7c9b799..7f3de369192025ad0570c4cac8880f7c94f05e0f 100644 (file)
--- a/doc/abi/x86
+++ b/doc/abi/x86
@@ -40,9 +40,9 @@ Object registration:
        eax: pointer to exception, or NULL if none
        edx: length of exception segment, if any
 
-GUID hash retrieval:
+GUID SHA-1 hash retrieval:
        eax: object id
-       edx: 16-byte buffer
+       edx: 20-byte buffer
        
        Call the 32-bit address stored at 0x7fff000c.
        

diff --git a/doc/orb/marshalling b/doc/orb/marshalling
index ab429bb8e853ee0e27a0e02154c8dbb6ff96f98b..e56e350a0d3eebc3c991906f4ad856a9112fc42c 100644 (file)
--- a/doc/orb/marshalling
+++ b/doc/orb/marshalling
@@ -37,6 +37,26 @@ for 32-bit architectures and 32 for 64-bit architectures.
 Object references are encoded as pointer-sized offsets into the
 objlist array.
 
+Virtual structs are prefaced with a header, which consists of
+the following, in order:
+1. 128-bit GUID of the most derived vstruct type
+2. 160-bit SHA-1 of the vstruct type info
+3. 32-bit objlist-offset of an introspection object
+4. 32-bit length of vstruct, including header, and all referenced
+data chunks, which must be contiguously appended to the vstruct body
+5. 32-bit reserved field
+
+The requirement for all referenced data chunks to be contiguous with
+the vstruct means that scatter-gather and zero-copy cannot be done;
+however, it prevents the loss of derived-type data when only a base
+type is known at unmarshalling time (the derived-type data could
+later be accessed through introspection, or be passed to another
+process that does know the derived type).  For this reason, vstructs
+should generally not be used to pass large chunks of data.
+
+The introspection object reference may be NULL; in this case, the
+SHA-1 field is ignored.
+
 Op1: Get Interface List
 -----------------------
 

diff --git a/doc/orb/newobject b/doc/orb/newobject
index 7b1c4c52ddbf45a1d0874fab79a1702eb88ad440..6140c6c6cbde126475aeb045ba5e021195ec2514 100644 (file)
--- a/doc/orb/newobject
+++ b/doc/orb/newobject
@@ -1,5 +1,5 @@
 struct NewObject {
-       u32 guid_hash[4]; // Interface GUID checksum
+       u32 guid_hash[5]; // SHA-1 hash of Interface GUIDs
        u32 id; // Filled in by ORB
        u32 reserved[3]; // must be zero
 };

diff --git a/include/c++/orb.h b/include/c++/orb.h
index 076f1ddea6e22aa4462ac40054ed6171bb08a7cb..23f0b72571ad07e544855e6d7c26748c2ccb456e 100644 (file)
--- a/include/c++/orb.h
+++ b/include/c++/orb.h
@@ -254,16 +254,12 @@ namespace System {
                        // Length of inheritance chain; 1 for System.VStruct
                        
                        const int chainlen;
-                       
-                       // Size of concrete vstruct
-                       
-                       const int structlen;
                };
                
                uintptr_t downcast(::System::_i_Object *obj,
                                   const unsigned long *new_guid);
 
-               typedef u64 GUID[2];
+               typedef uint64_t GUID[2];
 
                // FIXME: use above typedef
                static inline bool guids_equal(const unsigned long *guid1,
@@ -343,15 +339,6 @@ namespace System {
                                return false;
 #endif
                        }
-
-                       typedef void (*MethodEntry)(ParamInfoBlock *pib);
-
-                       struct Object {
-                               MethodEntry entry;
-                               void *ptr; // pointer to the class interface
-                       };
-
-                       typedef Util::RadixTree<Object, ID, 6> ObjTable;
                }
        };
 }
@@ -393,7 +380,7 @@ inline void operator delete[](void *ptr, ::System::RunTime::ORBMM *orbmm,
        throw T(NULL, NULL, \
                new(::System::RunTime::orbmm) \
                   ::System::Exceptions::NativeCodeExceptionOriginInfo \
-                  (::System::RunTime::get_pc()), \
+                  (::System::RunTime::Priv::get_pc()), \
                ::System::RunTime::Priv::in_kernel(), ##args); \
 } while (0)
 
@@ -401,7 +388,7 @@ inline void operator delete[](void *ptr, ::System::RunTime::ORBMM *orbmm,
        throw T(new(::System::RunTime::orbmm) typeof(oldex)(oldex), NULL, \
                new(::System::RunTime::orbmm) \
                   ::System::Exceptions::NativeCodeExceptionOriginInfo \
-                  (::System::RunTime::get_pc()), \
+                  (::System::RunTime::Priv::get_pc()), \
                ::System::RunTime::Priv::in_kernel(), ##args); \
 } while (0)
 #endif

diff --git a/include/c++/util/assert.h b/include/c++/util/assert.h
index fdff3b3d85b901b4b932917dc165e82f389ba703..43e80b9163ad6a70a77b71ae3f90cc53c74ae0f2 100644 (file)
--- a/include/c++/util/assert.h
+++ b/include/c++/util/assert.h
@@ -1,6 +1,10 @@
 #ifndef _UTIL_ASSERT_H
 #define _UTIL_ASSERT_H
 
+#ifndef _UTIL_ASSERT_LEVEL
+#define _UTIL_ASSERT_LEVEL 1
+#endif
+
 namespace Assert {
        enum {
                Always = 0,

diff --git a/include/c++/util/radix.h b/include/c++/util/radix.h
index 3dcaaaf993a156099a968b76517215449ac2d910..be982a504d3b4a32df4fef4c33640349c26bf6ae 100644 (file)
--- a/include/c++/util/radix.h
+++ b/include/c++/util/radix.h
@@ -11,10 +11,8 @@
 #ifndef _UTIL_RADIX_H
 #define _UTIL_RADIX_H
 
-#include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
-
 #include <lowlevel/bitops.h>
 
 namespace Util {
@@ -65,7 +63,7 @@ namespace Util {
                        return (key >> shift) & (dir_size - 1);
                }
 
-               static uint key_to_offset(Key key)
+               static unsigned int key_to_offset(Key key)
                {
                        return key & (node_size - 1);
                }

diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc
index 8d4f3eb96370a03fab278e4edbd06eb29b49e9bb..7fffb61ef2fde1bb1b8c00e17abea2aec434bcf5 100644 (file)
--- a/kernel/orb/invoke.cc
+++ b/kernel/orb/invoke.cc
@@ -158,7 +158,7 @@ namespace ORB {
                printf("invoke_method: pib %p\n", user_pib);
        
                ParamInfoBlock pib = Arch::copyin(user_pib);
-               printf("objlist len %lu\n", pib.objlist_len);
+               printf("objlist len %u\n", pib.objlist_len);
                
                if (pib.objlist_len == 0)
                        throw_idl(InvalidArgument, 0, countarray("no objects"));
@@ -194,7 +194,7 @@ namespace ORB {
                        u8 *copy = new(orbmm) u8[pib.copy_size];
                        ParamInfoBlock *dpib = reinterpret_cast<ParamInfoBlock *>
                                               (args + piboff);
-                       dpib->objlist = reinterpret_cast<uintptr_t *>(args + datalen);
+                       dpib->objlist = reinterpret_cast<ID *>(args + datalen);
                        
                        copy_ids_to_kern(dpib, &pib, ids);
                        copy_data(args, args, pib.buffer_size, dpib, &pib, ~0U, Segment::In);

diff --git a/lib/c++/orb.cc b/lib/c++/orb.cc
index 26f3fc2731b4a74039a3fe84e1726b49b7925136..30b1bcc576c364893fe5a69ea4e5e93b1835b6db 100644 (file)
--- a/lib/c++/orb.cc
+++ b/lib/c++/orb.cc
@@ -1,12 +1,12 @@
 #include <System.h>
+#include <util/radix.h>
 
 namespace System {
 namespace RunTime {
-       using ::System::Exceptions::Std;
+       using namespace ::System::Exceptions::Std;
 
        // This function could be made to do a binary search if we can
        // manage to somehow sort the IFaceTables...
-
        uintptr_t downcast(::System::_i_Object *obj,
                           const unsigned long *new_guid)
        {
@@ -48,9 +48,16 @@ namespace RunTime {
                
                return ptr;
        };
-       
 
        namespace Priv {
+               typedef void (*MethodEntry)(ParamInfoBlock *pib);
+
+               struct Object {
+                       MethodEntry entry;
+                       void *ptr; // pointer to the class interface
+               };
+
+               typedef ::Util::RadixTree<Object, ID, 6> ObjTable;
                ObjTable objtable;
 
                unsigned long get_pc()
@@ -60,44 +67,46 @@ namespace RunTime {
 
                void exception_to_array(::System::VStruct *ex, Array<uint8_t> *ar)
                {
-                       ar->ptr = reinterpret_cast<uint8_t *>(ex);
-                       ar->count = ex->_infoptr->structlen;
+                       // FIXME: marshall struct
                }
-               
-               void handle_message(ParameterInfoBlock *pib)
+
+               void handle_message(ParamInfoBlock *pib)
                {
                        Message *msg = reinterpret_cast<Message *>(pib->segments[0].ptr);
                
-                       switch (seg0->opcode) {
+                       switch (msg->seg0.opcode) {
                                case Segment0::InvokeMethod: {
-                                       if (pib->segments[0].len < sizeof(InvokeMessage))
+                                       if (pib->segments[0].len < sizeof(InvokeMethod))
                                                throw_idl(ShortMessage, 0, pib->segments[0].len,
-                                                         sizeof(InvokeMessage));
+                                                         sizeof(InvokeMethod));
        
-                                       ID obj = pib->objlist[0];
+//                                     ID obj = pib->objlist[0];
                                        
                                        
                                        break;
                                }
                                
                                default:
-                                       throw_idl(InvalidOpcode, seg0->opcode);
+                                       throw_idl(InvalidOpcode, msg->seg0.opcode);
                        }
                }
        }
 }}
 
-extern "C" handle_message(ParameterInfoaBlock *pib, Array<uint8_t> *ex_arr)
+extern "C" void abort();
+
+extern "C" void handle_message(::System::RunTime::ParamInfoBlock *pib,
+                               ::System::RunTime::Array<uint8_t> *ex_arr)
 {
        try {
-               ::System::RunTime::handle_message(pib);
+               ::System::RunTime::Priv::handle_message(pib);
        }
        
-       catch (::System::Exception *ex) {
-               exception_to_array(ex, ex_arr);
+       catch (::System::Exceptions::Exception &ex) {
+               ::System::RunTime::Priv::exception_to_array(&ex, ex_arr);
        }
        
        catch (...) {
-               assertl(0, Assert::Always);
+               abort();
        }
 }