github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-01-13 05:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Def signedness != signed != unsigned for char

Browse Source 
When checking for exact compatibility between types (such as in
__builtin_types_compatible_p) consider the case of default signedness to
be incompatible with both of the explicit signedness for char. That is,
char is incompatible with signed char *and* unsigned char, no matter
what the default signedness for char is.
This commit is contained in:
Thomas Preud'homme 2014-02-06 20:51:47 +08:00
parent e571850d79
commit b0b5165d16
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -68,6 +68,7 @@ Bug fixes:
- fix integer to double conversion on ARM (Thomas Preud'homme) - fix integer to double conversion on ARM (Thomas Preud'homme)
- fix parameter passing of (unsigned) long long bitfield (Thomas Preud'homme) - fix parameter passing of (unsigned) long long bitfield (Thomas Preud'homme)
- fix relocation of Thumb branch to ARM function (Thomas Preud'homme) - fix relocation of Thumb branch to ARM function (Thomas Preud'homme)
- fix char wrong compatibility with [un]signed char (Thomas Preud'homme)
version 0.9.26: version 0.9.26:

2
tcc-doc.texi
View File

@ -970,7 +970,7 @@ be the best solution.
#define VT_BITFIELD 0x0040 /* bitfield modifier */ #define VT_BITFIELD 0x0040 /* bitfield modifier */
#define VT_CONSTANT 0x0800 /* const modifier */ #define VT_CONSTANT 0x0800 /* const modifier */
#define VT_VOLATILE 0x1000 /* volatile modifier */ #define VT_VOLATILE 0x1000 /* volatile modifier */
#define VT_SIGNED 0x2000 /* signed type */ #define VT_DEFSIGN 0x2000 /* signed type */
#define VT_STRUCT_SHIFT 18 /* structure/enum name shift (14 bits left) */ #define VT_STRUCT_SHIFT 18 /* structure/enum name shift (14 bits left) */
@end example @end example

2
tcc.h
View File

@ -745,7 +745,7 @@ struct TCCState {
#define VT_BITFIELD 0x0040 /* bitfield modifier */ #define VT_BITFIELD 0x0040 /* bitfield modifier */
#define VT_CONSTANT 0x0800 /* const modifier */ #define VT_CONSTANT 0x0800 /* const modifier */
#define VT_VOLATILE 0x1000 /* volatile modifier */ #define VT_VOLATILE 0x1000 /* volatile modifier */
#define VT_SIGNED 0x2000 /* signed type */ #define VT_DEFSIGN 0x2000 /* signed type */
#define VT_VLA 0x00020000 /* VLA type (also has VT_PTR and VT_ARRAY) */ #define VT_VLA 0x00020000 /* VLA type (also has VT_PTR and VT_ARRAY) */
/* storage */ /* storage */

36
tccgen.c
View File

@ -949,7 +949,7 @@ static void lexpand(void)
{ {
int u; int u;
u = vtop->type.t & VT_UNSIGNED; u = vtop->type.t & (VT_DEFSIGN | VT_UNSIGNED);
gv(RC_INT); gv(RC_INT);
vdup(); vdup();
vtop[0].r = vtop[-1].r2; vtop[0].r = vtop[-1].r2;
@ -965,7 +965,7 @@ ST_FUNC void lexpand_nr(void)
{ {
int u,v; int u,v;
u = vtop->type.t & VT_UNSIGNED; u = vtop->type.t & (VT_DEFSIGN | VT_UNSIGNED);
vdup(); vdup();
vtop->r2 = VT_CONST; vtop->r2 = VT_CONST;
vtop->type.t = VT_INT | u; vtop->type.t = VT_INT | u;
@ -1621,8 +1621,8 @@ static void check_comparison_pointer_types(SValue *p1, SValue *p2, int op)
return; return;
tmp_type1 = *type1; tmp_type1 = *type1;
tmp_type2 = *type2; tmp_type2 = *type2;
tmp_type1.t &= ~(VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE); tmp_type1.t &= ~(VT_DEFSIGN | VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE);
tmp_type2.t &= ~(VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE); tmp_type2.t &= ~(VT_DEFSIGN | VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE);
if (!is_compatible_types(&tmp_type1, &tmp_type2)) { if (!is_compatible_types(&tmp_type1, &tmp_type2)) {
/* gcc-like error if '-' is used */ /* gcc-like error if '-' is used */
if (op == '-') if (op == '-')
@ -2212,6 +2212,11 @@ static int compare_types(CType *type1, CType *type2, int unqualified)
t1 &= ~(VT_CONSTANT | VT_VOLATILE); t1 &= ~(VT_CONSTANT | VT_VOLATILE);
t2 &= ~(VT_CONSTANT | VT_VOLATILE); t2 &= ~(VT_CONSTANT | VT_VOLATILE);
} }
/* Default Vs explicit signedness only matters for char */
if ((t1 & VT_BTYPE) != VT_BYTE) {
t1 &= ~VT_DEFSIGN;
t2 &= ~VT_DEFSIGN;
}
/* XXX: bitfields ? */ /* XXX: bitfields ? */
if (t1 != t2) if (t1 != t2)
return 0; return 0;
@ -2264,8 +2269,10 @@ static void type_to_str(char *buf, int buf_size,
pstrcat(buf, buf_size, "const "); pstrcat(buf, buf_size, "const ");
if (t & VT_VOLATILE) if (t & VT_VOLATILE)
pstrcat(buf, buf_size, "volatile "); pstrcat(buf, buf_size, "volatile ");
if (t & VT_UNSIGNED) if (t & (VT_DEFSIGN | VT_UNSIGNED))
pstrcat(buf, buf_size, "unsigned "); pstrcat(buf, buf_size, "unsigned ");
else if (t & VT_DEFSIGN)
pstrcat(buf, buf_size, "signed ");
switch(bt) { switch(bt) {
case VT_VOID: case VT_VOID:
tstr = "void"; tstr = "void";
@ -2385,8 +2392,10 @@ static void gen_assign_cast(CType *dt)
/* exact type match, except for unsigned */ /* exact type match, except for unsigned */
tmp_type1 = *type1; tmp_type1 = *type1;
tmp_type2 = *type2; tmp_type2 = *type2;
tmp_type1.t &= ~(VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE); tmp_type1.t &= ~(VT_DEFSIGN | VT_UNSIGNED | VT_CONSTANT |
tmp_type2.t &= ~(VT_UNSIGNED | VT_CONSTANT | VT_VOLATILE); VT_VOLATILE);
tmp_type2.t &= ~(VT_DEFSIGN | VT_UNSIGNED | VT_CONSTANT |
VT_VOLATILE);
if (!is_compatible_types(&tmp_type1, &tmp_type2)) if (!is_compatible_types(&tmp_type1, &tmp_type2))
tcc_warning("assignment from incompatible pointer type"); tcc_warning("assignment from incompatible pointer type");
} }
@ -3081,8 +3090,10 @@ static int parse_btype(CType *type, AttributeDef *ad)
case TOK_SIGNED1: case TOK_SIGNED1:
case TOK_SIGNED2: case TOK_SIGNED2:
case TOK_SIGNED3: case TOK_SIGNED3:
if ((t & (VT_DEFSIGN|VT_UNSIGNED)) == (VT_DEFSIGN|VT_UNSIGNED))
tcc_error("signed and unsigned modifier");
typespec_found = 1; typespec_found = 1;
t |= VT_SIGNED; t |= VT_DEFSIGN;
next(); next();
break; break;
case TOK_REGISTER: case TOK_REGISTER:
@ -3093,7 +3104,9 @@ static int parse_btype(CType *type, AttributeDef *ad)
next(); next();
break; break;
case TOK_UNSIGNED: case TOK_UNSIGNED:
t |= VT_UNSIGNED; if ((t & (VT_DEFSIGN|VT_UNSIGNED)) == VT_DEFSIGN)
tcc_error("signed and unsigned modifier");
t |= VT_DEFSIGN | VT_UNSIGNED;
next(); next();
typespec_found = 1; typespec_found = 1;
break; break;
@ -3160,13 +3173,10 @@ static int parse_btype(CType *type, AttributeDef *ad)
type_found = 1; type_found = 1;
} }
the_end: the_end:
if ((t & (VT_SIGNED|VT_UNSIGNED)) == (VT_SIGNED|VT_UNSIGNED))
tcc_error("signed and unsigned modifier");
if (tcc_state->char_is_unsigned) { if (tcc_state->char_is_unsigned) {
if ((t & (VT_SIGNED|VT_UNSIGNED|VT_BTYPE)) == VT_BYTE) if ((t & (VT_DEFSIGN|VT_BTYPE)) == VT_BYTE)
t |= VT_UNSIGNED; t |= VT_UNSIGNED;
} }
t &= ~VT_SIGNED;
/* long is never used as type */ /* long is never used as type */
if ((t & VT_BTYPE) == VT_LONG) if ((t & VT_BTYPE) == VT_LONG)