projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct semantic check in parse_return(): A condition was inverted.
[cparser]
/
type.c
diff --git
a/type.c
b/type.c
index
3864a0d
..
58c4a34
100644
(file)
--- a/
type.c
+++ b/
type.c
@@
-83,8
+83,8
@@
type_t *allocate_type_zero(type_kind_t kind)
*/
atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
[ATOMIC_TYPE_VOID] = {
*/
atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
[ATOMIC_TYPE_VOID] = {
- .size =
0
,
- .alignment =
0
,
+ .size =
1
,
+ .alignment =
1
,
.flags = ATOMIC_TYPE_FLAG_NONE,
.rank = 0,
},
.flags = ATOMIC_TYPE_FLAG_NONE,
.rank = 0,
},
@@
-225,9
+225,7
@@
void init_types(unsigned machine_size)
props[ATOMIC_TYPE_WCHAR_T] = props[ATOMIC_TYPE_INT];
/* set struct alignments to the same value as alignment */
props[ATOMIC_TYPE_WCHAR_T] = props[ATOMIC_TYPE_INT];
/* set struct alignments to the same value as alignment */
- for (size_t i = 0;
- i < sizeof(atomic_type_properties)/sizeof(atomic_type_properties[0]);
- ++i) {
+ for (size_t i = 0; i != lengthof(atomic_type_properties); ++i) {
props[i].struct_alignment = props[i].alignment;
}
}
props[i].struct_alignment = props[i].alignment;
}
}
@@
-375,7
+373,7
@@
restart:
static void print_function_type_post(const function_type_t *type,
const scope_t *parameters)
{
static void print_function_type_post(const function_type_t *type,
const scope_t *parameters)
{
- print_
string("("
);
+ print_
char('('
);
bool first = true;
if (parameters == NULL) {
function_parameter_t *parameter = type->parameters;
bool first = true;
if (parameters == NULL) {
function_parameter_t *parameter = type->parameters;
@@
-417,7
+415,7
@@
static void print_function_type_post(const function_type_t *type,
if (first && !type->unspecified_parameters) {
print_string("void");
}
if (first && !type->unspecified_parameters) {
print_string("void");
}
- print_
string(")"
);
+ print_
char(')'
);
intern_print_type_post(type->return_type);
}
intern_print_type_post(type->return_type);
}
@@
-439,7
+437,7
@@
static void print_pointer_type_pre(const pointer_type_t *type)
print_string(variable->base.base.symbol->string);
print_string(") ");
}
print_string(variable->base.base.symbol->string);
print_string(") ");
}
- print_
string("*"
);
+ print_
char('*'
);
print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START);
}
print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START);
}
@@
-452,7
+450,7
@@
static void print_pointer_type_post(const pointer_type_t *type)
{
type_t const *const points_to = type->points_to;
if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
{
type_t const *const points_to = type->points_to;
if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
- print_
string(")"
);
+ print_
char(')'
);
intern_print_type_post(points_to);
}
intern_print_type_post(points_to);
}
@@
-467,7
+465,7
@@
static void print_reference_type_pre(const reference_type_t *type)
intern_print_type_pre(refers_to);
if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
print_string(" (");
intern_print_type_pre(refers_to);
if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
print_string(" (");
- print_
string("&"
);
+ print_
char('&'
);
}
/**
}
/**
@@
-479,7
+477,7
@@
static void print_reference_type_post(const reference_type_t *type)
{
type_t const *const refers_to = type->refers_to;
if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
{
type_t const *const refers_to = type->refers_to;
if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
- print_
string(")"
);
+ print_
char(')'
);
intern_print_type_post(refers_to);
}
intern_print_type_post(refers_to);
}
@@
-500,7
+498,7
@@
static void print_array_type_pre(const array_type_t *type)
*/
static void print_array_type_post(const array_type_t *type)
{
*/
static void print_array_type_post(const array_type_t *type)
{
- print_
string("["
);
+ print_
char('['
);
if (type->is_static) {
print_string("static ");
}
if (type->is_static) {
print_string("static ");
}
@@
-509,15
+507,10
@@
static void print_array_type_post(const array_type_t *type)
&& (print_implicit_array_size || !type->has_implicit_size)) {
print_expression(type->size_expression);
}
&& (print_implicit_array_size || !type->has_implicit_size)) {
print_expression(type->size_expression);
}
- print_
string("]"
);
+ print_
char(']'
);
intern_print_type_post(type->element_type);
}
intern_print_type_post(type->element_type);
}
-/**
- * Prints an enum definition.
- *
- * @param declaration The enum's type declaration.
- */
void print_enum_definition(const enum_t *enume)
{
print_string("{\n");
void print_enum_definition(const enum_t *enume)
{
print_string("{\n");
@@
-532,17
+525,14
@@
void print_enum_definition(const enum_t *enume)
print_string(entry->base.symbol->string);
if (entry->enum_value.value != NULL) {
print_string(" = ");
print_string(entry->base.symbol->string);
if (entry->enum_value.value != NULL) {
print_string(" = ");
-
- /* skip the implicit cast */
- expression_t *expression = entry->enum_value.value;
- print_expression(expression);
+ print_expression(entry->enum_value.value);
}
print_string(",\n");
}
change_indent(-1);
print_indent();
}
print_string(",\n");
}
change_indent(-1);
print_indent();
- print_
string("}"
);
+ print_
char('}'
);
}
/**
}
/**
@@
-564,9
+554,6
@@
static void print_type_enum(const enum_type_t *type)
}
}
}
}
-/**
- * Print the compound part of a compound type.
- */
void print_compound_definition(const compound_t *compound)
{
print_string("{\n");
void print_compound_definition(const compound_t *compound)
{
print_string("{\n");
@@
-579,12
+566,12
@@
void print_compound_definition(const compound_t *compound)
print_indent();
print_entity(entity);
print_indent();
print_entity(entity);
- print_
string("\n"
);
+ print_
char('\n'
);
}
change_indent(-1);
print_indent();
}
change_indent(-1);
print_indent();
- print_
string("}"
);
+ print_
char('}'
);
if (compound->modifiers & DM_TRANSPARENT_UNION) {
print_string("__attribute__((__transparent_union__))");
}
if (compound->modifiers & DM_TRANSPARENT_UNION) {
print_string("__attribute__((__transparent_union__))");
}
@@
-639,7
+626,7
@@
static void print_typeof_type_pre(const typeof_type_t *const type)
} else {
print_type(type->typeof_type);
}
} else {
print_type(type->typeof_type);
}
- print_
string(")"
);
+ print_
char(')'
);
}
/**
}
/**
@@
-724,11
+711,6
@@
static void intern_print_type_post(const type_t *const type)
}
}
}
}
-/**
- * Prints a type.
- *
- * @param type The type.
- */
void print_type(const type_t *const type)
{
print_type_ext(type, NULL, NULL);
void print_type(const type_t *const type)
{
print_type_ext(type, NULL, NULL);
@@
-739,7
+721,7
@@
void print_type_ext(const type_t *const type, const symbol_t *symbol,
{
intern_print_type_pre(type);
if (symbol != NULL) {
{
intern_print_type_pre(type);
if (symbol != NULL) {
- print_
string(" "
);
+ print_
char(' '
);
print_string(symbol->string);
}
if (type->kind == TYPE_FUNCTION) {
print_string(symbol->string);
}
if (type->kind == TYPE_FUNCTION) {
@@
-749,14
+731,6
@@
void print_type_ext(const type_t *const type, const symbol_t *symbol,
}
}
}
}
-/**
- * Duplicates a type.
- *
- * @param type The type to copy.
- * @return A copy of the type.
- *
- * @note This does not produce a deep copy!
- */
type_t *duplicate_type(const type_t *type)
{
size_t size = get_type_struct_size(type->kind);
type_t *duplicate_type(const type_t *type)
{
size_t size = get_type_struct_size(type->kind);
@@
-768,12
+742,6
@@
type_t *duplicate_type(const type_t *type)
return copy;
}
return copy;
}
-/**
- * Returns the unqualified type of a given type.
- *
- * @param type The type.
- * @returns The unqualified type.
- */
type_t *get_unqualified_type(type_t *type)
{
assert(!is_typeref(type));
type_t *get_unqualified_type(type_t *type)
{
assert(!is_typeref(type));
@@
-822,12
+790,6
@@
static bool test_atomic_type_flag(atomic_type_kind_t kind,
return (atomic_type_properties[kind].flags & flag) != 0;
}
return (atomic_type_properties[kind].flags & flag) != 0;
}
-/**
- * Returns true if the given type is an integer type.
- *
- * @param type The type to check.
- * @return True if type is an integer type.
- */
bool is_type_integer(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_integer(const type_t *type)
{
assert(!is_typeref(type));
@@
-840,24
+802,12
@@
bool is_type_integer(const type_t *type)
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
}
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
}
-/**
- * Returns true if the given type is an enum type.
- *
- * @param type The type to check.
- * @return True if type is an enum type.
- */
bool is_type_enum(const type_t *type)
{
assert(!is_typeref(type));
return type->kind == TYPE_ENUM;
}
bool is_type_enum(const type_t *type)
{
assert(!is_typeref(type));
return type->kind == TYPE_ENUM;
}
-/**
- * Returns true if the given type is an floating point type.
- *
- * @param type The type to check.
- * @return True if type is a floating point type.
- */
bool is_type_float(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_float(const type_t *type)
{
assert(!is_typeref(type));
@@
-868,12
+818,6
@@
bool is_type_float(const type_t *type)
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
}
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
}
-/**
- * Returns true if the given type is an complex type.
- *
- * @param type The type to check.
- * @return True if type is a complex type.
- */
bool is_type_complex(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_complex(const type_t *type)
{
assert(!is_typeref(type));
@@
-884,12
+828,6
@@
bool is_type_complex(const type_t *type)
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
}
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
}
-/**
- * Returns true if the given type is a signed type.
- *
- * @param type The type to check.
- * @return True if type is a signed type.
- */
bool is_type_signed(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_signed(const type_t *type)
{
assert(!is_typeref(type));
@@
-903,12
+841,6
@@
bool is_type_signed(const type_t *type)
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
}
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
}
-/**
- * Returns true if the given type represents an arithmetic type.
- *
- * @param type The type to check.
- * @return True if type represents an arithmetic type.
- */
bool is_type_arithmetic(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_arithmetic(const type_t *type)
{
assert(!is_typeref(type));
@@
-925,24
+857,12
@@
bool is_type_arithmetic(const type_t *type)
}
}
}
}
-/**
- * Returns true if the given type is an integer or float type.
- *
- * @param type The type to check.
- * @return True if type is an integer or float type.
- */
bool is_type_real(const type_t *type)
{
/* 6.2.5 (17) */
return is_type_integer(type) || is_type_float(type);
}
bool is_type_real(const type_t *type)
{
/* 6.2.5 (17) */
return is_type_integer(type) || is_type_float(type);
}
-/**
- * Returns true if the given type represents a scalar type.
- *
- * @param type The type to check.
- * @return True if type represents a scalar type.
- */
bool is_type_scalar(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_scalar(const type_t *type)
{
assert(!is_typeref(type));
@@
-953,12
+873,6
@@
bool is_type_scalar(const type_t *type)
return is_type_arithmetic(type);
}
return is_type_arithmetic(type);
}
-/**
- * Check if a given type is incomplete.
- *
- * @param type The type to check.
- * @return True if the given type is incomplete (ie. just forward).
- */
bool is_type_incomplete(const type_t *type)
{
assert(!is_typeref(type));
bool is_type_incomplete(const type_t *type)
{
assert(!is_typeref(type));
@@
-1072,9
+986,6
@@
static bool array_types_compatible(const array_type_t *array1,
return array1->size == array2->size;
}
return array1->size == array2->size;
}
-/**
- * Check if two types are compatible.
- */
bool types_compatible(const type_t *type1, const type_t *type2)
{
assert(!is_typeref(type1));
bool types_compatible(const type_t *type1, const type_t *type2)
{
assert(!is_typeref(type1));
@@
-1215,11
+1126,7
@@
unsigned get_type_size(type_t *type)
case TYPE_TYPEDEF:
return get_type_size(type->typedeft.typedefe->type);
case TYPE_TYPEOF:
case TYPE_TYPEDEF:
return get_type_size(type->typedeft.typedefe->type);
case TYPE_TYPEOF:
- if (type->typeoft.typeof_type) {
- return get_type_size(type->typeoft.typeof_type);
- } else {
- return get_type_size(type->typeoft.expression->base.type);
- }
+ return get_type_size(type->typeoft.typeof_type);
}
panic("invalid type in get_type_size");
}
}
panic("invalid type in get_type_size");
}
@@
-1257,17
+1164,19
@@
unsigned get_type_alignment(type_t *type)
return alignment;
}
case TYPE_TYPEOF:
return alignment;
}
case TYPE_TYPEOF:
- if (type->typeoft.typeof_type) {
- return get_type_alignment(type->typeoft.typeof_type);
- } else {
- return get_type_alignment(type->typeoft.expression->base.type);
- }
+ return get_type_alignment(type->typeoft.typeof_type);
}
panic("invalid type in get_type_alignment");
}
}
panic("invalid type in get_type_alignment");
}
-unsigned get_type_alignment_compound(type_t *type)
+/**
+ * get alignment of a type when used inside a compound.
+ * Some ABIs are broken and alignment inside a compound is different from
+ * recommended alignment of a type
+ */
+static unsigned get_type_alignment_compound(type_t *const type)
{
{
+ assert(!is_typeref(type));
if (type->kind == TYPE_ATOMIC)
return atomic_type_properties[type->atomic.akind].struct_alignment;
return get_type_alignment(type);
if (type->kind == TYPE_ATOMIC)
return atomic_type_properties[type->atomic.akind].struct_alignment;
return get_type_alignment(type);
@@
-1297,11
+1206,7
@@
decl_modifiers_t get_type_modifiers(const type_t *type)
return modifiers;
}
case TYPE_TYPEOF:
return modifiers;
}
case TYPE_TYPEOF:
- if (type->typeoft.typeof_type) {
- return get_type_modifiers(type->typeoft.typeof_type);
- } else {
- return get_type_modifiers(type->typeoft.expression->base.type);
- }
+ return get_type_modifiers(type->typeoft.typeof_type);
}
panic("invalid type found in get_type_modifiers");
}
}
panic("invalid type found in get_type_modifiers");
}
@@
-1549,7
+1454,7
@@
static entity_t *pack_bitfield_members(il_size_t *struct_offset,
if (!member->compound_member.bitfield)
break;
if (!member->compound_member.bitfield)
break;
- type_t *
base_type = member->declaration.type
;
+ type_t *
const base_type = skip_typeref(member->declaration.type)
;
il_alignment_t base_alignment = get_type_alignment_compound(base_type);
il_alignment_t alignment_mask = base_alignment-1;
if (base_alignment > alignment)
il_alignment_t base_alignment = get_type_alignment_compound(base_type);
il_alignment_t alignment_mask = base_alignment-1;
if (base_alignment > alignment)
@@
-1611,9
+1516,8
@@
void layout_struct_type(compound_type_t *type)
continue;
}
continue;
}
- type_t *m_type = entry->declaration.type;
- type_t *skipped = skip_typeref(m_type);
- if (! is_type_valid(skipped)) {
+ type_t *const m_type = skip_typeref(entry->declaration.type);
+ if (!is_type_valid(m_type)) {
entry = entry->base.next;
continue;
}
entry = entry->base.next;
continue;
}
@@
-1679,7
+1583,7
@@
void layout_union_type(compound_type_t *type)
if (entry->kind != ENTITY_COMPOUND_MEMBER)
continue;
if (entry->kind != ENTITY_COMPOUND_MEMBER)
continue;
- type_t *m_type =
entry->declaration.type
;
+ type_t *m_type =
skip_typeref(entry->declaration.type)
;
if (! is_type_valid(skip_typeref(m_type)))
continue;
if (! is_type_valid(skip_typeref(m_type)))
continue;
@@
-1789,6
+1693,6
@@
void dbg_type(const type_t *type)
{
print_to_file(stderr);
print_type(type);
{
print_to_file(stderr);
print_type(type);
- print_
string("\n"
);
+ print_
char('\n'
);
fflush(stderr);
}
fflush(stderr);
}