Fix bootstrapping with recent bits.

[upkg.git] / src / uobject / uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 74734dd1bfd0c73758fe73698c66b66aca0ff292..c3cc24662ce4a69980b0086c8693c4b651f05d0a 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright © 2009-2011 Nick Bowler
+ *  Copyright © 2009-2012, 2015 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,9 +16,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <inttypes.h>
@@ -299,6 +301,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);
@@ -314,20 +351,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);
@@ -338,9 +377,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;
 
@@ -479,13 +525,17 @@ GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
        g_return_val_if_fail(IS_U_PKG(pkg), NULL);
 
-       const char *class, *package;
+       const struct upkg_export *export;
        GObject *obj = NULL;
        GType type;
 
-       class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
+       export = upkg_get_export(U_PKG(pkg)->pkg, idx);
+       if (!export) {
+               u_err(pkg, "invalid package export: %lu", idx);
+               return NULL;
+       }
 
-       type = u_object_module_get_class(package, class);
+       type = u_object_module_get_class(pkg, export->class);
        if (type) {
                obj = g_object_new(type, NULL);
                if (u_object_deserialize(obj, pkg, idx) != 0) {
@@ -565,18 +615,20 @@ static char *prepend_fmt(const char *prefix, const char *fmt)
 /* Logging helpers that automatically prepend the UObject class information. */
 void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
 {
-       g_return_if_fail(IS_U_OBJECT(o));
-       UObject *uo = U_OBJECT(o);
-       char *new_fmt = NULL;
-
-       if (uo->pkg_name) {
-               new_fmt = prepend_fmt(uo->pkg_name, fmt);
-               if (!new_fmt) {
-                       g_log(G_OBJECT_TYPE_NAME(o), level, "%s",
-                             uo->pkg_file->name);
-               } else {
+       char *new_fmt = NULL, *obj_prefix = NULL;
+
+       if (IS_U_OBJECT(o)) {
+               obj_prefix = U_OBJECT(o)->pkg_name;
+       } else if (G_IS_TYPE_MODULE(o)) {
+               obj_prefix = G_TYPE_MODULE(o)->name;
+       }
+
+       if (obj_prefix) {
+               new_fmt = prepend_fmt(obj_prefix, fmt);
+               if (!new_fmt)
+                       g_log(G_OBJECT_TYPE_NAME(o), level, "%s", obj_prefix);
+               else
                        fmt = new_fmt;
-               }
        }
 
        g_logv(G_OBJECT_TYPE_NAME(o), level, fmt, ap);