qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Simplify type_promotes and type_demotes

Browse source 
Using bit masks for valid source types for each destination type makes
the logic a lot easier to read. Still had to have some explicit checks
for enums and bools.
This commit is contained in:
Bill Currie 2024-12-05 00:02:26 +09:00
parent f4a8a5e179
commit 8d69ca9a99
1 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
tools/qfcc/source/type.c
View file

@ -1711,6 +1711,19 @@ type_assignable (const type_t *dst, const type_t *src)
return false; return false;
} }
#define P(type) (1 << ev_##type)
static unsigned promote_masks[ev_type_count] = {
[ev_float] = P(int) | P(uint),
[ev_int] = P(short) | P(ushort),
[ev_uint] = P(int) | P(short) | P(ushort),
[ev_double] = P(float) | P(ulong) | P(long)
| P(int) | P(uint) | P(short) | P(ushort),
[ev_long] = P(int) | P(uint) | P(short) | P(ushort),
[ev_ulong] = P(long) | P(int) | P(uint) | P(short) | P(ushort),
[ev_ushort] = P(short),
};
#undef P
bool bool
type_promotes (const type_t *dst, const type_t *src) type_promotes (const type_t *dst, const type_t *src)
{ {
@ -1720,39 +1733,37 @@ type_promotes (const type_t *dst, const type_t *src)
dst = unalias_type (dst); dst = unalias_type (dst);
src = unalias_type (src); src = unalias_type (src);
if (type_rows (dst) != type_rows (src) if (!is_math (dst) || !is_math (src)) {
|| type_cols (dst) != type_cols (src)) {
return false; return false;
} }
if (is_int (dst) && is_bool (src)) { if (is_bool (src)) {
return true; return !is_short (dst) && !is_ushort (dst);
} }
if (is_uint (dst) && is_int (src)) { if (is_lbool (src)) {
return true; return is_long (dst) || is_ulong (dst) || is_double (dst);
} }
if (is_long (dst) && (is_int (src) || is_uint (src) || is_boolean (src))) { if (is_enum (src)) {
return true; return is_integral (dst) && !is_enum (dst);
} }
if (is_ulong (dst) && (is_int (src) || is_uint (src) || is_long (src)
|| is_boolean (src))) { dst = base_type (dst);
return true; src = base_type (src);
} int dst_mask = promote_masks[dst->type];
if (is_float (dst) && (is_int (src) || is_uint (src) || is_bool (src))) { return dst_mask & (1 << src->type);
return true;
}
//XXX what to do with (u)long<->float?
if (is_double (dst)
&& (is_int (src) || is_uint (src) || is_long (src) || is_ulong (src)
|| is_float (src) || is_boolean (src))) {
return true;
}
if (is_lbool (dst) && is_bool (src)) {
return true;
}
return false;
} }
#define D(type) (1 << ev_##type)
static unsigned demote_masks[ev_type_count] = {
// FIXME should this be a complete matrix, or just from implicit constants?
// currently implicit constants are assumed
[ev_float] = D(double) | D(int) | D(long),
[ev_int] = D(long),
[ev_uint] = D(long) | D(int),
[ev_double] = D(int),
};
#undef D
bool bool
type_demotes (const type_t *dst, const type_t *src) type_demotes (const type_t *dst, const type_t *src)
{ {
@ -1762,22 +1773,18 @@ type_demotes (const type_t *dst, const type_t *src)
dst = unalias_type (dst); dst = unalias_type (dst);
src = unalias_type (src); src = unalias_type (src);
if (type_rows (dst) != type_rows (src) if (!is_math (dst) || !is_math (src)) {
|| type_cols (dst) != type_cols (src)) {
return false; return false;
} }
if (is_float (dst) && is_double (src)) { if (is_boolean (dst)) {
return true; return is_lbool (src) || is_long (src);
} }
if ((is_boolean (dst) || is_int (dst) || is_uint (dst))
&& is_lbool (src)) { dst = base_type (dst);
return true; src = base_type (src);
} int dst_mask = demote_masks[dst->type];
if (is_bool (dst) && (is_lbool (src) || is_long (src))) { return dst_mask & (1 << src->type);
return true;
}
return false;
} }
bool bool