Skip to contentSkip to conversation

target/hppa: fix PSW Q bit behaviour to match hardware

PATCH Applied Sven Schnelle 2 participants 2 messages Jan 29, 2019 – Feb 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/hppa: fix PSW Q bit behaviour to match hardware

PA-RISC specification says: "Setting the PSW Q-bit, PSW{28}, to 1 with this instruction, if it was not already 1, is an undefined operation." However, at least HP-UX 10.20 sets the Q bit from 0 to 1 with the SSM instruction. Tested this both on HP9000/712 and HP9000/785/C3750, both machines set the Q bit from 0 to 1 without exception. This makes HP-UX 10.20 progress a little bit further.

---
 target/hppa/op_helper.c | 5 -----
 1 file changed, 5 deletions(-)
target/hppa/op_helper.c +0 -5
index 912e8d5be4..3adcfd8976 100644
@@ -665,11 +665,6 @@ void HELPER(reset)(CPUHPPAState *env)
 target_ureg HELPER(swap_system_mask)(CPUHPPAState *env, target_ureg nsm)
 {
     target_ulong psw = env->psw;
-    /* ??? On second reading this condition simply seems
-       to be undefined rather than a diagnosed trap.  */
-    if (nsm & ~psw & PSW_Q) {
-        hppa_dynamic_excp(env, EXCP_ILL, GETPC());
-    }
     env->psw = (psw & ~PSW_SM) | (nsm & PSW_SM);
     return psw & PSW_SM;
 }
Signature · 1 line
2.20.1
#1 lore raw
Quoted 11 lines · Sven Schnelle

PA-RISC specification says: "Setting the PSW Q-bit, PSW{28}, to 1 with this instruction, if it was not already 1, is an undefined operation." However, at least HP-UX 10.20 sets the Q bit from 0 to 1 with the SSM instruction. Tested this both on HP9000/712 and HP9000/785/C3750, both machines set the Q bit from 0 to 1 without exception. This makes HP-UX 10.20 progress a little bit further.

---
 target/hppa/op_helper.c | 5 -----
 1 file changed, 5 deletions(-)

Queued, with much of this text copied into a comment in the code.

r~