/* */
/* */
/* */
-/* (C) 1998-2004 Ullrich von Bassewitz */
-/* Römerstraße 52 */
+/* (C) 1998-2008 Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/*****************************************************************************/
-/* Forwards */
+/* Data */
/*****************************************************************************/
-static void ParseTypeSpec (DeclSpec* D, int Default);
+typedef struct StructInitData StructInitData;
+struct StructInitData {
+ unsigned Size; /* Size of struct */
+ unsigned Offs; /* Current offset in struct */
+ unsigned BitVal; /* Summed up bit-field value */
+ unsigned ValBits; /* Valid bits in Val */
+};
+
+
+
+/*****************************************************************************/
+/* Forwards */
+/*****************************************************************************/
+
+
+
+static void ParseTypeSpec (DeclSpec* D, long Default, TypeCode Qualifiers);
/* Parse a type specificier */
-static unsigned ParseInitInternal (type* T, int AllowFlexibleMembers);
+static unsigned ParseInitInternal (Type* T, int AllowFlexibleMembers);
/* Parse initialization of variables. Return the number of data bytes. */
/*****************************************************************************/
-/* internal functions */
+/* Internal functions */
/*****************************************************************************/
-static type OptionalQualifiers (type Q)
-/* Read type qualifiers if we have any */
+static void DuplicateQualifier (const char* Name)
+/* Print an error message */
{
- while (TokIsTypeQual (&CurTok)) {
+ Warning ("Duplicate qualifier: `%s'", Name);
+}
- switch (CurTok.Tok) {
- case TOK_CONST:
- if (Q & T_QUAL_CONST) {
- Error ("Duplicate qualifier: `const'");
- }
- Q |= T_QUAL_CONST;
- break;
+
+static TypeCode OptionalQualifiers (TypeCode Allowed)
+/* Read type qualifiers if we have any. Allowed specifies the allowed
+ * qualifiers.
+ */
+{
+ /* We start without any qualifiers */
+ TypeCode Q = T_QUAL_NONE;
+
+ /* Check for more qualifiers */
+ while (1) {
+
+ switch (CurTok.Tok) {
+
+ case TOK_CONST:
+ if (Allowed & T_QUAL_CONST) {
+ if (Q & T_QUAL_CONST) {
+ DuplicateQualifier ("const");
+ }
+ Q |= T_QUAL_CONST;
+ } else {
+ goto Done;
+ }
+ break;
case TOK_VOLATILE:
- if (Q & T_QUAL_VOLATILE) {
- Error ("Duplicate qualifier: `volatile'");
- }
- Q |= T_QUAL_VOLATILE;
- break;
+ if (Allowed & T_QUAL_VOLATILE) {
+ if (Q & T_QUAL_VOLATILE) {
+ DuplicateQualifier ("volatile");
+ }
+ Q |= T_QUAL_VOLATILE;
+ } else {
+ goto Done;
+ }
+ break;
+
+ case TOK_RESTRICT:
+ if (Allowed & T_QUAL_RESTRICT) {
+ if (Q & T_QUAL_RESTRICT) {
+ DuplicateQualifier ("restrict");
+ }
+ Q |= T_QUAL_RESTRICT;
+ } else {
+ goto Done;
+ }
+ break;
+
+ case TOK_NEAR:
+ if (Allowed & T_QUAL_NEAR) {
+ if (Q & T_QUAL_NEAR) {
+ DuplicateQualifier ("near");
+ }
+ Q |= T_QUAL_NEAR;
+ } else {
+ goto Done;
+ }
+ break;
+
+ case TOK_FAR:
+ if (Allowed & T_QUAL_FAR) {
+ if (Q & T_QUAL_FAR) {
+ DuplicateQualifier ("far");
+ }
+ Q |= T_QUAL_FAR;
+ } else {
+ goto Done;
+ }
+ break;
+
+ case TOK_FASTCALL:
+ if (Allowed & T_QUAL_FASTCALL) {
+ if (Q & T_QUAL_FASTCALL) {
+ DuplicateQualifier ("fastcall");
+ }
+ Q |= T_QUAL_FASTCALL;
+ } else {
+ goto Done;
+ }
+ break;
default:
- Internal ("Unexpected type qualifier token: %d", CurTok.Tok);
+ goto Done;
}
NextToken ();
}
+Done:
+ /* We cannot have more than one address size far qualifier */
+ switch (Q & T_QUAL_ADDRSIZE) {
+
+ case T_QUAL_NONE:
+ case T_QUAL_NEAR:
+ case T_QUAL_FAR:
+ break;
+
+ default:
+ Error ("Cannot specify more than one address size qualifier");
+ Q &= ~T_QUAL_ADDRSIZE;
+ }
+
/* Return the qualifiers read */
return Q;
}
-static void optionalint (void)
+static void OptionalInt (void)
/* Eat an optional "int" token */
{
if (CurTok.Tok == TOK_INT) {
-static void optionalsigned (void)
+static void OptionalSigned (void)
/* Eat an optional "signed" token */
{
if (CurTok.Tok == TOK_SIGNED) {
/* Initialize the DeclSpec struct for use */
{
D->StorageClass = 0;
- D->Type[0] = T_END;
+ D->Type[0].C = T_END;
D->Flags = 0;
}
static void InitDeclaration (Declaration* D)
/* Initialize the Declaration struct for use */
{
- D->Ident[0] = '\0';
- D->Type[0] = T_END;
- D->Index = 0;
+ D->Ident[0] = '\0';
+ D->Type[0].C = T_END;
+ D->Index = 0;
+ D->Attributes = 0;
}
-static void AddTypeToDeclaration (Declaration* D, type T)
+static void AddTypeToDeclaration (Declaration* D, TypeCode T)
/* Add a type specifier to the type of a declaration */
{
NeedTypeSpace (D, 1);
- D->Type[D->Index++] = T;
+ D->Type[D->Index++].C = T;
}
-static void AddEncodeToDeclaration (Declaration* D, type T, unsigned long Val)
-/* Add a type plus encoding to the type of a declaration */
+static void FixQualifiers (Type* DataType)
+/* Apply several fixes to qualifiers */
{
- NeedTypeSpace (D, DECODE_SIZE+1);
- D->Type[D->Index++] = T;
- Encode (D->Type + D->Index, Val);
- D->Index += DECODE_SIZE;
+ Type* T;
+ TypeCode Q;
+
+ /* Using typedefs, it is possible to generate declarations that have
+ * type qualifiers attached to an array, not the element type. Go and
+ * fix these here.
+ */
+ T = DataType;
+ Q = T_QUAL_NONE;
+ while (T->C != T_END) {
+ if (IsTypeArray (T)) {
+ /* Extract any type qualifiers */
+ Q |= GetQualifier (T);
+ T->C = UnqualifiedType (T->C);
+ } else {
+ /* Add extracted type qualifiers here */
+ T->C |= Q;
+ Q = T_QUAL_NONE;
+ }
+ ++T;
+ }
+ /* Q must be empty now */
+ CHECK (Q == T_QUAL_NONE);
+
+ /* Do some fixes on pointers and functions. */
+ T = DataType;
+ while (T->C != T_END) {
+ if (IsTypePtr (T)) {
+
+ /* Fastcall qualifier on the pointer? */
+ if (IsQualFastcall (T)) {
+ /* Pointer to function which is not fastcall? */
+ if (IsTypeFunc (T+1) && !IsQualFastcall (T+1)) {
+ /* Move the fastcall qualifier from the pointer to
+ * the function.
+ */
+ T[0].C &= ~T_QUAL_FASTCALL;
+ T[1].C |= T_QUAL_FASTCALL;
+ } else {
+ Error ("Invalid `_fastcall__' qualifier for pointer");
+ }
+ }
+
+ /* Apply the default far and near qualifiers if none are given */
+ Q = (T[0].C & T_QUAL_ADDRSIZE);
+ if (Q == T_QUAL_NONE) {
+ /* No address size qualifiers specified */
+ if (IsTypeFunc (T+1)) {
+ /* Pointer to function. Use the qualifier from the function
+ * or the default if the function don't has one.
+ */
+ Q = (T[1].C & T_QUAL_ADDRSIZE);
+ if (Q == T_QUAL_NONE) {
+ Q = CodeAddrSizeQualifier ();
+ }
+ } else {
+ Q = DataAddrSizeQualifier ();
+ }
+ T[0].C |= Q;
+ } else {
+ /* We have address size qualifiers. If followed by a function,
+ * apply these also to the function.
+ */
+ if (IsTypeFunc (T+1)) {
+ TypeCode FQ = (T[1].C & T_QUAL_ADDRSIZE);
+ if (FQ == T_QUAL_NONE) {
+ T[1].C |= Q;
+ } else if (FQ != Q) {
+ Error ("Address size qualifier mismatch");
+ T[1].C = (T[1].C & ~T_QUAL_ADDRSIZE) | Q;
+ }
+ }
+ }
+
+ } else if (IsTypeFunc (T)) {
+
+ /* Apply the default far and near qualifiers if none are given */
+ if ((T[0].C & T_QUAL_ADDRSIZE) == 0) {
+ T[0].C |= CodeAddrSizeQualifier ();
+ }
+
+ }
+ ++T;
+ }
}
/* We expect an identifier */
if (CurTok.Tok != TOK_IDENT) {
Error ("Identifier expected");
- continue;
+ continue;
}
/* Remember the identifier and skip it */
/* Add an entry to the symbol table */
AddConstSym (Ident, type_int, SC_ENUM, EnumVal++);
- /* Check for end of definition */
+ /* Check for end of definition */
if (CurTok.Tok != TOK_COMMA)
break;
NextToken ();
-static SymEntry* ParseStructDecl (const char* Name, type StructType)
-/* Parse a struct/union declaration. */
+static int ParseFieldWidth (Declaration* Decl)
+/* Parse an optional field width. Returns -1 if no field width is speficied,
+ * otherwise the width of the field.
+ */
{
+ ExprDesc Expr;
- unsigned StructSize;
+ if (CurTok.Tok != TOK_COLON) {
+ /* No bit-field declaration */
+ return -1;
+ }
+
+ /* Read the width */
+ NextToken ();
+ ConstAbsIntExpr (hie1, &Expr);
+ if (Expr.IVal < 0) {
+ Error ("Negative width in bit-field");
+ return -1;
+ }
+ if (Expr.IVal > (int) INT_BITS) {
+ Error ("Width of bit-field exceeds its type");
+ return -1;
+ }
+ if (Expr.IVal == 0 && Decl->Ident[0] != '\0') {
+ Error ("Zero width for named bit-field");
+ return -1;
+ }
+ if (!IsTypeInt (Decl->Type)) {
+ /* Only integer types may be used for bit-fields */
+ Error ("Bit-field has invalid type");
+ return -1;
+ }
+
+ /* Return the field width */
+ return (int) Expr.IVal;
+}
+
+
+
+static SymEntry* StructOrUnionForwardDecl (const char* Name)
+/* Handle a struct or union forward decl */
+{
+ /* Try to find a struct with the given name. If there is none,
+ * insert a forward declaration into the current lexical level.
+ */
+ SymEntry* Entry = FindTagSym (Name);
+ if (Entry == 0) {
+ Entry = AddStructSym (Name, 0, 0);
+ } else if (SymIsLocal (Entry) && (Entry->Flags & SC_STRUCT) != SC_STRUCT) {
+ /* Already defined in the level, but no struct */
+ Error ("Symbol `%s' is already different kind", Name);
+ }
+ return Entry;
+}
+
+
+
+static SymEntry* ParseUnionDecl (const char* Name)
+/* Parse a union declaration. */
+{
+
+ unsigned UnionSize;
unsigned FieldSize;
- unsigned Offs;
+ int FieldWidth; /* Width in bits, -1 if not a bit-field */
+ SymTable* FieldTab;
+ SymEntry* Entry;
+
+
+ if (CurTok.Tok != TOK_LCURLY) {
+ /* Just a forward declaration. */
+ return StructOrUnionForwardDecl (Name);
+ }
+
+ /* Add a forward declaration for the struct in the current lexical level */
+ Entry = AddStructSym (Name, 0, 0);
+
+ /* Skip the curly brace */
+ NextToken ();
+
+ /* Enter a new lexical level for the struct */
+ EnterStructLevel ();
+
+ /* Parse union fields */
+ UnionSize = 0;
+ while (CurTok.Tok != TOK_RCURLY) {
+
+ /* Get the type of the entry */
+ DeclSpec Spec;
+ InitDeclSpec (&Spec);
+ ParseTypeSpec (&Spec, -1, T_QUAL_NONE);
+
+ /* Read fields with this type */
+ while (1) {
+
+ Declaration Decl;
+
+ /* Get type and name of the struct field */
+ ParseDecl (&Spec, &Decl, DM_ACCEPT_IDENT);
+
+ /* Check for a bit-field declaration */
+ FieldWidth = ParseFieldWidth (&Decl);
+
+ /* Ignore zero sized bit fields in a union */
+ if (FieldWidth == 0) {
+ goto NextMember;
+ }
+
+ /* Check for fields without a name */
+ if (Decl.Ident[0] == '\0') {
+ /* Any field without a name is legal but useless in a union */
+ Warning ("Declaration does not declare anything");
+ goto NextMember;
+ }
+
+ /* Handle sizes */
+ FieldSize = CheckedSizeOf (Decl.Type);
+ if (FieldSize > UnionSize) {
+ UnionSize = FieldSize;
+ }
+
+ /* Add a field entry to the table. */
+ if (FieldWidth > 0) {
+ AddBitField (Decl.Ident, 0, 0, FieldWidth);
+ } else {
+ AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, 0);
+ }
+
+NextMember: if (CurTok.Tok != TOK_COMMA) {
+ break;
+ }
+ NextToken ();
+ }
+ ConsumeSemi ();
+ }
+
+ /* Skip the closing brace */
+ NextToken ();
+
+ /* Remember the symbol table and leave the struct level */
+ FieldTab = GetSymTab ();
+ LeaveStructLevel ();
+
+ /* Make a real entry from the forward decl and return it */
+ return AddStructSym (Name, UnionSize, FieldTab);
+}
+
+
+
+static SymEntry* ParseStructDecl (const char* Name)
+/* Parse a struct declaration. */
+{
+
+ unsigned StructSize;
int FlexibleMember;
+ int BitOffs; /* Bit offset for bit-fields */
+ int FieldWidth; /* Width in bits, -1 if not a bit-field */
SymTable* FieldTab;
SymEntry* Entry;
if (CurTok.Tok != TOK_LCURLY) {
- /* Just a forward declaration. Try to find a struct with the given
- * name. If there is none, insert a forward declaration into the
- * current lexical level.
- */
- Entry = FindTagSym (Name);
- if (Entry == 0) {
- Entry = AddStructSym (Name, 0, 0);
- } else if (SymIsLocal (Entry) && (Entry->Flags & SC_STRUCT) == 0) {
- /* Already defined in the level but no struct */
- Error ("Symbol `%s' is already different kind", Name);
- }
- return Entry;
+ /* Just a forward declaration. */
+ return StructOrUnionForwardDecl (Name);
}
/* Add a forward declaration for the struct in the current lexical level */
/* Parse struct fields */
FlexibleMember = 0;
StructSize = 0;
+ BitOffs = 0;
while (CurTok.Tok != TOK_RCURLY) {
/* Get the type of the entry */
DeclSpec Spec;
InitDeclSpec (&Spec);
- ParseTypeSpec (&Spec, -1);
+ ParseTypeSpec (&Spec, -1, T_QUAL_NONE);
/* Read fields with this type */
while (1) {
Declaration Decl;
+ ident Ident;
/* If we had a flexible array member before, no other fields can
* follow.
}
/* Get type and name of the struct field */
- ParseDecl (&Spec, &Decl, 0);
+ ParseDecl (&Spec, &Decl, DM_ACCEPT_IDENT);
- /* Get the offset of this field */
- Offs = (StructType == T_STRUCT)? StructSize : 0;
+ /* Check for a bit-field declaration */
+ FieldWidth = ParseFieldWidth (&Decl);
- /* Calculate the sizes, handle flexible array members */
- if (StructType == T_STRUCT) {
+ /* If this is not a bit field, or the bit field is too large for
+ * the remainder of the current member, or we have a bit field
+ * with width zero, align the struct to the next member by adding
+ * a member with an anonymous name.
+ */
+ if (BitOffs > 0) {
+ if (FieldWidth <= 0 || (BitOffs + FieldWidth) > (int) INT_BITS) {
- /* It's a struct. Check if this field is a flexible array
- * member, and calculate the size of the field.
- */
- if (IsTypeArray (Decl.Type) && GetElementCount (Decl.Type) == UNSPECIFIED) {
- /* Array with unspecified size */
- if (StructSize == 0) {
- Error ("Flexible array member cannot be first struct field");
- }
- FlexibleMember = 1;
- /* Assume zero for size calculations */
- Encode (Decl.Type + 1, FLEXIBLE);
- } else {
- StructSize += CheckedSizeOf (Decl.Type);
+ /* We need an anonymous name */
+ AnonName (Ident, "bit-field");
+
+ /* Add an anonymous bit-field that aligns to the next
+ * storage unit.
+ */
+ AddBitField (Ident, StructSize, BitOffs, INT_BITS - BitOffs);
+
+ /* No bits left */
+ StructSize += SIZEOF_INT;
+ BitOffs = 0;
}
+ }
- } else {
+ /* Apart from the above, a bit field with width 0 is not processed
+ * further.
+ */
+ if (FieldWidth == 0) {
+ goto NextMember;
+ }
- /* It's a union */
- FieldSize = CheckedSizeOf (Decl.Type);
- if (FieldSize > StructSize) {
- StructSize = FieldSize;
- }
- }
+ /* Check for fields without names */
+ if (Decl.Ident[0] == '\0') {
+ if (FieldWidth < 0) {
+ /* A non bit-field without a name is legal but useless */
+ Warning ("Declaration does not declare anything");
+ goto NextMember;
+ } else {
+ /* A bit-field without a name will get an anonymous one */
+ AnonName (Decl.Ident, "bit-field");
+ }
+ }
- /* Add a field entry to the table */
- AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, Offs);
+ /* Check if this field is a flexible array member, and
+ * calculate the size of the field.
+ */
+ if (IsTypeArray (Decl.Type) && GetElementCount (Decl.Type) == UNSPECIFIED) {
+ /* Array with unspecified size */
+ if (StructSize == 0) {
+ Error ("Flexible array member cannot be first struct field");
+ }
+ FlexibleMember = 1;
+ /* Assume zero for size calculations */
+ SetElementCount (Decl.Type, FLEXIBLE);
+ }
- if (CurTok.Tok != TOK_COMMA) {
- break;
+ /* Add a field entry to the table */
+ if (FieldWidth > 0) {
+ /* Add full byte from the bit offset to the variable offset.
+ * This simplifies handling he bit-field as a char type
+ * in expressions.
+ */
+ unsigned Offs = StructSize + (BitOffs / CHAR_BITS);
+ AddBitField (Decl.Ident, Offs, BitOffs % CHAR_BITS, FieldWidth);
+ BitOffs += FieldWidth;
+ CHECK (BitOffs <= (int) INT_BITS);
+ if (BitOffs == INT_BITS) {
+ StructSize += SIZEOF_INT;
+ BitOffs = 0;
+ }
+ } else {
+ AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, StructSize);
+ if (!FlexibleMember) {
+ StructSize += CheckedSizeOf (Decl.Type);
+ }
}
- NextToken ();
- }
- ConsumeSemi ();
+
+NextMember: if (CurTok.Tok != TOK_COMMA) {
+ break;
+ }
+ NextToken ();
+ }
+ ConsumeSemi ();
+ }
+
+ /* If we have bits from bit-fields left, add them to the size. */
+ if (BitOffs > 0) {
+ StructSize += ((BitOffs + CHAR_BITS - 1) / CHAR_BITS);
}
/* Skip the closing brace */
-static void ParseTypeSpec (DeclSpec* D, int Default)
+static void ParseTypeSpec (DeclSpec* D, long Default, TypeCode Qualifiers)
/* Parse a type specificier */
{
ident Ident;
SymEntry* Entry;
- type StructType;
- type Qualifiers; /* Type qualifiers */
/* Assume we have an explicit type */
D->Flags &= ~DS_DEF_TYPE;
/* Read type qualifiers if we have any */
- Qualifiers = OptionalQualifiers (T_QUAL_NONE);
+ Qualifiers |= OptionalQualifiers (T_QUAL_CONST | T_QUAL_VOLATILE);
/* Look at the data type */
switch (CurTok.Tok) {
case TOK_VOID:
NextToken ();
- D->Type[0] = T_VOID;
- D->Type[1] = T_END;
+ D->Type[0].C = T_VOID;
+ D->Type[1].C = T_END;
break;
case TOK_CHAR:
NextToken ();
- D->Type[0] = GetDefaultChar();
- D->Type[1] = T_END;
+ D->Type[0].C = GetDefaultChar();
+ D->Type[1].C = T_END;
break;
case TOK_LONG:
NextToken ();
if (CurTok.Tok == TOK_UNSIGNED) {
NextToken ();
- optionalint ();
- D->Type[0] = T_ULONG;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_ULONG;
+ D->Type[1].C = T_END;
} else {
- optionalsigned ();
- optionalint ();
- D->Type[0] = T_LONG;
- D->Type[1] = T_END;
+ OptionalSigned ();
+ OptionalInt ();
+ D->Type[0].C = T_LONG;
+ D->Type[1].C = T_END;
}
break;
NextToken ();
if (CurTok.Tok == TOK_UNSIGNED) {
NextToken ();
- optionalint ();
- D->Type[0] = T_USHORT;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_USHORT;
+ D->Type[1].C = T_END;
} else {
- optionalsigned ();
- optionalint ();
- D->Type[0] = T_SHORT;
- D->Type[1] = T_END;
+ OptionalSigned ();
+ OptionalInt ();
+ D->Type[0].C = T_SHORT;
+ D->Type[1].C = T_END;
}
- break;
+ break;
case TOK_INT:
NextToken ();
- D->Type[0] = T_INT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_INT;
+ D->Type[1].C = T_END;
break;
case TOK_SIGNED:
case TOK_CHAR:
NextToken ();
- D->Type[0] = T_SCHAR;
- D->Type[1] = T_END;
+ D->Type[0].C = T_SCHAR;
+ D->Type[1].C = T_END;
break;
case TOK_SHORT:
NextToken ();
- optionalint ();
- D->Type[0] = T_SHORT;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_SHORT;
+ D->Type[1].C = T_END;
break;
case TOK_LONG:
NextToken ();
- optionalint ();
- D->Type[0] = T_LONG;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_LONG;
+ D->Type[1].C = T_END;
break;
case TOK_INT:
/* FALL THROUGH */
default:
- D->Type[0] = T_INT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_INT;
+ D->Type[1].C = T_END;
break;
}
break;
case TOK_CHAR:
NextToken ();
- D->Type[0] = T_UCHAR;
- D->Type[1] = T_END;
+ D->Type[0].C = T_UCHAR;
+ D->Type[1].C = T_END;
break;
case TOK_SHORT:
NextToken ();
- optionalint ();
- D->Type[0] = T_USHORT;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_USHORT;
+ D->Type[1].C = T_END;
break;
case TOK_LONG:
NextToken ();
- optionalint ();
- D->Type[0] = T_ULONG;
- D->Type[1] = T_END;
+ OptionalInt ();
+ D->Type[0].C = T_ULONG;
+ D->Type[1].C = T_END;
break;
case TOK_INT:
/* FALL THROUGH */
default:
- D->Type[0] = T_UINT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_UINT;
+ D->Type[1].C = T_END;
break;
}
break;
case TOK_FLOAT:
NextToken ();
- D->Type[0] = T_FLOAT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_FLOAT;
+ D->Type[1].C = T_END;
break;
case TOK_DOUBLE:
NextToken ();
- D->Type[0] = T_DOUBLE;
- D->Type[1] = T_END;
+ D->Type[0].C = T_DOUBLE;
+ D->Type[1].C = T_END;
break;
- case TOK_STRUCT:
case TOK_UNION:
- StructType = (CurTok.Tok == TOK_STRUCT)? T_STRUCT : T_UNION;
NextToken ();
/* */
if (CurTok.Tok == TOK_IDENT) {
strcpy (Ident, CurTok.Ident);
NextToken ();
} else {
- AnonName (Ident, (StructType == T_STRUCT)? "struct" : "union");
+ AnonName (Ident, "union");
+ }
+ /* Remember we have an extra type decl */
+ D->Flags |= DS_EXTRA_TYPE;
+ /* Declare the union in the current scope */
+ Entry = ParseUnionDecl (Ident);
+ /* Encode the union entry into the type */
+ D->Type[0].C = T_UNION;
+ SetSymEntry (D->Type, Entry);
+ D->Type[1].C = T_END;
+ break;
+
+ case TOK_STRUCT:
+ NextToken ();
+ /* */
+ if (CurTok.Tok == TOK_IDENT) {
+ strcpy (Ident, CurTok.Ident);
+ NextToken ();
+ } else {
+ AnonName (Ident, "struct");
}
/* Remember we have an extra type decl */
D->Flags |= DS_EXTRA_TYPE;
/* Declare the struct in the current scope */
- Entry = ParseStructDecl (Ident, StructType);
+ Entry = ParseStructDecl (Ident);
/* Encode the struct entry into the type */
- D->Type[0] = StructType;
- EncodePtr (D->Type+1, Entry);
- D->Type[DECODE_SIZE+1] = T_END;
+ D->Type[0].C = T_STRUCT;
+ SetSymEntry (D->Type, Entry);
+ D->Type[1].C = T_END;
break;
case TOK_ENUM:
NextToken ();
- if (CurTok.Tok != TOK_LCURLY) {
+ if (CurTok.Tok != TOK_LCURLY) {
/* Named enum */
if (CurTok.Tok == TOK_IDENT) {
/* Find an entry with this name */
- Entry = FindTagSym (CurTok.Ident);
+ Entry = FindTagSym (CurTok.Ident);
if (Entry) {
if (SymIsLocal (Entry) && (Entry->Flags & SC_ENUM) == 0) {
Error ("Symbol `%s' is already different kind", Entry->Name);
}
/* Skip the identifier */
NextToken ();
- } else {
+ } else {
Error ("Identifier expected");
- }
- }
- /* Remember we have an extra type decl */
- D->Flags |= DS_EXTRA_TYPE;
- /* Parse the enum decl */
+ }
+ }
+ /* Remember we have an extra type decl */
+ D->Flags |= DS_EXTRA_TYPE;
+ /* Parse the enum decl */
ParseEnumDecl ();
- D->Type[0] = T_INT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_INT;
+ D->Type[1].C = T_END;
break;
case TOK_IDENT:
- Entry = FindSym (CurTok.Ident);
- if (Entry && SymIsTypeDef (Entry)) {
+ Entry = FindSym (CurTok.Ident);
+ if (Entry && SymIsTypeDef (Entry)) {
/* It's a typedef */
NextToken ();
- TypeCpy (D->Type, Entry->Type);
+ TypeCopy (D->Type, Entry->Type);
break;
}
/* FALL THROUGH */
default:
if (Default < 0) {
Error ("Type expected");
- D->Type[0] = T_INT;
- D->Type[1] = T_END;
+ D->Type[0].C = T_INT;
+ D->Type[1].C = T_END;
} else {
- D->Flags |= DS_DEF_TYPE;
- D->Type[0] = (type) Default;
- D->Type[1] = T_END;
- }
- break;
+ D->Flags |= DS_DEF_TYPE;
+ D->Type[0].C = (TypeCode) Default;
+ D->Type[1].C = T_END;
+ }
+ break;
}
/* There may also be qualifiers *after* the initial type */
- D->Type[0] |= OptionalQualifiers (Qualifiers);
+ D->Type[0].C |= (Qualifiers | OptionalQualifiers (T_QUAL_CONST | T_QUAL_VOLATILE));
}
-static type* ParamTypeCvt (type* T)
+static Type* ParamTypeCvt (Type* T)
/* If T is an array, convert it to a pointer else do nothing. Return the
* resulting type.
*/
{
if (IsTypeArray (T)) {
- T += DECODE_SIZE;
- T[0] = T_PTR;
+ T->C = T_PTR;
}
return T;
}
}
/* Create a symbol table entry with type int */
- AddLocalSym (CurTok.Ident, type_int, SC_AUTO | SC_PARAM | SC_DEF, 0);
+ AddLocalSym (CurTok.Ident, type_int, SC_AUTO | SC_PARAM | SC_DEF | SC_DEFTYPE, 0);
/* Count arguments */
++F->ParamCount;
* we ignore all this, since we use auto anyway.
*/
if ((Spec.StorageClass & SC_AUTO) == 0 &&
- (Spec.StorageClass & SC_REGISTER) == 0) {
+ (Spec.StorageClass & SC_REGISTER) == 0) {
Error ("Illegal storage class");
}
/* Parse a comma separated variable list */
while (1) {
- Declaration Decl;
+ Declaration Decl;
/* Read the parameter */
ParseDecl (&Spec, &Decl, DM_NEED_IDENT);
if (Decl.Ident[0] != '\0') {
- /* We have a name given. Search for the symbol */
+ /* We have a name given. Search for the symbol */
SymEntry* Sym = FindLocalSym (Decl.Ident);
if (Sym) {
- /* Found it, change the default type to the one given */
- ChangeSymType (Sym, ParamTypeCvt (Decl.Type));
+ /* Check if we already changed the type for this
+ * parameter
+ */
+ if (Sym->Flags & SC_DEFTYPE) {
+ /* Found it, change the default type to the one given */
+ ChangeSymType (Sym, ParamTypeCvt (Decl.Type));
+ /* Reset the "default type" flag */
+ Sym->Flags &= ~SC_DEFTYPE;
+ } else {
+ /* Type has already been changed */
+ Error ("Redefinition for parameter `%s'", Sym->Name);
+ }
} else {
Error ("Unknown identifier: `%s'", Decl.Ident);
}
DeclSpec Spec;
Declaration Decl;
- DeclAttr Attr;
+ SymEntry* Sym;
/* Allow an ellipsis as last parameter */
if (CurTok.Tok == TOK_ELLIPSIS) {
- NextToken ();
+ NextToken ();
F->Flags |= FD_VARIADIC;
break;
}
F->Flags |= FD_UNNAMED_PARAMS;
/* Clear defined bit on nonames */
- Spec.StorageClass &= ~SC_DEF;
+ Decl.StorageClass &= ~SC_DEF;
}
- /* Parse an attribute ### */
- ParseAttribute (&Decl, &Attr);
+ /* Parse attributes for this parameter */
+ ParseAttribute (&Decl);
/* Create a symbol table entry */
- AddLocalSym (Decl.Ident, ParamTypeCvt (Decl.Type), Spec.StorageClass, 0);
+ Sym = AddLocalSym (Decl.Ident, ParamTypeCvt (Decl.Type), Decl.StorageClass, 0);
+
+ /* Add attributes if we have any */
+ SymUseAttr (Sym, &Decl);
+
+ /* If the parameter is a struct or union, emit a warning */
+ if (IsClassStruct (Decl.Type)) {
+ if (IS_Get (&WarnStructParam)) {
+ Warning ("Passing struct by value for parameter `%s'", Decl.Ident);
+ }
+ }
/* Count arguments */
++F->ParamCount;
* the breaks above bail out without checking.
*/
ConsumeRParen ();
-
- /* Check if this is a function definition */
- if (CurTok.Tok == TOK_LCURLY) {
- /* Print an error if we have unnamed parameters and cc65 extensions
- * are disabled.
- */
- if (IS_Get (&Standard) != STD_CC65 &&
- (F->Flags & FD_UNNAMED_PARAMS) != 0) {
- Error ("Parameter name omitted");
- }
- }
}
-static FuncDesc* ParseFuncDecl (const DeclSpec* Spec)
+static FuncDesc* ParseFuncDecl (void)
/* Parse the argument list of a function. */
{
unsigned Offs;
*/
Sym = FindSym (CurTok.Ident);
if (Sym == 0 || !SymIsTypeDef (Sym)) {
- /* Old style (K&R) function. Assume variable param list. */
- F->Flags |= (FD_OLDSTYLE | FD_VARIADIC);
+ /* Old style (K&R) function. */
+ F->Flags |= FD_OLDSTYLE;
}
}
- /* Check for an implicit int return in the function */
- if ((Spec->Flags & DS_DEF_TYPE) != 0 &&
- Spec->Type[0] == T_INT &&
- Spec->Type[1] == T_END) {
- /* Function has an implicit int return */
- F->Flags |= FD_OLDSTYLE_INTRET;
- }
-
/* Parse params */
if ((F->Flags & FD_OLDSTYLE) == 0) {
+
/* New style function */
ParseAnsiParamList (F);
+
} else {
/* Old style function */
ParseOldStyleParamList (F);
Sym = Sym->PrevSym;
}
- /* Add the default address size for the function */
- if (CodeAddrSize == ADDR_SIZE_FAR) {
- F->Flags |= FD_FAR;
- } else {
- F->Flags |= FD_NEAR;
- }
-
/* Leave the lexical level remembering the symbol tables */
RememberFunctionLevel (F);
-static unsigned FunctionModifierFlags (void)
-/* Parse __fastcall__, __near__ and __far__ and return the matching FD_ flags */
-{
- /* Read the flags */
- unsigned Flags = FD_NONE;
- while (CurTok.Tok == TOK_FASTCALL || CurTok.Tok == TOK_NEAR || CurTok.Tok == TOK_FAR) {
-
- /* Get the flag bit for the next token */
- unsigned F = FD_NONE;
- switch (CurTok.Tok) {
- case TOK_FASTCALL: F = FD_FASTCALL; break;
- case TOK_NEAR: F = FD_NEAR; break;
- case TOK_FAR: F = FD_FAR; break;
- default: Internal ("Unexpected token: %d", CurTok.Tok);
- }
-
- /* Remember the flag for this modifier */
- if (Flags & F) {
- Error ("Duplicate modifier");
- }
- Flags |= F;
-
- /* Skip the token */
- NextToken ();
- }
-
- /* Sanity check */
- if ((Flags & (FD_NEAR | FD_FAR)) == (FD_NEAR | FD_FAR)) {
- Error ("Cannot specify both, `__near__' and `__far__' modifiers");
- Flags &= ~(FD_NEAR | FD_FAR);
- }
-
- /* Return the flags read */
- return Flags;
-}
-
-
-
-static void ApplyFunctionModifiers (type* T, unsigned Flags)
-/* Apply a set of function modifier flags to a function */
-{
- /* Get the function descriptor */
- FuncDesc* F = GetFuncDesc (T);
-
- /* Special check for __fastcall__ */
- if ((Flags & FD_FASTCALL) != 0 && IsVariadicFunc (T)) {
- Error ("Cannot apply `__fastcall__' to functions with "
- "variable parameter list");
- Flags &= ~FD_FASTCALL;
- }
-
- /* Remove the default function address size modifiers */
- F->Flags &= ~(FD_NEAR | FD_FAR);
-
- /* Add the new modifers */
- F->Flags |= Flags;
-}
-
-
-
-static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
+static void Declarator (const DeclSpec* Spec, Declaration* D, declmode_t Mode)
/* Recursively process declarators. Build a type array in reverse order. */
{
+ /* Read optional function or pointer qualifiers. These modify the
+ * identifier or token to the right. For convenience, we allow the fastcall
+ * qualifier also for pointers here. If it is a pointer-to-function, the
+ * qualifier will later be transfered to the function itself. If it's a
+ * pointer to something else, it will be flagged as an error.
+ */
+ TypeCode Qualifiers = OptionalQualifiers (T_QUAL_ADDRSIZE | T_QUAL_FASTCALL);
+
/* Pointer to something */
if (CurTok.Tok == TOK_STAR) {
- type T;
-
/* Skip the star */
NextToken ();
- /* Allow optional const or volatile qualifiers */
- T = T_PTR | OptionalQualifiers (T_QUAL_NONE);
+ /* Allow const, restrict and volatile qualifiers */
+ Qualifiers |= OptionalQualifiers (T_QUAL_CONST | T_QUAL_VOLATILE | T_QUAL_RESTRICT);
/* Parse the type, the pointer points to */
- Decl (Spec, D, Mode);
+ Declarator (Spec, D, Mode);
/* Add the type */
- AddTypeToDeclaration (D, T);
+ AddTypeToDeclaration (D, T_PTR | Qualifiers);
return;
}
- /* Function modifiers */
- if (CurTok.Tok == TOK_FASTCALL || CurTok.Tok == TOK_NEAR || CurTok.Tok == TOK_FAR) {
-
- /* Remember the current type pointer */
- type* T = D->Type + D->Index;
-
- /* Read the flags */
- unsigned Flags = FunctionModifierFlags ();
-
- /* Parse the function */
- Decl (Spec, D, Mode);
-
- /* Check that we have a function */
- if (!IsTypeFunc (T) && !IsTypeFuncPtr (T)) {
- Error ("Function modifier applied to non function");
- } else {
- ApplyFunctionModifiers (T, Flags);
- }
-
- /* Done */
- return;
- }
-
if (CurTok.Tok == TOK_LPAREN) {
NextToken ();
- Decl (Spec, D, Mode);
+ Declarator (Spec, D, Mode);
ConsumeRParen ();
} else {
/* Things depend on Mode now:
if (CurTok.Tok == TOK_LPAREN) {
/* Function declaration */
- FuncDesc* F;
+ FuncDesc* F;
+
+ /* Skip the opening paren */
NextToken ();
- /* Parse the function declaration */
- F = ParseFuncDecl (Spec);
+ /* Parse the function declaration */
+ F = ParseFuncDecl ();
+
+ /* We cannot specify fastcall for variadic functions */
+ if ((F->Flags & FD_VARIADIC) && (Qualifiers & T_QUAL_FASTCALL)) {
+ Error ("Variadic functions cannot be `__fastcall'");
+ Qualifiers &= ~T_QUAL_FASTCALL;
+ }
+
+ /* Add the function type. Be sure to bounds check the type buffer */
+ NeedTypeSpace (D, 1);
+ D->Type[D->Index].C = T_FUNC | Qualifiers;
+ D->Type[D->Index].A.P = F;
+ ++D->Index;
+
+ /* Qualifiers now used */
+ Qualifiers = T_QUAL_NONE;
- /* Add the function type. Be sure to bounds check the type buffer */
- AddEncodeToDeclaration (D, T_FUNC, (unsigned long) F);
} else {
- /* Array declaration */
+ /* Array declaration. */
long Size = UNSPECIFIED;
+
+ /* We cannot have any qualifiers for an array */
+ if (Qualifiers != T_QUAL_NONE) {
+ Error ("Invalid qualifiers for array");
+ Qualifiers = T_QUAL_NONE;
+ }
+
+ /* Skip the left bracket */
NextToken ();
- /* Read the size if it is given */
+
+ /* Read the size if it is given */
if (CurTok.Tok != TOK_RBRACK) {
ExprDesc Expr;
ConstAbsIntExpr (hie1, &Expr);
}
Size = Expr.IVal;
}
+
+ /* Skip the right bracket */
ConsumeRBrack ();
- /* Add the type */
- AddEncodeToDeclaration (D, T_ARRAY, Size);
+ /* Add the array type with the size to the type */
+ NeedTypeSpace (D, 1);
+ D->Type[D->Index].C = T_ARRAY;
+ D->Type[D->Index].A.L = Size;
+ ++D->Index;
}
}
+
+ /* If we have remaining qualifiers, flag them as invalid */
+ if (Qualifiers & T_QUAL_NEAR) {
+ Error ("Invalid `__near__' qualifier");
+ }
+ if (Qualifiers & T_QUAL_FAR) {
+ Error ("Invalid `__far__' qualifier");
+ }
+ if (Qualifiers & T_QUAL_FASTCALL) {
+ Error ("Invalid `__fastcall__' qualifier");
+ }
}
-type* ParseType (type* Type)
+Type* ParseType (Type* T)
/* Parse a complete type specification */
{
DeclSpec Spec;
/* Get a type without a default */
InitDeclSpec (&Spec);
- ParseTypeSpec (&Spec, -1);
+ ParseTypeSpec (&Spec, -1, T_QUAL_NONE);
/* Parse additional declarators */
ParseDecl (&Spec, &Decl, DM_NO_IDENT);
/* Copy the type to the target buffer */
- TypeCpy (Type, Decl.Type);
+ TypeCopy (T, Decl.Type);
/* Return a pointer to the target buffer */
- return Type;
+ return T;
}
-void ParseDecl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
+void ParseDecl (const DeclSpec* Spec, Declaration* D, declmode_t Mode)
/* Parse a variable, type or function declaration */
{
/* Initialize the Declaration struct */
InitDeclaration (D);
/* Get additional declarators and the identifier */
- Decl (Spec, D, Mode);
+ Declarator (Spec, D, Mode);
/* Add the base type. */
NeedTypeSpace (D, TypeLen (Spec->Type) + 1); /* Bounds check */
- TypeCpy (D->Type + D->Index, Spec->Type);
+ TypeCopy (D->Type + D->Index, Spec->Type);
+
+ /* Use the storage class from the declspec */
+ D->StorageClass = Spec->StorageClass;
+
+ /* Do several fixes on qualifiers */
+ FixQualifiers (D->Type);
+
+ /* If we have a function, add a special storage class */
+ if (IsTypeFunc (D->Type)) {
+ D->StorageClass |= SC_FUNC;
+ }
+
+ /* Parse attributes for this declaration */
+ ParseAttribute (D);
+
+ /* Check several things for function or function pointer types */
+ if (IsTypeFunc (D->Type) || IsTypeFuncPtr (D->Type)) {
+
+ /* A function. Check the return type */
+ Type* RetType = GetFuncReturn (D->Type);
+
+ /* Functions may not return functions or arrays */
+ if (IsTypeFunc (RetType)) {
+ Error ("Functions are not allowed to return functions");
+ } else if (IsTypeArray (RetType)) {
+ Error ("Functions are not allowed to return arrays");
+ }
+
+ /* The return type must not be qualified */
+ if (GetQualifier (RetType) != T_QUAL_NONE && RetType[1].C == T_END) {
+
+ if (GetType (RetType) == T_TYPE_VOID) {
+ /* A qualified void type is always an error */
+ Error ("function definition has qualified void return type");
+ } else {
+ /* For others, qualifiers are ignored */
+ Warning ("type qualifiers ignored on function return type");
+ RetType[0].C = UnqualifiedType (RetType[0].C);
+ }
+ }
+
+ /* Warn about an implicit int return in the function */
+ if ((Spec->Flags & DS_DEF_TYPE) != 0 &&
+ RetType[0].C == T_INT && RetType[1].C == T_END) {
+ /* Function has an implicit int return. Output a warning if we don't
+ * have the C89 standard enabled explicitly.
+ */
+ if (IS_Get (&Standard) >= STD_C99) {
+ Warning ("Implicit `int' return type is an obsolete feature");
+ }
+ GetFuncDesc (D->Type)->Flags |= FD_OLDSTYLE_INTRET;
+ }
+
+ }
+
+ /* For anthing that is not a function or typedef, check for an implicit
+ * int declaration.
+ */
+ if ((D->StorageClass & SC_FUNC) != SC_FUNC &&
+ (D->StorageClass & SC_TYPEDEF) != SC_TYPEDEF) {
+ /* If the standard was not set explicitly to C89, print a warning
+ * for variables with implicit int type.
+ */
+ if ((Spec->Flags & DS_DEF_TYPE) != 0 && IS_Get (&Standard) >= STD_C99) {
+ Warning ("Implicit `int' is an obsolete feature");
+ }
+ }
/* Check the size of the generated type */
if (!IsTypeFunc (D->Type) && !IsTypeVoid (D->Type)) {
- unsigned Size = SizeOf (D->Type);
- if (Size >= 0x10000) {
- if (D->Ident[0] != '\0') {
- Error ("Size of `%s' is invalid (0x%06X)", D->Ident, Size);
- } else {
- Error ("Invalid size in declaration (0x%06X)", Size);
- }
- }
+ unsigned Size = SizeOf (D->Type);
+ if (Size >= 0x10000) {
+ if (D->Ident[0] != '\0') {
+ Error ("Size of `%s' is invalid (0x%06X)", D->Ident, Size);
+ } else {
+ Error ("Invalid size in declaration (0x%06X)", Size);
+ }
+ }
}
+
}
-void ParseDeclSpec (DeclSpec* D, unsigned DefStorage, int DefType)
+void ParseDeclSpec (DeclSpec* D, unsigned DefStorage, long DefType)
/* Parse a declaration specification */
{
+ TypeCode Qualifiers;
+
/* Initialize the DeclSpec struct */
InitDeclSpec (D);
- /* First, get the storage class specifier for this declaration */
+ /* There may be qualifiers *before* the storage class specifier */
+ Qualifiers = OptionalQualifiers (T_QUAL_CONST | T_QUAL_VOLATILE);
+
+ /* Now get the storage class specifier for this declaration */
ParseStorageClass (D, DefStorage);
- /* Parse the type specifiers */
- ParseTypeSpec (D, DefType);
+ /* Parse the type specifiers passing any initial type qualifiers */
+ ParseTypeSpec (D, DefType, Qualifiers);
}
-static unsigned ParseScalarInit (type* T)
-/* Parse initializaton for scalar data types. Return the number of data bytes. */
+static void OutputBitFieldData (StructInitData* SI)
+/* Output bit field data */
{
- ExprDesc ED;
+ /* Ignore if we have no data */
+ if (SI->ValBits > 0) {
+
+ /* Output the data */
+ g_defdata (CF_INT | CF_UNSIGNED | CF_CONST, SI->BitVal, 0);
+
+ /* Clear the data from SI and account for the size */
+ SI->BitVal = 0;
+ SI->ValBits = 0;
+ SI->Offs += SIZEOF_INT;
+ }
+}
+
+
+static void ParseScalarInitInternal (Type* T, ExprDesc* ED)
+/* Parse initializaton for scalar data types. This function will not output the
+ * data but return it in ED.
+ */
+{
/* Optional opening brace */
unsigned BraceCount = OpeningCurlyBraces (0);
}
/* Get the expression and convert it to the target type */
- ConstExpr (hie1, &ED);
- TypeConversion (&ED, T);
-
- /* Output the data */
- DefineData (&ED);
+ ConstExpr (hie1, ED);
+ TypeConversion (ED, T);
/* Close eventually opening braces */
ClosingCurlyBraces (BraceCount);
+}
+
+
+
+static unsigned ParseScalarInit (Type* T)
+/* Parse initializaton for scalar data types. Return the number of data bytes. */
+{
+ ExprDesc ED;
+
+ /* Parse initialization */
+ ParseScalarInitInternal (T, &ED);
+
+ /* Output the data */
+ DefineData (&ED);
/* Done */
return SizeOf (T);
-static unsigned ParsePointerInit (type* T)
+static unsigned ParsePointerInit (Type* T)
/* Parse initializaton for pointer data types. Return the number of data bytes. */
{
/* Optional opening brace */
-static unsigned ParseArrayInit (type* T, int AllowFlexibleMembers)
+static unsigned ParseArrayInit (Type* T, int AllowFlexibleMembers)
/* Parse initializaton for arrays. Return the number of data bytes. */
{
int Count;
/* Get the array data */
- type* ElementType = GetElementType (T);
+ Type* ElementType = GetElementType (T);
unsigned ElementSize = CheckedSizeOf (ElementType);
long ElementCount = GetElementCount (T);
/* Special handling for a character array initialized by a literal */
if (IsTypeChar (ElementType) &&
- (CurTok.Tok == TOK_SCONST ||
- (CurTok.Tok == TOK_LCURLY && NextTok.Tok == TOK_SCONST))) {
+ (CurTok.Tok == TOK_SCONST || CurTok.Tok == TOK_WCSCONST ||
+ (CurTok.Tok == TOK_LCURLY &&
+ (NextTok.Tok == TOK_SCONST || NextTok.Tok == TOK_WCSCONST)))) {
/* Char array initialized by string constant */
int NeedParen;
- const char* Str;
/* If we initializer is enclosed in brackets, remember this fact and
* skip the opening bracket.
NextToken ();
}
- /* Get the initializer string and its size */
- Str = GetLiteral (CurTok.IVal);
- Count = GetLiteralPoolOffs () - CurTok.IVal;
-
/* Translate into target charset */
- TranslateLiteralPool (CurTok.IVal);
+ TranslateLiteral (CurTok.SVal);
/* If the array is one too small for the string literal, omit the
* trailing zero.
*/
+ Count = GetLiteralSize (CurTok.SVal);
if (ElementCount != UNSPECIFIED &&
ElementCount != FLEXIBLE &&
Count == ElementCount + 1) {
}
/* Output the data */
- g_defbytes (Str, Count);
+ g_defbytes (GetLiteralStr (CurTok.SVal), Count);
- /* Remove string from pool */
- ResetLiteralPoolOffs (CurTok.IVal);
+ /* Skip the string */
NextToken ();
/* If the initializer was enclosed in curly braces, we need a closing
ConsumeRCurly ();
}
-
if (ElementCount == UNSPECIFIED) {
/* Number of elements determined by initializer */
- Encode (T + 1, Count);
+ SetElementCount (T, Count);
ElementCount = Count;
} else if (ElementCount == FLEXIBLE && AllowFlexibleMembers) {
/* In non ANSI mode, allow initialization of flexible array
-static unsigned ParseStructInit (type* Type, int AllowFlexibleMembers)
+static unsigned ParseStructInit (Type* T, int AllowFlexibleMembers)
/* Parse initialization of a struct or union. Return the number of data bytes. */
{
- SymEntry* Entry;
- SymTable* Tab;
- unsigned StructSize;
- unsigned Size;
+ SymEntry* Entry;
+ SymTable* Tab;
+ StructInitData SI;
/* Consume the opening curly brace */
ConsumeLCurly ();
/* Get a pointer to the struct entry from the type */
- Entry = DecodePtr (Type + 1);
+ Entry = GetSymEntry (T);
/* Get the size of the struct from the symbol table entry */
- StructSize = Entry->V.S.Size;
+ SI.Size = Entry->V.S.Size;
/* Check if this struct definition has a field table. If it doesn't, it
* is an incomplete definition.
*/
Tab = Entry->V.S.SymTab;
if (Tab == 0) {
- Error ("Cannot initialize variables with incomplete type");
+ Error ("Cannot initialize variables with incomplete type");
/* Try error recovery */
SkipInitializer (1);
- /* Nothing initialized */
- return 0;
+ /* Nothing initialized */
+ return 0;
}
/* Get a pointer to the list of symbols */
Entry = Tab->SymHead;
/* Initialize fields */
- Size = 0;
+ SI.Offs = 0;
+ SI.BitVal = 0;
+ SI.ValBits = 0;
while (CurTok.Tok != TOK_RCURLY) {
- if (Entry == 0) {
- Error ("Too many initializers");
+
+ /* */
+ if (Entry == 0) {
+ Error ("Too many initializers");
SkipInitializer (1);
- return Size;
+ return SI.Offs;
}
- /* Parse initialization of one field. Flexible array members may
- * only be initialized if they are the last field (or part of the
- * last struct field).
+
+ /* Parse initialization of one field. Bit-fields need a special
+ * handling.
*/
- Size += ParseInitInternal (Entry->Type, AllowFlexibleMembers && Entry->NextSym == 0);
- Entry = Entry->NextSym;
- if (CurTok.Tok != TOK_COMMA)
+ if (SymIsBitField (Entry)) {
+
+ ExprDesc ED;
+ unsigned Val;
+ unsigned Shift;
+
+ /* Calculate the bitmask from the bit-field data */
+ unsigned Mask = (1U << Entry->V.B.BitWidth) - 1U;
+
+ /* Safety ... */
+ CHECK (Entry->V.B.Offs * CHAR_BITS + Entry->V.B.BitOffs ==
+ SI.Offs * CHAR_BITS + SI.ValBits);
+
+ /* This may be an anonymous bit-field, in which case it doesn't
+ * have an initializer.
+ */
+ if (IsAnonName (Entry->Name)) {
+ /* Account for the data and output it if we have a full word */
+ SI.ValBits += Entry->V.B.BitWidth;
+ CHECK (SI.ValBits <= INT_BITS);
+ if (SI.ValBits == INT_BITS) {
+ OutputBitFieldData (&SI);
+ }
+ goto NextMember;
+ } else {
+ /* Read the data, check for a constant integer, do a range
+ * check.
+ */
+ ParseScalarInitInternal (type_uint, &ED);
+ if (!ED_IsConstAbsInt (&ED)) {
+ Error ("Constant initializer expected");
+ ED_MakeConstAbsInt (&ED, 1);
+ }
+ if (ED.IVal > (long) Mask) {
+ Warning ("Truncating value in bit-field initializer");
+ ED.IVal &= (long) Mask;
+ }
+ Val = (unsigned) ED.IVal;
+ }
+
+ /* Add the value to the currently stored bit-field value */
+ Shift = (Entry->V.B.Offs - SI.Offs) * CHAR_BITS + Entry->V.B.BitOffs;
+ SI.BitVal |= (Val << Shift);
+
+ /* Account for the data and output it if we have a full word */
+ SI.ValBits += Entry->V.B.BitWidth;
+ CHECK (SI.ValBits <= INT_BITS);
+ if (SI.ValBits == INT_BITS) {
+ OutputBitFieldData (&SI);
+ }
+
+ } else {
+
+ /* Standard member. We should never have stuff from a
+ * bit-field left
+ */
+ CHECK (SI.ValBits == 0);
+
+ /* Flexible array members may only be initialized if they are
+ * the last field (or part of the last struct field).
+ */
+ SI.Offs += ParseInitInternal (Entry->Type, AllowFlexibleMembers && Entry->NextSym == 0);
+ }
+
+ /* More initializers? */
+ if (CurTok.Tok != TOK_COMMA) {
break;
- NextToken ();
+ }
+
+ /* Skip the comma */
+ NextToken ();
+
+NextMember:
+ /* Next member. For unions, only the first one can be initialized */
+ if (IsTypeUnion (T)) {
+ /* Union */
+ Entry = 0;
+ } else {
+ /* Struct */
+ Entry = Entry->NextSym;
+ }
}
/* Consume the closing curly brace */
ConsumeRCurly ();
+ /* If we have data from a bit-field left, output it now */
+ OutputBitFieldData (&SI);
+
/* If there are struct fields left, reserve additional storage */
- if (Size < StructSize) {
- g_zerobytes (StructSize - Size);
- Size = StructSize;
+ if (SI.Offs < SI.Size) {
+ g_zerobytes (SI.Size - SI.Offs);
+ SI.Offs = SI.Size;
}
/* Return the actual number of bytes initialized. This number may be
- * larger than StructSize if flexible array members are present and were
- * initialized (possible in non ANSI mode).
+ * larger than sizeof (Struct) if flexible array members are present and
+ * were initialized (possible in non ANSI mode).
*/
- return Size;
+ return SI.Offs;
}
Size = 0;
do {
ConstExpr (hie1, &Expr);
- switch (UnqualifiedType (Expr.Type[0])) {
+ switch (UnqualifiedType (Expr.Type[0].C)) {
case T_SCHAR:
case T_UCHAR:
- if (ED_IsConstAbsInt (&Expr)) {
- /* Make it byte sized */
- Expr.IVal &= 0xFF;
- }
- DefineData (&Expr);
+ if (ED_IsConstAbsInt (&Expr)) {
+ /* Make it byte sized */
+ Expr.IVal &= 0xFF;
+ }
+ DefineData (&Expr);
Size += SIZEOF_CHAR;
break;
case T_UINT:
case T_PTR:
case T_ARRAY:
- if (ED_IsConstAbsInt (&Expr)) {
+ if (ED_IsConstAbsInt (&Expr)) {
/* Make it word sized */
- Expr.IVal &= 0xFFFF;
- }
- DefineData (&Expr);
- Size += SIZEOF_INT;
+ Expr.IVal &= 0xFFFF;
+ }
+ DefineData (&Expr);
+ Size += SIZEOF_INT;
break;
case T_LONG:
case T_ULONG:
- if (ED_IsConstAbsInt (&Expr)) {
+ if (ED_IsConstAbsInt (&Expr)) {
/* Make it dword sized */
- Expr.IVal &= 0xFFFFFFFF;
- }
- DefineData (&Expr);
- Size += SIZEOF_LONG;
+ Expr.IVal &= 0xFFFFFFFF;
+ }
+ DefineData (&Expr);
+ Size += SIZEOF_LONG;
break;
default:
- Error ("Illegal type in initialization");
+ Error ("Illegal type in initialization");
break;
}
-static unsigned ParseInitInternal (type* T, int AllowFlexibleMembers)
+static unsigned ParseInitInternal (Type* T, int AllowFlexibleMembers)
/* Parse initialization of variables. Return the number of data bytes. */
{
- switch (UnqualifiedType (*T)) {
+ switch (UnqualifiedType (T->C)) {
case T_SCHAR:
case T_UCHAR:
case T_UINT:
case T_LONG:
case T_ULONG:
+ case T_FLOAT:
+ case T_DOUBLE:
return ParseScalarInit (T);
case T_PTR:
-unsigned ParseInit (type* T)
+unsigned ParseInit (Type* T)
/* Parse initialization of variables. Return the number of data bytes. */
{
/* Parse the initialization. Flexible array members can only be initialized
projects / cc65 / blobdiff