target/alpha: Fix SWCR_TRAP_ENABLE_MASK
commit106e1319cc88ed627775714945380e3491d3718b
authorRichard Henderson <richard.henderson@linaro.org>
Sat, 21 Sep 2019 04:32:52 +0000 (20 21:32 -0700)
committerAlex Bennée <alex.bennee@linaro.org>
Thu, 26 Sep 2019 18:00:53 +0000 (26 19:00 +0100)
tree2f64b84e7fafff9e695dada88dd129ae330f54f8
parent712e7c6112c0c7df719b943a0138785e02f383c1
target/alpha: Fix SWCR_TRAP_ENABLE_MASK

The CONFIG_USER_ONLY adjustment blindly mashed the swcr
exception enable bits into the fpcr exception disable bits.

However, fpcr_exc_enable has already converted the exception
disable bits into the exception status bits in order to make
it easier to mask status bits at runtime.

Instead, merge the swcr enable bits with the fpcr before we
convert to status bits.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190921043256.4575-4-richard.henderson@linaro.org>
target/alpha/helper.c