luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Alignment Errors.

Browse Source 
Signed-off-by: Kedar Sovani <kedars@marvell.com>

https://bugzilla.gnome.org/show_bug.cgi?id=606139
This commit is contained in:
Kedar Sovani 2009-10-21 13:28:12 +02:00 committed by Colin Walters
parent 3a8a1d2653
commit 6962d65125
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
girnode.c
View File

@ -53,6 +53,13 @@ _g_irnode_dump_stats (void)
g_message ("%lu types (%lu before sharing)", unique_types_count, types_count); g_message ("%lu types (%lu before sharing)", unique_types_count, types_count);
} }
#define DO_ALIGNED_COPY(dest_addr, value, type) \
do { \
type tmp_var; \
tmp_var = value; \
memcpy(dest_addr, &tmp_var, sizeof(type)); \
} while(0)
#define ALIGN_VALUE(this, boundary) \ #define ALIGN_VALUE(this, boundary) \
(( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
@ -2271,11 +2278,11 @@ g_ir_node_build_typelib (GIrNode *node,
break; break;
case GI_TYPE_TAG_INT64: case GI_TYPE_TAG_INT64:
blob->size = 8; blob->size = 8;
*(gint64*)&data[blob->offset] = (gint64) parse_int_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_int_value (constant->value), gint64);
break; break;
case GI_TYPE_TAG_UINT64: case GI_TYPE_TAG_UINT64:
blob->size = 8; blob->size = 8;
*(guint64*)&data[blob->offset] = (guint64) parse_uint_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_uint_value (constant->value), guint64);
break; break;
case GI_TYPE_TAG_SHORT: case GI_TYPE_TAG_SHORT:
blob->size = sizeof (gshort); blob->size = sizeof (gshort);
@ -2296,21 +2303,21 @@ g_ir_node_build_typelib (GIrNode *node,
case GI_TYPE_TAG_SSIZE: /* FIXME */ case GI_TYPE_TAG_SSIZE: /* FIXME */
case GI_TYPE_TAG_LONG: case GI_TYPE_TAG_LONG:
blob->size = sizeof (glong); blob->size = sizeof (glong);
*(glong*)&data[blob->offset] = (glong) parse_int_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_int_value (constant->value), glong);
break; break;
case GI_TYPE_TAG_SIZE: /* FIXME */ case GI_TYPE_TAG_SIZE: /* FIXME */
case GI_TYPE_TAG_TIME_T: case GI_TYPE_TAG_TIME_T:
case GI_TYPE_TAG_ULONG: case GI_TYPE_TAG_ULONG:
blob->size = sizeof (gulong); blob->size = sizeof (gulong);
*(gulong*)&data[blob->offset] = (gulong) parse_uint_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_uint_value (constant->value), gulong);
break; break;
case GI_TYPE_TAG_FLOAT: case GI_TYPE_TAG_FLOAT:
blob->size = sizeof (gfloat); blob->size = sizeof (gfloat);
*(gfloat*)&data[blob->offset] = (gfloat) parse_float_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_float_value (constant->value), gfloat);
break; break;
case GI_TYPE_TAG_DOUBLE: case GI_TYPE_TAG_DOUBLE:
blob->size = sizeof (gdouble); blob->size = sizeof (gdouble);
*(gdouble*)&data[blob->offset] = (gdouble) parse_float_value (constant->value); DO_ALIGNED_COPY(&data[blob->offset], parse_float_value (constant->value), gdouble);
break; break;
case GI_TYPE_TAG_UTF8: case GI_TYPE_TAG_UTF8:
case GI_TYPE_TAG_FILENAME: case GI_TYPE_TAG_FILENAME: