X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/8a919f09087cf70e15196f79aa8e885a8fa01595..d42bc5c2d8dcf388b424c5bbc4b6f25416f689f1:/src/uobject/uobject.c diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c index b8c2479..331b8ae 100644 --- a/src/uobject/uobject.c +++ b/src/uobject/uobject.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -190,6 +191,93 @@ decode_prop_header(struct upkg *upkg, struct prop_head *head, return len; } +/* + * TODO: Make this use the uobject_module stuff so packages are not loaded + * more than once. + */ +static GTypeModule * +open_import_package(UObject *uo, const struct upkg_import *i) +{ + GTypeModule *pkg; + + assert(i->parent == NULL); + + if (strcmp(i->class_package, "Core") != 0 + || strcmp(i->class_name, "Package") != 0) { + u_err(uo, "import root must be Core.Package"); + return NULL; + } + + pkg = u_pkg_open(i->name); + if (!pkg || !g_type_module_use(pkg)) { + u_err(uo, "failed to open package: %s", i->name); + return NULL; + } + + if (!U_PKG(pkg)->pkg) { + g_type_module_unuse(pkg); + u_err(uo, "failed to open package: %s", pkg->name); + return NULL; + } + + return pkg; +} + +/* Find the export index of a package based on the import chain from another + * package. Returns the (non-negative) offset on success, or a negative value + * on failure. */ +static long resolve_import(struct upkg *pkg, const struct upkg_import *import) +{ + long current, index; + + if (!import->parent) + return -1; + + current = resolve_import(pkg, import->parent); + if (current != -1 && current >= 0) + return -42; + + index = upkg_export_find(pkg, current, import->name); + if (index < 0) + return -42; + + return index; +} + +static GObject *get_import_object(UObject *uo, unsigned long index) +{ + const struct upkg_import *import; + GObject *obj = NULL; + GTypeModule *pkg; + long obj_index; + + import = upkg_get_import(uo->pkg_file->pkg, index); + if (!import) { + u_err(uo, "invalid package import: %ld", index); + return NULL; + } + + /* Get the package name at the top of the hierarchy. */ + for (const struct upkg_import *i = import; i; i = i->parent) { + if (i->parent == NULL) { + pkg = open_import_package(uo, i); + if (!pkg) + return NULL; + } + } + + obj_index = resolve_import(U_PKG(pkg)->pkg, import); + if (obj_index < 0) { + u_err(uo, "could not find import in package: %s", pkg->name); + goto out; + } + + obj = u_object_new_from_package(pkg, obj_index); +out: + g_type_module_unuse(pkg); + return obj; +} + static int decode_object_property(UObject *uo, GValue *val, unsigned long len) { struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo); @@ -202,7 +290,7 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len) return -1; if (index < 0) { - fprintf(stderr, "Imports not supported yet.\n"); + obj = get_import_object(uo, -(index+1)); } else { obj = u_object_new_from_package(uo->pkg, index-1); } @@ -212,6 +300,41 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len) return 0; } +/* + * Deserialize an IEEE 754 binary32 value in "little endian" (for whatever + * that term is worth in this context). That is, when interpreted as a little + * endian 32-bit unsigned integer: bit 31 is the sign, bits 30-23 are the + * (biased) exponent, and bits 22-0 are the encoded part of the significand. + * + * The implementation is designed to be agnostic of the platform's actual + * float type, but the conversion may be lossy if "float" is not itself a + * binary32 format. NaN payloads are not preserved. + */ +static float unpack_binary32_le(const unsigned char *buf) +{ + unsigned long raw; + long significand; + int exponent; + float result; + + raw = unpack_32_le(buf); + exponent = (raw & 0x7f800000) >> 23; + significand = (raw & 0x007fffff) >> 0; + + switch (exponent) { + case 255: + result = significand ? NAN : INFINITY; + break; + default: + significand |= 0x00800000; + /* fall through */ + case 0: + result = ldexpf(significand, exponent-126-24); + } + + return copysignf(result, raw & 0x80000000 ? -1 : 1); +} + static unsigned long deserialize_property(UObject *uo, struct prop_head *head) { struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo); @@ -227,20 +350,22 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head) case PROPERTY_END: break; case PROPERTY_BYTE: - if (priv->nbuf-len < 1) + if (head->size != 1 || priv->nbuf-len < head->size) return 0; g_value_init(&val, G_TYPE_UCHAR); g_value_set_uchar(&val, priv->buf[len]); g_object_set_property(G_OBJECT(uo), head->prop_name, &val); break; case PROPERTY_INTEGER: - if (priv->nbuf-len < 4) + if (head->size != 4 || priv->nbuf-len < head->size) return 0; g_value_init(&val, G_TYPE_ULONG); g_value_set_ulong(&val, unpack_32_le(priv->buf+len)); g_object_set_property(G_OBJECT(uo), head->prop_name, &val); break; case PROPERTY_BOOLEAN: + if (head->size != 0) + return 0; g_value_init(&val, G_TYPE_BOOLEAN); g_value_set_boolean(&val, head->tag_msb); g_object_set_property(G_OBJECT(uo), head->prop_name, &val); @@ -251,9 +376,16 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head) return 0; g_object_set_property(G_OBJECT(uo), head->prop_name, &val); break; + case PROPERTY_FLOAT: + if (head->size != 4 || priv->nbuf-len < head->size) + return 0; + g_value_init(&val, G_TYPE_FLOAT); + g_value_set_float(&val, unpack_binary32_le(priv->buf+len)); + g_object_set_property(G_OBJECT(uo), head->prop_name, &val); + break; default: - fprintf(stderr, "Unhandled property type %x\n", - (unsigned)head->type); + u_warn(uo, "%s: unsupported property type %u", + head->prop_name, (unsigned)head->type); } len += head->size; @@ -392,12 +524,13 @@ GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx) { g_return_val_if_fail(IS_U_PKG(pkg), NULL); - const struct upkg_export *export; const char *class, *package; GObject *obj = NULL; GType type; class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package); + if (!class) + return NULL; type = u_object_module_get_class(package, class); if (type) {