From patchwork Thu Aug 9 03:40:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 955312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="iYIPfgxf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41mDcR0qSXz9s1c for ; Thu, 9 Aug 2018 13:43:19 +1000 (AEST) Received: from localhost ([::1]:46391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnbr2-0008Bi-NM for incoming@patchwork.ozlabs.org; Wed, 08 Aug 2018 23:43:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnboh-0006nA-DH for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnbog-0003Ec-LP for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:51 -0400 Received: from mail-pl0-x22e.google.com ([2607:f8b0:400e:c01::22e]:33013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnbog-0003E6-G0 for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:50 -0400 Received: by mail-pl0-x22e.google.com with SMTP id b90-v6so1948879plb.0 for ; Wed, 08 Aug 2018 20:40:50 -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; bh=ibaa2x/FVJzOL9C446Qkj9eSHPvGG5P1FYKx2aZVL6Q=; b=iYIPfgxfAZYI7KyW+M4lgq7p9K937RHDugS4+lRMThwtEFC6Of1yYzxhVG71QQHH/a uMh0xs5Gn562fGY8kBZrV2CAbKagOGfhOAjQKy2PW5W7oEQOooS6D9RVYFVaPvVrNm0b 10nUwqi+Gdh1VU9q1Ei78SFWMUAND+nG3FDa0= 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; bh=ibaa2x/FVJzOL9C446Qkj9eSHPvGG5P1FYKx2aZVL6Q=; b=nNg/WvJPjtnpCcSwZj1GLpZJ8kRitZzR44VP08l0ECDt8QpxvkiX6p5nyMtqjtLPUa TKafKje3QOch5EOd5cDJvGKi8BZ6t0MvUfIc92AqLSLSI/rz+6qWFmbY0r6YUATNSAV2 l1IwN6vBFvjXx3Hkdkso2sF588pMCcghX7epSLTQ03OonTJ9+8csIIHUcsTG6Tp9mgxH YPIZ/8XjqvUjapDbmEhzXNRTFHowVZQs6unZ/GY/mZgXtaBFm4bhw9D7rri197vYsGku UL9pZ/KiENQKd8QUz10rNegqJuOaiVhw9iODH26lOmF1sRTHnn6ogh+5nJOny/YGv4v6 ZSAg== X-Gm-Message-State: AOUpUlFpTo5BL5ODLwYJgvv37tQkd9G1jCvjciOo8dSAxZkfbzfy90BD pa1yPXUD5LtmTz10emGq4xD+/wp6omw= X-Google-Smtp-Source: AA+uWPzUsGXKLkJSW34N+rGeiP+1nYn9MCPBH4F9JutkQxyBV5LTnidSx//xykeKzvYHTjXPraMbRA== X-Received: by 2002:a17:902:1121:: with SMTP id d30-v6mr401007pla.247.1533786049218; Wed, 08 Aug 2018 20:40:49 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id q78-v6sm9674103pfi.185.2018.08.08.20.40.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 20:40:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 20:40:31 -0700 Message-Id: <20180809034033.10579-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809034033.10579-1-richard.henderson@linaro.org> References: <20180809034033.10579-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22e Subject: [Qemu-devel] [PATCH 09/11] target/arm: Reformat integer register dump X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent.desnogues@gmail.com, peter.maydell@linaro.org, alex.bennee@linaro.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" With PC, there are 33 registers. Three per line lines up nicely without overflowing 80 columns. Cc: qemu-stable@nongnu.org (3.0.1) Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Alex Bennée --- target/arm/translate-a64.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 45a6c2a3aa..358f169c75 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -137,14 +137,13 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int el = arm_current_el(env); const char *ns_status; - cpu_fprintf(f, "PC=%016"PRIx64" SP=%016"PRIx64"\n", - env->pc, env->xregs[31]); - for (i = 0; i < 31; i++) { - cpu_fprintf(f, "X%02d=%016"PRIx64, i, env->xregs[i]); - if ((i % 4) == 3) { - cpu_fprintf(f, "\n"); + cpu_fprintf(f, " PC=%016" PRIx64 " ", env->pc); + for (i = 0; i < 32; i++) { + if (i == 31) { + cpu_fprintf(f, " SP=%016" PRIx64 "\n", env->xregs[i]); } else { - cpu_fprintf(f, " "); + cpu_fprintf(f, "X%02d=%016" PRIx64 "%s", i, env->xregs[i], + (i + 2) % 3 ? " " : "\n"); } }