bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove special-case bit-field width code

Browse Source 
cbb33f8 restricted allowed bit-field types to int,
so this is equivalent for now, but forward-compatible.

Fixes FIXME

Also move the int type check before parsing the colon.
This commit is contained in:
Jesse Rosenstock
2020-07-29 14:04:52 +02:00
committed by Oliver Schmidt
parent 74dda01919
commit a2561d07f3
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cc65/declare.c
View File

@@ -681,14 +681,16 @@ static int ParseFieldWidth (Declaration* Decl)
return -1; return -1;
} }
if (!IsClassInt (Decl->Type)) {
/* Only integer types may be used for bit-fields */
Error ("Bit-field has invalid type '%s', must be integral",
GetBasicTypeName (Decl->Type));
return -1;
}
/* Read the width */ /* Read the width */
NextToken (); NextToken ();
ConstAbsIntExpr (hie1, &Expr); ConstAbsIntExpr (hie1, &Expr);
if (!IsClassInt (Decl->Type)) {
/* Only integer types may be used for bit-fields */
Error ("Bit-field has invalid type '%s'", GetBasicTypeName (Decl->Type));
return -1;
}
if (SizeOf (Decl->Type) != SizeOf (type_uint)) { if (SizeOf (Decl->Type) != SizeOf (type_uint)) {
/* Only int sized types may be used for bit-fields for now */ /* Only int sized types may be used for bit-fields for now */
@@ -700,20 +702,10 @@ static int ParseFieldWidth (Declaration* Decl)
Error ("Negative width in bit-field"); Error ("Negative width in bit-field");
return -1; return -1;
} }
/* FIXME: We should compare with the width of the specified type */
#if 0
/* Use is when we really support non-uint16_t bit-fields */
if (Expr.IVal > (long)(SizeOf (Decl->Type) * CHAR_BITS)) { if (Expr.IVal > (long)(SizeOf (Decl->Type) * CHAR_BITS)) {
Error ("Width of bit-field exceeds its type"); Error ("Width of bit-field exceeds its type");
return -1; return -1;
} }
#else
/* This is what we currenty do */
if (Expr.IVal > (long)(SizeOf (type_uint) * CHAR_BITS)) {
Error ("Width of bit-field exceeds 16");
return -1;
}
#endif
if (Expr.IVal == 0 && Decl->Ident[0] != '\0') { if (Expr.IVal == 0 && Decl->Ident[0] != '\0') {
Error ("Zero width for named bit-field"); Error ("Zero width for named bit-field");
return -1; return -1;