From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48755C28EBD for ; Sun, 9 Jun 2019 09:08:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09FC420868 for ; Sun, 9 Jun 2019 09:08:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SB34dUVB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09FC420868 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZtoB-0005R6-UO for qemu-devel@archiver.kernel.org; Sun, 09 Jun 2019 05:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33361) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZtnL-000519-K9 for qemu-devel@nongnu.org; Sun, 09 Jun 2019 05:07:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZtnK-0007PK-NE for qemu-devel@nongnu.org; Sun, 09 Jun 2019 05:07:19 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:41543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZtnK-0007Ou-HY for qemu-devel@nongnu.org; Sun, 09 Jun 2019 05:07:18 -0400 Received: by mail-pg1-x544.google.com with SMTP id 83so3409980pgg.8 for ; Sun, 09 Jun 2019 02:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=PjdNmZrR6OjtG5qlkwnMVYBO99frhv4oSNKd5NeeYIo=; b=SB34dUVB4nj0+sJ/l9MP3cgWePaRSNcmQsU0q5YVA6ZBw/j4Vp+DqDc9Zu17UmyXjn 7ZsPo2EUSpDjpvEwnfQvbIQRogmddOXFZ8XfTgB9pRUA30PUe3vVPfI4heo4T+ul9cvw Amd4hKKNdoQ0GzjwOtGFHuwMx+AOgtoenmCAnFbp+fFj/LnRq7Tsb0TbaERytMYAadoR poIo5UTkFyA3hqjAhQpcDuwvy6aJcH2QC2stVAcCMwcngDSHq+3kZqnlbQb9LnaFV4/M 0TI0Ds69cWy/LZGMi/PUhVozAQfTholl5q5pL4epbAYvN4gLBpEZ7ztA8QdSI/x80SSN PLZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=PjdNmZrR6OjtG5qlkwnMVYBO99frhv4oSNKd5NeeYIo=; b=Q7EGMY2Nw9wApxBinGCCpQjYMfq65ymz9Q4PQjxaHx7kFanfozDhOxlqXsFpAJYekb HgYstarxYcIBn7IQRzSiCx1klu8zdjQ0ao5v3nDY6l7SDZjc7/KEQCl8wnpBOU57l5mt DwUF8QjjnPOEtOC1Eg42n6bc0sEUt+FplAEWPi2ht3ovs/LOc1wgeS3MO9mj8tI3RS/u Z0EgrH7jjBwm7ubaHG2UVhu22onFky52uR2Ds1bKNk6NtX0kL0Iox1TgFN0hXl7p6f7C ZVdB6IRT+YdFZGi+dFsJdkaESofQPgAT6AU39/lWchCQkzq0vDGEKy6HXQ4lMlvsdcSQ tdFA== X-Gm-Message-State: APjAAAUfB+lblLnaZW3OLRHNjXIOvK0/RKCpe03HQaPNKLcnUlG6dnwD Nv0Y+J7GFvDUFIAG1lqNpGC9E9vL X-Google-Smtp-Source: APXvYqxnf7hMnxAtTcpm01y7bO5mE8w5UQUcfXAScO98YsNI2PDgFHd6uSE2kpe7lgJu4h2SlEwYtA== X-Received: by 2002:a65:56cc:: with SMTP id w12mr10659632pgs.415.1560071236935; Sun, 09 Jun 2019 02:07:16 -0700 (PDT) Received: from localhost.localdomain (i60-43-49-30.s30.a048.ap.plala.or.jp. [60.43.49.30]) by smtp.gmail.com with ESMTPSA id f17sm6256328pgv.16.2019.06.09.02.07.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 09 Jun 2019 02:07:16 -0700 (PDT) Date: Sun, 9 Jun 2019 18:07:13 +0900 From: Lucien Murray-Pitts To: qemu-devel@nongnu.org, Laurent Vivier , Lucien Murray-Pitts Message-ID: <20190609090713.GA14864@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.11.4 (2019-03-13) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH v2] The m68k gdbstub SR reg request doesnt include Condition-Codes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The register request via gdbstub would return the SR part which contains the Trace/Master/IRQ state flags, but would be missing the CR (Condition Register) state bits. This fix adds this support by merging them in the m68k specific gdbstub handler m68k_cpu_gdb_read_register for SR register. Signed-off-by: Lucien Murray-Pitts --- Notes: v1->v2 - remove superfluous braces from my additional code - slightly amended the commit message target/m68k/gdbstub.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/m68k/gdbstub.c b/target/m68k/gdbstub.c index fd2bb46c42..5e5aef5c0f 100644 --- a/target/m68k/gdbstub.c +++ b/target/m68k/gdbstub.c @@ -35,8 +35,10 @@ int m68k_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) return gdb_get_reg32(mem_buf, env->aregs[n - 8]); } else { switch (n) { - case 16: - return gdb_get_reg32(mem_buf, env->sr); + case 16: { + /* SR is made of SR+CCR, CCR is many 1bit flags so uses helper */ + return gdb_get_reg32(mem_buf, env->sr | cpu_m68k_get_ccr(env)); + } case 17: return gdb_get_reg32(mem_buf, env->pc); } -- 2.21.0