X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcc65%2Fdeclare.c;h=414c353d8aa5a71ea6178af0cac78336e559d251;hb=ef6a0341530193e373fd59eabec134f597a1c6bc;hp=8a8dda69171a04de06344c61667300147c969ebf;hpb=77e8bffa81d947d2d726c9ee2efffaf1e945a16d;p=cc65 diff --git a/src/cc65/declare.c b/src/cc65/declare.c index 8a8dda691..414c353d8 100644 --- a/src/cc65/declare.c +++ b/src/cc65/declare.c @@ -1,21 +1,53 @@ -/* - * declare.c - * - * Ullrich von Bassewitz, 20.06.1998 - */ +/*****************************************************************************/ +/* */ +/* declare.c */ +/* */ +/* Parse variable and function declarations */ +/* */ +/* */ +/* */ +/* (C) 1998-2004 Ullrich von Bassewitz */ +/* Römerstraße 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ #include #include #include -#include -#include "../common/xmalloc.h" +/* common */ +#include "addrsize.h" +#include "mmodel.h" +#include "xmalloc.h" +/* cc65 */ #include "anonname.h" #include "codegen.h" #include "datatype.h" +#include "declare.h" +#include "declattr.h" #include "error.h" #include "expr.h" #include "funcdesc.h" @@ -25,7 +57,7 @@ #include "pragma.h" #include "scanner.h" #include "symtab.h" -#include "declare.h" +#include "typeconv.h" @@ -38,6 +70,9 @@ static void ParseTypeSpec (DeclSpec* D, int Default); /* Parse a type specificier */ +static unsigned ParseInitInternal (type* T, int AllowFlexibleMembers); +/* Parse initialization of variables. Return the number of data bytes. */ + /*****************************************************************************/ @@ -46,13 +81,38 @@ static void ParseTypeSpec (DeclSpec* D, int Default); -static void optional_modifiers (void) -/* Eat optional "const" or "volatile" tokens */ +static type OptionalQualifiers (type Q) +/* Read type qualifiers if we have any */ { - while (curtok == TOK_CONST || curtok == TOK_VOLATILE) { - /* Skip it */ - NextToken (); + while (TokIsTypeQual (&CurTok)) { + + switch (CurTok.Tok) { + + case TOK_CONST: + if (Q & T_QUAL_CONST) { + Error ("Duplicate qualifier: `const'"); + } + Q |= T_QUAL_CONST; + break; + + case TOK_VOLATILE: + if (Q & T_QUAL_VOLATILE) { + Error ("Duplicate qualifier: `volatile'"); + } + Q |= T_QUAL_VOLATILE; + break; + + default: + Internal ("Unexpected type qualifier token: %d", CurTok.Tok); + + } + + /* Skip the token */ + NextToken (); } + + /* Return the qualifiers read */ + return Q; } @@ -60,7 +120,7 @@ static void optional_modifiers (void) static void optionalint (void) /* Eat an optional "int" token */ { - if (curtok == TOK_INT) { + if (CurTok.Tok == TOK_INT) { /* Skip it */ NextToken (); } @@ -71,7 +131,7 @@ static void optionalint (void) static void optionalsigned (void) /* Eat an optional "signed" token */ { - if (curtok == TOK_SIGNED) { + if (CurTok.Tok == TOK_SIGNED) { /* Skip it */ NextToken (); } @@ -82,9 +142,9 @@ static void optionalsigned (void) static void InitDeclSpec (DeclSpec* D) /* Initialize the DeclSpec struct for use */ { - D->StorageClass = 0; - D->Type[0] = T_END; - D->Flags = 0; + D->StorageClass = 0; + D->Type[0] = T_END; + D->Flags = 0; } @@ -92,9 +152,43 @@ static void InitDeclSpec (DeclSpec* D) static void InitDeclaration (Declaration* D) /* Initialize the Declaration struct for use */ { - D->Ident[0] = '\0'; - D->Type[0] = T_END; - D->T = D->Type; + D->Ident[0] = '\0'; + D->Type[0] = T_END; + D->Index = 0; +} + + + +static void NeedTypeSpace (Declaration* D, unsigned Count) +/* Check if there is enough space for Count type specifiers within D */ +{ + if (D->Index + Count >= MAXTYPELEN) { + /* We must call Fatal() here, since calling Error() will try to + * continue, and the declaration type is not correctly terminated + * in case we come here. + */ + Fatal ("Too many type specifiers"); + } +} + + + +static void AddTypeToDeclaration (Declaration* D, type T) +/* Add a type specifier to the type of a declaration */ +{ + NeedTypeSpace (D, 1); + D->Type[D->Index++] = T; +} + + + +static void AddEncodeToDeclaration (Declaration* D, type T, unsigned long Val) +/* Add a type plus encoding to the type of a declaration */ +{ + NeedTypeSpace (D, DECODE_SIZE+1); + D->Type[D->Index++] = T; + Encode (D->Type + D->Index, Val); + D->Index += DECODE_SIZE; } @@ -106,7 +200,7 @@ static void ParseStorageClass (DeclSpec* D, unsigned DefStorage) D->Flags &= ~DS_DEF_STORAGE; /* Check the storage class given */ - switch (curtok) { + switch (CurTok.Tok) { case TOK_EXTERN: D->StorageClass = SC_EXTERN | SC_STATIC; @@ -150,7 +244,7 @@ static void ParseEnumDecl (void) ident Ident; /* Accept forward definitions */ - if (curtok != TOK_LCURLY) { + if (CurTok.Tok != TOK_LCURLY) { return; } @@ -159,11 +253,11 @@ static void ParseEnumDecl (void) /* Read the enum tags */ EnumVal = 0; - while (curtok != TOK_RCURLY) { + while (CurTok.Tok != TOK_RCURLY) { /* We expect an identifier */ - if (curtok != TOK_IDENT) { - Error (ERR_IDENT_EXPECTED); + if (CurTok.Tok != TOK_IDENT) { + Error ("Identifier expected"); continue; } @@ -172,18 +266,18 @@ static void ParseEnumDecl (void) NextToken (); /* Check for an assigned value */ - if (curtok == TOK_ASSIGN) { - struct expent lval; + if (CurTok.Tok == TOK_ASSIGN) { + ExprDesc lval; NextToken (); - constexpr (&lval); - EnumVal = lval.e_const; + ConstExpr (&lval); + EnumVal = lval.ConstVal; } /* Add an entry to the symbol table */ - AddEnumSym (Ident, EnumVal++); + AddConstSym (Ident, type_int, SC_ENUM, EnumVal++); /* Check for end of definition */ - if (curtok != TOK_COMMA) + if (CurTok.Tok != TOK_COMMA) break; NextToken (); } @@ -196,13 +290,15 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) /* Parse a struct/union declaration. */ { - unsigned Size; - unsigned Offs; + unsigned StructSize; + unsigned FieldSize; + unsigned Offs; + int FlexibleMember; SymTable* FieldTab; SymEntry* Entry; - if (curtok != TOK_LCURLY) { + 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. @@ -212,7 +308,7 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) Entry = AddStructSym (Name, 0, 0); } else if (SymIsLocal (Entry) && (Entry->Flags & SC_STRUCT) == 0) { /* Already defined in the level but no struct */ - Error (ERR_SYMBOL_KIND); + Error ("Symbol `%s' is already different kind", Name); } return Entry; } @@ -227,8 +323,9 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) EnterStructLevel (); /* Parse struct fields */ - Size = 0; - while (curtok != TOK_RCURLY) { + FlexibleMember = 0; + StructSize = 0; + while (CurTok.Tok != TOK_RCURLY) { /* Get the type of the entry */ DeclSpec Spec; @@ -238,25 +335,55 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) /* Read fields with this type */ while (1) { - /* Get type and name of the struct field */ Declaration Decl; + + /* If we had a flexible array member before, no other fields can + * follow. + */ + if (FlexibleMember) { + Error ("Flexible array member must be last field"); + FlexibleMember = 0; /* Avoid further errors */ + } + + /* Get type and name of the struct field */ ParseDecl (&Spec, &Decl, 0); - /* Add a field entry to the table */ - AddLocalSym (Decl.Ident, Decl.Type, SC_SFLD, (StructType == T_STRUCT)? Size : 0); + /* Get the offset of this field */ + Offs = (StructType == T_STRUCT)? StructSize : 0; + + /* Calculate the sizes, handle flexible array members */ + if (StructType == T_STRUCT) { + + /* 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); + } - /* Calculate offset of next field/size of the union */ - Offs = SizeOf (Decl.Type); - if (StructType == T_STRUCT) { - Size += Offs; } else { - if (Offs > Size) { - Size = Offs; + + /* It's a union */ + FieldSize = CheckedSizeOf (Decl.Type); + if (FieldSize > StructSize) { + StructSize = FieldSize; } } - if (curtok != TOK_COMMA) + /* Add a field entry to the table */ + AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, Offs); + + if (CurTok.Tok != TOK_COMMA) { break; + } NextToken (); } ConsumeSemi (); @@ -270,7 +397,7 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) LeaveStructLevel (); /* Make a real entry from the forward decl and return it */ - return AddStructSym (Name, Size, FieldTab); + return AddStructSym (Name, StructSize, FieldTab); } @@ -278,18 +405,19 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) static void ParseTypeSpec (DeclSpec* D, int Default) /* Parse a type specificier */ { - ident Ident; + ident Ident; SymEntry* Entry; type StructType; + type Qualifiers; /* Type qualifiers */ /* Assume we have an explicit type */ D->Flags &= ~DS_DEF_TYPE; - /* Skip const or volatile modifiers if needed */ - optional_modifiers (); + /* Read type qualifiers if we have any */ + Qualifiers = OptionalQualifiers (T_QUAL_NONE); /* Look at the data type */ - switch (curtok) { + switch (CurTok.Tok) { case TOK_VOID: NextToken (); @@ -305,31 +433,31 @@ static void ParseTypeSpec (DeclSpec* D, int Default) case TOK_LONG: NextToken (); - if (curtok == TOK_UNSIGNED) { - NextToken (); - optionalint (); - D->Type[0] = T_ULONG; - D->Type[1] = T_END; + if (CurTok.Tok == TOK_UNSIGNED) { + NextToken (); + optionalint (); + D->Type[0] = T_ULONG; + D->Type[1] = T_END; } else { - optionalsigned (); - optionalint (); - D->Type[0] = T_LONG; - D->Type[1] = T_END; + optionalsigned (); + optionalint (); + D->Type[0] = T_LONG; + D->Type[1] = T_END; } break; case TOK_SHORT: NextToken (); - if (curtok == TOK_UNSIGNED) { - NextToken (); - optionalint (); - D->Type[0] = T_USHORT; - D->Type[1] = T_END; + if (CurTok.Tok == TOK_UNSIGNED) { + NextToken (); + optionalint (); + D->Type[0] = T_USHORT; + D->Type[1] = T_END; } else { - optionalsigned (); - optionalint (); - D->Type[0] = T_SHORT; - D->Type[1] = T_END; + optionalsigned (); + optionalint (); + D->Type[0] = T_SHORT; + D->Type[1] = T_END; } break; @@ -341,12 +469,12 @@ static void ParseTypeSpec (DeclSpec* D, int Default) case TOK_SIGNED: NextToken (); - switch (curtok) { + switch (CurTok.Tok) { case TOK_CHAR: NextToken (); - D->Type[0] = T_CHAR; - D->Type[1] = T_END; + D->Type[0] = T_SCHAR; + D->Type[1] = T_END; break; case TOK_SHORT: @@ -361,14 +489,14 @@ static void ParseTypeSpec (DeclSpec* D, int Default) optionalint (); D->Type[0] = T_LONG; D->Type[1] = T_END; - break; + break; case TOK_INT: NextToken (); /* FALL THROUGH */ - default: - D->Type[0] = T_INT; + default: + D->Type[0] = T_INT; D->Type[1] = T_END; break; } @@ -376,7 +504,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) case TOK_UNSIGNED: NextToken (); - switch (curtok) { + switch (CurTok.Tok) { case TOK_CHAR: NextToken (); @@ -398,23 +526,35 @@ static void ParseTypeSpec (DeclSpec* D, int Default) D->Type[1] = T_END; break; - case TOK_INT: + case TOK_INT: NextToken (); /* FALL THROUGH */ default: D->Type[0] = T_UINT; - D->Type[1] = T_END; + D->Type[1] = T_END; break; } break; + case TOK_FLOAT: + NextToken (); + D->Type[0] = T_FLOAT; + D->Type[1] = T_END; + break; + + case TOK_DOUBLE: + NextToken (); + D->Type[0] = T_DOUBLE; + D->Type[1] = T_END; + break; + case TOK_STRUCT: case TOK_UNION: - StructType = (curtok == TOK_STRUCT)? T_STRUCT : T_UNION; + StructType = (CurTok.Tok == TOK_STRUCT)? T_STRUCT : T_UNION; NextToken (); /* */ - if (curtok == TOK_IDENT) { + if (CurTok.Tok == TOK_IDENT) { strcpy (Ident, CurTok.Ident); NextToken (); } else { @@ -432,22 +572,22 @@ static void ParseTypeSpec (DeclSpec* D, int Default) case TOK_ENUM: NextToken (); - if (curtok != TOK_LCURLY) { + if (CurTok.Tok != TOK_LCURLY) { /* Named enum */ - if (curtok == TOK_IDENT) { + if (CurTok.Tok == TOK_IDENT) { /* Find an entry with this name */ Entry = FindTagSym (CurTok.Ident); if (Entry) { if (SymIsLocal (Entry) && (Entry->Flags & SC_ENUM) == 0) { - Error (ERR_SYMBOL_KIND); + Error ("Symbol `%s' is already different kind", Entry->Name); } - } else { + } else { /* Insert entry into table ### */ } /* Skip the identifier */ NextToken (); } else { - Error (ERR_IDENT_EXPECTED); + Error ("Identifier expected"); } } /* Remember we have an extra type decl */ @@ -460,7 +600,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) case TOK_IDENT: Entry = FindSym (CurTok.Ident); - if (Entry && IsTypeDef (Entry)) { + if (Entry && SymIsTypeDef (Entry)) { /* It's a typedef */ NextToken (); TypeCpy (D->Type, Entry->Type); @@ -470,7 +610,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) default: if (Default < 0) { - Error (ERR_TYPE_EXPECTED); + Error ("Type expected"); D->Type[0] = T_INT; D->Type[1] = T_END; } else { @@ -480,6 +620,9 @@ static void ParseTypeSpec (DeclSpec* D, int Default) } break; } + + /* There may also be qualifiers *after* the initial type */ + D->Type[0] |= OptionalQualifiers (Qualifiers); } @@ -489,7 +632,7 @@ static type* ParamTypeCvt (type* T) * resulting type. */ { - if (IsArray (T)) { + if (IsTypeArray (T)) { T += DECODE_SIZE; T[0] = T_PTR; } @@ -502,11 +645,11 @@ static void ParseOldStyleParamList (FuncDesc* F) /* Parse an old style (K&R) parameter list */ { /* Parse params */ - while (curtok != TOK_RPAREN) { + while (CurTok.Tok != TOK_RPAREN) { /* List of identifiers expected */ - if (curtok != TOK_IDENT) { - Error (ERR_IDENT_EXPECTED); + if (CurTok.Tok != TOK_IDENT) { + Error ("Identifier expected"); } /* Create a symbol table entry with type int */ @@ -519,7 +662,7 @@ static void ParseOldStyleParamList (FuncDesc* F) NextToken (); /* Check for more parameters */ - if (curtok == TOK_COMMA) { + if (CurTok.Tok == TOK_COMMA) { NextToken (); } else { break; @@ -532,9 +675,9 @@ static void ParseOldStyleParamList (FuncDesc* F) ConsumeRParen (); /* An optional list of type specifications follows */ - while (curtok != TOK_LCURLY) { + while (CurTok.Tok != TOK_LCURLY) { - DeclSpec Spec; + DeclSpec Spec; /* Read the declaration specifier */ ParseDeclSpec (&Spec, SC_AUTO, T_INT); @@ -544,7 +687,7 @@ static void ParseOldStyleParamList (FuncDesc* F) */ if ((Spec.StorageClass & SC_AUTO) == 0 && (Spec.StorageClass & SC_REGISTER) == 0) { - Error (ERR_ILLEGAL_STORAGE_CLASS); + Error ("Illegal storage class"); } /* Parse a comma separated variable list */ @@ -562,12 +705,12 @@ static void ParseOldStyleParamList (FuncDesc* F) /* Found it, change the default type to the one given */ ChangeSymType (Sym, ParamTypeCvt (Decl.Type)); } else { - Error (ERR_UNKNOWN_IDENT, Decl.Ident); + Error ("Unknown identifier: `%s'", Decl.Ident); } } - if (curtok == TOK_COMMA) { - NextToken (); + if (CurTok.Tok == TOK_COMMA) { + NextToken (); } else { break; } @@ -585,30 +728,31 @@ static void ParseAnsiParamList (FuncDesc* F) /* Parse a new style (ANSI) parameter list */ { /* Parse params */ - while (curtok != TOK_RPAREN) { + while (CurTok.Tok != TOK_RPAREN) { DeclSpec Spec; Declaration Decl; - + DeclAttr Attr; /* Allow an ellipsis as last parameter */ - if (curtok == TOK_ELLIPSIS) { + if (CurTok.Tok == TOK_ELLIPSIS) { NextToken (); - F->Flags |= FD_ELLIPSIS; + F->Flags |= FD_VARIADIC; break; } /* Read the declaration specifier */ ParseDeclSpec (&Spec, SC_AUTO, T_INT); - /* We accept only auto and register as storage class specifiers, but - * we ignore all this and use auto. - */ - if ((Spec.StorageClass & SC_AUTO) == 0 && - (Spec.StorageClass & SC_REGISTER) == 0) { - Error (ERR_ILLEGAL_STORAGE_CLASS); + /* We accept only auto and register as storage class specifiers */ + if ((Spec.StorageClass & SC_AUTO) == SC_AUTO) { + Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF; + } else if ((Spec.StorageClass & SC_REGISTER) == SC_REGISTER) { + Spec.StorageClass = SC_REGISTER | SC_STATIC | SC_PARAM | SC_DEF; + } else { + Error ("Illegal storage class"); + Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF; } - Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF; /* Allow parameters without a name, but remember if we had some to * eventually print an error message later. @@ -626,6 +770,9 @@ static void ParseAnsiParamList (FuncDesc* F) Spec.StorageClass &= ~SC_DEF; } + /* Parse an attribute ### */ + ParseAttribute (&Decl, &Attr); + /* Create a symbol table entry */ AddLocalSym (Decl.Ident, ParamTypeCvt (Decl.Type), Spec.StorageClass, 0); @@ -633,7 +780,7 @@ static void ParseAnsiParamList (FuncDesc* F) ++F->ParamCount; /* Check for more parameters */ - if (curtok == TOK_COMMA) { + if (CurTok.Tok == TOK_COMMA) { NextToken (); } else { break; @@ -646,19 +793,19 @@ static void ParseAnsiParamList (FuncDesc* F) ConsumeRParen (); /* Check if this is a function definition */ - if (curtok == TOK_LCURLY) { + if (CurTok.Tok == TOK_LCURLY) { /* Print an error if in strict ANSI mode and we have unnamed * parameters. */ if (ANSI && (F->Flags & FD_UNNAMED_PARAMS) != 0) { - Error (ERR_MISSING_PARAM_NAME); + Error ("Parameter name omitted"); } } } -static FuncDesc* ParseFuncDecl (void) +static FuncDesc* ParseFuncDecl (const DeclSpec* Spec) /* Parse the argument list of a function. */ { unsigned Offs; @@ -671,16 +818,31 @@ static FuncDesc* ParseFuncDecl (void) EnterFunctionLevel (); /* Check for several special parameter lists */ - if (curtok == TOK_RPAREN) { + if (CurTok.Tok == TOK_RPAREN) { /* Parameter list is empty */ - F->Flags |= (FD_EMPTY | FD_ELLIPSIS); - } else if (curtok == TOK_VOID && nxttok == TOK_RPAREN) { + F->Flags |= (FD_EMPTY | FD_VARIADIC); + } else if (CurTok.Tok == TOK_VOID && NextTok.Tok == TOK_RPAREN) { /* Parameter list declared as void */ NextToken (); F->Flags |= FD_VOID_PARAM; - } else if (curtok == TOK_IDENT && (nxttok == TOK_COMMA || nxttok == TOK_RPAREN)) { - /* Old style (K&R) function. Assume variable param list. */ - F->Flags |= (FD_OLDSTYLE | FD_ELLIPSIS); + } else if (CurTok.Tok == TOK_IDENT && + (NextTok.Tok == TOK_COMMA || NextTok.Tok == TOK_RPAREN)) { + /* If the identifier is a typedef, we have a new style parameter list, + * if it's some other identifier, it's an old style parameter list. + */ + Sym = FindSym (CurTok.Ident); + if (Sym == 0 || !SymIsTypeDef (Sym)) { + /* Old style (K&R) function. Assume variable param list. */ + F->Flags |= (FD_OLDSTYLE | FD_VARIADIC); + } + } + + /* 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 */ @@ -692,19 +854,37 @@ static FuncDesc* ParseFuncDecl (void) ParseOldStyleParamList (F); } + /* Remember the last function parameter. We need it later for several + * purposes, for example when passing stuff to fastcall functions. Since + * more symbols are added to the table, it is easier if we remember it + * now, since it is currently the last entry in the symbol table. + */ + F->LastParam = GetSymTab()->SymTail; + /* Assign offsets. If the function has a variable parameter list, * there's one additional byte (the arg size). */ - Offs = (F->Flags & FD_ELLIPSIS)? 1 : 0; - Sym = GetSymTab()->SymTail; + Offs = (F->Flags & FD_VARIADIC)? 1 : 0; + Sym = F->LastParam; while (Sym) { - unsigned Size = SizeOf (Sym->Type); - Sym->V.Offs = Offs; + unsigned Size = CheckedSizeOf (Sym->Type); + if (SymIsRegVar (Sym)) { + Sym->V.R.SaveOffs = Offs; + } else { + Sym->V.Offs = Offs; + } Offs += Size; F->ParamSize += Size; 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); @@ -714,84 +894,173 @@ static FuncDesc* ParseFuncDecl (void) -static void Decl (Declaration* D, unsigned Mode) +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) /* Recursively process declarators. Build a type array in reverse order. */ { - if (curtok == TOK_STAR) { + /* Pointer to something */ + if (CurTok.Tok == TOK_STAR) { + + type T; + + /* Skip the star */ NextToken (); - /* Allow optional const or volatile modifiers */ - optional_modifiers (); - Decl (D, Mode); - *D->T++ = T_PTR; + + /* Allow optional const or volatile qualifiers */ + T = T_PTR | OptionalQualifiers (T_QUAL_NONE); + + /* Parse the type, the pointer points to */ + Decl (Spec, D, Mode); + + /* Add the type */ + AddTypeToDeclaration (D, T); return; - } else if (curtok == TOK_LPAREN) { - NextToken (); - Decl (D, Mode); - ConsumeRParen (); - } else if (curtok == TOK_FASTCALL) { + } + + /* Function modifiers */ + if (CurTok.Tok == TOK_FASTCALL || CurTok.Tok == TOK_NEAR || CurTok.Tok == TOK_FAR) { + /* Remember the current type pointer */ - type* T = D->T; - /* Skip the fastcall token */ - NextToken (); + type* T = D->Type + D->Index; + + /* Read the flags */ + unsigned Flags = FunctionModifierFlags (); + /* Parse the function */ - Decl (D, Mode); - /* Set the fastcall flag */ - if (!IsFunc (T)) { - Error (ERR_ILLEGAL_MODIFIER); + Decl (Spec, D, Mode); + + /* Check that we have a function */ + if (!IsTypeFunc (T) && !IsTypeFuncPtr (T)) { + Error ("Function modifier applied to non function"); } else { - FuncDesc* F = DecodePtr (T+1); - F->Flags |= FD_FASTCALL; - } + ApplyFunctionModifiers (T, Flags); + } + + /* Done */ return; + } + + if (CurTok.Tok == TOK_LPAREN) { + NextToken (); + Decl (Spec, D, Mode); + ConsumeRParen (); } else { /* Things depend on Mode now: * - Mode == DM_NEED_IDENT means: * we *must* have a type and a variable identifer. * - Mode == DM_NO_IDENT means: - * we must have a type but no variable identifer + * we must have a type but no variable identifer * (if there is one, it's not read). * - Mode == DM_ACCEPT_IDENT means: - * we *may* have an identifier. If there is an identifier, - * it is read, but it is no error, if there is none. + * we *may* have an identifier. If there is an identifier, + * it is read, but it is no error, if there is none. */ if (Mode == DM_NO_IDENT) { D->Ident[0] = '\0'; - } else if (curtok == TOK_IDENT) { + } else if (CurTok.Tok == TOK_IDENT) { strcpy (D->Ident, CurTok.Ident); NextToken (); } else { if (Mode == DM_NEED_IDENT) { - Error (ERR_IDENT_EXPECTED); + Error ("Identifier expected"); } D->Ident[0] = '\0'; - return; } } - while (curtok == TOK_LBRACK || curtok == TOK_LPAREN) { - if (curtok == TOK_LPAREN) { + while (CurTok.Tok == TOK_LBRACK || CurTok.Tok == TOK_LPAREN) { + if (CurTok.Tok == TOK_LPAREN) { + /* Function declaration */ FuncDesc* F; NextToken (); + /* Parse the function declaration */ - F = ParseFuncDecl (); - *D->T++ = T_FUNC; - EncodePtr (D->T, F); - D->T += DECODE_SIZE; + F = ParseFuncDecl (Spec); + + /* Add the function type. Be sure to bounds check the type buffer */ + AddEncodeToDeclaration (D, T_FUNC, (unsigned long) F); } else { /* Array declaration */ - unsigned long Size = 0; + long Size = UNSPECIFIED; NextToken (); /* Read the size if it is given */ - if (curtok != TOK_RBRACK) { - struct expent lval; - constexpr (&lval); - Size = lval.e_const; + if (CurTok.Tok != TOK_RBRACK) { + ExprDesc lval; + ConstExpr (&lval); + if (lval.ConstVal <= 0) { + if (D->Ident[0] != '\0') { + Error ("Size of array `%s' is invalid", D->Ident); + } else { + Error ("Size of array is invalid"); + } + lval.ConstVal = 1; + } + Size = lval.ConstVal; } ConsumeRBrack (); - *D->T++ = T_ARRAY; - Encode (D->T, Size); - D->T += DECODE_SIZE; + + /* Add the type */ + AddEncodeToDeclaration (D, T_ARRAY, Size); } } } @@ -815,7 +1084,6 @@ type* ParseType (type* Type) ParseTypeSpec (&Spec, -1); /* Parse additional declarators */ - InitDeclaration (&Decl); ParseDecl (&Spec, &Decl, DM_NO_IDENT); /* Copy the type to the target buffer */ @@ -834,14 +1102,19 @@ void ParseDecl (const DeclSpec* Spec, Declaration* D, unsigned Mode) InitDeclaration (D); /* Get additional declarators and the identifier */ - Decl (D, Mode); + Decl (Spec, D, Mode); /* Add the base type. */ - TypeCpy (D->T, Spec->Type); + NeedTypeSpace (D, TypeLen (Spec->Type) + 1); /* Bounds check */ + TypeCpy (D->Type + D->Index, Spec->Type); /* Check the size of the generated type */ - if (!IsFunc (D->Type) && SizeOf (D->Type) >= 0x10000) { - Error (ERR_ILLEGAL_SIZE); + if (!IsTypeFunc (D->Type) && !IsTypeVoid (D->Type) && SizeOf (D->Type) >= 0x10000) { + if (D->Ident[0] != '\0') { + Error ("Size of `%s' is invalid", D->Ident); + } else { + Error ("Invalid size"); + } } } @@ -869,215 +1142,405 @@ void CheckEmptyDecl (const DeclSpec* D) */ { if ((D->Flags & DS_EXTRA_TYPE) == 0) { - Warning (WARN_USELESS_DECL); + Warning ("Useless declaration"); } } -static void ParseVoidInit (void) -/* Parse an initialization of a void variable (special cc65 extension) */ +static void SkipInitializer (unsigned BracesExpected) +/* Skip the remainder of an initializer in case of errors. Try to be somewhat + * smart so we don't have too many following errors. + */ { - struct expent lval; + while (CurTok.Tok != TOK_CEOF && CurTok.Tok != TOK_SEMI && BracesExpected > 0) { + switch (CurTok.Tok) { + case TOK_RCURLY: --BracesExpected; break; + case TOK_LCURLY: ++BracesExpected; break; + default: break; + } + NextToken (); + } +} - /* Allow an arbitrary list of values */ - ConsumeLCurly (); - do { - constexpr (&lval); - switch (lval.e_tptr[0]) { - case T_CHAR: - case T_UCHAR: - if ((lval.e_flags & E_MCTYPE) == E_TCONST) { - /* Make it byte sized */ - lval.e_const &= 0xFF; - } - DefineData (&lval); - break; - case T_SHORT: - case T_USHORT: - case T_INT: - case T_UINT: - case T_PTR: - case T_ARRAY: - if ((lval.e_flags & E_MCTYPE) == E_TCONST) { - /* Make it word sized */ - lval.e_const &= 0xFFFF; - } - DefineData (&lval); - break; +static unsigned OpeningCurlyBraces (unsigned BracesNeeded) +/* Accept any number of opening curly braces around an initialization, skip + * them and return the number. If the number of curly braces is less than + * BracesNeeded, issue a warning. + */ +{ + unsigned BraceCount = 0; + while (CurTok.Tok == TOK_LCURLY) { + ++BraceCount; + NextToken (); + } + if (BraceCount < BracesNeeded) { + Error ("`{' expected"); + } + return BraceCount; +} - case T_LONG: - case T_ULONG: - DefineData (&lval); - break; - default: - Error (ERR_ILLEGAL_TYPE); - break; - } +static void ClosingCurlyBraces (unsigned BracesExpected) +/* Accept and skip the given number of closing curly braces together with + * an optional comma. Output an error messages, if the input does not contain + * the expected number of braces. + */ +{ + while (BracesExpected) { + if (CurTok.Tok == TOK_RCURLY) { + NextToken (); + } else if (CurTok.Tok == TOK_COMMA && NextTok.Tok == TOK_RCURLY) { + NextToken (); + NextToken (); + } else { + Error ("`}' expected"); + return; + } + --BracesExpected; + } +} - if (curtok != TOK_COMMA) { - break; - } - NextToken (); - } while (curtok != TOK_RCURLY); - ConsumeRCurly (); +static unsigned ParseScalarInit (type* T) +/* Parse initializaton for scalar data types. Return the number of data bytes. */ +{ + ExprDesc ED; + + /* Optional opening brace */ + unsigned BraceCount = OpeningCurlyBraces (0); + + /* We warn if an initializer for a scalar contains braces, because this is + * quite unusual and often a sign for some problem in the input. + */ + if (BraceCount > 0) { + Warning ("Braces around scalar initializer"); + } + + /* Get the expression and convert it to the target type */ + ConstExpr (&ED); + TypeConversion (&ED, T); + + /* Output the data */ + DefineData (&ED); + + /* Close eventually opening braces */ + ClosingCurlyBraces (BraceCount); + + /* Done */ + return SizeOf (T); +} + + + +static unsigned ParsePointerInit (type* T) +/* Parse initializaton for pointer data types. Return the number of data bytes. */ +{ + /* Optional opening brace */ + unsigned BraceCount = OpeningCurlyBraces (0); + + /* Expression */ + ExprDesc ED; + ConstExpr (&ED); + if ((ED.Flags & E_MCTYPE) == E_TCONST) { + /* Make the const value the correct size */ + ED.ConstVal &= 0xFFFF; + } + TypeConversion (&ED, T); + + /* Output the data */ + DefineData (&ED); + + /* Close eventually opening braces */ + ClosingCurlyBraces (BraceCount); + + /* Done */ + return SIZEOF_PTR; +} + + + +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); + 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) { + + /* Char array initialized by string constant */ + const char* Str = GetLiteral (CurTok.IVal); + Count = GetLiteralPoolOffs () - CurTok.IVal; + + /* Translate into target charset */ + TranslateLiteralPool (CurTok.IVal); + + /* If the array is one too small for the string literal, omit the + * trailing zero. + */ + if (ElementCount != UNSPECIFIED && + ElementCount != FLEXIBLE && + Count == ElementCount + 1) { + /* Omit the trailing zero */ + --Count; + } + + /* Output the data */ + g_defbytes (Str, Count); + + /* Remove string from pool */ + ResetLiteralPoolOffs (CurTok.IVal); + NextToken (); + + } else { + + /* Curly brace */ + ConsumeLCurly (); + + /* Initialize the array members */ + Count = 0; + while (CurTok.Tok != TOK_RCURLY) { + /* Flexible array members may not be initialized within + * an array (because the size of each element may differ + * otherwise). + */ + ParseInitInternal (ElementType, 0); + ++Count; + if (CurTok.Tok != TOK_COMMA) + break; + NextToken (); + } + + /* Closing curly braces */ + ConsumeRCurly (); + } + + + if (ElementCount == UNSPECIFIED) { + /* Number of elements determined by initializer */ + Encode (T + 1, Count); + ElementCount = Count; + } else if (ElementCount == FLEXIBLE && AllowFlexibleMembers) { + /* In non ANSI mode, allow initialization of flexible array + * members. + */ + ElementCount = Count; + } else if (Count < ElementCount) { + g_zerobytes ((ElementCount - Count) * ElementSize); + } else if (Count > ElementCount) { + Error ("Too many initializers"); + } + return ElementCount * ElementSize; } -static void ParseStructInit (type* Type) -/* Parse initialization of a struct or union */ +static unsigned ParseStructInit (type* Type, int AllowFlexibleMembers) +/* Parse initialization of a struct or union. Return the number of data bytes. */ { SymEntry* Entry; SymTable* Tab; + unsigned StructSize; + unsigned Size; + /* Consume the opening curly brace */ ConsumeLCurly (); /* Get a pointer to the struct entry from the type */ - Entry = (SymEntry*) Decode (Type + 1); + Entry = DecodePtr (Type + 1); + + /* Get the size of the struct from the symbol table entry */ + StructSize = 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 (ERR_INIT_INCOMPLETE_TYPE); - /* Returning here will cause lots of errors, but recovery is difficult */ - return; + Error ("Cannot initialize variables with incomplete type"); + /* Try error recovery */ + SkipInitializer (1); + /* Nothing initialized */ + return 0; } /* Get a pointer to the list of symbols */ Entry = Tab->SymHead; - while (curtok != TOK_RCURLY) { - if (Entry == 0) { - Error (ERR_TOO_MANY_INITIALIZERS); - return; - } - ParseInit (Entry->Type); - Entry = Entry->NextSym; - if (curtok != TOK_COMMA) - break; - NextToken (); + + /* Initialize fields */ + Size = 0; + while (CurTok.Tok != TOK_RCURLY) { + if (Entry == 0) { + Error ("Too many initializers"); + SkipInitializer (1); + return Size; + } + /* 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). + */ + Size += ParseInitInternal (Entry->Type, AllowFlexibleMembers && Entry->NextSym == 0); + Entry = Entry->NextSym; + if (CurTok.Tok != TOK_COMMA) + break; + NextToken (); } /* Consume the closing curly brace */ ConsumeRCurly (); /* If there are struct fields left, reserve additional storage */ - while (Entry) { - g_zerobytes (SizeOf (Entry->Type)); - Entry = Entry->NextSym; + if (Size < StructSize) { + g_zerobytes (StructSize - Size); + Size = StructSize; } + + /* 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). + */ + return Size; } +static unsigned ParseVoidInit (void) +/* Parse an initialization of a void variable (special cc65 extension). + * Return the number of bytes initialized. + */ +{ + ExprDesc lval; + unsigned Size; + /* Opening brace */ + ConsumeLCurly (); -void ParseInit (type *tptr) -/* Parse initialization of variables */ -{ - int count; - struct expent lval; - type* t; - const char* str; - int sz; + /* Allow an arbitrary list of values */ + Size = 0; + do { + ConstExpr (&lval); + switch (UnqualifiedType (lval.Type[0])) { - switch (*tptr) { + case T_SCHAR: + case T_UCHAR: + if ((lval.Flags & E_MCTYPE) == E_TCONST) { + /* Make it byte sized */ + lval.ConstVal &= 0xFF; + } + DefineData (&lval); + Size += SIZEOF_CHAR; + break; - case T_CHAR: - case T_UCHAR: - constexpr (&lval); - if ((lval.e_flags & E_MCTYPE) == E_TCONST) { - /* Make it byte sized */ - lval.e_const &= 0xFF; - } - assignadjust (tptr, &lval); - DefineData (&lval); - break; + case T_SHORT: + case T_USHORT: + case T_INT: + case T_UINT: + case T_PTR: + case T_ARRAY: + if ((lval.Flags & E_MCTYPE) == E_TCONST) { + /* Make it word sized */ + lval.ConstVal &= 0xFFFF; + } + DefineData (&lval); + Size += SIZEOF_INT; + break; + + case T_LONG: + case T_ULONG: + DefineData (&lval); + Size += SIZEOF_LONG; + break; + default: + Error ("Illegal type in initialization"); + break; + + } + + if (CurTok.Tok != TOK_COMMA) { + break; + } + NextToken (); + + } while (CurTok.Tok != TOK_RCURLY); + + /* Closing brace */ + ConsumeRCurly (); + + /* Return the number of bytes initialized */ + return Size; +} + + + +static unsigned ParseInitInternal (type* T, int AllowFlexibleMembers) +/* Parse initialization of variables. Return the number of data bytes. */ +{ + switch (UnqualifiedType (*T)) { + + case T_SCHAR: + case T_UCHAR: case T_SHORT: case T_USHORT: case T_INT: case T_UINT: - case T_PTR: - constexpr (&lval); - if ((lval.e_flags & E_MCTYPE) == E_TCONST) { - /* Make it word sized */ - lval.e_const &= 0xFFFF; - } - assignadjust (tptr, &lval); - DefineData (&lval); - break; - case T_LONG: case T_ULONG: - constexpr (&lval); - if ((lval.e_flags & E_MCTYPE) == E_TCONST) { - /* Make it long sized */ - lval.e_const &= 0xFFFFFFFF; - } - assignadjust (tptr, &lval); - DefineData (&lval); - break; + return ParseScalarInit (T); + + case T_PTR: + return ParsePointerInit (T); case T_ARRAY: - sz = Decode (tptr + 1); - t = tptr + DECODE_SIZE + 1; - if ((t [0] == T_CHAR || t [0] == T_UCHAR) && curtok == TOK_SCONST) { - str = GetLiteral (curval); - count = strlen (str) + 1; - TranslateLiteralPool (curval); /* Translate into target charset */ - g_defbytes (str, count); - ResetLiteralOffs (curval); /* Remove string from pool */ - NextToken (); - } else { - ConsumeLCurly (); - count = 0; - while (curtok != TOK_RCURLY) { - ParseInit (tptr + DECODE_SIZE + 1); - ++count; - if (curtok != TOK_COMMA) - break; - NextToken (); - } - ConsumeRCurly (); - } - if (sz == 0) { - Encode (tptr + 1, count); - } else if (count < sz) { - g_zerobytes ((sz - count) * SizeOf (tptr + DECODE_SIZE + 1)); - } else if (count > sz) { - Error (ERR_TOO_MANY_INITIALIZERS); - } - break; + return ParseArrayInit (T, AllowFlexibleMembers); case T_STRUCT: case T_UNION: - ParseStructInit (tptr); - break; + return ParseStructInit (T, AllowFlexibleMembers); case T_VOID: if (!ANSI) { /* Special cc65 extension in non ANSI mode */ - ParseVoidInit (); - break; + return ParseVoidInit (); } /* FALLTHROUGH */ default: - Error (ERR_ILLEGAL_TYPE); - break; + Error ("Illegal type"); + return SIZEOF_CHAR; } } +unsigned ParseInit (type* T) +/* Parse initialization of variables. Return the number of data bytes. */ +{ + /* Parse the initialization */ + unsigned Size = ParseInitInternal (T, !ANSI); + + /* The initialization may not generate code on global level, because code + * outside function scope will never get executed. + */ + if (HaveGlobalCode ()) { + Error ("Non constant initializers"); + RemoveGlobalCode (); + } + + /* Return the size needed for the initialization */ + return Size; +} + + +