diff options
| author | Peter Maydell | 2019-01-08 11:40:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-08 11:40:55 +0100 |
| commit | 625fa8de78e6e848c20532758b5393cde96b2060 (patch) | |
| tree | 85c276d1be016242d35827a5700a70feb2d418c1 /target/alpha/cpu.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190107'... (diff) | |
| parent | pc-bios: Update palcode-clipper (diff) | |
| download | qemu-625fa8de78e6e848c20532758b5393cde96b2060.tar.gz qemu-625fa8de78e6e848c20532758b5393cde96b2060.tar.xz qemu-625fa8de78e6e848c20532758b5393cde96b2060.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20190108' into staging
Queued target/alpha patches
# gpg: Signature made Tue 08 Jan 2019 02:14:18 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-axp-20190108:
pc-bios: Update palcode-clipper
target/alpha: Fix user-only initialization of fpcr
hw/alpha/typhoon: Stop calling cpu_unassigned_access()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/alpha/cpu.c')
| -rw-r--r-- | target/alpha/cpu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index a953897fcc..1fd95d6c0f 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -205,9 +205,9 @@ static void alpha_cpu_initfn(Object *obj) env->lock_addr = -1; #if defined(CONFIG_USER_ONLY) env->flags = ENV_FLAG_PS_USER | ENV_FLAG_FEN; - cpu_alpha_store_fpcr(env, (FPCR_INVD | FPCR_DZED | FPCR_OVFD - | FPCR_UNFD | FPCR_INED | FPCR_DNOD - | FPCR_DYN_NORMAL)); + cpu_alpha_store_fpcr(env, (uint64_t)(FPCR_INVD | FPCR_DZED | FPCR_OVFD + | FPCR_UNFD | FPCR_INED | FPCR_DNOD + | FPCR_DYN_NORMAL) << 32); #else env->flags = ENV_FLAG_PAL_MODE | ENV_FLAG_FEN; #endif |