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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 50144C433F5 for ; Tue, 14 Sep 2021 15:08:47 +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 CBEE9610A6 for ; Tue, 14 Sep 2021 15:08:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CBEE9610A6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQA3C-0005Hw-0f for qemu-devel@archiver.kernel.org; Tue, 14 Sep 2021 11:08:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9Qh-0002kn-QB for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:28:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9QZ-0000GL-Qr for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:28:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631629731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qmRjzYwG+Lqfcps3G17xaNhRzRStWHGYP7XEVvjTzcM=; b=aD9lNuCXnA3NfKFIRR7jpQfJanT4MLYd52X5tmfN59NqekPvFJGrj3uBEj73nJlcm9S7VZ vbqi9y9jLQ/3pjveqLT0tHTYqUARl1HJCjg8pBHaaM81j6wCKYSNpAlXrqwsWYXsANt67z OcugroLO2b4DnGnAtJ+v5mX07IQQAG0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-yKE_4DFNPHKCIDnj822tIg-1; Tue, 14 Sep 2021 10:28:49 -0400 X-MC-Unique: yKE_4DFNPHKCIDnj822tIg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B2DFA0CCD; Tue, 14 Sep 2021 14:28:45 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AE295D9CA; Tue, 14 Sep 2021 14:27:57 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 22/53] target/rx: convert to use format_state instead of dump_state Date: Tue, 14 Sep 2021 15:20:11 +0100 Message-Id: <20210914142042.1655100-23-berrange@redhat.com> In-Reply-To: <20210914142042.1655100-1-berrange@redhat.com> References: <20210914142042.1655100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) DKIMWL_WL_HIGH=-0.398, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Chris Wulff , David Hildenbrand , Bin Meng , Mark Cave-Ayland , Yuval Shaia , Laurent Vivier , Max Filippov , Taylor Simpson , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Eric Blake , Marek Vasut , Yoshinori Sato , Markus Armbruster , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Michael Rolnik , Peter Xu , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Daniel P. Berrangé --- target/rx/cpu.c | 2 +- target/rx/cpu.h | 2 +- target/rx/translate.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 96cc96e514..f7f158cfa5 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -207,7 +207,7 @@ static void rx_cpu_class_init(ObjectClass *klass, void *data) cc->class_by_name = rx_cpu_class_by_name; cc->has_work = rx_cpu_has_work; - cc->dump_state = rx_cpu_dump_state; + cc->format_state = rx_cpu_format_state; cc->set_pc = rx_cpu_set_pc; #ifndef CONFIG_USER_ONLY diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 0b4b998c7b..97fc1b9ed6 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -126,7 +126,7 @@ typedef RXCPU ArchCPU; const char *rx_crname(uint8_t cr); void rx_cpu_do_interrupt(CPUState *cpu); bool rx_cpu_exec_interrupt(CPUState *cpu, int int_req); -void rx_cpu_dump_state(CPUState *cpu, FILE *f, int flags); +void rx_cpu_format_state(CPUState *cpu, GString *buf, int flags); int rx_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int rx_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); hwaddr rx_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); diff --git a/target/rx/translate.c b/target/rx/translate.c index a3cf720455..2d3bdabce4 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -125,7 +125,7 @@ static int bdsp_s(DisasContext *ctx, int d) /* Include the auto-generated decoder. */ #include "decode-insns.c.inc" -void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags) +void rx_cpu_format_state(CPUState *cs, GString *buf, int flags) { RXCPU *cpu = RX_CPU(cs); CPURXState *env = &cpu->env; @@ -133,12 +133,14 @@ void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags) uint32_t psw; psw = rx_cpu_pack_psw(env); - qemu_fprintf(f, "pc=0x%08x psw=0x%08x\n", - env->pc, psw); + g_string_append_printf(buf, "pc=0x%08x psw=0x%08x\n", + env->pc, psw); for (i = 0; i < 16; i += 4) { - qemu_fprintf(f, "r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n", - i, env->regs[i], i + 1, env->regs[i + 1], - i + 2, env->regs[i + 2], i + 3, env->regs[i + 3]); + g_string_append_printf(buf, + "r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n", + i, env->regs[i], i + 1, env->regs[i + 1], + i + 2, env->regs[i + 2], i + 3, + env->regs[i + 3]); } } -- 2.31.1