harec

commit 430723518f8250e69281f6837e21183460521e53
parent b335a2ad9f2ed3d974df889b75298047ef10e308
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue,  2 Mar 2021 09:19:56 -0500

qtype: sort struct types by offset

Diffstat:
M
src/qtype.c
 | 
24
+++++++++++++++++++++++-

1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/qtype.c b/src/qtype.c
@@ -145,6 +145,14 @@ tagged_qtype(struct gen_context *ctx, const struct type *type)
 	return &def->type;
 }
 
+static int
+sf_compar(const void *_a, const void *_b)
+{
+	const struct struct_field **a = (const struct struct_field **)_a;
+	const struct struct_field **b = (const struct struct_field **)_b;
+	return (int)(*a)->offset - (int)(*b)->offset;
+}
+
 static const struct qbe_type *
 lookup_aggregate(struct gen_context *ctx, const struct type *type)
 {
@@ -190,16 +198,30 @@ lookup_aggregate(struct gen_context *ctx, const struct type *type)
 			field->count = type->size;
 			break;
 		}
+		size_t n = 0;
 		for (struct struct_field *tfield = type->struct_union.fields;
 				tfield; tfield = tfield->next) {
+			++n;
+		}
+		struct struct_field **tfields =
+			xcalloc(sizeof(struct struct_field *), n);
+		size_t i = 0;
+		for (struct struct_field *tfield = type->struct_union.fields;
+				tfield; tfield = tfield->next, ++i) {
+			tfields[i] = tfield;
+		}
+		qsort(tfields, n, sizeof(struct struct_field *), sf_compar);
+		for (size_t i = 0; i < n; ++i) {
+			struct struct_field *tfield = tfields[i];
 			field->type = qtype_for_type(ctx, tfield->type, true);
 			field->count = 1;
 
-			if (tfield->next) {
+			if (i + 1 < n) {
 				field->next = xcalloc(1, sizeof(struct qbe_field));
 				field = field->next;
 			}
 		}
+		free(tfields);
 		break;
 	case STORAGE_SLICE:
 		field->type = &qbe_long; // XXX: ARCH