* [PULL v2 0/4] tcg patch queue
@ 2021-05-16 14:11 Richard Henderson
2021-05-16 14:11 ` [PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section Richard Henderson
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Richard Henderson @ 2021-05-16 14:11 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
Version 2 drops the bsd cleanup and includes a minor improvement
to the dump of the constant pool.
r~
The following changes since commit 2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426:
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging (2021-05-13 20:13:24 +0100)
are available in the Git repository at:
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210516
for you to fetch changes up to 6c6a4a76eea900112c343ba4f9c5737e298feddf:
accel/tcg: Align data dumped at end of TB (2021-05-16 09:05:14 -0500)
----------------------------------------------------------------
Minor MAINTAINERS update.
Tweak to includes.
Add tcg_constant_tl.
Improve constant pool dump.
----------------------------------------------------------------
Matheus Ferst (1):
tcg: Add tcg_constant_tl
Philippe Mathieu-Daudé (3):
MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
exec/gen-icount.h: Add missing "exec/exec-all.h" include
accel/tcg: Align data dumped at end of TB
include/exec/gen-icount.h | 1 +
include/tcg/tcg-op.h | 2 ++
accel/tcg/translate-all.c | 11 +++++++++--
MAINTAINERS | 1 +
4 files changed, 13 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
@ 2021-05-16 14:11 ` Richard Henderson
2021-05-16 14:11 ` [PULL v2 2/4] exec/gen-icount.h: Add missing "exec/exec-all.h" include Richard Henderson
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2021-05-16 14:11 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
As the 'Main Loop' section covers softmmu/icount.c,
add "exec/gen-icount.h" there too.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210422064128.2318616-2-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index f73354fc8a..6f73315dcc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2429,6 +2429,7 @@ F: ui/cocoa.m
Main loop
M: Paolo Bonzini <pbonzini@redhat.com>
S: Maintained
+F: include/exec/gen-icount.h
F: include/qemu/main-loop.h
F: include/sysemu/runstate.h
F: include/sysemu/runstate-action.h
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PULL v2 2/4] exec/gen-icount.h: Add missing "exec/exec-all.h" include
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
2021-05-16 14:11 ` [PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section Richard Henderson
@ 2021-05-16 14:11 ` Richard Henderson
2021-05-16 14:11 ` [PULL v2 3/4] tcg: Add tcg_constant_tl Richard Henderson
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2021-05-16 14:11 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
When including "exec/gen-icount.h" we get:
include/exec/gen-icount.h: In function ‘gen_tb_start’:
include/exec/gen-icount.h:40:9: error: implicit declaration of function ‘tb_cflags’ [-Werror=implicit-function-declaration]
40 | if (tb_cflags(tb) & CF_USE_ICOUNT) {
| ^~~~~~~~~
include/exec/gen-icount.h:40:9: error: nested extern declaration of ‘tb_cflags’ [-Werror=nested-externs]
include/exec/gen-icount.h:40:25: error: ‘CF_USE_ICOUNT’ undeclared (first use in this function); did you mean ‘CPU_COUNT’?
40 | if (tb_cflags(tb) & CF_USE_ICOUNT) {
| ^~~~~~~~~~~~~
| CPU_COUNT
Since tb_cflags() is declared in "exec/exec-all.h", include this
header in "exec/gen-icount.h".
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210422064128.2318616-3-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gen-icount.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
index 298e01eef4..467529d84c 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -1,6 +1,7 @@
#ifndef GEN_ICOUNT_H
#define GEN_ICOUNT_H
+#include "exec/exec-all.h"
#include "qemu/timer.h"
/* Helpers for instruction counting code generation. */
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PULL v2 3/4] tcg: Add tcg_constant_tl
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
2021-05-16 14:11 ` [PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section Richard Henderson
2021-05-16 14:11 ` [PULL v2 2/4] exec/gen-icount.h: Add missing "exec/exec-all.h" include Richard Henderson
@ 2021-05-16 14:11 ` Richard Henderson
2021-05-16 14:11 ` [PULL v2 4/4] accel/tcg: Align data dumped at end of TB Richard Henderson
2021-05-18 11:21 ` [PULL v2 0/4] tcg patch queue Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2021-05-16 14:11 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Matheus Ferst
From: Matheus Ferst <matheus.ferst@eldorado.org.br>
Used in ppc D/DS/X-form load/store implementation.
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210512185441.3619828-24-matheus.ferst@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg-op.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h
index 2cd1faf9c4..ef8a008ea7 100644
--- a/include/tcg/tcg-op.h
+++ b/include/tcg/tcg-op.h
@@ -1096,6 +1096,7 @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
#define tcg_gen_sextract_tl tcg_gen_sextract_i64
#define tcg_gen_extract2_tl tcg_gen_extract2_i64
#define tcg_const_tl tcg_const_i64
+#define tcg_constant_tl tcg_constant_i64
#define tcg_const_local_tl tcg_const_local_i64
#define tcg_gen_movcond_tl tcg_gen_movcond_i64
#define tcg_gen_add2_tl tcg_gen_add2_i64
@@ -1209,6 +1210,7 @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
#define tcg_gen_sextract_tl tcg_gen_sextract_i32
#define tcg_gen_extract2_tl tcg_gen_extract2_i32
#define tcg_const_tl tcg_const_i32
+#define tcg_constant_tl tcg_constant_i32
#define tcg_const_local_tl tcg_const_local_i32
#define tcg_gen_movcond_tl tcg_gen_movcond_i32
#define tcg_gen_add2_tl tcg_gen_add2_i32
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PULL v2 4/4] accel/tcg: Align data dumped at end of TB
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
` (2 preceding siblings ...)
2021-05-16 14:11 ` [PULL v2 3/4] tcg: Add tcg_constant_tl Richard Henderson
@ 2021-05-16 14:11 ` Richard Henderson
2021-05-18 11:21 ` [PULL v2 0/4] tcg patch queue Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2021-05-16 14:11 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
To better visualize the data dumped at the end of a TB, left-align it
(padding it with 0). Print ".long" instead of ".quad" on 32-bit hosts.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210515104202.241504-1-f4bug@amsat.org>
[rth: Split the qemu_log and print .long for 32-bit hosts.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translate-all.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index ae7e873713..fbf8fc630b 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -2042,8 +2042,15 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
int i;
qemu_log(" data: [size=%d]\n", data_size);
for (i = 0; i < data_size / sizeof(tcg_target_ulong); i++) {
- qemu_log("0x%08" PRIxPTR ": .quad 0x%" TCG_PRIlx "\n",
- (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+ if (sizeof(tcg_target_ulong) == 8) {
+ qemu_log("0x%08" PRIxPTR ": .quad 0x%016" TCG_PRIlx "\n",
+ (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+ } else if (sizeof(tcg_target_ulong) == 4) {
+ qemu_log("0x%08" PRIxPTR ": .long 0x%08" TCG_PRIlx "\n",
+ (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+ } else {
+ qemu_build_not_reached();
+ }
}
}
qemu_log("\n");
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PULL v2 0/4] tcg patch queue
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
` (3 preceding siblings ...)
2021-05-16 14:11 ` [PULL v2 4/4] accel/tcg: Align data dumped at end of TB Richard Henderson
@ 2021-05-18 11:21 ` Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2021-05-18 11:21 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers
On Sun, 16 May 2021 at 15:11, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Version 2 drops the bsd cleanup and includes a minor improvement
> to the dump of the constant pool.
>
>
> r~
>
>
> The following changes since commit 2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426:
>
> Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging (2021-05-13 20:13:24 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210516
>
> for you to fetch changes up to 6c6a4a76eea900112c343ba4f9c5737e298feddf:
>
> accel/tcg: Align data dumped at end of TB (2021-05-16 09:05:14 -0500)
>
> ----------------------------------------------------------------
> Minor MAINTAINERS update.
> Tweak to includes.
> Add tcg_constant_tl.
> Improve constant pool dump.
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-18 11:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 14:11 [PULL v2 0/4] tcg patch queue Richard Henderson
2021-05-16 14:11 ` [PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section Richard Henderson
2021-05-16 14:11 ` [PULL v2 2/4] exec/gen-icount.h: Add missing "exec/exec-all.h" include Richard Henderson
2021-05-16 14:11 ` [PULL v2 3/4] tcg: Add tcg_constant_tl Richard Henderson
2021-05-16 14:11 ` [PULL v2 4/4] accel/tcg: Align data dumped at end of TB Richard Henderson
2021-05-18 11:21 ` [PULL v2 0/4] tcg patch queue Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).