Re: [Qemu-devel] [PATCH v3 02/18] target/s390x: change PSW_SHIFT_KEY

[Aurelien Jarno]

On 2017-06-19 17:03, Richard Henderson wrote:
> From: David Hildenbrand 
> 
> Such shifts are usually used to easily extract the PSW KEY from the PSW
> mask, so let's avoid the confusing offset of 4.
> 
> Reviewed-by: Thomas Huth 
> Signed-off-by: David Hildenbrand 
> Message-Id: <20170614133819.18480-2-da...@redhat.com>
> Signed-off-by: Richard Henderson 
> ---
>  target/s390x/cpu.h   | 2 +-
>  target/s390x/translate.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Aurelien Jarno 

-- 
Aurelien Jarno  GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net

[Qemu-devel] [PATCH v3 02/18] target/s390x: change PSW_SHIFT_KEY

[Richard Henderson]

From: David Hildenbrand 

Such shifts are usually used to easily extract the PSW KEY from the PSW
mask, so let's avoid the confusing offset of 4.

Reviewed-by: Thomas Huth 
Signed-off-by: David Hildenbrand 
Message-Id: <20170614133819.18480-2-da...@redhat.com>
Signed-off-by: Richard Henderson 
---
 target/s390x/cpu.h   | 2 +-
 target/s390x/translate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index a4028fb..532a4a0 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -315,7 +315,7 @@ void s390x_cpu_debug_excp_handler(CPUState *cs);
 #define PSW_MASK_IO 0x0200ULL
 #define PSW_MASK_EXT0x0100ULL
 #define PSW_MASK_KEY0x00F0ULL
-#define PSW_SHIFT_KEY   56
+#define PSW_SHIFT_KEY   52
 #define PSW_MASK_MCHECK 0x0004ULL
 #define PSW_MASK_WAIT   0x0002ULL
 #define PSW_MASK_PSTATE 0x0001ULL
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index af18ffb..204b52a 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3751,7 +3751,7 @@ static ExitStatus op_spka(DisasContext *s, DisasOps *o)
 {
 check_privileged(s);
 tcg_gen_shri_i64(o->in2, o->in2, 4);
-tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, PSW_SHIFT_KEY - 4, 4);
+tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, PSW_SHIFT_KEY, 4);
 return NO_EXIT;
 }
 
-- 
2.9.4