From patchwork Wed Apr 15 10:42:04 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: 185470 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295095ecu; Wed, 15 Apr 2020 03:43:12 -0700 (PDT) X-Google-Smtp-Source: APiQypKC/ovIJvBQnQfnMLofcw5L6kByUTViR7YdAzT8wnh5NFb1/86tUAB5okt5MvXXmrgPUAkF X-Received: by 2002:a37:98d:: with SMTP id 135mr13274750qkj.377.1586947392002; Wed, 15 Apr 2020 03:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947391; cv=none; d=google.com; s=arc-20160816; b=Sg0E8P3kbqfAj8NTnU+Ni42q1vPONDK9MtEfkEIUHYsIR57l5WUx0ZXEsEp5znCvd/ yQgrsIuIlRFPnKBErntsdK1JMEV4T6UbGuUwS34AXSEUKsqOzfTv8ssIx1wKKn8AW6E+ OApcqk2GWXtHvIgrmeYKB62inOrf4/jw3DUuc5pqVExM3+dHCfE/JD76iWU6+BihZrKI UVESP+i7LYQtZUiqbgugwZdl341XDmOTKvK90gvPxqaQyfFHGwH+JzfR2t4U2yk46fH8 Bz7ZD6v/OcYc4Vji02QZE9HlNZmtKxZhBokR+JjhVID9rciZssEnW21EJFfMDM8vkXUT y4yw== 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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=dtxWMqXSJCbxFCvyxlaPhwm5OHRWCasQvGn2gOli+e1+nJSugo8b/7TDes82aD6ZjG Aj56JqRh3tMyh/kcSkl2jbyEK6NRpNQSNGlGJrmo+ZuuyajZnDFPEvR2ADTlpLjASmVe UbiY4ZWfahgbfz2A+rHkycJDzj09nAjIIXuoOfKhoyKZnSrUXXMoudpEviPWQObJWqrx hGFNF35BAzh/lpxDWjszWEgVadFthPUkY+k09Xg/1scpFLHnlBO7m9SuGTtjmRc7dbFF Stw1m96t21ag8mxeHUmEf62reAnFKvBMYBCMUsMPnwbwZDe+zwsflg8MaoFcWY0xVVsc EXpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=s5XowzuA; 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 q33si9460509qtd.160.2020.04.15.03.43.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:43:11 -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=s5XowzuA; 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]:47580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfVf-0002Dp-CF for patch@linaro.org; Wed, 15 Apr 2020 06:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUp-00028n-26 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUn-00036y-Bw for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:18 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:34824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUn-00036b-5p for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:17 -0400 Received: by mail-wm1-x335.google.com with SMTP id r26so18433677wmh.0 for ; Wed, 15 Apr 2020 03:42:17 -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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=s5XowzuA9uoF1wZOsE5UuWL3tQeKsX4fPJC9yjLfPaWkFNcUVSpoCXi7D/h//hQagf u22Vh3qJjU4h/+SagQsF3E/4j4PIzGBUg9OjKOgtuXn7wdANl/jb2TVfal5KPM1t09Fm 18e6FDbh9/0V2Q9p3Q0ejZ54e0rmSH/FoMZ5aecKBBunp7nCYiQmeq8+1N4BSE87SbEW unLvaVfVDlz7lXV125XvNwWcuQ10oxRXbYlaHYEwqFnGJzc+Tmg4AxvGWxe3jGxhEpet azBTWRUJ9aqFLcJtyrgd6l1ndlIL63erm4AjrkZNQ+/BLrTh1NTxEO/CMX8U/IiiAGrY pdaA== 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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=MCU/NyR8JS2NCTWiY3xxE9DMqh5FBuQ2m4E3DUp+2+fT6ANAIDVKRttJqCtYUIIp6h 0P/CFIBawTF8bCtkzTFDgnb1mMy47oAoB99sJi/intaeWoMjFp33+ZvONsUhw/Htec73 xuLHTA2ZzxyWLq5lBQyS2JV5DaLck/003KUB5OYMDa3DUu7GeiF+0wQIXLnvzoNZXwPz HT52AW74WUfSVBrz+hkKguZCJxSpGErTQ6EYUABgJmPYz9YBtKvhwGdrAjBjkPYXwMOp xGKmiufTkkMALX4gaNKOy55kujz6p4FrGxsPjzwsfHuOlTGoF03ThuMlgEj6tiMbpxad ZqtQ== X-Gm-Message-State: AGi0PuYz9rme9kt+zIyNQF6IQRustAxAwot5okNg40VjNSE3wwYjjfBv 8lOyxK+yVvB8aH7GPlbnaQ6c34aPBlc= X-Received: by 2002:a1c:bd54:: with SMTP id n81mr4408252wmf.141.1586947336151; Wed, 15 Apr 2020 03:42:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h2sm22870154wmf.34.2020.04.15.03.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 165781FF87; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/8] tests/docker: add docs FEATURE flag and use for test-misc Date: Wed, 15 Apr 2020 11:42:04 +0100 Message-Id: <20200415104211.9388-2-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::335 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The test-misc docker test fails on a number of images which don't have the prerequisites to build the docs. Use the FEATURES flag so we can skip those tests. As the sphinx test fails to detect whatever feature we need to get hxtool to work we drop them from debian9 so the windows build doesn't attempt to build the docs. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200414200631.12799-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index 2fcdc406e83..0769700a416 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -34,3 +34,5 @@ RUN apt update && \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) + +ENV FEATURES docs diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker index 92edbbf0f48..08cc970feb1 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -30,6 +30,4 @@ RUN apt update && \ pkg-config \ psmisc \ python3 \ - python3-sphinx \ - texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4bd2c953af8..179575ecaaa 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -103,4 +103,4 @@ ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt ENV PATH $PATH:/usr/libexec/python3-sphinx/ -ENV FEATURES mingw clang pyyaml asan +ENV FEATURES mingw clang pyyaml asan docs diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index e8eb48dccfd..591282561bc 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -13,5 +13,5 @@ RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf g # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV FEATURES clang pyyaml +ENV FEATURES clang pyyaml docs USER travis diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index b6c7b41dddd..eeb3b22bf20 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -68,4 +68,4 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml sdl2 +ENV FEATURES clang pyyaml sdl2 docs diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 1efedeef995..f66b06f4cff 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -54,7 +54,7 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml sdl2 +ENV FEATURES clang pyyaml sdl2 docs # https://bugs.launchpad.net/qemu/+bug/1838763 ENV QEMU_CONFIGURE_OPTS --disable-libssh diff --git a/tests/docker/test-misc b/tests/docker/test-misc index d480afedca7..cc94a738dd0 100755 --- a/tests/docker/test-misc +++ b/tests/docker/test-misc @@ -14,6 +14,8 @@ . common.rc +requires docs + cd "$BUILD_DIR" # build everything else but QEMU From patchwork Wed Apr 15 10:42:05 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: 185468 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp294800ecu; Wed, 15 Apr 2020 03:42:31 -0700 (PDT) X-Google-Smtp-Source: APiQypLz3b2GJ8k8lmDlHOxAX0J2X4xFNlf5M1R3o4pOvhwcCZQhg44OFh9qiWzt013pnr64a+/H X-Received: by 2002:a37:6587:: with SMTP id z129mr26076135qkb.437.1586947351522; Wed, 15 Apr 2020 03:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947351; cv=none; d=google.com; s=arc-20160816; b=qvb/6byxkpH/FTs7x0XozyyZSQONN3VaZr8Mg5h61X6WbTmU1UiwlZkuEJSFbmX3Dk E9hDs7fhsWk/V5Jm4t4LnXphN+sCqmqcGtR76QuyQJ0wWxWacMjBNbRX1s48btTXLp/2 0SB1cldbOaXwK5nmwOxyxs91q2CKixoj1MfqntOaeRycF18KDF5J9TM8+sG5b94ZCtid bcXcbllC6hd2qWFoM0NVjg3w1AiaApV3hpy5HyXcmF0ZXALcnph+jqWSgD2S1rRpIHMY YDOqs/ig0IRX/LeAZjrS1FPE9s5ESAeIxjGsVoGkmF7P03zTFTnVv0bLsA+oUDEy52qp YEOw== 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=VTWM8r5mCw2pzFl9GbjwfDDSYLryAvqKFCJ6J7AJAD8=; b=mBiGEUy+4P+80Z7VFuFt+YWNz3MU85VZy94AlV0yQfh19VcOTAXjI6BLRHZuXOCmDd p+wPI0mogYpruYe4JJYOiM7WkU+gUjMpubNbegd94sfg8v1KBmAWr8GJgyNg/fNcmORY qA/xG7b72lAROw2mmQ6eUUn3Tc8u9v7/BAzCGJNKiOOkDxDz4VkwkGhiz+2OpDRfelWo 1OFb2lOZhb2QUpDZ7B1Tm1OQexl8ExbkbCitS1xRtbdtcl8287G76UL1qrtG4CKj/3Tl v90cuG2VVfGUhKcjwINp+pj1QOAVTKup7NMAUMFQcsVWsg4D+GHRyefckR8u+SWnY9vL grWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=T2xZitao; 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 d76si8116134qkg.316.2020.04.15.03.42.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:42:31 -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=T2xZitao; 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]:47570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfV0-0002AB-T5 for patch@linaro.org; Wed, 15 Apr 2020 06:42:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45436) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUm-00026b-WA for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUm-00036M-1q for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:16 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:38765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUl-000362-Sl for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:16 -0400 Received: by mail-wm1-x334.google.com with SMTP id g12so10552834wmh.3 for ; Wed, 15 Apr 2020 03:42:15 -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=VTWM8r5mCw2pzFl9GbjwfDDSYLryAvqKFCJ6J7AJAD8=; b=T2xZitaonTiKrWYTYhX0M3MR7904lttjgsnJiQr4DI3r1pyBgCOG38qNG09QNGZhad PsfuChVfCHTH/I64/2pfjJGfpQVxkjrjblvqy3/ERlagiWEMGsU8KMeO4dSog5aaCvnB 5QOrzmQ+Cjb96ov5iDpitVHePVfGDl6pEvWNy53mpA/c2akLyc9OLAfdj07qL0gkpk4w bZFE5Y/ldb2cJVpjy8t+xCC4ohjoX5SDU9hlB+17IzLfMeojAsZXom5A3kyjlVgsbe/C h+Vv+pAuThUsDeRC6umn2nQauS2HoAPvYCuTxws+as7zDs82hl+tImtebA4cpZmx6DZO DsQg== 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=VTWM8r5mCw2pzFl9GbjwfDDSYLryAvqKFCJ6J7AJAD8=; b=kRxcSJlozUszKNktzMV4Ta7pbS972ExuiQUHsAzZRaxT0u2jubDKi4uoot+h1TYuDK ws4KCJPTy6vWVu/EfIE1tHlBM25BnKV/WZJnZMuQ7Z/CWBAMyB8sSnrVqFP4sBja28IU v7kwwXeNNMaG85POdtmJ8VN8pDbqQQUZ6LT59UFZ3ynnKjDU8dZ5QelInQ+GSc6tPuZE 73xS85j/vQ3m3OAhxWTYK4REEFdOUvMLkaL6rL5T2kbPAVIQsaI//hv3vg4g7BdKfxtb hJopt7/rqoHSQGVC4vsyOWFsa7RK5IYndv1hnsKS3BCNF0IwULGPesJYzpq40FJ26r1+ GkHA== X-Gm-Message-State: AGi0Puaxfjx1Oq6E3LLa4HpnRUgzLjYGMjU6yXQp6xYMztroQrQ5eGPI LbQ/wwb52Q3uKWM/tPG/HIEeZP1MlQ4= X-Received: by 2002:a1c:e187:: with SMTP id y129mr4831464wmg.133.1586947334888; Wed, 15 Apr 2020 03:42:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y9sm21672499wmm.26.2020.04.15.03.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2BC661FF8C; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/8] configure: redirect sphinx-build check to config.log Date: Wed, 15 Apr 2020 11:42:05 +0100 Message-Id: <20200415104211.9388-3-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::334 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise it's hard to debug whats going on. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200414200631.12799-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 9b1f5b33e45..25f7d915720 100755 --- a/configure +++ b/configure @@ -4942,7 +4942,9 @@ has_sphinx_build() { # sphinx-build doesn't exist at all or if it is too old. mkdir -p "$TMPDIR1/sphinx" touch "$TMPDIR1/sphinx/index.rst" - "$sphinx_build" $sphinx_werror -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >/dev/null 2>&1 + "$sphinx_build" $sphinx_werror -c "$source_path/docs" \ + -b html "$TMPDIR1/sphinx" \ + "$TMPDIR1/sphinx/out" >> config.log 2>&1 } # Check if tools are available to build documentation. From patchwork Wed Apr 15 10:42:06 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: 185471 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295516ecu; Wed, 15 Apr 2020 03:44:09 -0700 (PDT) X-Google-Smtp-Source: APiQypI+KFtxfJDIDBLoMAxZLBvRHv8il8vZu4bR8qJ6lCXSkOiZNaEijOpPxaK7lQur8srm6+Yq X-Received: by 2002:ae9:edc8:: with SMTP id c191mr19373971qkg.478.1586947448918; Wed, 15 Apr 2020 03:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947448; cv=none; d=google.com; s=arc-20160816; b=Wb8kFbsyLTHXGIDBHuW+IO5xdFTeVrKCuRvC3zVIYCcEZsJ5KYGEnBpWcokvHXfruE 1TtxAfyor3DXWwxKf4ijWhzxN1CrHFm9Va9whdV0w8iGC26SVF5rAw0aTm/vxelYSWG9 mnKpd0MnFYPSAE+pFnua1Lf9+ehSWpknCacOpMXIGmu7JunjEzyu8U+OPt9C+KIVmRDk G+5q3mYd/0nq0btgM/R9cPRVeiEoDs4H6CyZeNol/V/8WtqTE8qNULN+2nnM/dKXorBR 7I/+Q8vSwjFzhd+2j/XJf9F+Vp7F0dCmc4JUiQezvlYD2Y26rWIdLS2yicTEqHAHf6R5 ndGQ== 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=R1iGbNrPxs7Q1flfCK5WZAyghUVesN3d6e9WvcQ4hxE=; b=FHxr4PtS+Lo0v/SoqIXD8EQcOLY+eqaY8FjEZ7NJyDZWQDYf8jZuH2Vb9edIy+GR6l RZmKhAH+6iLOw17LHQ8FYviCEGXVJOlbC0yxJY5kKXuZV6/H7TdKTpjPxKLOvvnU3qDq 8kA28w52bk+3HqBTvqUyt6HnO5ORgPC76/zu5Io9QK+NEI3L+QNXOhTo1GA8NbeF3jy7 IQO/NCqxt/ULYIyvnDQbfvmVkUXZ3NfMEYK4roDRBBkEXGqCFgKzLXkF4bCis3uqk4zl 48mwNDseEF08Q9/tZ2QzGUpyfLsqJvzpXhBqbfvrsIx22y16aLEVObo8/tY9scLSdu7i aNyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bXs6vLnL; 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 f21si5545549qtp.18.2020.04.15.03.44.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:44:08 -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=bXs6vLnL; 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]:47656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfWa-0005c9-BT for patch@linaro.org; Wed, 15 Apr 2020 06:44:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45472) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUp-00029R-K9 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUo-00037T-Fl for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:19 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:51866) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUo-00037D-9m for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:18 -0400 Received: by mail-wm1-x336.google.com with SMTP id x4so16843604wmj.1 for ; Wed, 15 Apr 2020 03:42:18 -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=R1iGbNrPxs7Q1flfCK5WZAyghUVesN3d6e9WvcQ4hxE=; b=bXs6vLnL1mmwCoZunbo4QOPJgBB3Nr1b5K1QpKfcOt80TgynDurUml9i13rYBUdXjj RASNv6rnVvK8gfMGDvxwRjvqRcsbrJbiiCYKWxnW6AaE++dtX/thhAN/lKblFkhQirUd 4VAr331f1TmVHcOhFeu87JdpbTeJxGLVcjWgjQUI+Olr4LLbeylbwm+lZefPk8hNfs8o 58uZFDax1ppAvQXI7htmHuGH1BOg+4RIyv2BB9uDvk9L8hSQJSYW6CnPia+ZhEU4fzBi vK4Aby+fer7RBNuTaSLQYKXLppuMBVH+eN0v0dWDP7XK/pMCnCKtER1ZBWfryudDleh6 NPhQ== 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=R1iGbNrPxs7Q1flfCK5WZAyghUVesN3d6e9WvcQ4hxE=; b=IBZSOS3dDCNhIzvu0VfEVpjoEEkjiho7HOVWoHjMqbtIecVR0WkPfyrlkcQ9i4Xhnw 6KG+AJ+Pf1kVnQlhTjSdTt81e8ejXM45YbON9SGO+7utnsKdz6x92WBIrS10ZmYZwjAY llBWR+cFcgFm+NlbiThzLEjNiz1FvTyv4lgOgabqYKoJucJbwNO3QIEnvE6OpsAbkrrH EOpRGfgd7IdccHGh5HuenFPkmVS2e3lfSGte5iXPKe9pIiMvJlc8G6CmnNhAeIn307+U dABlWGpgDXD7FWcY8oe8ALdd7RVtS4092yYtYyLC7rslJVbQCRLco5D3CihqAdJCe9kZ Bhfg== X-Gm-Message-State: AGi0PuaGExaLSE3344w90ePm/xOIqQZKrpWObWou03YNJVmPuwDYkdAV YD8RGhXwE+urY5iXLEJHfFUdJw== X-Received: by 2002:a1c:6503:: with SMTP id z3mr4759100wmb.92.1586947337330; Wed, 15 Apr 2020 03:42:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e15sm22831332wrt.16.2020.04.15.03.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 416D21FF8F; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/8] configure: disable PIE for Windows builds Date: Wed, 15 Apr 2020 11:42:06 +0100 Message-Id: <20200415104211.9388-4-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::336 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: Bug 1871798 <1871798@bugs.launchpad.net>, Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , James Le Cuirot , Howard Spoelstra , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It seems on some compilers the test can pass but still give you broken binaries. Fixes: d2cd29e30736 Fixes: https://bugs.launchpad.net/qemu/+bug/1871798 Cc: Bug 1871798 <1871798@bugs.launchpad.net> Signed-off-by: Alex Bennée Tested-by: Howard Spoelstra Tested-by: James Le Cuirot Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200414200631.12799-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 25f7d915720..23b5e93752b 100755 --- a/configure +++ b/configure @@ -807,6 +807,7 @@ MINGW32*) audio_drv_list="" fi supported_os="yes" + pie="no" ;; GNU/kFreeBSD) bsd="yes" From patchwork Wed Apr 15 10:42:07 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: 185476 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp296485ecu; Wed, 15 Apr 2020 03:46:11 -0700 (PDT) X-Google-Smtp-Source: APiQypIiCTJnRFmOfOTVvDOGpWQEceAf6ntDNjABU+lUkXR6iqLEQSSmPPZeZs6UqEk1aK0uNTMU X-Received: by 2002:a37:5907:: with SMTP id n7mr25915994qkb.227.1586947570968; Wed, 15 Apr 2020 03:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947570; cv=none; d=google.com; s=arc-20160816; b=FOUdPdUu4IcYL+LBD8uHgTPguF3Q882irL3wtmwj9HFX6qTDrYZNP027Chj1htuFi8 VKUf8Rh9jooH5tOEUSC02W5sQhz48Lk5RVlljXJT+m1H4RR427mJ1jkHmrdU9yHcrNWN fpcwPp98DMvl2mREwzXMtyCCXK2Dsk3PKqrgvcvFbGmlYYB9ZkUmAOfrsy4X0SoFcdFu TVa/n8d+Q6Lu7l5tngWKBUZsP+pTJZS+bHPQo444O0uLfcIZhPfe/g4wHapAHxI+PrFW jZG3FaewAeQw/72ZDgl3VT2GjzziiL9QapAOAFKH3DJu9cyfIiUZOD6Zxb4u6ZC9jqSm 2iLA== 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=xbro/RkD78CkyyXw+NBefFNc/SpIU1l0Ej5jYONi0ms=; b=WMbDUXrHBZU7egumUjKAFZpP1zWP4wx/fdgcLbTPeo/G4zSs/MzUIzymRXlS4eLf8F lToN903rW47M2qcU5lfsASAX48WEgX/dMeHmNpoeG6+aHYyiUNsG8YTlSdPeZLzK+frw JzaWb0rmtEWbM4v6qVYSJPXunkZM649oeOBAdI0DUeQsEXvNfcz4qY9ImBnZc4KtUFFd Qae1R11ysX2EwfEwOGXdtW/wFP4CZIToLU/YkFD8xjJw5CMPAKqK4tBkN3CoY8g2ujRU hiC4HfKwJGf3/xARR80GbLTG0PhH2q013yAc3781gPaQyfvaCLTyskdos/2vb1yqx28i oWYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z8oriZLa; 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 i13si8174154qtj.137.2020.04.15.03.46.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:46:10 -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=Z8oriZLa; 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]:47734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfYY-0000pQ-Bi for patch@linaro.org; Wed, 15 Apr 2020 06:46:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUr-0002Db-DU for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUq-00038D-9f for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:21 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39953) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUq-00037t-2u for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:20 -0400 Received: by mail-wm1-x343.google.com with SMTP id a81so18368554wmf.5 for ; Wed, 15 Apr 2020 03:42:20 -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=xbro/RkD78CkyyXw+NBefFNc/SpIU1l0Ej5jYONi0ms=; b=Z8oriZLafPy1iDQxG3Fe9GeQv78TtU963w4AhWk6iHSTB9iK7i334CwDJSsL1HAIZ8 R5SsYqQ/Yzgs18TP1rGfzSybzphIRIAdttoj5M0IfYn5oHPa57+nGy8HIb0pRx1AmPkM 9+QuJOOgtJ8u8oERT4F/ss6WcSm/Y2RLafTr8S0XqePZc0WWk5wjK/7a9jXb3ylRPtC4 hUfWtWoxizcsdQDfZRBI1pjN/tU7uRgdY72hly0j76/Cu2glTi8EQRPnwP59PLIVOnLp K9SJB0aA7gUTcMQd7X/Nc6zzQJMWx26kuOSb730B6w+R1MR9gBG/vNVa7nkSFPYVsTgB QJmA== 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=xbro/RkD78CkyyXw+NBefFNc/SpIU1l0Ej5jYONi0ms=; b=A9ICF1nPbhAvSyXZa3zlrgXd27qFu+oOTyCQ4c4hDjQ09Np9z1fkASiNOL34MhRYJU sxfgfmpzfyO/VB6WtuvVC/D/gnzLA5ETBa3o5z6tSouaa1+Qk9I7z2Z6FluC7qBqM+WH JtkN15Gi4zsRVPbVLrP0nhl4Se+e5evrNA6cFp0I/7EfpyiykvjSPLQsCOYToRIs8Glo vdNgK4GPw8NffPqKwf/sOTGCn72HJL0/xh6QGOHMt7t5pJ+BkL/mVpl+3TEMSy2mbIMj JWlvJWwsbI/Koyjet1mOnwUXFmjH2RuF5VffWUth6KZTnIsVoN48jDKToh+S7VZ27UXe Zh9A== X-Gm-Message-State: AGi0PuaTKddSmC3qxyr7T6tOeQdyd+xCamGoH7iuxiyuACzB3BKHlPWx I4JAHQTug2UCtRhK3rHTbpoAfw== X-Received: by 2002:a7b:c755:: with SMTP id w21mr4465467wmk.120.1586947339104; Wed, 15 Apr 2020 03:42:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r27sm3810254wra.83.2020.04.15.03.42.12 (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 5689F1FF90; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/8] linux-user: fix /proc/self/stat handling Date: Wed, 15 Apr 2020 11:42:07 +0100 Message-Id: <20200415104211.9388-5-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::343 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Riku Voipio , Richard Henderson , qemu-devel@nongnu.org, Laurent Vivier , Brice Goglin , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In the original bug report long files names in Guix caused /proc/self/stat be truncated without the trailing ") " as specified in proc manpage which says: (2) comm %s The filename of the executable, in parentheses. This is visible whether or not the executable is swapped out. In the kernel this is currently done by do_task_stat calling proc_task_name() which uses a structure limited by TASK_COMM_LEN (16). Additionally it should only be reporting the executable name rather than the full path. Fix both these failings while cleaning up the code to use GString to build up the reported values. As the whole function is cleaned up also adjust the white space to the current coding style. Message-ID: Reported-by: Brice Goglin Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200414200631.12799-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6495ddc4cda..674f70e70a5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7295,34 +7295,29 @@ static int open_self_stat(void *cpu_env, int fd) { CPUState *cpu = env_cpu((CPUArchState *)cpu_env); TaskState *ts = cpu->opaque; - abi_ulong start_stack = ts->info->start_stack; + g_autoptr(GString) buf = g_string_new(NULL); int i; for (i = 0; i < 44; i++) { - char buf[128]; - int len; - uint64_t val = 0; - - if (i == 0) { - /* pid */ - val = getpid(); - snprintf(buf, sizeof(buf), "%"PRId64 " ", val); - } else if (i == 1) { - /* app name */ - snprintf(buf, sizeof(buf), "(%s) ", ts->bprm->argv[0]); - } else if (i == 27) { - /* stack bottom */ - val = start_stack; - snprintf(buf, sizeof(buf), "%"PRId64 " ", val); - } else { - /* for the rest, there is MasterCard */ - snprintf(buf, sizeof(buf), "0%c", i == 43 ? '\n' : ' '); - } + if (i == 0) { + /* pid */ + g_string_printf(buf, FMT_pid " ", getpid()); + } else if (i == 1) { + /* app name */ + gchar *bin = g_strrstr(ts->bprm->argv[0], "/"); + bin = bin ? bin + 1 : ts->bprm->argv[0]; + g_string_printf(buf, "(%.15s) ", bin); + } else if (i == 27) { + /* stack bottom */ + g_string_printf(buf, TARGET_ABI_FMT_ld " ", ts->info->start_stack); + } else { + /* for the rest, there is MasterCard */ + g_string_printf(buf, "0%c", i == 43 ? '\n' : ' '); + } - len = strlen(buf); - if (write(fd, buf, len) != len) { - return -1; - } + if (write(fd, buf->str, buf->len) != buf->len) { + return -1; + } } return 0; From patchwork Wed Apr 15 10:42:08 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: 185473 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295718ecu; Wed, 15 Apr 2020 03:44:33 -0700 (PDT) X-Google-Smtp-Source: APiQypI1KZCsbk24LWJaWDlu+Kl+SjFHJ4yCtlQdOUIAjHoB4fdhS+zC5Sx8yJ8q+Q7y5DzSvOoU X-Received: by 2002:a37:a9c7:: with SMTP id s190mr4538915qke.75.1586947473356; Wed, 15 Apr 2020 03:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947473; cv=none; d=google.com; s=arc-20160816; b=EuAHe9J0HiUyRK6uWiFybhLXJ8tV9o5tazUXLMf8lZ64Rdp/XDbyxJG2IU+TbnQwr5 mLUXHWBAKNld20W+tb0Wbv1AZanDPi5VAQPZz28FVgAPU01Zyn8IJRZKmMy+v2zzhGPx dMRs6q2YbeLM/EvgPU9F2zPYBHvdhsydds4VL+T4K8nswsdUGxqWmLExi96uubJ02bDy xz0nvQkgBFHiiNNmY2CHKu+rgxwSDCcebmNvuEdVqvvOVCZWDu4HR9i7QzmUJkz43dvp zYKSPrAUXXR1ljvsP40D6aPZ9kUljjF+X7pEmsUrcCdLRfIfsPYXb+a0YDBQxfV/m8yN xrOw== 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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=v7OeCobLSwkgDDUASaAN6uqUfWoEHQtK3zEQJfGd8rpRcXjVFfjmQ2A82mp69hGpve O7OzXs2YpCQvedstdyZqUq/lZh0xOaKo4htjDzeNuQ/TDWdMxcjWAWqxmjVnSkR1HC3N wlmE9lTP8Ut4227FhcksGmSjYiNiVhDny1fNx15tzwkiKGoNoqEuW+KIiOYSs336bSGC YS45CX0TI+gpl1kWx0DWzjAiAGjRFHDButUi2cA680lZ3PlvRBb3jgJLLNczXQyT3fj+ EX8loMjc+sbv7aJlBlTmD/zfF8A3YmeE6SdfBjuDIZoLDOtLbkPjDfpCjT3+8UPHf/xs OZEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kVn17K3R; 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 c10si8945504qtp.248.2020.04.15.03.44.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:44:33 -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=kVn17K3R; 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]:47662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfWy-0005im-R6 for patch@linaro.org; Wed, 15 Apr 2020 06:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUw-0002Pw-CT for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUr-00038m-Mb for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:26 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53113) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUr-00038K-Gm for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:21 -0400 Received: by mail-wm1-x32a.google.com with SMTP id o81so11243878wmo.2 for ; Wed, 15 Apr 2020 03:42:21 -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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=kVn17K3RRpWAUiMVy8jLloOQ73Uzb/t3cz8e3frYLgH5nHxI5YVgqZnJ1FhIh+h5LS OYOgUdoj/egm1rChyWkXP9tunqhrEpma9q4NPthI+C20c9DMuOfbyTpXw5SiDY4qmBI/ nzuPgQMjEOQ65MpT/8E2Pe3Z79axe423n3nLM0YXt2sjX4d50EZblNkCC+BGHI0Uil9a 75k84yJfySKba0BZSvL4DXc5YIBHC4hwn/k61+qU2+gcX9B9SMiBp+x4aQdifhOWk8Fm tjyJLtkNtop8mHXLXKWqhFjGOA53CVg7gcrk9PHhGTwEhBK6t2YZect2qFupHkJky3A7 Z+sg== 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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=kjabjz9PhEbc/HwMN4b2QPCIlaT1U4F8zPSDGrbOlkJJjkQoU1JIeNuP3++2H8uySx aXC2QDSf8ix0yPXQV7rjj5wVECgj6JhEVQwhn6U7PDCuRRwh7CQtA840EWBYvyKjwwdp 9Qdqz+joedppXdVTlVTrwFIRF9e2AdVx6ctXaeBbJEWbKvVRrePJrMsIDmQVyeO0iot1 mSQrjKcDhRsTGHXQ/j7ECRISi6cWBON+TXPDi68PXdv5akQjm7oCtenOHP/3ACws/zaE JjW67+fzFbWnyNNDsy/JrLXWasNPNM8KgDgyrI+2GCr3St2G4UzXtTjcM+lnubFolgJ9 IjnA== X-Gm-Message-State: AGi0PuZjA//74iwTRABHDHhYHBanKsuv+EGdemsjzJoZ/zlH6VAqzmKJ 6WqOZrNMAqxab+LIFSZBHQfjPg== X-Received: by 2002:a1c:4409:: with SMTP id r9mr4712601wma.165.1586947340337; Wed, 15 Apr 2020 03:42:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w17sm14375640wru.20.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 6C2B91FF91; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/8] target/m68k/helper: Fix m68k_fpu_gdb_get_reg() use of GByteArray Date: Wed, 15 Apr 2020 11:42:08 +0100 Message-Id: <20200415104211.9388-6-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::32a 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Peter Xu , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since a010bdbe719 the gdbstub API takes a GByteArray*. Unfortunately we forgot to update the gdb_get_reg*() calls. Do it now. Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Reported-by: Peter Xu Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200409172509.4078-1-philmd@redhat.com> Message-Id: <20200414200631.12799-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 014657c6372..cad40838956 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -109,8 +109,8 @@ static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n) { if (n < 8) { int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper); - len += gdb_get_reg16(mem_buf + len, 0); - len += gdb_get_reg64(mem_buf + len, env->fregs[n].l.lower); + len += gdb_get_reg16(mem_buf, 0); + len += gdb_get_reg64(mem_buf, env->fregs[n].l.lower); return len; } switch (n) { 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; From patchwork Wed Apr 15 10:42:10 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: 185472 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295699ecu; Wed, 15 Apr 2020 03:44:31 -0700 (PDT) X-Google-Smtp-Source: APiQypIqukQb18orFYS4mlT/9Czd6MMB+3Fyc57iVbEmyG31kojoCHewCtTxNCs6CZtfzZn1H0Zh X-Received: by 2002:a05:620a:1405:: with SMTP id d5mr18298354qkj.329.1586947471638; Wed, 15 Apr 2020 03:44:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947471; cv=none; d=google.com; s=arc-20160816; b=D/3yCQDPzZknGy/Af/HRae6IXdSKXMTmt4vfArcnivvnJxnD/M8H6NKDW25aoW52We rEWK3FwJ8Tp81fecJYyGq8QhTbWZ/zu2KDKTMbDLuJfOrwslnWl0+3sf3JQ/2ER4nSWY 9QqM4lcgTGlQhA454KXq4vmsoLq8UL8kuSKPAWxvxzBcRwpo1CN5RSrY0gQ0DZzOzJ+6 njHv7EsksGPQMn8Hl12/X1rbrV/iemgwd6LNzqVGZJZsFZg/JL2qFoQkh1QQpHAM2X6K oMna1GYRIq9n/BODsOnK6ZTM7vNAuqZsP46rRUaBtHy21HwHx12RbMCtVNJcgKfnrib1 RTMg== 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=9MYeJGiJJI7VipH3/taczzrj1+vWUn9zJs0HrOL++KI=; b=eLQKxwa68jA9UfeixysgMY936gvFtTVhkE1Cwbfd2W33ZMzMSx7ZnO+fgqrby1rfrk /tBJ3Ep09lhiamphcenaYI+D5PDXp7C4WmPUQ+cRGLJziiSR5dYk8cNwNVjeR9Lr9vb1 PHzo6mpU8+KyeVRF8BSgejfaFg6z1BYhFPD+MahjlYVmbxJunK7S1hIxuqLhr0evy0fc CFi7l7fBVA21irdjJ49dpKoG9QEI+t3/kQygzAUlH+8PhEoOa0J9i4Q/CO4H4Bjv9koe ijdsTVTnjt+VS7ctp0s1CHkIKEdsJvHZ84Fy8wM8j21isi8G1TPCSDrPiqNW9caC6l3b HosQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RiHc3Z+h; 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 o23si8790912qtk.198.2020.04.15.03.44.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:44:31 -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=RiHc3Z+h; 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]:47653 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfWx-0005bO-1q for patch@linaro.org; Wed, 15 Apr 2020 06:44:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUu-0002Kl-Kv for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUt-00039p-Ey for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:24 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:41091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUt-00039H-7e for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:23 -0400 Received: by mail-wr1-x431.google.com with SMTP id h9so18524817wrc.8 for ; Wed, 15 Apr 2020 03:42:23 -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=9MYeJGiJJI7VipH3/taczzrj1+vWUn9zJs0HrOL++KI=; b=RiHc3Z+hAcJcVjMXi3NwvA/tc7bnOXOaVUuy4RPPZjf6HsuqnovP8vK8zkBy7FBAD6 wd2MeCJCwr+F6Nag4CBn7Kf71psqjleGmLw5nkMN92GIVtljDao0qrerdY2Jzh2urO2v PQbS54ADfdypqGNKFET7goACvzOp9RrRZJkEqyNbO782ajIbCbKy+BVBXlLXMAK91ZJo tTchIrC1katcaBpwfNlIM5yN7+jne4tQolQvQ0NeQmiY512rxiDreTOM/aVuEDP5zMbl 4uL0BGMD5X2Mi8gFdSZeNytEltx7EAnWcD4qobPiaUXJR+WGWsk4lntOEZLfP5i6J3Du xfSA== 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=9MYeJGiJJI7VipH3/taczzrj1+vWUn9zJs0HrOL++KI=; b=RKPsI31CgdR6rhaGxFORjZZHcNzbt8QzfsLnlGfLbYEG4P7wBuDQXFdQU/qVXxVK4E 4/5mied3E/92cpBs7iG4DN937Tpuhj/97qtKuWo2vGlhBNPS9/9/MFOoY8IMl0g+vmUh cuYy19wErI/Iihw6qPf+e06f4oX7xuThXYgqY8AAlxdCm4UmzN+iHIGpdreQdwlun1dI GppecgTyr+25i0V6OQikgiKgn/52B1DQY3EJdnnXT0oyuYE1wGbAD6MKvfEbCcDzofug 49/fEsvJmW6vDs+z4VpGXnvZYWjcEFBS6NX4k7g0EiSZgCkKLLnemzDwKR/FJW892NjU IAlQ== X-Gm-Message-State: AGi0PuakaT9RQGOJh/7a6RR5IlF7j8s76E5RiB/i0gLtPSNBLp/E/AOO XvtAg9TrYLtXWtMK+R++wFd2wQ== X-Received: by 2002:adf:bc05:: with SMTP id s5mr28076971wrg.70.1586947342237; Wed, 15 Apr 2020 03:42:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k8sm20848913wrm.52.2020.04.15.03.42.15 (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 9B38D1FF93; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/8] gdbstub: Do not use memset() on GByteArray Date: Wed, 15 Apr 2020 11:42:10 +0100 Message-Id: <20200415104211.9388-8-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::431 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: =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:ARM TCG CPUs" , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Max Filippov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Introduce gdb_get_zeroes() to fill a GByteArray with zeroes. Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200414102427.7459-1-philmd@redhat.com> [AJB: used slightly more gliby set_size approach] Signed-off-by: Alex Bennée Message-Id: <20200414200631.12799-13-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 30b909ebd27..3c452fc50c0 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -125,6 +125,15 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi, return 16; } +static inline int gdb_get_zeroes(GByteArray *array, size_t len) +{ + guint oldlen = array->len; + g_byte_array_set_size(array, oldlen + len); + memset(array->data + oldlen, 0, len); + + return len; +} + /** * gdb_get_reg_ptr: get pointer to start of last element * @len: length of element diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 8efc535f2a0..063551df234 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -47,8 +47,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) if (gdb_has_xml) { return 0; } - memset(mem_buf, 0, 12); - return 12; + return gdb_get_zeroes(mem_buf, 12); } switch (n) { case 24: diff --git a/target/xtensa/gdbstub.c b/target/xtensa/gdbstub.c index 0ee3feabe54..4d43f1340ae 100644 --- a/target/xtensa/gdbstub.c +++ b/target/xtensa/gdbstub.c @@ -105,8 +105,7 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) default: qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported size %d\n", __func__, n, reg->size); - memset(mem_buf, 0, reg->size); - return reg->size; + return gdb_get_zeroes(mem_buf, reg->size); } case xtRegisterTypeWindow: /*a*/ @@ -115,8 +114,7 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) default: qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported type %d\n", __func__, n, reg->type); - memset(mem_buf, 0, reg->size); - return reg->size; + return gdb_get_zeroes(mem_buf, reg->size); } } From patchwork Wed Apr 15 10:42:11 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: 185475 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp296341ecu; Wed, 15 Apr 2020 03:45:55 -0700 (PDT) X-Google-Smtp-Source: APiQypL7I/9O+oioT5QB65aDXs8F9dxavoBGEiudxMI6EN6T8f0KX0IX0WNsC18sI8v1xJll76cg X-Received: by 2002:ae9:f44a:: with SMTP id z10mr26219986qkl.353.1586947555064; Wed, 15 Apr 2020 03:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947555; cv=none; d=google.com; s=arc-20160816; b=BLZkAS4waXmBrs9w6/7FfAUcPmqvJGnob59GKSW4YakbMm/J+/SITcL54OL8wMQIMv qaZNnt9w9I1Bb/KpmxYNWLJj0GIRktp0FJPtS1JgiN86mVCWGy9oZ41wP6uZyjqjzazp DAa/+FBKmyOBev8g3hpng39YMyMx5IKTr96HAeeOsYFam9WrHsAaemYPCUuFNm70/wA5 x/fUpnnj5dWdxpicplqL2VxwSQMfhB7/VU/Jr2WP/YayPXtw10CYCIrCtKSZq6FvqZ07 QYL46swo/5wme/CcRhSJEAK2Eoj/pO53VZcIx2/LTOlYcLJtKptdRFl3C1XdAXt0Fht9 VIGg== 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=GnU4V1ssA1vvrZAqgpc7l1Tr/eH57b7BySlJY/PvGWg=; b=qoBWEvjfAKMZsmEMCNiM/jGD2DTe/Pi6eGwETVKYxrFxe6c90TqpiVuGHfdc1Uaj+J h2RvPUjDgxZenfJN2Ty+3y2XM7LOUUVaNHWoye2pobEsa876qwjVzLIagLPasON2abaO Arkg6B0fqofM2PpUNVFMtzWNkRlYCxBMxldl8k4ZF9dQOj78luLSpn73B9za4LEyk5nE o8EgGWixvx6wA1r1uR90lj1Si5f+AHJ9mOPoR7ZoqkPZu/pD8ih9SNfezoAf7bKGFDyq UH/QyNofdPLgjb7E/mk6IQ4GGDrLHJ28GNWe9+So50yrn1dgBE97nsqNMIQ+0m3WtmGI GDtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pOxIZEg9; 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 u10si2189237qvm.202.2020.04.15.03.45.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:45:55 -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=pOxIZEg9; 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]:47744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfYI-0001Cy-FL for patch@linaro.org; Wed, 15 Apr 2020 06:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUv-0002O9-Pl for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUu-0003Ai-Gz for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:25 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUu-0003A4-AO for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:24 -0400 Received: by mail-wr1-x42c.google.com with SMTP id i10so18515803wrv.10 for ; Wed, 15 Apr 2020 03:42:24 -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=GnU4V1ssA1vvrZAqgpc7l1Tr/eH57b7BySlJY/PvGWg=; b=pOxIZEg9XzXXexDMvObLCzOlHhXv+fua1xazJDYfVWTIFR3twymeWGfi5rc6T/sGNu lE0c5mgI4HAGfpxJnE3bcsIuv+w+n91LNqPY1dijXi86esrtYRqkyOxfR4WSPlPBywke 8ycQR7iZAaFHfnxri+IUqy+D4/u4tSw/Nz4hUiNxLRENEp63jNAFQOaY65OicB+jcswi xCp/6GZsCq/PHRbWrdifaJqIlLyHfgGu8NRigS5QLDY0l+XwMBsZBKve8LkDvm3jckt1 Eq2a6iaip5q4ue5sajKeUz5eecIaBszg+14YqYlDkc5yVAc47KJbvf7NsyxD+ZL/o7nb +fUw== 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=GnU4V1ssA1vvrZAqgpc7l1Tr/eH57b7BySlJY/PvGWg=; b=Qc5EnylTagAKyy4c5Q/1uEdtQWaz84+NLR6N5BaG6QxpSSMtSSzDD3zpsBh11mQUQd 9KUOCOq/Bz1yK/gHB2HmkF/4PEcShoZ9J1kWNhlVgjF57XJKFTvLK/FJG6AvvHLMMzq5 9ciMFU5cfuQo1DSwlbFzIzJneqaXCITl3cDQ5Bc0v1hXo+aAQqpAOPSTEr+sNRiKLgY5 TAWN/oDQNzyI+k2g1u8smibXxHoGx7rNMM0xUUK3L4Lme/4AHncOjWEZmePGPO3OC/Oz AseHKpCG2rP3lNUsLw1n1llZInhWNy+2fZwe5pbvJZQbKgribAhP/ontOe9ZCgzrwfgV HCow== X-Gm-Message-State: AGi0PuaHlWXMwMAHbMsCu3Kfrav4/0jynlhi7TEx+BX4eQUKxz4dCOcO JZ/1Wpc2IxXRKex2uFH367ytH1J43Tk= X-Received: by 2002:adf:dfc2:: with SMTP id q2mr16409449wrn.390.1586947343281; Wed, 15 Apr 2020 03:42:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h137sm17314440wme.0.2020.04.15.03.42.15 (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 B2FA71FF96; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/8] gdbstub: Introduce gdb_get_float32() to get 32-bit float registers Date: Wed, 15 Apr 2020 11:42:11 +0100 Message-Id: <20200415104211.9388-9-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::42c 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since we now use a GByteArray, we can not use stfl_p() directly. Introduce the gdb_get_float32() helper to load a float32 register. Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200414163853.12164-2-philmd@redhat.com> Message-Id: <20200414200631.12799-14-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 3c452fc50c0..20e10726929 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -125,6 +125,15 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi, return 16; } +static inline int gdb_get_float32(GByteArray *array, float32 val) +{ + uint8_t buf[sizeof(CPU_FloatU)]; + + stfl_p(buf, val); + g_byte_array_append(array, buf, sizeof(buf)); + + return sizeof(buf); +} static inline int gdb_get_zeroes(GByteArray *array, size_t len) { guint oldlen = array->len; diff --git a/target/sh4/gdbstub.c b/target/sh4/gdbstub.c index 49fc4a0cc69..34ad3ca0508 100644 --- a/target/sh4/gdbstub.c +++ b/target/sh4/gdbstub.c @@ -58,11 +58,9 @@ int superh_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) return gdb_get_regl(mem_buf, env->fpscr); case 25 ... 40: if (env->fpscr & FPSCR_FR) { - stfl_p(mem_buf, env->fregs[n - 9]); - } else { - stfl_p(mem_buf, env->fregs[n - 25]); + return gdb_get_float32(mem_buf, env->fregs[n - 9]); } - return 4; + return gdb_get_float32(mem_buf, env->fregs[n - 25]); case 41: return gdb_get_regl(mem_buf, env->ssr); case 42: