/* */
/* */
/* */
-/* (C) 1998-2001 Ullrich von Bassewitz */
+/* (C) 1998-2002 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
if (CurTok.Tok == TOK_ASSIGN) {
ExprDesc lval;
NextToken ();
- constexpr (&lval);
+ ConstExpr (&lval);
EnumVal = lval.ConstVal;
}
AddLocalSym (Decl.Ident, Decl.Type, SC_SFLD, (StructType == T_STRUCT)? Size : 0);
/* Calculate offset of next field/size of the union */
- Offs = SizeOf (Decl.Type);
+ Offs = CheckedSizeOf (Decl.Type);
if (StructType == T_STRUCT) {
Size += Offs;
} else {
optionalint ();
D->Type[0] = T_LONG;
D->Type[1] = T_END;
- break;
+ break;
case TOK_INT:
NextToken ();
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;
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 */
}
if (CurTok.Tok == TOK_COMMA) {
- NextToken ();
+ NextToken ();
} else {
break;
}
-static FuncDesc* ParseFuncDecl (void)
+static FuncDesc* ParseFuncDecl (const DeclSpec* Spec)
/* Parse the argument list of a function. */
{
unsigned Offs;
if (Sym == 0 || !IsTypeDef (Sym)) {
/* Old style (K&R) function. Assume variable param list. */
F->Flags |= (FD_OLDSTYLE | FD_VARIADIC);
+
+ /* Check for an implicit int return in the K&R 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;
+ }
}
}
Offs = (F->Flags & FD_VARIADIC)? 1 : 0;
Sym = GetSymTab()->SymTail;
while (Sym) {
- unsigned Size = SizeOf (Sym->Type);
+ unsigned Size = CheckedSizeOf (Sym->Type);
Sym->V.Offs = Offs;
Offs += Size;
F->ParamSize += Size;
-static void Decl (Declaration* D, unsigned Mode)
+static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
/* Recursively process declarators. Build a type array in reverse order. */
{
if (CurTok.Tok == TOK_STAR) {
- type T = T_PTR;
+ type T = T_PTR;
NextToken ();
- /* Allow optional const or volatile qualifiers */
- T |= OptionalQualifiers (T_QUAL_NONE);
- Decl (D, Mode);
+ /* Allow optional const or volatile qualifiers */
+ T |= OptionalQualifiers (T_QUAL_NONE);
+ Decl (Spec, D, Mode);
*D->T++ = T;
return;
} else if (CurTok.Tok == TOK_LPAREN) {
NextToken ();
- Decl (D, Mode);
+ Decl (Spec, D, Mode);
ConsumeRParen ();
} else if (CurTok.Tok == TOK_FASTCALL) {
/* Remember the current type pointer */
/* Skip the fastcall token */
NextToken ();
/* Parse the function */
- Decl (D, Mode);
+ Decl (Spec, D, Mode);
/* Set the fastcall flag */
- if (!IsTypeFunc (T)) {
+ 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");
} else {
- FuncDesc* F = (FuncDesc*) DecodePtr (T+1);
+ FuncDesc* F = GetFuncDesc (T);
F->Flags |= FD_FASTCALL;
}
return;
* - 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';
Error ("Identifier expected");
}
D->Ident[0] = '\0';
- return;
}
}
FuncDesc* F;
NextToken ();
/* Parse the function declaration */
- F = ParseFuncDecl ();
+ F = ParseFuncDecl (Spec);
*D->T++ = T_FUNC;
EncodePtr (D->T, F);
D->T += DECODE_SIZE;
/* Read the size if it is given */
if (CurTok.Tok != TOK_RBRACK) {
ExprDesc lval;
- constexpr (&lval);
+ ConstExpr (&lval);
Size = lval.ConstVal;
}
ConsumeRBrack ();
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");
+ }
}
}
/* Allow an arbitrary list of values */
ConsumeLCurly ();
do {
- constexpr (&lval);
+ ConstExpr (&lval);
switch (lval.Type[0]) {
case T_SCHAR:
/* If there are struct fields left, reserve additional storage */
while (Entry) {
- g_zerobytes (SizeOf (Entry->Type));
+ g_zerobytes (CheckedSizeOf (Entry->Type));
Entry = Entry->NextSym;
}
}
case T_SCHAR:
case T_UCHAR:
- constexpr (&lval);
+ ConstExpr (&lval);
if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it byte sized */
lval.ConstVal &= 0xFF;
case T_INT:
case T_UINT:
case T_PTR:
- constexpr (&lval);
+ ConstExpr (&lval);
if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it word sized */
lval.ConstVal &= 0xFFFF;
case T_LONG:
case T_ULONG:
- constexpr (&lval);
+ ConstExpr (&lval);
if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it long sized */
lval.ConstVal &= 0xFFFFFFFF;
if (Size == 0) {
Encode (T + 1, Count);
} else if (Count < Size) {
- g_zerobytes ((Size - Count) * SizeOf (T + DECODE_SIZE + 1));
+ g_zerobytes ((Size - Count) * CheckedSizeOf (T + DECODE_SIZE + 1));
} else if (Count > Size) {
Error ("Too many initializers");
}
projects / cc65 / blobdiff