On 3/22/23 13:33, Aaron Lindsay wrote:
On Feb 22 11:37, Richard Henderson wrote:
On 2/22/23 09:35, Aaron Lindsay wrote:
@@ -406,6 +421,16 @@ static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr,
uint64_t modifier,
uint64_t xor_mask = MAKE_64BIT_MASK(bot_bit, top_bit - bot_bit + 1) &
~MAKE_64BIT_MASK(55, 1);
result = ((ptr ^ pac) & xor_mask) | (ptr & ~xor_mask);
+ if (cpu_isar_feature(aa64_fpac_combine, env_archcpu(env)) ||
+ (cpu_isar_feature(aa64_fpac, env_archcpu(env)) &&
+ !is_combined)) {
Indentation is off.
I pulled `env_archcpu(env)` out of this if-statement in my latest
patchset in addition to the indentation, but am not confident I have
done what you intended. The QEMU Coding Style guide doesn't seem to
address longer statements like this in its section on indentation, so I
attempted to follow other examples in the code, but I'll take further
direction here.
if (function(a) ||
(function(b) &&
function(c))) {
...
1234567890
r~
