From patchwork Sat Apr 27 00:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 162982 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1368079jan; Fri, 26 Apr 2019 17:54:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpXQQ+frwTsaCg2Pxy3UmTAIpv091d9+ma9qQ2uuTf/vVg+EjQdzk8lX1Ju9zbBRg5a5a0 X-Received: by 2002:adf:dccd:: with SMTP id x13mr34257107wrm.326.1556326491611; Fri, 26 Apr 2019 17:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556326491; cv=none; d=google.com; s=arc-20160816; b=aZ1PrLQ5Hn6PCjU4ledg0Z+enYtU9YBF7UmvGULNHh+kXFJ8hY9OtFGGSrTrndHerR aUzu1r5F/5bVJHPsgwK5skl2USctv//B2WdlaUilQLtPzS2KnoVLLyya2XODHblpt/PL uyGgqTYo9g1U1iAICd0ek0hiXw/dTVvEmX3Hc+sUgWzzRAMUHfqcKYLXlzCsrJBF00my 6v3+B6ZPUvcOM6No5hyh6XcrDN7JoskQZc3EpGL58MWGCRSX9dDK2S2I4JOIsN+CPBXV fsF66bkPxAD/iFZxsXyV8m4ri8YkjlCOYJyejEq6nrQ/NNl2IQqUXM7F9hJiLtW922Wg qzBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=yR3SBCBXYUmKX63niTZceDYrt1W/+HQOJtz/bKyhTGI=; b=WefqOs0qxwhzmwHd8kX0i7doMKbSCGgi5Wft96ezA1F8846E5DoNUFJHGfPIV9FOq8 TuevituR3+fCZXdVKSdi58Tiw2fZpn0uRnfj8zDl+idoCWPIjihmJIAUoF3Zj/HkZBwH l4LRP5KPMhxwwQ/kHrT4XIb149n4fhSw1pUzM104fps3segUVwAeBYM68mdqUOZ5CBv1 WEihNSxTftD/yl6AgeiqazchcdnHNdrhfwZ9ftp/LTlkDbgAqog1F/T2aqeLPyybXe5V Ovk+aNHg4EbcmmBW975dGZ+OK0PhBYpzNtrScqw3dvPnd05g972CgvuZVK4olxVdBFkZ HPtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LXz5eCQt; 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 a198si16703438wma.0.2019.04.26.17.54.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 26 Apr 2019 17:54:51 -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=LXz5eCQt; 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 ([127.0.0.1]:53838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKBcA-0007HW-KZ for patch@linaro.org; Fri, 26 Apr 2019 20:54:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKBZs-0005He-1T for qemu-devel@nongnu.org; Fri, 26 Apr 2019 20:52:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKBYv-0000zx-9C for qemu-devel@nongnu.org; Fri, 26 Apr 2019 20:51:30 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:33929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKBYv-0000zY-2X for qemu-devel@nongnu.org; Fri, 26 Apr 2019 20:51:29 -0400 Received: by mail-pf1-x441.google.com with SMTP id b3so2494108pfd.1 for ; Fri, 26 Apr 2019 17:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=yR3SBCBXYUmKX63niTZceDYrt1W/+HQOJtz/bKyhTGI=; b=LXz5eCQtDQIJUGDa1TZ4LI5N5lpwRVeXEwyAdwmnaWnx8+JEaexsoQQtlDJPZRErp7 ZQyYYvBVwdE4TUjOMkufgS80A/pju5hY908Oy9agv9M44KPODu9GgWJN6gHtqPyhI5O0 VTOt13063mLlb5k46KYGQ4iBP+Yb10rfsev+jwhK2aEhWb9emYBx36qOvZk8Hw5KZRlm 31Ze6W8YJHxe4ZoJUopbnBCiElHSEQ9rGRP9JzX4dwPwMUtxTSz/HPDHGii3gtw/VkOp M3uvM1+5L783RjmpUan+I6LuRs9xDh1+Rka8onEFxEyfNZPKyi/rLvGOIEoF8JMxj57J IFpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yR3SBCBXYUmKX63niTZceDYrt1W/+HQOJtz/bKyhTGI=; b=bng0EB9nMxLDgAMzo/EeisNkmNqjSmsa4AJbLXRssdhL1ys+ecfq5ZiPJWGpxOq69n MBe4A+Kzdqao6CWZ7N6QP8L2wys/eoIxAc2Wq3bo215HsDRb548/WMzKD1UmYPsfEs0i 9gmvXbCC21gNQQ31k/BDt4ZNYVKRJGW+eGcf1nBODS/3KY+WgclBOh0cBEQh0b22xmbQ f5QZ1Rh0fg7hCGiGeRy3BO5AtIcFxnVKTKq6zDl5jKLGPLvCvK9sZzzvswH6qj3PH3o5 X4agTriP1E+Ui9yRq0MXx1Cz2AB8swTJAYT6H0M1EswH+EGH5m65fa6vQDp1qaBgL5aK lJXQ== X-Gm-Message-State: APjAAAVciusX5c92zjoSkbHyCyOM6u/2LcAQ4wCPpsRr5rJGPHsz4VdS b+pHuX3jPruJqeYabirQ+cSFow6LmXI= X-Received: by 2002:aa7:938b:: with SMTP id t11mr50145807pfe.67.1556326287334; Fri, 26 Apr 2019 17:51:27 -0700 (PDT) Received: from localhost.localdomain (97-113-179-147.tukw.qwest.net. [97.113.179.147]) by smtp.gmail.com with ESMTPSA id b20sm5301745pff.118.2019.04.26.17.51.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 17:51:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2019 17:51:23 -0700 Message-Id: <20190427005124.12756-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190427005124.12756-1-richard.henderson@linaro.org> References: <20190427005124.12756-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH 1/2] target/alpha: Clean up alpha_cpu_dump_state 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Drop the "RI" and "FIR" prefixes; use only the normal linux names. Add the FPCR to the dump. Signed-off-by: Richard Henderson --- target/alpha/helper.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 7201576aae..31de9593b6 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -429,32 +429,33 @@ bool alpha_cpu_exec_interrupt(CPUState *cs, int interrupt_request) void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) { - static const char *linux_reg_names[] = { - "v0 ", "t0 ", "t1 ", "t2 ", "t3 ", "t4 ", "t5 ", "t6 ", - "t7 ", "s0 ", "s1 ", "s2 ", "s3 ", "s4 ", "s5 ", "fp ", - "a0 ", "a1 ", "a2 ", "a3 ", "a4 ", "a5 ", "t8 ", "t9 ", - "t10", "t11", "ra ", "t12", "at ", "gp ", "sp ", "zero", + static const char linux_reg_names[31][4] = { + "v0", "t0", "t1", "t2", "t3", "t4", "t5", "t6", + "t7", "s0", "s1", "s2", "s3", "s4", "s5", "fp", + "a0", "a1", "a2", "a3", "a4", "a5", "t8", "t9", + "t10", "t11", "ra", "t12", "at", "gp", "sp" }; AlphaCPU *cpu = ALPHA_CPU(cs); CPUAlphaState *env = &cpu->env; int i; - qemu_fprintf(f, " PC " TARGET_FMT_lx " PS %02x\n", + qemu_fprintf(f, "PC " TARGET_FMT_lx " PS %02x\n", env->pc, extract32(env->flags, ENV_FLAG_PS_SHIFT, 8)); for (i = 0; i < 31; i++) { - qemu_fprintf(f, "IR%02d %s " TARGET_FMT_lx "%c", i, + qemu_fprintf(f, "%-8s" TARGET_FMT_lx "%c", linux_reg_names[i], cpu_alpha_load_gr(env, i), (i % 3) == 2 ? '\n' : ' '); } - qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", + qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", env->lock_addr, env->lock_value); if (flags & CPU_DUMP_FPU) { for (i = 0; i < 31; i++) { - qemu_fprintf(f, "FIR%02d %016" PRIx64 "%c", i, env->fir[i], + qemu_fprintf(f, "f%-7d%016" PRIx64 "%c", i, env->fir[i], (i % 3) == 2 ? '\n' : ' '); } + qemu_fprintf(f, "fpcr %016" PRIx64 "\n", cpu_alpha_load_fpcr(env)); } qemu_fprintf(f, "\n"); }