6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-16 13:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Use CHAR_BITS instead of a hardcoded 8 bits/byte.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4088 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2009-08-30 08:37:21 +00:00
parent 03e206a44f
commit 0b0353de13
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc65/declare.c
View File

@ -466,7 +466,7 @@ static int ParseFieldWidth (Declaration* Decl)
Error ("Negative width in bit-field");
return -1;
}
if (Expr.IVal > INT_BITS) {
if (Expr.IVal > (int) INT_BITS) {
Error ("Width of bit-field exceeds its type");
return -1;
}
@ -567,7 +567,7 @@ static SymEntry* ParseUnionDecl (const char* Name)
UnionSize = FieldSize;
}
/* Add a field entry to the table */
/* Add a field entry to the table. */
if (FieldWidth > 0) {
AddBitField (Decl.Ident, 0, 0, FieldWidth);
} else {
@ -657,7 +657,7 @@ static SymEntry* ParseStructDecl (const char* Name)
* with width zero, align the struct to the next member
*/
if (BitOffs > 0) {
if (FieldWidth <= 0 || (BitOffs + FieldWidth) > INT_BITS) {
if (FieldWidth <= 0 || (BitOffs + FieldWidth) > (int) INT_BITS) {
StructSize += SIZEOF_INT;
BitOffs = 0;
}
@ -688,7 +688,7 @@ static SymEntry* ParseStructDecl (const char* Name)
/* Byte offset of this member is the current struct size plus any
* full bytes from the bit offset in case of bit-fields.
*/
Offs = StructSize + (BitOffs >> 3);
Offs = StructSize + (BitOffs / CHAR_BITS);
/* Check if this field is a flexible array member, and
* calculate the size of the field.
@ -707,7 +707,7 @@ static SymEntry* ParseStructDecl (const char* Name)
/* Add a field entry to the table */
if (FieldWidth > 0) {
AddBitField (Decl.Ident, Offs, BitOffs & 0x07, FieldWidth);
AddBitField (Decl.Ident, Offs, BitOffs % CHAR_BITS, FieldWidth);
BitOffs += FieldWidth;
} else {
AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, Offs);
@ -723,7 +723,7 @@ NextMember: if (CurTok.Tok != TOK_COMMA) {
/* If we have bits from bit-fields left, add them to the size. */
if (BitOffs > 0) {
StructSize += ((BitOffs + CHAR_BITS - 1) >> 3);
StructSize += ((BitOffs + CHAR_BITS - 1) / CHAR_BITS);
}
/* Skip the closing brace */