frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'NestedStructTypenames-V5' of http://infra-srv1.demorecorder.com/git/free-sw/xcb/libxcb

This commit is contained in:
Peter Harris 2014-10-30 11:51:57 -04:00
parent 382d306d6c fdb291b414
commit bbca7b82f8
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/c_client.py
View File

@ -358,7 +358,8 @@ def _c_type_setup(self, name, postfix):
field.c_pointer = '*' field.c_pointer = '*'
field.c_field_const_type = 'const ' + field.c_field_type field.c_field_const_type = 'const ' + field.c_field_type
self.c_need_aux = True self.c_need_aux = True
elif not field.type.fixed_size() and not field.type.is_case_or_bitcase:
if not field.type.fixed_size() and not field.type.is_case_or_bitcase:
self.c_need_sizeof = True self.c_need_sizeof = True
field.c_iterator_type = _t(field.field_type + ('iterator',)) # xcb_fieldtype_iterator_t field.c_iterator_type = _t(field.field_type + ('iterator',)) # xcb_fieldtype_iterator_t
@ -656,9 +657,15 @@ def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'):
return (param_fields, wire_fields, params) return (param_fields, wire_fields, params)
# get_serialize_params() # get_serialize_params()
def _c_serialize_helper_insert_padding(context, code_lines, space, postpone): def _c_serialize_helper_insert_padding(context, code_lines, space, postpone, is_case_or_bitcase):
code_lines.append('%s /* insert padding */' % space) code_lines.append('%s /* insert padding */' % space)
code_lines.append('%s xcb_pad = -xcb_block_len & (xcb_align_to - 1);' % space) if is_case_or_bitcase:
code_lines.append(
'%s xcb_pad = -(xcb_block_len + xcb_padding_offset) & (xcb_align_to - 1);'
% space)
else:
code_lines.append(
'%s xcb_pad = -xcb_block_len & (xcb_align_to - 1);' % space)
# code_lines.append('%s printf("automatically inserting padding: %%%%d\\n", xcb_pad);' % space) # code_lines.append('%s printf("automatically inserting padding: %%%%d\\n", xcb_pad);' % space)
code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space)
@ -676,6 +683,8 @@ def _c_serialize_helper_insert_padding(context, code_lines, space, postpone):
code_lines.append('%s }' % space) code_lines.append('%s }' % space)
code_lines.append('%s xcb_block_len = 0;' % space) code_lines.append('%s xcb_block_len = 0;' % space)
if is_case_or_bitcase:
code_lines.append('%s xcb_padding_offset = 0;' % space)
# keep tracking of xcb_parts entries for serialize # keep tracking of xcb_parts entries for serialize
return 1 return 1
@ -770,6 +779,10 @@ def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, pr
elif context in ('unserialize', 'unpack'): elif context in ('unserialize', 'unpack'):
length = "%s(xcb_tmp, %s&%s%s)" % (field.type.c_unpack_name, length = "%s(xcb_tmp, %s&%s%s)" % (field.type.c_unpack_name,
c_field_names, prefix_str, field.c_field_name) c_field_names, prefix_str, field.c_field_name)
elif 'sizeof' == context:
# remove trailing ", " from c_field_names because it will be used at end of arglist
my_c_field_names = c_field_names[:-2]
length = "%s(xcb_tmp, %s)" % (field.type.c_sizeof_name, my_c_field_names)
return length return length
# _c_serialize_helper_switch_field() # _c_serialize_helper_switch_field()
@ -869,9 +882,13 @@ def _c_serialize_helper_fields_fixed_size(context, self, field,
# total padding = sizeof(pad0) * nmemb # total padding = sizeof(pad0) * nmemb
length += " * %d" % field.type.nmemb length += " * %d" % field.type.nmemb
if field.type.is_list: elif field.type.is_list:
# no such case in the protocol, cannot be tested and therefore ignored for now # list with fixed number of elements
raise Exception('list with fixed number of elemens unhandled in _unserialize()') # length of array = sizeof(arrayElementType) * nmemb
length += " * %d" % field.type.nmemb
# use memcpy because C cannot assign whole arrays with operator=
value = ' memcpy(%s, xcb_tmp, %s);' % (abs_field_name, length)
elif 'serialize' == context: elif 'serialize' == context:
value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) ' value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) '
@ -996,13 +1013,15 @@ def _c_serialize_helper_fields(context, self,
# Variable length pad is <pad align= /> # Variable length pad is <pad align= />
code_lines.append('%s xcb_align_to = %d;' % (space, field.type.align)) code_lines.append('%s xcb_align_to = %d;' % (space, field.type.align))
count += _c_serialize_helper_insert_padding(context, code_lines, space, count += _c_serialize_helper_insert_padding(context, code_lines, space,
self.c_var_followed_by_fixed_fields) self.c_var_followed_by_fixed_fields,
is_case_or_bitcase)
continue continue
else: else:
# switch/bitcase: always calculate padding before and after variable sized fields # switch/bitcase: always calculate padding before and after variable sized fields
if need_padding or is_case_or_bitcase: if need_padding or is_case_or_bitcase:
count += _c_serialize_helper_insert_padding(context, code_lines, space, count += _c_serialize_helper_insert_padding(context, code_lines, space,
self.c_var_followed_by_fixed_fields) self.c_var_followed_by_fixed_fields,
is_case_or_bitcase)
value, length = _c_serialize_helper_fields_variable_size(context, self, field, value, length = _c_serialize_helper_fields_variable_size(context, self, field,
code_lines, temp_vars, code_lines, temp_vars,
@ -1042,7 +1061,12 @@ def _c_serialize_helper_fields(context, self,
code_lines.append('%s xcb_parts_idx++;' % space) code_lines.append('%s xcb_parts_idx++;' % space)
count += 1 count += 1
code_lines.append('%s xcb_align_to = ALIGNOF(%s);' % (space, 'char' if field.c_field_type == 'void' else field.c_field_type)) code_lines.append(
'%s xcb_align_to = ALIGNOF(%s);'
% (space,
'char'
if field.c_field_type == 'void' or field.type.is_switch
else field.c_field_type))
need_padding = True need_padding = True
if self.c_var_followed_by_fixed_fields: if self.c_var_followed_by_fixed_fields:
@ -1086,7 +1110,7 @@ def _c_serialize_helper(context, complex_type,
code_lines, temp_vars, code_lines, temp_vars,
space, prefix, False) space, prefix, False)
# "final padding" # "final padding"
count += _c_serialize_helper_insert_padding(context, code_lines, space, False) count += _c_serialize_helper_insert_padding(context, code_lines, space, False, self.is_switch)
return count return count
# _c_serialize_helper() # _c_serialize_helper()
@ -1156,6 +1180,8 @@ def _c_serialize(context, self):
_c(' char *xcb_out = *_buffer;') _c(' char *xcb_out = *_buffer;')
_c(' unsigned int xcb_buffer_len = 0;') _c(' unsigned int xcb_buffer_len = 0;')
_c(' unsigned int xcb_align_to = 0;') _c(' unsigned int xcb_align_to = 0;')
if self.is_switch:
_c(' unsigned int xcb_padding_offset = ((size_t)xcb_out) & 7;')
prefix = [('_aux', '->', self)] prefix = [('_aux', '->', self)]
aux_ptr = 'xcb_out' aux_ptr = 'xcb_out'
@ -1179,6 +1205,8 @@ def _c_serialize(context, self):
_c(' unsigned int xcb_block_len = 0;') _c(' unsigned int xcb_block_len = 0;')
_c(' unsigned int xcb_pad = 0;') _c(' unsigned int xcb_pad = 0;')
_c(' unsigned int xcb_align_to = 0;') _c(' unsigned int xcb_align_to = 0;')
if self.is_switch:
_c(' unsigned int xcb_padding_offset = ((size_t)_buffer) & 7;')
elif 'sizeof' == context: elif 'sizeof' == context:
param_names = [p[2] for p in params] param_names = [p[2] for p in params]
@ -1196,6 +1224,8 @@ def _c_serialize(context, self):
else: else:
_c(' char *xcb_tmp = (char *)_buffer;') _c(' char *xcb_tmp = (char *)_buffer;')
prefix = [('_aux', '->', self)] prefix = [('_aux', '->', self)]
if self.is_switch:
_c(' unsigned int xcb_padding_offset = 0;')
count = _c_serialize_helper(context, self, code_lines, temp_vars, prefix=prefix) count = _c_serialize_helper(context, self, code_lines, temp_vars, prefix=prefix)
# update variable size fields (only important for context=='serialize' # update variable size fields (only important for context=='serialize'
@ -1774,7 +1804,7 @@ def _c_complex(self, force_packed = False):
for b in self.bitcases: for b in self.bitcases:
space = '' space = ''
if b.type.has_name: if b.type.has_name:
_h(' struct _%s {', b.c_field_name) _h(' struct {')
space = ' ' space = ' '
for field in b.type.fields: for field in b.type.fields:
_c_complex_field(self, field, space) _c_complex_field(self, field, space)