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 A2DBEC433FE for ; Tue, 14 Sep 2021 14:43:38 +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 4B68460F26 for ; Tue, 14 Sep 2021 14:43:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4B68460F26 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]:38214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ9er-0005SL-Gq for qemu-devel@archiver.kernel.org; Tue, 14 Sep 2021 10:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9La-0003SR-MM for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:23:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9LY-0004qu-9n for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:23:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631629419; 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=HvKtDY8hvhL+Mhb7T4tthhDY0w2UGu81fBbKj8Ukk/M=; b=hbAL62AgzNnhVRYWC7yZrmVtLMTSYmgXTuNIJXm9oNp74Mo0kDQgHQ0R5CPDMtbOxNqd3k 3rpxUHC5FOAAqU3bVt6I1z03bVrNaIzBZHieK8P0hEHDkeEDJ8k6peLYgNQqeWWwZHputQ 2vUAXQFtJHwjkoelOYjKCrO8molzss4= 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-305-6RGKKmbnPumDTWSfTJDAMA-1; Tue, 14 Sep 2021 10:23:38 -0400 X-MC-Unique: 6RGKKmbnPumDTWSfTJDAMA-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 9BEE81084685; Tue, 14 Sep 2021 14:23:34 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 535C05D9CA; Tue, 14 Sep 2021 14:23:27 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/53] target/avr: convert to use format_state instead of dump_state Date: Tue, 14 Sep 2021 15:19:58 +0100 Message-Id: <20210914142042.1655100-10-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, 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/avr/cpu.c | 57 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index ea14175ca5..17ff21f8be 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -145,43 +145,44 @@ static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) return oc; } -static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) +static void avr_cpu_format_state(CPUState *cs, GString *buf, int flags) { AVRCPU *cpu = AVR_CPU(cs); CPUAVRState *env = &cpu->env; int i; - qemu_fprintf(f, "\n"); - qemu_fprintf(f, "PC: %06x\n", env->pc_w * 2); /* PC points to words */ - qemu_fprintf(f, "SP: %04x\n", env->sp); - qemu_fprintf(f, "rampD: %02x\n", env->rampD >> 16); - qemu_fprintf(f, "rampX: %02x\n", env->rampX >> 16); - qemu_fprintf(f, "rampY: %02x\n", env->rampY >> 16); - qemu_fprintf(f, "rampZ: %02x\n", env->rampZ >> 16); - qemu_fprintf(f, "EIND: %02x\n", env->eind >> 16); - qemu_fprintf(f, "X: %02x%02x\n", env->r[27], env->r[26]); - qemu_fprintf(f, "Y: %02x%02x\n", env->r[29], env->r[28]); - qemu_fprintf(f, "Z: %02x%02x\n", env->r[31], env->r[30]); - qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", - env->sregI ? 'I' : '-', - env->sregT ? 'T' : '-', - env->sregH ? 'H' : '-', - env->sregS ? 'S' : '-', - env->sregV ? 'V' : '-', - env->sregN ? '-' : 'N', /* Zf has negative logic */ - env->sregZ ? 'Z' : '-', - env->sregC ? 'I' : '-'); - qemu_fprintf(f, "SKIP: %02x\n", env->skip); - - qemu_fprintf(f, "\n"); + g_string_append_printf(buf, "\n"); + /* PC points to words */ + g_string_append_printf(buf, "PC: %06x\n", env->pc_w * 2); + g_string_append_printf(buf, "SP: %04x\n", env->sp); + g_string_append_printf(buf, "rampD: %02x\n", env->rampD >> 16); + g_string_append_printf(buf, "rampX: %02x\n", env->rampX >> 16); + g_string_append_printf(buf, "rampY: %02x\n", env->rampY >> 16); + g_string_append_printf(buf, "rampZ: %02x\n", env->rampZ >> 16); + g_string_append_printf(buf, "EIND: %02x\n", env->eind >> 16); + g_string_append_printf(buf, "X: %02x%02x\n", env->r[27], env->r[26]); + g_string_append_printf(buf, "Y: %02x%02x\n", env->r[29], env->r[28]); + g_string_append_printf(buf, "Z: %02x%02x\n", env->r[31], env->r[30]); + g_string_append_printf(buf, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic */ + env->sregZ ? 'Z' : '-', + env->sregC ? 'I' : '-'); + g_string_append_printf(buf, "SKIP: %02x\n", env->skip); + + g_string_append_printf(buf, "\n"); for (i = 0; i < ARRAY_SIZE(env->r); i++) { - qemu_fprintf(f, "R[%02d]: %02x ", i, env->r[i]); + g_string_append_printf(buf, "R[%02d]: %02x ", i, env->r[i]); if ((i % 8) == 7) { - qemu_fprintf(f, "\n"); + g_string_append_printf(buf, "\n"); } } - qemu_fprintf(f, "\n"); + g_string_append_printf(buf, "\n"); } #include "hw/core/sysemu-cpu-ops.h" @@ -215,7 +216,7 @@ static void avr_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = avr_cpu_class_by_name; cc->has_work = avr_cpu_has_work; - cc->dump_state = avr_cpu_dump_state; + cc->format_state = avr_cpu_format_state; cc->set_pc = avr_cpu_set_pc; cc->memory_rw_debug = avr_cpu_memory_rw_debug; dc->vmsd = &vms_avr_cpu; -- 2.31.1