Received: from eggs.gnu.org ([2001:4830:134:3::10]:59576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aS-0004Fi-B6 for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VR3aM-0000Ek-Gc for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:16 -0400 Received: from mail-qe0-x22e.google.com ([2607:f8b0:400d:c02::22e]:46223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aM-0000Ee-Cn for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:10 -0400 Received: by mail-qe0-f46.google.com with SMTP id x7so5180742qeu.5 for ; Tue, 01 Oct 2013 10:18:10 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 1 Oct 2013 10:17:21 -0700 Message-Id: <1380647845-16793-6-git-send-email-rth@twiddle.net> In-Reply-To: <1380647845-16793-1-git-send-email-rth@twiddle.net> References: <1380647845-16793-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 5/9] target-s390: Fix STIDP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de The implementation had been incomplete, as we did not store the machine type. Note that the machine_type member is still unset during initialization, so this has no effect yet. Signed-off-by: Richard Henderson --- target-s390x/cpu.h | 4 +++- target-s390x/translate.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 382c691..ca9c3dd 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -197,7 +197,9 @@ typedef struct CPUS390XState { /* reset does memset(0) up to here */ uint64_t facilities[2]; - int cpu_num; + uint32_t cpu_num; + uint32_t machine_type; + uint8_t *storage_keys; uint64_t tod_offset; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index c1ea060..b97c44a 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -3238,8 +3238,14 @@ static ExitStatus op_stctl(DisasContext *s, DisasOps *o) static ExitStatus op_stidp(DisasContext *s, DisasOps *o) { + TCGv_i64 t1 = tcg_temp_new_i64(); + check_privileged(s); tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, cpu_num)); + tcg_gen_ld32u_i64(t1, cpu_env, offsetof(CPUS390XState, machine_type)); + tcg_gen_deposit_i64(o->out, o->out, t1, 32, 32); + tcg_temp_free_i64(t1); + return NO_EXIT; } -- 1.8.1.4