Attachment 601820 Details for Bug 841596 – Work in progress patch against upstream master to fix various issues on ppc64

[patch] Work in progress patch against upstream master to fix various issues on ppc64

ppc64-fixes-2012-08-01-001.patch (text/plain), 13.87 KB, created by Dave Malcolm on 2012-08-01 20:10:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Malcolm

Created: 2012-08-01 20:10:51 UTC

Size: 13.87 KB

patch

obsolete

>diff --git a/gi/pygi-cache.c b/gi/pygi-cache.c
>index f42aa64..d6531ed 100644
>--- a/gi/pygi-cache.c
>+++ b/gi/pygi-cache.c
>@@ -1393,6 +1393,8 @@ _args_cache_generate (GICallableInfo *callable_info,
>                 callable_cache->n_to_py_child_args++;
>             }
> 
>+            arg_cache->type_tag = g_type_info_get_tag (type_info);
>+
>             g_base_info_unref ( (GIBaseInfo *)arg_info);
>             continue;
>         }
>diff --git a/gi/pygi-marshal-from-py.c b/gi/pygi-marshal-from-py.c
>index 26c08c9..b5eca11 100644
>--- a/gi/pygi-marshal-from-py.c
>+++ b/gi/pygi-marshal-from-py.c
>@@ -32,6 +32,119 @@
> #include "pygi-marshal-cleanup.h"
> #include "pygi-marshal-from-py.h"
> 
>+gboolean
>+gi_argument_from_py_ssize_t (GIArgument   *arg_out,
>+                             Py_ssize_t    size_in,
>+                             GITypeTag     type_tag)                             
>+{
>+    switch (type_tag) {
>+    case GI_TYPE_TAG_VOID:
>+    case GI_TYPE_TAG_BOOLEAN:
>+    case GI_TYPE_TAG_INT8:
>+    case GI_TYPE_TAG_UINT8:
>+    case GI_TYPE_TAG_INT16:
>+    case GI_TYPE_TAG_UINT16:
>+        goto unhandled_type;
>+
>+	/* Ranges assume two's complement */
>+    case GI_TYPE_TAG_INT32:
>+	if (size_in >= G_MININT32 && size_in <= G_MAXINT32) {
>+	    arg_out->v_int32 = size_in;
>+	    return TRUE;
>+	} else {
>+            goto overflow;
>+	}
>+
>+    case GI_TYPE_TAG_UINT32:
>+	if (size_in >= 0 && size_in <= G_MAXUINT32) {
>+	    arg_out->v_uint32 = size_in;
>+	    return TRUE;
>+	} else {
>+            goto overflow;
>+	}
>+
>+    case GI_TYPE_TAG_INT64:
>+	arg_out->v_int64 = size_in;
>+	return TRUE;
>+
>+    case GI_TYPE_TAG_UINT64:
>+	if (size_in >= 0) {
>+	    arg_out->v_uint64 = size_in;
>+	    return TRUE;
>+	} else {
>+            goto overflow;
>+	}
>+	    
>+    case GI_TYPE_TAG_FLOAT:
>+    case GI_TYPE_TAG_DOUBLE:
>+    case GI_TYPE_TAG_GTYPE:
>+    case GI_TYPE_TAG_UTF8:
>+    case GI_TYPE_TAG_FILENAME:
>+    case GI_TYPE_TAG_ARRAY:
>+    case GI_TYPE_TAG_INTERFACE:
>+    case GI_TYPE_TAG_GLIST:
>+    case GI_TYPE_TAG_GSLIST:
>+    case GI_TYPE_TAG_GHASH:
>+    case GI_TYPE_TAG_ERROR:
>+    case GI_TYPE_TAG_UNICHAR:
>+    default:
>+        goto unhandled_type;
>+    }
>+
>+ overflow:
>+    PyErr_Format (PyExc_OverflowError,
>+                  "Unable to marshal C Py_ssize_t %zd to %s",
>+                  size_in,
>+                  g_type_tag_to_string(type_tag));
>+    return FALSE;
>+
>+ unhandled_type:
>+    PyErr_Format (PyExc_TypeError,
>+                  "Unable to marshal C Py_ssize_t %zd to %s",
>+                  size_in,
>+                  g_type_tag_to_string(type_tag));
>+    return FALSE;
>+}
>+
>+gboolean
>+gi_argument_from_c_long (GIArgument *arg_out,
>+			 long        c_long_in,
>+			 GITypeTag   type_tag)
>+{
>+    switch (type_tag) {
>+      case GI_TYPE_TAG_INT8:
>+	  arg_out->v_int8 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_UINT8:
>+	  arg_out->v_uint8 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_INT16:
>+	  arg_out->v_int16 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_UINT16:
>+	  arg_out->v_uint16 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_INT32:
>+	  arg_out->v_int32 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_UINT32:
>+	  arg_out->v_uint32 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_INT64:
>+	  arg_out->v_int64 = c_long_in;
>+	  return TRUE;
>+      case GI_TYPE_TAG_UINT64:
>+	  arg_out->v_uint64 = c_long_in;
>+	  return TRUE;
>+      default:
>+          PyErr_Format (PyExc_TypeError,
>+                        "Unable to marshal C long %ld to %s",
>+                        c_long_in,
>+                        g_type_tag_to_string(type_tag));
>+	  return FALSE;
>+    }
>+}
>+
> /*
>  * _is_union_member - check to see if the py_arg is actually a member of the
>  * expected C union
>@@ -915,12 +1028,21 @@ array_success:
>         if (child_cache->direction == PYGI_DIRECTION_BIDIRECTIONAL) {
>             gint *len_arg = (gint *)state->in_args[child_cache->c_arg_index].v_pointer;
>             /* if we are not setup yet just set the in arg */
>-            if (len_arg == NULL)
>-                state->in_args[child_cache->c_arg_index].v_long = length;
>-            else
>+            if (len_arg == NULL) {
>+		if (!gi_argument_from_py_ssize_t (&state->in_args[child_cache->c_arg_index],
>+                                                  length,
>+                                                  child_cache->type_tag)) {
>+		    goto err;
>+		}
>+            } else {
>                 *len_arg = length;
>+	    }
>         } else {
>-            state->in_args[child_cache->c_arg_index].v_long = length;
>+	    if (!gi_argument_from_py_ssize_t (&state->in_args[child_cache->c_arg_index],
>+                                              length,
>+                                              child_cache->type_tag)) {
>+		goto err;
>+	    }
>         }
>     }
> 
>@@ -1281,20 +1403,32 @@ _pygi_marshal_from_py_interface_enum (PyGIInvokeState   *state,
>                                       PyObject          *py_arg,
>                                       GIArgument        *arg)
> {
>-    PyObject *int_;
>+    PyObject *py_long;
>+    long c_long;
>     gint is_instance;
>     PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
>+    GIBaseInfo *interface;
> 
>     is_instance = PyObject_IsInstance (py_arg, iface_cache->py_type);
> 
>-    int_ = PYGLIB_PyNumber_Long (py_arg);
>-    if (int_ == NULL) {
>+    py_long = PYGLIB_PyNumber_Long (py_arg);
>+    if (py_long == NULL) {
>         PyErr_Clear();
>         goto err;
>     }
> 
>-    arg->v_long = PYGLIB_PyLong_AsLong (int_);
>-    Py_DECREF (int_);
>+    c_long = PYGLIB_PyLong_AsLong (py_long);
>+    Py_DECREF (py_long);
>+
>+    /* Write c_long into arg */
>+    interface = g_type_info_get_interface (arg_cache->type_info);
>+    assert(g_base_info_get_type (interface) == GI_INFO_TYPE_ENUM);
>+    if (!gi_argument_from_c_long(arg,
>+                                 c_long,
>+                                 g_enum_info_get_storage_type ((GIEnumInfo *)interface))) {
>+          g_assert_not_reached();
>+          return FALSE;
>+    }
> 
>     /* If this is not an instance of the Enum type that we want
>      * we need to check if the value is equivilant to one of the
>@@ -1308,7 +1442,7 @@ _pygi_marshal_from_py_interface_enum (PyGIInvokeState   *state,
>                 g_enum_info_get_value (iface_cache->interface_info, i);
>             glong enum_value = g_value_info_get_value (value_info);
>             g_base_info_unref ( (GIBaseInfo *)value_info);
>-            if (arg->v_long == enum_value) {
>+            if (c_long == enum_value) {
>                 is_found = TRUE;
>                 break;
>             }
>@@ -1333,25 +1467,35 @@ _pygi_marshal_from_py_interface_flags (PyGIInvokeState   *state,
>                                        PyObject          *py_arg,
>                                        GIArgument        *arg)
> {
>-    PyObject *int_;
>+    PyObject *py_long;
>+    long c_long;
>     gint is_instance;
>     PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
>+    GIBaseInfo *interface;
> 
>     is_instance = PyObject_IsInstance (py_arg, iface_cache->py_type);
> 
>-    int_ = PYGLIB_PyNumber_Long (py_arg);
>-    if (int_ == NULL) {
>+    py_long = PYGLIB_PyNumber_Long (py_arg);
>+    if (py_long == NULL) {
>         PyErr_Clear ();
>         goto err;
>     }
> 
>-    arg->v_long = PYGLIB_PyLong_AsLong (int_);
>-    Py_DECREF (int_);
>+    c_long = PYGLIB_PyLong_AsLong (py_long);
>+    Py_DECREF (py_long);
> 
>     /* only 0 or argument of type Flag is allowed */
>-    if (!is_instance && arg->v_long != 0)
>+    if (!is_instance && c_long != 0)
>         goto err;
> 
>+    /* Write c_long into arg */
>+    interface = g_type_info_get_interface (arg_cache->type_info);
>+    g_assert (g_base_info_get_type (interface) == GI_INFO_TYPE_FLAGS);
>+    if (!gi_argument_from_c_long(arg, c_long,
>+                                 g_enum_info_get_storage_type ((GIEnumInfo *)interface))) {
>+        return FALSE;
>+    }
>+
>     return TRUE;
> 
> err:
>diff --git a/gi/pygi-marshal-from-py.h b/gi/pygi-marshal-from-py.h
>index 34511db..b82f890 100644
>--- a/gi/pygi-marshal-from-py.h
>+++ b/gi/pygi-marshal-from-py.h
>@@ -30,6 +30,9 @@
> 
> G_BEGIN_DECLS
> 
>+gboolean _pygi_marshal_from_py_ssize_t     (PyGIArgCache      *arg_cache,
>+                                            Py_ssize_t         size,
>+                                            GIArgument        *arg);
> gboolean _pygi_marshal_from_py_void        (PyGIInvokeState   *state,
>                                             PyGICallableCache *callable_cache,
>                                             PyGIArgCache      *arg_cache,
>diff --git a/gi/pygi-marshal-to-py.c b/gi/pygi-marshal-to-py.c
>index 3af443d..f6770bb 100644
>--- a/gi/pygi-marshal-to-py.c
>+++ b/gi/pygi-marshal-to-py.c
>@@ -34,6 +34,83 @@
> #include "pygi-marshal-cleanup.h"
> #include "pygi-marshal-to-py.h"
> 
>+gboolean
>+gi_argument_to_c_long (GIArgument *arg_in,
>+                       long *c_long_out,
>+                       GITypeTag type_tag)
>+{
>+    switch (type_tag) {
>+      case GI_TYPE_TAG_INT8:
>+          *c_long_out = arg_in->v_int8;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT8:
>+          *c_long_out = arg_in->v_uint8;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT16:
>+          *c_long_out = arg_in->v_int16;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT16:
>+          *c_long_out = arg_in->v_uint16;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT32:
>+          *c_long_out = arg_in->v_int32;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT32:
>+          *c_long_out = arg_in->v_uint32;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT64:
>+          *c_long_out = arg_in->v_int64;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT64:
>+          *c_long_out = arg_in->v_uint64;
>+          return TRUE;
>+      default:
>+          PyErr_Format (PyExc_TypeError,
>+                        "Unable to marshal %s to C long",
>+                        g_type_tag_to_string(type_tag));
>+          return FALSE;
>+    }
>+}
>+
>+gboolean
>+gi_argument_to_gsize (GIArgument *arg_in,
>+                      gsize *gsize_out,
>+                      GITypeTag type_tag)
>+{
>+    switch (type_tag) {
>+      case GI_TYPE_TAG_INT8:
>+          *gsize_out = arg_in->v_int8;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT8:
>+          *gsize_out = arg_in->v_uint8;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT16:
>+          *gsize_out = arg_in->v_int16;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT16:
>+          *gsize_out = arg_in->v_uint16;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT32:
>+          *gsize_out = arg_in->v_int32;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT32:
>+          *gsize_out = arg_in->v_uint32;
>+          return TRUE;
>+      case GI_TYPE_TAG_INT64:
>+          *gsize_out = arg_in->v_int64;
>+          return TRUE;
>+      case GI_TYPE_TAG_UINT64:
>+          *gsize_out = arg_in->v_uint64;
>+          return TRUE;
>+      default:
>+          PyErr_Format (PyExc_TypeError,
>+                        "Unable to marshal %s to gsize",
>+                        g_type_tag_to_string(type_tag));
>+          return FALSE;
>+    }
>+}
>+
>+
> PyObject *
> _pygi_marshal_to_py_void (PyGIInvokeState   *state,
>                           PyGICallableCache *callable_cache,
>@@ -284,7 +361,12 @@ _pygi_marshal_to_py_array (PyGIInvokeState   *state,
>             }
>         } else {
>             GIArgument *len_arg = state->args[seq_cache->len_arg_index];
>-            len = len_arg->v_long;
>+
>+            if (!gi_argument_to_gsize (len_arg,
>+                                       &len,
>+                                       callable_cache->args_cache[seq_cache->len_arg_index]->type_tag)) {
>+                return NULL;
>+            }
>         }
> 
>         array_ = g_array_new (FALSE,
>@@ -656,11 +738,21 @@ _pygi_marshal_to_py_interface_enum (PyGIInvokeState   *state,
> {
>     PyObject *py_obj = NULL;
>     PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
>+    GIBaseInfo *interface;
>+    long c_long;
>+
>+    interface = g_type_info_get_interface (arg_cache->type_info);
>+    g_assert (g_base_info_get_type (interface) == GI_INFO_TYPE_ENUM);
>+
>+    if (!gi_argument_to_c_long(arg, &c_long,
>+                               g_enum_info_get_storage_type ((GIEnumInfo *)interface))) {
>+        return NULL;
>+    }
> 
>     if (iface_cache->g_type == G_TYPE_NONE) {
>-        py_obj = PyObject_CallFunction (iface_cache->py_type, "l", arg->v_long);
>+        py_obj = PyObject_CallFunction (iface_cache->py_type, "l", c_long);
>     } else {
>-        py_obj = pyg_enum_from_gtype (iface_cache->g_type, arg->v_long);
>+        py_obj = pyg_enum_from_gtype (iface_cache->g_type, c_long);
>     }
>     return py_obj;
> }
>@@ -673,6 +765,16 @@ _pygi_marshal_to_py_interface_flags (PyGIInvokeState   *state,
> {
>     PyObject *py_obj = NULL;
>     PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
>+    GIBaseInfo *interface;
>+    long c_long;
>+
>+    interface = g_type_info_get_interface (arg_cache->type_info);
>+    g_assert (g_base_info_get_type (interface) == GI_INFO_TYPE_FLAGS);
>+
>+    if (!gi_argument_to_c_long(arg, &c_long,
>+                               g_enum_info_get_storage_type ((GIEnumInfo *)interface))) {
>+        return NULL;
>+    }
> 
>     if (iface_cache->g_type == G_TYPE_NONE) {
>         /* An enum with a GType of None is an enum without GType */
>@@ -684,18 +786,18 @@ _pygi_marshal_to_py_interface_flags (PyGIInvokeState   *state,
>             return NULL;
> 
>         py_args = PyTuple_New (1);
>-        if (PyTuple_SetItem (py_args, 0, PyLong_FromLong (arg->v_long)) != 0) {
>+        if (PyTuple_SetItem (py_args, 0, PyLong_FromLong (c_long)) != 0) {
>             Py_DECREF (py_args);
>             Py_DECREF (py_type);
>             return NULL;
>         }
> 
>-        py_obj = PyObject_CallFunction (py_type, "l", arg->v_long);
>+        py_obj = PyObject_CallFunction (py_type, "l", c_long);
> 
>         Py_DECREF (py_args);
>         Py_DECREF (py_type);
>     } else {
>-        py_obj = pyg_flags_from_gtype (iface_cache->g_type, arg->v_long);
>+        py_obj = pyg_flags_from_gtype (iface_cache->g_type, c_long);
>     }
> 
>     return py_obj;

Actions: View | Diff

Attachments on bug 841596: 601594 | 601820 | 603090 | 603367 | 603634