X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fdeclare.c;h=9f0a94a27d9f267b4fadc266d0fdd5222e44a5b8;hb=3f4096d3030095605f28b4cfa73563c53a563df6;hp=0b516c95636c1574dc4aa5cfe09fedcf18482e33;hpb=3b5808788bed043ae26f562649363668085272e0;p=cc65 diff --git a/src/cc65/declare.c b/src/cc65/declare.c index 0b516c956..9f0a94a27 100644 --- a/src/cc65/declare.c +++ b/src/cc65/declare.c @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998-2002 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (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 */ @@ -38,12 +38,15 @@ #include /* 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" @@ -54,7 +57,7 @@ #include "pragma.h" #include "scanner.h" #include "symtab.h" -#include "declare.h" +#include "typeconv.h" @@ -67,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. */ + /*****************************************************************************/ @@ -83,7 +89,7 @@ static type OptionalQualifiers (type Q) switch (CurTok.Tok) { case TOK_CONST: - if (Q & T_QUAL_CONST) { + if (Q & T_QUAL_CONST) { Error ("Duplicate qualifier: `const'"); } Q |= T_QUAL_CONST; @@ -251,8 +257,10 @@ 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; @@ -282,7 +290,8 @@ static SymEntry* ParseStructDecl (const char* Name, type StructType) EnterStructLevel (); /* Parse struct fields */ - Size = 0; + FlexibleMember = 0; + StructSize = 0; while (CurTok.Tok != TOK_RCURLY) { /* Get the type of the entry */ @@ -293,25 +302,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 != 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 (); @@ -325,7 +364,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); } @@ -336,7 +375,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) ident Ident; SymEntry* Entry; type StructType; - type Qualifiers; /* Type qualifiers */ + type Qualifiers; /* Type qualifiers */ /* Assume we have an explicit type */ D->Flags &= ~DS_DEF_TYPE; @@ -385,7 +424,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) optionalsigned (); optionalint (); D->Type[0] = T_SHORT; - D->Type[1] = T_END; + D->Type[1] = T_END; } break; @@ -417,14 +456,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; } @@ -454,17 +493,29 @@ 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 == TOK_STRUCT)? T_STRUCT : T_UNION; @@ -497,7 +548,7 @@ static void ParseTypeSpec (DeclSpec* D, int Default) if (SymIsLocal (Entry) && (Entry->Flags & SC_ENUM) == 0) { Error ("Symbol `%s' is already different kind", Entry->Name); } - } else { + } else { /* Insert entry into table ### */ } /* Skip the identifier */ @@ -516,7 +567,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); @@ -626,7 +677,7 @@ static void ParseOldStyleParamList (FuncDesc* F) } if (CurTok.Tok == TOK_COMMA) { - NextToken (); + NextToken (); } else { break; } @@ -660,14 +711,15 @@ static void ParseAnsiParamList (FuncDesc* F) /* 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) { + /* 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. @@ -720,7 +772,7 @@ static void ParseAnsiParamList (FuncDesc* F) -static FuncDesc* ParseFuncDecl (void) +static FuncDesc* ParseFuncDecl (const DeclSpec* Spec) /* Parse the argument list of a function. */ { unsigned Offs; @@ -741,15 +793,23 @@ static FuncDesc* ParseFuncDecl (void) NextToken (); F->Flags |= FD_VOID_PARAM; } 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 || !IsTypeDef (Sym)) { - /* Old style (K&R) function. Assume variable param list. */ - F->Flags |= (FD_OLDSTYLE | FD_VARIADIC); - } + (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 */ @@ -761,19 +821,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_VARIADIC)? 1 : 0; - Sym = GetSymTab()->SymTail; + 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); @@ -783,49 +861,124 @@ static FuncDesc* ParseFuncDecl (void) -static void Decl (Declaration* D, unsigned Mode) -/* Recursively process declarators. Build a type array in reverse order. */ +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. */ +{ + /* Pointer to something */ if (CurTok.Tok == TOK_STAR) { - type T = T_PTR; + + type T; + + /* Skip the star */ NextToken (); - /* Allow optional const or volatile qualifiers */ - T |= OptionalQualifiers (T_QUAL_NONE); - Decl (D, Mode); + + /* Allow optional const or volatile qualifiers */ + T = T_PTR | OptionalQualifiers (T_QUAL_NONE); + + /* Parse the type, the pointer points to */ + Decl (Spec, D, Mode); + *D->T++ = T; return; - } else if (CurTok.Tok == TOK_LPAREN) { - NextToken (); - Decl (D, Mode); - ConsumeRParen (); - } else if (CurTok.Tok == 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 (); + + /* Read the flags */ + unsigned Flags = FunctionModifierFlags (); + /* Parse the function */ - Decl (D, Mode); - /* Set the fastcall flag */ + Decl (Spec, D, Mode); + + /* Check that we have a function */ if (!IsTypeFunc (T) && !IsTypeFuncPtr (T)) { - Error ("__fastcall__ modifier applied to non function"); - } else if (IsVariadicFunc (T)) { - Error ("Cannot apply __fastcall__ to functions with variable parameter list"); + Error ("Function modifier applied to non function"); } else { - FuncDesc* F = GetFuncDesc (T); - 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'; @@ -837,7 +990,6 @@ static void Decl (Declaration* D, unsigned Mode) Error ("Identifier expected"); } D->Ident[0] = '\0'; - return; } } @@ -847,18 +999,26 @@ static void Decl (Declaration* D, unsigned Mode) FuncDesc* F; NextToken (); /* Parse the function declaration */ - F = ParseFuncDecl (); + F = ParseFuncDecl (Spec); *D->T++ = T_FUNC; EncodePtr (D->T, F); D->T += DECODE_SIZE; } else { /* Array declaration */ - unsigned long Size = 0; + long Size = UNSPECIFIED; NextToken (); /* Read the size if it is given */ 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 (); @@ -888,7 +1048,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 */ @@ -907,18 +1066,18 @@ 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); /* Check the size of the generated type */ 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"); - } + if (D->Ident[0] != '\0') { + Error ("Size of `%s' is invalid", D->Ident); + } else { + Error ("Invalid size"); + } } } @@ -952,73 +1111,219 @@ void CheckEmptyDecl (const DeclSpec* D) -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. + */ { - ExprDesc 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.Type[0]) { - case T_SCHAR: - case T_UCHAR: - if ((lval.Flags & E_MCTYPE) == E_TCONST) { - /* Make it byte sized */ - lval.ConstVal &= 0xFF; - } - 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); - 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 ("Illegal type in initialization"); - 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 != TOK_COMMA) { - break; - } - NextToken (); - } while (CurTok.Tok != 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, 0, 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, 0, 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. @@ -1026,133 +1331,179 @@ static void ParseStructInit (type* Type) Tab = Entry->V.S.SymTab; if (Tab == 0) { Error ("Cannot initialize variables with incomplete type"); - /* Returning here will cause lots of errors, but recovery is difficult */ - return; + /* Try error recovery */ + SkipInitializer (1); + /* Nothing initialized */ + return 0; } /* Get a pointer to the list of symbols */ Entry = Tab->SymHead; + + /* Initialize fields */ + Size = 0; while (CurTok.Tok != TOK_RCURLY) { - if (Entry == 0) { - Error ("Too many initializers"); - return; - } - ParseInit (Entry->Type); - Entry = Entry->NextSym; - if (CurTok.Tok != TOK_COMMA) - break; - NextToken (); + 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; } -void ParseInit (type* T) -/* Parse initialization of variables. */ +static unsigned ParseVoidInit (void) +/* Parse an initialization of a void variable (special cc65 extension). + * Return the number of bytes initialized. + */ { ExprDesc lval; - type* t; - const char* str; - int Count; - int Size; + unsigned Size; + /* Opening brace */ + ConsumeLCurly (); + + /* Allow an arbitrary list of values */ + Size = 0; + do { + ConstExpr (&lval); + switch (UnqualifiedType (lval.Type[0])) { + + 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_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: - ConstExpr (&lval); - if ((lval.Flags & E_MCTYPE) == E_TCONST) { - /* Make it byte sized */ - lval.ConstVal &= 0xFF; - } - assignadjust (T, &lval); - DefineData (&lval); - break; - case T_SHORT: case T_USHORT: case T_INT: case T_UINT: - case T_PTR: - ConstExpr (&lval); - if ((lval.Flags & E_MCTYPE) == E_TCONST) { - /* Make it word sized */ - lval.ConstVal &= 0xFFFF; - } - assignadjust (T, &lval); - DefineData (&lval); - break; - case T_LONG: case T_ULONG: - ConstExpr (&lval); - if ((lval.Flags & E_MCTYPE) == E_TCONST) { - /* Make it long sized */ - lval.ConstVal &= 0xFFFFFFFF; - } - assignadjust (T, &lval); - DefineData (&lval); - break; + return ParseScalarInit (T); + + case T_PTR: + return ParsePointerInit (T); case T_ARRAY: - Size = Decode (T + 1); - t = T + DECODE_SIZE + 1; - if (IsTypeChar(t) && CurTok.Tok == TOK_SCONST) { - str = GetLiteral (CurTok.IVal); - Count = strlen (str) + 1; - TranslateLiteralPool (CurTok.IVal); /* Translate into target charset */ - g_defbytes (str, Count); - ResetLiteralPoolOffs (CurTok.IVal); /* Remove string from pool */ - NextToken (); - } else { - ConsumeLCurly (); - Count = 0; - while (CurTok.Tok != TOK_RCURLY) { - ParseInit (T + DECODE_SIZE + 1); - ++Count; - if (CurTok.Tok != TOK_COMMA) - break; - NextToken (); - } - ConsumeRCurly (); - } - if (Size == 0) { - Encode (T + 1, Count); - } else if (Count < Size) { - g_zerobytes ((Size - Count) * SizeOf (T + DECODE_SIZE + 1)); - } else if (Count > Size) { - Error ("Too many initializers"); - } - break; + return ParseArrayInit (T, AllowFlexibleMembers); case T_STRUCT: case T_UNION: - ParseStructInit (T); - break; + return ParseStructInit (T, AllowFlexibleMembers); case T_VOID: if (!ANSI) { /* Special cc65 extension in non ANSI mode */ - ParseVoidInit (); - break; + return ParseVoidInit (); } /* FALLTHROUGH */ default: Error ("Illegal type"); - break; + 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; +} + + +