From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mQ9RZ-0005SY-0X for mharc-qemu-riscv@gnu.org; Tue, 14 Sep 2021 10:29:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9RW-0005KD-UP for qemu-riscv@nongnu.org; Tue, 14 Sep 2021 10:29:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9RR-0000tA-Kg for qemu-riscv@nongnu.org; Tue, 14 Sep 2021 10:29:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631629785; 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=5ox0yxENRArnSajwWt6R0ATTJtvgUIn+1CN57BaiibE=; b=EbCupnzaSYKQq/1KG1fGUCCY73KfyINhdqvifPQ8uNz42srM4iA0OD4yOTw05c86J5aiz7 jqIH81D57wSz3y0yFNxmTwblErKyVkKHPbU1WadjGBltaq7R/W/RvyFpIiFiPF/yp4KpHL a0hEDIWq5yDUZ04/UYtEgi9jmds1xdY= 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-211-_ngq6vkNMNSEfIs-Yi7oXA-1; Tue, 14 Sep 2021 10:29:43 -0400 X-MC-Unique: _ngq6vkNMNSEfIs-Yi7oXA-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 E74AA10247AB; Tue, 14 Sep 2021 14:29:39 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 635F35D9CA; Tue, 14 Sep 2021 14:29:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Bin Meng , Yoshinori Sato , Stafford Horne , Cornelia Huck , David Hildenbrand , "Edgar E. Iglesias" , Jiaxun Yang , Peter Xu , Christian Borntraeger , qemu-ppc@nongnu.org, Mark Cave-Ayland , Paolo Bonzini , qemu-arm@nongnu.org, Michael Rolnik , Peter Maydell , Palmer Dabbelt , Alistair Francis , Halil Pasic , Taylor Simpson , Gerd Hoffmann , qemu-riscv@nongnu.org, Max Filippov , Yuval Shaia , Bastian Koppelmann , Artyom Tarasenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Aleksandar Rikalo , David Gibson , Marcel Apfelbaum , Laurent Vivier , "Dr. David Alan Gilbert" , Eduardo Habkost , Marek Vasut , Markus Armbruster , Aurelien Jarno , qemu-s390x@nongnu.org, Laurent Vivier , Eric Blake , Richard Henderson , Chris Wulff , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 26/53] target/tricore: convert to use format_state instead of dump_state Date: Tue, 14 Sep 2021 15:20:15 +0100 Message-Id: <20210914142042.1655100-27-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=216.205.24.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-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 14:29:51 -0000 Signed-off-by: Daniel P. Berrangé --- target/tricore/cpu.c | 2 +- target/tricore/cpu.h | 2 +- target/tricore/translate.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index b95682b7f0..11f1a79247 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -174,7 +174,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data) cc->gdb_num_core_regs = 44; cc->gdb_arch_name = tricore_gdb_arch_name; - cc->dump_state = tricore_cpu_dump_state; + cc->format_state = tricore_cpu_format_state; cc->set_pc = tricore_cpu_set_pc; cc->sysemu_ops = &tricore_sysemu_ops; cc->tcg_ops = &tricore_tcg_ops; diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index 4b61a2c03f..572bda55e7 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -208,7 +208,7 @@ struct TriCoreCPU { hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -void tricore_cpu_dump_state(CPUState *cpu, FILE *f, int flags); +void tricore_cpu_format_state(CPUState *cpu, GString *buf, int flags); #define MASK_PCXI_PCPN 0xff000000 diff --git a/target/tricore/translate.c b/target/tricore/translate.c index a0cc0f1cb3..a1e56fba32 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -86,7 +86,7 @@ enum { MODE_UU = 3, }; -void tricore_cpu_dump_state(CPUState *cs, FILE *f, int flags) +void tricore_cpu_format_state(CPUState *cs, GString *buf, int flags) { TriCoreCPU *cpu = TRICORE_CPU(cs); CPUTriCoreState *env = &cpu->env; @@ -95,26 +95,26 @@ void tricore_cpu_dump_state(CPUState *cs, FILE *f, int flags) psw = psw_read(env); - qemu_fprintf(f, "PC: " TARGET_FMT_lx, env->PC); - qemu_fprintf(f, " PSW: " TARGET_FMT_lx, psw); - qemu_fprintf(f, " ICR: " TARGET_FMT_lx, env->ICR); - qemu_fprintf(f, "\nPCXI: " TARGET_FMT_lx, env->PCXI); - qemu_fprintf(f, " FCX: " TARGET_FMT_lx, env->FCX); - qemu_fprintf(f, " LCX: " TARGET_FMT_lx, env->LCX); + g_string_append_printf(buf, "PC: " TARGET_FMT_lx, env->PC); + g_string_append_printf(buf, " PSW: " TARGET_FMT_lx, psw); + g_string_append_printf(buf, " ICR: " TARGET_FMT_lx, env->ICR); + g_string_append_printf(buf, "\nPCXI: " TARGET_FMT_lx, env->PCXI); + g_string_append_printf(buf, " FCX: " TARGET_FMT_lx, env->FCX); + g_string_append_printf(buf, " LCX: " TARGET_FMT_lx, env->LCX); for (i = 0; i < 16; ++i) { if ((i & 3) == 0) { - qemu_fprintf(f, "\nGPR A%02d:", i); + g_string_append_printf(buf, "\nGPR A%02d:", i); } - qemu_fprintf(f, " " TARGET_FMT_lx, env->gpr_a[i]); + g_string_append_printf(buf, " " TARGET_FMT_lx, env->gpr_a[i]); } for (i = 0; i < 16; ++i) { if ((i & 3) == 0) { - qemu_fprintf(f, "\nGPR D%02d:", i); + g_string_append_printf(buf, "\nGPR D%02d:", i); } - qemu_fprintf(f, " " TARGET_FMT_lx, env->gpr_d[i]); + g_string_append_printf(buf, " " TARGET_FMT_lx, env->gpr_d[i]); } - qemu_fprintf(f, "\n"); + g_string_append_printf(buf, "\n"); } /* -- 2.31.1