From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58565 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4YzY-00012i-WD for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4YzX-0006W7-J5 for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:52 -0400 Received: from cantor.suse.de ([195.135.220.2]:48648 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4YzX-0006Vb-DM for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:51 -0400 From: Alexander Graf Date: Tue, 29 Mar 2011 15:29:39 +0200 Message-Id: <1301405386-25738-13-git-send-email-agraf@suse.de> In-Reply-To: <1301405386-25738-1-git-send-email-agraf@suse.de> References: <1301405386-25738-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 12/19] s390x: Adjust GDB stub List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aurelien@aurel32.net, rth@twiddle.net We have successfully lazilized cc computation, so we need to manually trigger its calculation when gdb wants to fetch it. We also changed the variable name, so writing it writes into a different field now. Signed-off-by: Alexander Graf --- gdbstub.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 1e9f931..f8b5d7e 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1431,7 +1431,11 @@ static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n) /* XXX */ break; case S390_PC_REGNUM: GET_REGL(env->psw.addr); break; - case S390_CC_REGNUM: GET_REG32(env->cc); break; + case S390_CC_REGNUM: + env->cc_op = calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, + env->cc_vr); + GET_REG32(env->cc_op); + break; } return 0; @@ -1457,7 +1461,7 @@ static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n) /* XXX */ break; case S390_PC_REGNUM: env->psw.addr = tmpl; break; - case S390_CC_REGNUM: env->cc = tmp32; r=4; break; + case S390_CC_REGNUM: env->cc_op = tmp32; r=4; break; } return r; -- 1.6.0.2