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=-16.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 64824C433F5 for ; Wed, 15 Sep 2021 07:34:54 +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 D897360F25 for ; Wed, 15 Sep 2021 07:34:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D897360F25 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:42902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQPRU-00027R-L3 for qemu-devel@archiver.kernel.org; Wed, 15 Sep 2021 03:34:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQPPS-0000Fi-Dz; Wed, 15 Sep 2021 03:32:46 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQPPQ-0002FP-55; Wed, 15 Sep 2021 03:32:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id q11so2254026wrr.9; Wed, 15 Sep 2021 00:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=F4nkTvjH2+C2DybC5dYtkAVd8MFCngdAUOYYZ14AamA=; b=ToSF4DHvjQLXG1fI8dOGpmRYjgybQu79oWT+ACMaam7MxGfUvyJk0kXtOn2vs6pNEJ lo0q5uInV5Ex1fgoZgtiQ+G/hqhwsrdtn/2bbyOFqZuJZZ67tmrt7aEYIBocXkSQTHeb BRBsriTIRfvskPNdcSo/Uq3VTAWD175RnJ95u/QGyIfXcBF03eE5XgwtAjzkrP73Q+Sj zGl1RgzOGnJKhXOsSzivtDM+4T1oxurALjmoFs9KA2xng80yB4Jg8icXL+5b7aDxUKgD D03BSkCIvZ4NrSh113rto5BKG3sCdOUT1TVcTaQQudoqbRmNQmwEx2nuLA5gckZMVDBB 8riQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=F4nkTvjH2+C2DybC5dYtkAVd8MFCngdAUOYYZ14AamA=; b=mIFApLmvwTpy79znoZ7u/kw8bucHaIpwnezqty1SMYbcfNshOosuYm2qeXLpKu0rFT 3+28bT69DHW9RzVKArkQqMETefIvVu+sZPgFvZ+Ebi9lYSqQSSrodMgioqfZ+Mr51Wn4 q84syC3On7/jhbcSN0V6Qxa4idDJW3NZR/V8v4tPR0gAJIytapABwyARpYMaHUAKt1qZ wnvMz2NNHodnPIUEarB0rsjjG8416ldQNnggJErIaxIyK/k8hJ2PaUrt89NGlJi3vtym B8lfZmuyM5xngT0e/PsWy6iNEQblhI6Bx9dg373esrq+yQNfekdG0JYfOnRdSi1q+gpr ZL5A== X-Gm-Message-State: AOAM533UQuUm0Lcl12MnG6iz5RTi/4NX0cXpo+qmnxrTECD/VTYjTAJv cvr3EgQDHBgPbIlgpFBr160= X-Google-Smtp-Source: ABdhPJzxrwHYT3fEpqlOblURbfrh2qchWkpbXLyoLJjOYag3+h0z8b09juiZPYv12gJnBn4yvowiIg== X-Received: by 2002:a5d:4b42:: with SMTP id w2mr3138017wrs.273.1631691161316; Wed, 15 Sep 2021 00:32:41 -0700 (PDT) Received: from [192.168.1.36] (14.red-83-35-25.dynamicip.rima-tde.net. [83.35.25.14]) by smtp.gmail.com with ESMTPSA id b188sm2560520wmd.39.2021.09.15.00.32.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Sep 2021 00:32:40 -0700 (PDT) Subject: Re: [PATCH v2 27/53] target/xtensa: convert to use format_state instead of dump_state To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-28-berrange@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <1cb38e8f-cc05-461a-c722-efb18519f6fe@amsat.org> Date: Wed, 15 Sep 2021 09:32:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210914142042.1655100-28-berrange@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.969, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Cornelia Huck , David Hildenbrand , Bin Meng , Mark Cave-Ayland , Yuval Shaia , Peter Xu , Max Filippov , Taylor Simpson , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Eric Blake , Marek Vasut , Yoshinori Sato , Markus Armbruster , Halil Pasic , Christian Borntraeger , qemu-ppc@nongnu.org, 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 , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Chris Wulff , Laurent Vivier , Palmer Dabbelt , Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/14/21 4:20 PM, Daniel P. Berrangé wrote: > Signed-off-by: Daniel P. Berrangé > --- > target/xtensa/cpu.c | 2 +- > target/xtensa/cpu.h | 2 +- > target/xtensa/translate.c | 45 ++++++++++++++++++++------------------- > 3 files changed, 25 insertions(+), 24 deletions(-) > -void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int flags) > +void xtensa_cpu_format_state(CPUState *cs, GString *buf, int flags) > { > XtensaCPU *cpu = XTENSA_CPU(cs); > CPUXtensaState *env = &cpu->env; > xtensa_isa isa = env->config->isa; > int i, j; > > - qemu_fprintf(f, "PC=%08x\n\n", env->pc); > + g_string_append_printf(buf, "PC=%08x\n\n", env->pc); > > for (i = j = 0; i < xtensa_isa_num_sysregs(isa); ++i) { > const uint32_t *reg = > @@ -1340,55 +1340,56 @@ void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int flags) > int regno = xtensa_sysreg_number(isa, i); > > if (regno >= 0) { > - qemu_fprintf(f, "%12s=%08x%c", > - xtensa_sysreg_name(isa, i), > - reg[regno], > - (j++ % 4) == 3 ? '\n' : ' '); > + g_string_append_printf(buf, "%12s=%08x%c", > + xtensa_sysreg_name(isa, i), > + reg[regno], > + (j++ % 4) == 3 ? '\n' : ' '); > } > } > > - qemu_fprintf(f, (j % 4) == 0 ? "\n" : "\n\n"); > + g_string_append_printf(buf, (j % 4) == 0 ? "\n" : "\n\n"); > > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, " A%02d=%08x%c", > - i, env->regs[i], (i % 4) == 3 ? '\n' : ' '); > + g_string_append_printf(buf, " A%02d=%08x%c", > + i, env->regs[i], (i % 4) == 3 ? '\n' : ' '); > } > > xtensa_sync_phys_from_window(env); > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); g_string_append_c(); pre-existing but better to move it before xtensa_sync_phys_from_window(). > > for (i = 0; i < env->config->nareg; ++i) { > - qemu_fprintf(f, "AR%02d=%08x ", i, env->phys_regs[i]); > + g_string_append_printf(buf, "AR%02d=%08x ", i, env->phys_regs[i]); > if (i % 4 == 3) { > bool ws = (env->sregs[WINDOW_START] & (1 << (i / 4))) != 0; > bool cw = env->sregs[WINDOW_BASE] == i / 4; > > - qemu_fprintf(f, "%c%c\n", ws ? '<' : ' ', cw ? '=' : ' '); > + g_string_append_printf(buf, "%c%c\n", > + ws ? '<' : ' ', cw ? '=' : ' '); > } > } > > if ((flags & CPU_DUMP_FPU) && > xtensa_option_enabled(env->config, XTENSA_OPTION_FP_COPROCESSOR)) { > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); g_string_append_c(); simpler to move it before this if() statement. > > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, "F%02d=%08x (%-+15.8e)%c", i, > - float32_val(env->fregs[i].f32[FP_F32_LOW]), > - *(float *)(env->fregs[i].f32 + FP_F32_LOW), > - (i % 2) == 1 ? '\n' : ' '); > + g_string_append_printf(buf, "F%02d=%08x (%-+15.8e)%c", i, > + float32_val(env->fregs[i].f32[FP_F32_LOW]), > + *(float *)(env->fregs[i].f32 + FP_F32_LOW), > + (i % 2) == 1 ? '\n' : ' '); > } > } > > if ((flags & CPU_DUMP_FPU) && > xtensa_option_enabled(env->config, XTENSA_OPTION_DFP_COPROCESSOR) && > !xtensa_option_enabled(env->config, XTENSA_OPTION_DFPU_SINGLE_ONLY)) { > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); Ditto (move out). > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, "F%02d=%016"PRIx64" (%-+24.16le)%c", i, > - float64_val(env->fregs[i].f64), > - *(double *)(&env->fregs[i].f64), > - (i % 2) == 1 ? '\n' : ' '); > + g_string_append_printf(buf, "F%02d=%016"PRIx64" (%-+24.16le)%c", i, > + float64_val(env->fregs[i].f64), > + *(double *)(&env->fregs[i].f64), > + (i % 2) == 1 ? '\n' : ' '); > } > } > } > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mQPPY-0000I5-9R for mharc-qemu-riscv@gnu.org; Wed, 15 Sep 2021 03:32:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQPPS-0000Fi-Dz; Wed, 15 Sep 2021 03:32:46 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQPPQ-0002FP-55; Wed, 15 Sep 2021 03:32:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id q11so2254026wrr.9; Wed, 15 Sep 2021 00:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=F4nkTvjH2+C2DybC5dYtkAVd8MFCngdAUOYYZ14AamA=; b=ToSF4DHvjQLXG1fI8dOGpmRYjgybQu79oWT+ACMaam7MxGfUvyJk0kXtOn2vs6pNEJ lo0q5uInV5Ex1fgoZgtiQ+G/hqhwsrdtn/2bbyOFqZuJZZ67tmrt7aEYIBocXkSQTHeb BRBsriTIRfvskPNdcSo/Uq3VTAWD175RnJ95u/QGyIfXcBF03eE5XgwtAjzkrP73Q+Sj zGl1RgzOGnJKhXOsSzivtDM+4T1oxurALjmoFs9KA2xng80yB4Jg8icXL+5b7aDxUKgD D03BSkCIvZ4NrSh113rto5BKG3sCdOUT1TVcTaQQudoqbRmNQmwEx2nuLA5gckZMVDBB 8riQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=F4nkTvjH2+C2DybC5dYtkAVd8MFCngdAUOYYZ14AamA=; b=mIFApLmvwTpy79znoZ7u/kw8bucHaIpwnezqty1SMYbcfNshOosuYm2qeXLpKu0rFT 3+28bT69DHW9RzVKArkQqMETefIvVu+sZPgFvZ+Ebi9lYSqQSSrodMgioqfZ+Mr51Wn4 q84syC3On7/jhbcSN0V6Qxa4idDJW3NZR/V8v4tPR0gAJIytapABwyARpYMaHUAKt1qZ wnvMz2NNHodnPIUEarB0rsjjG8416ldQNnggJErIaxIyK/k8hJ2PaUrt89NGlJi3vtym B8lfZmuyM5xngT0e/PsWy6iNEQblhI6Bx9dg373esrq+yQNfekdG0JYfOnRdSi1q+gpr ZL5A== X-Gm-Message-State: AOAM533UQuUm0Lcl12MnG6iz5RTi/4NX0cXpo+qmnxrTECD/VTYjTAJv cvr3EgQDHBgPbIlgpFBr160= X-Google-Smtp-Source: ABdhPJzxrwHYT3fEpqlOblURbfrh2qchWkpbXLyoLJjOYag3+h0z8b09juiZPYv12gJnBn4yvowiIg== X-Received: by 2002:a5d:4b42:: with SMTP id w2mr3138017wrs.273.1631691161316; Wed, 15 Sep 2021 00:32:41 -0700 (PDT) Received: from [192.168.1.36] (14.red-83-35-25.dynamicip.rima-tde.net. [83.35.25.14]) by smtp.gmail.com with ESMTPSA id b188sm2560520wmd.39.2021.09.15.00.32.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Sep 2021 00:32:40 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Subject: Re: [PATCH v2 27/53] target/xtensa: convert to use format_state instead of dump_state To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org 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 , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-28-berrange@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <1cb38e8f-cc05-461a-c722-efb18519f6fe@amsat.org> Date: Wed, 15 Sep 2021 09:32:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210914142042.1655100-28-berrange@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.969, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Wed, 15 Sep 2021 07:32:47 -0000 On 9/14/21 4:20 PM, Daniel P. Berrangé wrote: > Signed-off-by: Daniel P. Berrangé > --- > target/xtensa/cpu.c | 2 +- > target/xtensa/cpu.h | 2 +- > target/xtensa/translate.c | 45 ++++++++++++++++++++------------------- > 3 files changed, 25 insertions(+), 24 deletions(-) > -void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int flags) > +void xtensa_cpu_format_state(CPUState *cs, GString *buf, int flags) > { > XtensaCPU *cpu = XTENSA_CPU(cs); > CPUXtensaState *env = &cpu->env; > xtensa_isa isa = env->config->isa; > int i, j; > > - qemu_fprintf(f, "PC=%08x\n\n", env->pc); > + g_string_append_printf(buf, "PC=%08x\n\n", env->pc); > > for (i = j = 0; i < xtensa_isa_num_sysregs(isa); ++i) { > const uint32_t *reg = > @@ -1340,55 +1340,56 @@ void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int flags) > int regno = xtensa_sysreg_number(isa, i); > > if (regno >= 0) { > - qemu_fprintf(f, "%12s=%08x%c", > - xtensa_sysreg_name(isa, i), > - reg[regno], > - (j++ % 4) == 3 ? '\n' : ' '); > + g_string_append_printf(buf, "%12s=%08x%c", > + xtensa_sysreg_name(isa, i), > + reg[regno], > + (j++ % 4) == 3 ? '\n' : ' '); > } > } > > - qemu_fprintf(f, (j % 4) == 0 ? "\n" : "\n\n"); > + g_string_append_printf(buf, (j % 4) == 0 ? "\n" : "\n\n"); > > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, " A%02d=%08x%c", > - i, env->regs[i], (i % 4) == 3 ? '\n' : ' '); > + g_string_append_printf(buf, " A%02d=%08x%c", > + i, env->regs[i], (i % 4) == 3 ? '\n' : ' '); > } > > xtensa_sync_phys_from_window(env); > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); g_string_append_c(); pre-existing but better to move it before xtensa_sync_phys_from_window(). > > for (i = 0; i < env->config->nareg; ++i) { > - qemu_fprintf(f, "AR%02d=%08x ", i, env->phys_regs[i]); > + g_string_append_printf(buf, "AR%02d=%08x ", i, env->phys_regs[i]); > if (i % 4 == 3) { > bool ws = (env->sregs[WINDOW_START] & (1 << (i / 4))) != 0; > bool cw = env->sregs[WINDOW_BASE] == i / 4; > > - qemu_fprintf(f, "%c%c\n", ws ? '<' : ' ', cw ? '=' : ' '); > + g_string_append_printf(buf, "%c%c\n", > + ws ? '<' : ' ', cw ? '=' : ' '); > } > } > > if ((flags & CPU_DUMP_FPU) && > xtensa_option_enabled(env->config, XTENSA_OPTION_FP_COPROCESSOR)) { > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); g_string_append_c(); simpler to move it before this if() statement. > > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, "F%02d=%08x (%-+15.8e)%c", i, > - float32_val(env->fregs[i].f32[FP_F32_LOW]), > - *(float *)(env->fregs[i].f32 + FP_F32_LOW), > - (i % 2) == 1 ? '\n' : ' '); > + g_string_append_printf(buf, "F%02d=%08x (%-+15.8e)%c", i, > + float32_val(env->fregs[i].f32[FP_F32_LOW]), > + *(float *)(env->fregs[i].f32 + FP_F32_LOW), > + (i % 2) == 1 ? '\n' : ' '); > } > } > > if ((flags & CPU_DUMP_FPU) && > xtensa_option_enabled(env->config, XTENSA_OPTION_DFP_COPROCESSOR) && > !xtensa_option_enabled(env->config, XTENSA_OPTION_DFPU_SINGLE_ONLY)) { > - qemu_fprintf(f, "\n"); > + g_string_append_printf(buf, "\n"); Ditto (move out). > for (i = 0; i < 16; ++i) { > - qemu_fprintf(f, "F%02d=%016"PRIx64" (%-+24.16le)%c", i, > - float64_val(env->fregs[i].f64), > - *(double *)(&env->fregs[i].f64), > - (i % 2) == 1 ? '\n' : ' '); > + g_string_append_printf(buf, "F%02d=%016"PRIx64" (%-+24.16le)%c", i, > + float64_val(env->fregs[i].f64), > + *(double *)(&env->fregs[i].f64), > + (i % 2) == 1 ? '\n' : ' '); > } > } > } >