ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Replace code to round up values and calculate padding with macros to improve readability.

This commit is contained in:
Rob Shearman 2008-06-23 12:57:28 +01:00 committed by Alexandre Julliard
parent 7524019796
commit 5f1de5a11d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/widl/typegen.c
View File

@ -41,6 +41,11 @@
#include "typegen.h" #include "typegen.h"
#include "expr.h" #include "expr.h"
/* round size up to multiple of alignment */
#define ROUND_SIZE(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1))
/* value to add on to round size up to a multiple of alignment */
#define ROUNDING(size, alignment) (((alignment) - 1) - (((size) + ((alignment) - 1)) & ((alignment) - 1)))
static const func_t *current_func; static const func_t *current_func;
static const type_t *current_structure; static const type_t *current_structure;
static const type_t *current_iface; static const type_t *current_iface;
@ -754,11 +759,11 @@ static size_t fields_memsize(const var_list_t *fields, unsigned int *align)
*align = falign; *align = falign;
have_align = TRUE; have_align = TRUE;
} }
size = (size + (falign - 1)) & ~(falign - 1); size = ROUND_SIZE(size, falign);
size += fsize; size += fsize;
} }
size = (size + (*align - 1)) & ~(*align - 1); size = ROUND_SIZE(size, *align);
return size; return size;
} }
@ -798,11 +803,11 @@ int get_padding(const var_list_t *fields)
size_t size = type_memsize(ft, &align); size_t size = type_memsize(ft, &align);
if (salign == -1) if (salign == -1)
salign = align; salign = align;
offset = (offset + (align - 1)) & ~(align - 1); offset = ROUND_SIZE(offset, align);
offset += size; offset += size;
} }
return ((offset + (salign - 1)) & ~(salign - 1)) - offset; return ROUNDING(offset, salign);
} }
size_t type_memsize(const type_t *t, unsigned int *align) size_t type_memsize(const type_t *t, unsigned int *align)
@ -1711,7 +1716,7 @@ static void write_struct_members(FILE *file, const type_t *type,
error("write_struct_members: cannot align type %d\n", ft->type); error("write_struct_members: cannot align type %d\n", ft->type);
} }
print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc));
offset = (offset + (align - 1)) & ~(align - 1); offset = ROUND_SIZE(offset, align);
*typestring_offset += 1; *typestring_offset += 1;
} }
write_member_type(file, type, field->attrs, field->type, corroff, write_member_type(file, type, field->attrs, field->type, corroff,
@ -1720,7 +1725,7 @@ static void write_struct_members(FILE *file, const type_t *type,
} }
} }
padding = ((offset + (salign - 1)) & ~(salign - 1)) - offset; padding = ROUNDING(offset, salign);
if (padding) if (padding)
{ {
print_file(file, 2, "0x%x,\t/* FC_STRUCTPAD%d */\n", print_file(file, 2, "0x%x,\t/* FC_STRUCTPAD%d */\n",