}
-static int emit_parse_postfix_subscripts_to_reg_dims_now (const char *reg, int elem_size, int pointer_depth, int pointed_size, int array_dimensions, int is_unsigned, int *final_elem_size) {
+static int emit_parse_postfix_subscripts_to_reg_dims_now (const char *reg, int elem_size, int scalar_elem_size, int pointer_depth, int pointed_size, int array_dimensions, int is_unsigned, int *final_elem_size) {
const char *index_reg;
int saw_subscript = 0;
if (tok.kind == TOK_LBRACK) {
- if (pointer_depth == 0 && pointed_size > 0 && elem_size > pointed_size) {
+ if (pointer_depth == 0 && dims_before > 1) {
+
+ emit_add_indexed_scaled_address_to_reg_now (reg, index_reg, elem_size);
+
+ if (array_dimensions == 1 && scalar_elem_size > 0) {
+ elem_size = index_step_size (scalar_elem_size);
+ }
+
+ } else if (pointer_depth == 0 && pointed_size > 0 && elem_size > pointed_size) {
emit_add_indexed_scaled_address_to_reg_now (reg, index_reg, elem_size);
elem_size = index_step_size (pointed_size);
}
} else if (array_dimensions > 1) {
- emit_parse_postfix_subscripts_to_reg_dims_now (reg, subscript_elem_size, pointer_depth, elem_size, array_dimensions, is_unsigned, &subscript_elem_size);
+ emit_parse_postfix_subscripts_to_reg_dims_now (reg, subscript_elem_size, last_found_member_scalar_elem_size, pointer_depth, elem_size, array_dimensions, is_unsigned, &subscript_elem_size);
} else {
emit_parse_postfix_subscript_scaled_address_to_reg_now (reg, subscript_elem_size);
- }
+ }
if (tok.kind == TOK_ARROW && subscript_elem_size <= (DATA_PTR & 0x1f)) {
emit_load_local_to_reg (reg, src->offset, DATA_PTR);
}
- saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, src->pointer_depth, src->pointed_size, src->array_dimensions, src->pointer_depth > 0 ? src->pointed_is_unsigned : src->is_unsigned, &final_subscript_elem_size);
+ saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, src->pointed_size, src->pointer_depth, src->pointed_size, src->array_dimensions, src->pointer_depth > 0 ? src->pointed_is_unsigned : src->is_unsigned, &final_subscript_elem_size);
postfix_copy_lvalue_size = index_step_size (final_subscript_elem_size);
postfix_copy_lvalue_tag_name = src->is_array ? (src->tag_name ? src->tag_name : src->pointed_tag_name) : src->pointed_tag_name;
emit_load_global_to_reg (reg, name, DATA_PTR);
}
- saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, get_global_symbol_pointer_depth (name), get_global_symbol_pointed_size (name), get_global_symbol_array_dimensions (name), get_global_symbol_pointer_depth (name) > 0 ? get_global_symbol_pointed_is_unsigned (name) : get_global_symbol_unsigned (name), &final_subscript_elem_size);
+ saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, get_global_symbol_pointed_size (name), get_global_symbol_pointer_depth (name), get_global_symbol_pointed_size (name), get_global_symbol_array_dimensions (name), get_global_symbol_pointer_depth (name) > 0 ? get_global_symbol_pointed_is_unsigned (name) : get_global_symbol_unsigned (name), &final_subscript_elem_size);
postfix_copy_lvalue_size = index_step_size (final_subscript_elem_size);
postfix_copy_lvalue_tag_name = get_global_symbol_array (name) ? get_global_symbol_tag_name (name) : 0;
}
-static int emit_parse_postfix_subscripts_to_reg_dims_now (const char *reg, int elem_size, int pointer_depth, int pointed_size, int array_dimensions, int is_unsigned, int *final_elem_size) {
+static int emit_parse_postfix_subscripts_to_reg_dims_now (const char *reg, int elem_size, int scalar_elem_size, int pointer_depth, int pointed_size, int array_dimensions, int is_unsigned, int *final_elem_size) {
const char *index_reg;
int saw_subscript = 0;
if (tok.kind == TOK_LBRACK) {
- if (pointer_depth == 0 && pointed_size > 0 && elem_size > pointed_size) {
+ if (pointer_depth == 0 && dims_before > 1) {
+
+ emit_add_indexed_scaled_address_to_reg_now (reg, index_reg, elem_size);
+
+ if (array_dimensions == 1 && scalar_elem_size > 0) {
+ elem_size = index_step_size (scalar_elem_size);
+ }
+
+ } else if (pointer_depth == 0 && pointed_size > 0 && elem_size > pointed_size) {
emit_add_indexed_scaled_address_to_reg_now (reg, index_reg, elem_size);
elem_size = index_step_size (pointed_size);
}
} else if (array_dimensions > 1) {
- emit_parse_postfix_subscripts_to_reg_dims_now (reg, subscript_elem_size, pointer_depth, elem_size, array_dimensions, is_unsigned, &subscript_elem_size);
+ emit_parse_postfix_subscripts_to_reg_dims_now (reg, subscript_elem_size, last_found_member_scalar_elem_size, pointer_depth, elem_size, array_dimensions, is_unsigned, &subscript_elem_size);
} else {
emit_parse_postfix_subscript_scaled_address_to_reg_now (reg, subscript_elem_size);
- }
+ }
if (tok.kind == TOK_ARROW && subscript_elem_size <= (DATA_PTR & 0x1f)) {
emit_load_local_to_reg (reg, src->offset, DATA_PTR);
}
- saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, src->pointer_depth, src->pointed_size, src->array_dimensions, src->pointer_depth > 0 ? src->pointed_is_unsigned : src->is_unsigned, &final_subscript_elem_size);
+ saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, src->pointed_size, src->pointer_depth, src->pointed_size, src->array_dimensions, src->pointer_depth > 0 ? src->pointed_is_unsigned : src->is_unsigned, &final_subscript_elem_size);
postfix_copy_lvalue_size = index_step_size (final_subscript_elem_size);
postfix_copy_lvalue_tag_name = src->is_array ? (src->tag_name ? src->tag_name : src->pointed_tag_name) : src->pointed_tag_name;
emit_load_global_to_reg (reg, name, DATA_PTR);
}
- saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, get_global_symbol_pointer_depth (name), get_global_symbol_pointed_size (name), get_global_symbol_array_dimensions (name), get_global_symbol_pointer_depth (name) > 0 ? get_global_symbol_pointed_is_unsigned (name) : get_global_symbol_unsigned (name), &final_subscript_elem_size);
+ saw_subscript = emit_parse_postfix_subscripts_to_reg_dims_now (reg, elem_size, get_global_symbol_pointed_size (name), get_global_symbol_pointer_depth (name), get_global_symbol_pointed_size (name), get_global_symbol_array_dimensions (name), get_global_symbol_pointer_depth (name) > 0 ? get_global_symbol_pointed_is_unsigned (name) : get_global_symbol_unsigned (name), &final_subscript_elem_size);
postfix_copy_lvalue_size = index_step_size (final_subscript_elem_size);
postfix_copy_lvalue_tag_name = get_global_symbol_array (name) ? get_global_symbol_tag_name (name) : 0;
int member_info_count = 0;
int last_found_member_array_dimensions = 0;
+int last_found_member_scalar_elem_size = 0;
int last_found_member_is_unsigned = 0;
struct pending_param pending_params[MAX_PENDING_PARAMS];
last_found_member_tag_name = 0;
last_found_member_is_unsigned = 0;
last_found_member_array_dimensions = 0;
+ last_found_member_scalar_elem_size = 0;
last_found_member_calling_convention = TOK_EOF;
if (!name) {
last_found_member_tag_name = member_infos[best].tag_name;
last_found_member_is_unsigned = member_infos[best].is_unsigned ? 1 : 0;
last_found_member_array_dimensions = member_infos[best].array_dimensions;
+ last_found_member_scalar_elem_size = member_infos[best].scalar_elem_size;
last_found_member_calling_convention = member_infos[best].calling_convention;
if (offset) {
last_found_member_tag_name = 0;
last_found_member_is_unsigned = 0;
last_found_member_array_dimensions = 0;
+ last_found_member_scalar_elem_size = 0;
last_found_member_calling_convention = TOK_EOF;
if (!name) {
last_found_member_tag_name = member_infos[best].tag_name;
last_found_member_is_unsigned = member_infos[best].is_unsigned ? 1 : 0;
last_found_member_array_dimensions = member_infos[best].array_dimensions;
+ last_found_member_scalar_elem_size = member_infos[best].scalar_elem_size;
last_found_member_calling_convention = member_infos[best].calling_convention;
if (offset) {
}
-static void remember_member_info_ex (const char *name, int offset, int size, int elem_size, int pointer_depth, int is_array, int is_floating, int is_packed) {
+static void remember_member_info_ex (const char *name, int offset, int size, int elem_size, int scalar_elem_size, int pointer_depth, int is_array, int is_floating, int is_packed) {
if (!name) {
return;
member_infos[member_info_count].name = xstrdup (name);
member_infos[member_info_count].offset = offset;
member_infos[member_info_count].size = size;
+ member_infos[member_info_count].scalar_elem_size = scalar_elem_size > 0 ? scalar_elem_size : member_infos[member_info_count].elem_size;
member_infos[member_info_count].elem_size = elem_size > 0 ? elem_size : size;
member_infos[member_info_count].pointer_depth = pointer_depth;
member_infos[member_info_count].array_dimensions = is_array ? declarator_array_dimensions : 0;
dst->offset = base_offset + src->offset;
dst->size = src->size;
dst->elem_size = src->elem_size;
+ dst->scalar_elem_size = src->scalar_elem_size;
dst->pointer_depth = src->pointer_depth;
dst->array_dimensions = src->array_dimensions;
dst->is_array = src->is_array;
if (is_union) {
- remember_member_info_ex (member, 0, member_size, member_info_elem_size, declarator_is_pointer ? declarator_pointer_depth : 0, declarator_has_array, declarator_is_pointer ? 0 : member_type_is_floating, aggregate_is_packed);
+ remember_member_info_ex (member, 0, member_size, member_info_elem_size, member_type_size, declarator_is_pointer ? declarator_pointer_depth : 0, declarator_has_array, declarator_is_pointer ? 0 : member_type_is_floating, aggregate_is_packed);
if (member_size > aggregate_size) {
aggregate_size = member_size;
aggregate_size = member_offset;
- remember_member_info_ex (member, member_offset, member_size, member_info_elem_size, declarator_is_pointer ? declarator_pointer_depth : 0, declarator_has_array, declarator_is_pointer ? 0 : member_type_is_floating, aggregate_is_packed);
+ remember_member_info_ex (member, member_offset, member_size, member_info_elem_size, member_type_size, declarator_is_pointer ? declarator_pointer_depth : 0, declarator_has_array, declarator_is_pointer ? 0 : member_type_is_floating, aggregate_is_packed);
aggregate_size += member_size;
for (r = 0; r < repeat; r++) {
int elem_size;
int array_dimensions;
+ int scalar_elem_size;
int pointer_depth;
int is_array;
};
extern const char *last_found_member_tag_name;
-
extern int last_found_member_is_unsigned;
+
extern int last_found_member_array_dimensions;
+extern int last_found_member_scalar_elem_size;
struct aggregate_tag_entry {