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

[qfcc] Give mono-group multivec types structs

Browse source 
This fixes the motor-point.r test (ie, the sub-type field selector works
on mono-group types now). Still need to sort out something for scalars
(but I imagine that can work only in an @algebra context).
This commit is contained in:
Bill Currie 2023-09-30 16:33:14 +09:00
parent 87cf48ffc4
commit afe6ea526b
1 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tools/qfcc/source/algebra.c
View file

@ -454,23 +454,16 @@ algebra_alignment (const type_t *type, int width)
return type->alignment * BITOP_RUP (width); return type->alignment * BITOP_RUP (width);
} }
type_t * static symbol_t *
algebra_mvec_type (algebra_t *algebra, pr_uint_t group_mask) mvec_struct (algebra_t *algebra, pr_uint_t group_mask, type_t *type)
{ {
if (!group_mask || group_mask > ((1u << algebra->layout.count) - 1)) {
internal_error (0, "invalid group_mask");
}
if (!algebra->mvec_types[group_mask]) {
int count = 0; int count = 0;
int components = 0;
for (int i = 0; i < algebra->layout.count; i++) { for (int i = 0; i < algebra->layout.count; i++) {
if (group_mask & (1 << i)) { if (group_mask & (1 << i)) {
components += algebra->layout.groups[i].count;
count++; count++;
} }
} }
symbol_t *mvec_sym = 0;
if (group_mask & (group_mask - 1)) {
const char **mv_names = 0; const char **mv_names = 0;
if (algebra->dimension < 5) { if (algebra->dimension < 5) {
mv_names = mvec_names[algebra->dimension]; mv_names = mvec_names[algebra->dimension];
@ -487,12 +480,30 @@ algebra_mvec_type (algebra_t *algebra, pr_uint_t group_mask)
} }
fields[c] = (struct_def_t) { fields[c] = (struct_def_t) {
.name = save_string (name), .name = save_string (name),
.type = algebra_mvec_type (algebra, mask), .type = type ? type : algebra_mvec_type (algebra, mask),
}; };
c++; c++;
}; };
}; };
mvec_sym = make_structure (0, 's', fields, 0); return make_structure (0, 's', fields, 0);
}
type_t *
algebra_mvec_type (algebra_t *algebra, pr_uint_t group_mask)
{
if (!group_mask || group_mask > ((1u << algebra->layout.count) - 1)) {
internal_error (0, "invalid group_mask");
}
if (!algebra->mvec_types[group_mask]) {
int components = 0;
for (int i = 0; i < algebra->layout.count; i++) {
if (group_mask & (1 << i)) {
components += algebra->layout.groups[i].count;
}
}
symbol_t *mvec_sym = 0;
if (group_mask & (group_mask - 1)) {
mvec_sym = mvec_struct (algebra, group_mask, 0);
} }
multivector_t *mvec = malloc (sizeof (multivector_t)); multivector_t *mvec = malloc (sizeof (multivector_t));
*mvec = (multivector_t) { *mvec = (multivector_t) {
@ -501,8 +512,8 @@ algebra_mvec_type (algebra_t *algebra, pr_uint_t group_mask)
.algebra = algebra, .algebra = algebra,
.mvec_sym = mvec_sym, .mvec_sym = mvec_sym,
}; };
algebra->mvec_types[group_mask] = new_type (); auto type = algebra->mvec_types[group_mask] = new_type ();
*algebra->mvec_types[group_mask] = (type_t) { *type = (type_t) {
.type = algebra->type->type, .type = algebra->type->type,
.name = save_string (va (0, "algebra(%s(%d,%d,%d):%04x)", .name = save_string (va (0, "algebra(%s(%d,%d,%d):%04x)",
algebra->type->name, algebra->type->name,
@ -516,6 +527,9 @@ algebra_mvec_type (algebra_t *algebra, pr_uint_t group_mask)
.allocated = true, .allocated = true,
}; };
chain_type (algebra->mvec_types[group_mask]); chain_type (algebra->mvec_types[group_mask]);
if (!(group_mask & (group_mask - 1))) {
mvec->mvec_sym = mvec_struct (algebra, group_mask, type);
}
} }
return algebra->mvec_types[group_mask]; return algebra->mvec_types[group_mask];
} }