fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vc4: Abstract out the field-merging logic for instructions.

Browse source 
I'm going to be doing the same logic for some more fields next.
This commit is contained in:
Eric Anholt 2014-10-02 23:22:03 -07:00
parent acdcef6788
commit 48af7426f2
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/drivers/vc4/vc4_qpu.c
View file

@ -185,23 +185,29 @@ qpu_m_alu2(enum qpu_op_mul op,
return inst;
}
static uint64_t
merge_fields(uint64_t merge,
uint64_t add, uint64_t mul,
uint64_t mask, uint64_t ignore)
{
if ((add & mask) == ignore)
return (merge & ~mask) | (mul & mask);
else if ((mul & mask) == ignore)
return (merge & ~mask) | (add & mask);
else {
assert((add & mask) == (mul & mask));
return merge;
}
}
uint64_t
qpu_inst(uint64_t add, uint64_t mul)
{
uint64_t merge = ((add & ~QPU_WADDR_MUL_MASK) |
(mul & ~QPU_WADDR_ADD_MASK));
/* If either one has no signal field, then use the other's signal field.
* (since QPU_SIG_NONE != 0).
*/
if (QPU_GET_FIELD(add, QPU_SIG) == QPU_SIG_NONE)
merge = (merge & ~QPU_SIG_MASK) | (mul & QPU_SIG_MASK);
else if (QPU_GET_FIELD(mul, QPU_SIG) == QPU_SIG_NONE)
merge = (merge & ~QPU_SIG_MASK) | (add & QPU_SIG_MASK);
else {
assert(QPU_GET_FIELD(add, QPU_SIG) ==
QPU_GET_FIELD(mul, QPU_SIG));
}
merge = merge_fields(merge, add, mul, QPU_SIG_MASK,
QPU_SET_FIELD(QPU_SIG_NONE, QPU_SIG));
return merge;
}