From d69cf5529d3fdbbfd3d1d6b429a67f912e3c4f44 Mon Sep 17 00:00:00 2001 From: Flavio Cruz Date: Fri, 17 Feb 2023 00:51:04 -0500 Subject: Also align mach_msg_type_long_t to complex_alignof This was a miss in the previous patch given that mach_msg_type_long_t is 12 bytes long so won't neatly align to 8 bytes. Message-Id: --- utils.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/utils.c b/utils.c index f2f45f6..000a47f 100644 --- a/utils.c +++ b/utils.c @@ -304,9 +304,14 @@ WriteFieldDeclPrim(FILE *file, const argument_t *arg, fprintf(file, "\t\tmach_msg_type_%st %s;\n", arg->argLongForm ? "long_" : "", arg->argTTName); - if (!arg->argLongForm && complex_alignof > sizeof_mach_msg_type_t) { - /* Pad mach_msg_type_t in case we need alignment by more than its size. */ - fprintf(file, "\t\tchar %s_pad[%d];\n", arg->argTTName, complex_alignof - sizeof_mach_msg_type_t); + + /* Pad mach_msg_type_t/mach_msg_type_long_t in case we need alignment by more than its size. */ + if (!arg->argLongForm && sizeof_mach_msg_type_t % complex_alignof) { + fprintf(file, "\t\tchar %s_pad[%d];\n", + arg->argTTName, complex_alignof - sizeof_mach_msg_type_t % complex_alignof); + } else if (arg->argLongForm && sizeof_mach_msg_type_long_t % complex_alignof) { + fprintf(file, "\t\tchar %s_pad[%d];\n", arg->argTTName, + complex_alignof - sizeof_mach_msg_type_long_t % complex_alignof); } if (it->itInLine && it->itVarArray) -- cgit v1.2.3