diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-16 20:23:16 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-15 10:03:44 +0200 |
| commit | ebc9401a4067fd61afea811d1d059d8ac0fc5db9 (patch) | |
| tree | 384df5f6ad37ce198e7db28dfe4165295c5f3c06 /target/hppa | |
| parent | d2e22fde144ea5f32980031537a7e1bb88e8bcf1 (diff) | |
| download | qemu-ebc9401a4067fd61afea811d1d059d8ac0fc5db9.zip qemu-ebc9401a4067fd61afea811d1d059d8ac0fc5db9.tar.gz qemu-ebc9401a4067fd61afea811d1d059d8ac0fc5db9.tar.bz2 | |
target/hppa: Split PSW X and B into their own field
Generally, both of these bits are cleared at the end of each
instruction. By separating these, we will be able to clear
both with a single insn, instead of 2 or 3.
Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/hppa')
| -rw-r--r-- | target/hppa/cpu.h | 3 | ||||
| -rw-r--r-- | target/hppa/helper.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 1232a4c..f247ad5 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -208,7 +208,8 @@ typedef struct CPUArchState { uint64_t fr[32]; uint64_t sr[8]; /* stored shifted into place for gva */ - target_ulong psw; /* All psw bits except the following: */ + uint32_t psw; /* All psw bits except the following: */ + uint32_t psw_xb; /* X and B, in their normal positions */ target_ulong psw_n; /* boolean */ target_long psw_v; /* in most significant bit */ diff --git a/target/hppa/helper.c b/target/hppa/helper.c index 7d22c24..b79ddd8 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -54,7 +54,7 @@ target_ulong cpu_hppa_get_psw(CPUHPPAState *env) psw |= env->psw_n * PSW_N; psw |= (env->psw_v < 0) * PSW_V; - psw |= env->psw; + psw |= env->psw | env->psw_xb; return psw; } @@ -76,8 +76,8 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ulong psw) } psw &= ~reserved; - env->psw = psw & (uint32_t)~(PSW_N | PSW_V | PSW_CB); - + env->psw = psw & (uint32_t)~(PSW_B | PSW_N | PSW_V | PSW_X | PSW_CB); + env->psw_xb = psw & (PSW_X | PSW_B); env->psw_n = (psw / PSW_N) & 1; env->psw_v = -((psw / PSW_V) & 1); |