From patchwork Wed Apr 15 10:42:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185474 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295765ecu; Wed, 15 Apr 2020 03:44:41 -0700 (PDT) X-Google-Smtp-Source: APiQypJ5RtAEaC09BY6cXwJVUvwSJn/QEvQUHGqa1cWX1/GxjfkjwjYRyAnORTmq9X0ksFZoV/Dc X-Received: by 2002:ac8:4a93:: with SMTP id l19mr20568658qtq.365.1586947481138; Wed, 15 Apr 2020 03:44:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947481; cv=none; d=google.com; s=arc-20160816; b=psegTDzpxtRJxhj49Yg2hoVxmyx/cxYxbAuBCHyl0tKZGY9JMELNBZgrKQ3nAkZFb5 c7gSCxzfbodxLjT0D7IZ+xFUC+XHdkQJRsmW9v8WbW21olqsNzGbFGtS7vHdgRnGYfNt Iy8aLcAgFFXCqeFV/q923xKSiArtlpQNPQF5oAhuQv+zU4eNsvuGPsOn3BXoOctE2qiB 1XLFmg9lN8mT72KrqSWWGf0LQfLCmS71kpt/o54ZmzHV5IMOmXlUuzOboP3nmj/Fce6N FDCLm4isihJoj7avxO0sDJy2MjXBbj2UIoYVMhtVQ5Y6dH1x0Xg5BOLkbAt7H3aGm/4D mTlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MK/jC81/8sRpluD3scWqqrQbZZzk/m9KkgnOCQx5tL4=; b=YPy9RfkQ4iU9k56SM0UO3hcnXi3E46rXfbeNOAerOovOWfXmi+MZWsKwT6gou/Dnhg FeKeX4SRfHhR2JpRy/n1FD0lFNqDVRIO6SGSSExfQYn2SJ+OXLSOCgFZkwEo6O2nBh5j 68DyMeeQvHTklBt9tJmQ+w7hR4EZbBJ8AlVaOOKxEILebS2d1LB3PH2uSYwuvTkNaNb5 iMLgKpM7Ly2v+qLYasV6z54ZWUR81emqmbarDs67/83k+mVm2ea5gXxHySH/baugHpKW ARc8fX4KtjqWeXFXP5GMF1ZAHESzZ3MExc3hROd6dri+Y6hoCxoojyxPdvhExsbhEWXP l6Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SXCrfySX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v15si9502680qka.164.2020.04.15.03.44.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:44:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SXCrfySX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfX6-000647-HX for patch@linaro.org; Wed, 15 Apr 2020 06:44:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45637) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfV2-0002iF-J9 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUs-00039D-FF for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:32 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUs-00038j-9G for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:22 -0400 Received: by mail-wr1-x436.google.com with SMTP id k1so11308961wrx.4 for ; Wed, 15 Apr 2020 03:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MK/jC81/8sRpluD3scWqqrQbZZzk/m9KkgnOCQx5tL4=; b=SXCrfySXY+B05afPhpSqlY7shjKkEMXLp6BVdiDm1qiz/nt5g0vnhmNmNGoe/4NsZi cIoO0FYCiLy09566psoY/M3riT1F9pDUQG/ptxtZnZ1PuZkwWFUvB0KYo1SN37XDQk/F vG1qCLb4utntovGhhph9ficu96n1FZgrWio7FEtbKr0Fh13wvuHetrRwlo2NkyzN/GpQ 6tsJxK7ozCxFf1TBKnMxha7rb5GOflJ2qgbkpgGA47vrcyDnStKTFAJI+x6w6wkErN5w sJaQyN5ZlRU2MJ/BxCG8oLYM6agS7OKOxyM320sAN7RLynre+wxQbRXR1RFL9BkbulY6 YcWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MK/jC81/8sRpluD3scWqqrQbZZzk/m9KkgnOCQx5tL4=; b=dQ1qcfTMy2q9iBzoP9q6lb23uBxdugwxKB53wuN5EA+dh4Y4IS4MjkDQ9cdv/Rixtf 6/sEqedePq81iuJPa1Whwcl0JlBXhykRwIh1dJ2FSsXlxZElsNrldfakzk5zESi1Q2mm xTAhclUu8FLbvFCqhLs+CBogQdebhiHfZz/pUopi/D9aMTK1TKK2YHbON5N86dw53NeW LqJFh+WugN1A9N06pn8sPmX0TzFq1lop85EF27GMKT+gajykkNlFFwCg7otLOr5CvmM5 TCng5UscudEw30nLLY6W9blGLUYV0u/DvDl9LbvpK72TJItb5aCzvdbUUk4r2HbliGJa SxCg== X-Gm-Message-State: AGi0PuYYW+7V2/Leosljoh80hYQUN0uvIIUJa23XVUom5MyYKL3HPLUJ EcJHNnKMh0HRBlHIZW3FHePnOg== X-Received: by 2002:adf:e3ca:: with SMTP id k10mr11722322wrm.53.1586947341200; Wed, 15 Apr 2020 03:42:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z18sm16637303wrw.41.2020.04.15.03.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 825CC1FF92; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] gdbstub: i386: Fix gdb_get_reg16() parameter to unbreak gdb Date: Wed, 15 Apr 2020 11:42:09 +0100 Message-Id: <20200415104211.9388-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415104211.9388-1-alex.bennee@linaro.org> References: <20200415104211.9388-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 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: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Richard Henderson , qemu-devel@nongnu.org, Peter Xu , Paolo Bonzini , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , Stefano Garzarella Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu We should only pass in gdb_get_reg16() with the GByteArray* object itself, no need to shift. Without this patch, gdb remote attach will crash QEMU: (gdb) target remote :1234 Remote debugging using :1234 Remote communication error. Target disconnected.: Connection reset by peer. $ qemu-system-x86_64 -m 1G -smp 4 ... -s ERROR:qemu/gdbstub.c:1843:handle_read_all_regs: assertion failed: (len == gdbserver_state.mem_buf->len) Bail out! ERROR:qemu/gdbstub.c:1843:handle_read_all_regs: assertion failed: (len == gdbserver_state.mem_buf->len) Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Signed-off-by: Peter Xu Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Tested-by: Stefano Garzarella Reviewed-by: Richard Henderson Message-Id: <20200409164954.36902-3-peterx@redhat.com> Message-Id: <20200414200631.12799-12-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index f3d23b614ee..b98a99500ae 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -106,7 +106,7 @@ int x86_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) } else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) { floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS]; int len = gdb_get_reg64(mem_buf, cpu_to_le64(fp->low)); - len += gdb_get_reg16(mem_buf + len, cpu_to_le16(fp->high)); + len += gdb_get_reg16(mem_buf, cpu_to_le16(fp->high)); return len; } else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) { n -= IDX_XMM_REGS;