#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include <stdarg.h>
#include <stdbool.h>
#include <inttypes.h>
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);
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);
}
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);
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);
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;
/*
* Get the full hierarchical object name for an export, used for diagnostics.
- * Currently, this does not include the package name (which is actually
- * required for this to be a "full" name) as it's not yet passed to the
- * deserialize method.
+ * The package name is passed in pname.
*
* Returns a buffer allocated by malloc on success, or NULL on failure.
*/
-static char *get_obj_fullname(const struct upkg_export *e)
+static char *get_obj_fullname(const char *pname, const struct upkg_export *e)
{
- size_t total_len = 0, len;
+ size_t total_len = strlen(pname) + 1, len;
char *fullname;
+ assert(e != NULL);
+
for (const struct upkg_export *c = e; c; c = c->parent) {
len = strlen(c->name) + 1;
if (total_len > SIZE_MAX - len)
fullname[total_len + len] = c == e ? '\0' : '.';
}
+ assert(total_len == strlen(pname)+1);
+ memcpy(fullname, pname, total_len-1);
+ fullname[total_len-1] = '.';
+
return fullname;
}
e = upkg_get_export(upkg, idx);
if (!e)
return -1;
- uo->pkg_name = get_obj_fullname(e);
+ uo->pkg_name = get_obj_fullname(pkg->name, e);
if (!uo->pkg_name)
return -1;
{
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) {
projects / upkg.git / blobdiff