On Fri, Mar 25, 2022 at 11:51 PM Viktor Prutyanov
<viktor.prutya...@redhat.com> wrote:
>
> Context structure in 64-bit Windows differs from 32-bit one and it
> should be reflected in its name.
>
> Signed-off-by: Viktor Prutyanov <viktor.prutya...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> contrib/elf2dmp/main.c | 6 +++---
> dump/win_dump.c | 14 +++++++-------
> include/qemu/win_dump_defs.h | 8 ++++----
> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c
> index 20b477d582..b9fc6d230c 100644
> --- a/contrib/elf2dmp/main.c
> +++ b/contrib/elf2dmp/main.c
> @@ -141,10 +141,10 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase,
> struct pdb_reader *pdb,
> return kdbg;
> }
>
> -static void win_context_init_from_qemu_cpu_state(WinContext *ctx,
> +static void win_context_init_from_qemu_cpu_state(WinContext64 *ctx,
> QEMUCPUState *s)
> {
> - WinContext win_ctx = (WinContext){
> + WinContext64 win_ctx = (WinContext64){
> .ContextFlags = WIN_CTX_X64 | WIN_CTX_INT | WIN_CTX_SEG |
> WIN_CTX_CTL,
> .MxCsr = INITIAL_MXCSR,
>
> @@ -302,7 +302,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
> for (i = 0; i < qe->state_nr; i++) {
> uint64_t Prcb;
> uint64_t Context;
> - WinContext ctx;
> + WinContext64 ctx;
> QEMUCPUState *s = qe->state[i];
>
> if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index c5eb5a9aac..29b6e4f670 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -189,7 +189,7 @@ try_again:
> }
>
> struct saved_context {
> - WinContext ctx;
> + WinContext64 ctx;
> uint64_t addr;
> };
>
> @@ -221,7 +221,7 @@ static void patch_and_save_context(WinDumpHeader64 *h,
> CPUX86State *env = &x86_cpu->env;
> uint64_t Prcb;
> uint64_t Context;
> - WinContext ctx;
> + WinContext64 ctx;
>
> if (cpu_memory_rw_debug(first_cpu,
> KiProcessorBlock + i * sizeof(uint64_t),
> @@ -241,8 +241,8 @@ static void patch_and_save_context(WinDumpHeader64 *h,
>
> saved_ctx[i].addr = Context;
>
> - ctx = (WinContext){
> - .ContextFlags = WIN_CTX_ALL,
> + ctx = (WinContext64){
> + .ContextFlags = WIN_CTX64_ALL,
> .MxCsr = env->mxcsr,
>
> .SegEs = env->segs[0].selector,
> @@ -284,13 +284,13 @@ static void patch_and_save_context(WinDumpHeader64 *h,
> };
>
> if (cpu_memory_rw_debug(first_cpu, Context,
> - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext), 0)) {
> + (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 0)) {
> error_setg(errp, "win-dump: failed to save CPU #%d context", i);
> return;
> }
>
> if (cpu_memory_rw_debug(first_cpu, Context,
> - (uint8_t *)&ctx, sizeof(WinContext), 1)) {
> + (uint8_t *)&ctx, sizeof(WinContext64), 1)) {
> error_setg(errp, "win-dump: failed to write CPU #%d context", i);
> return;
> }
> @@ -306,7 +306,7 @@ static void restore_context(WinDumpHeader64 *h,
>
> for (i = 0; i < h->NumberProcessors; i++) {
> if (cpu_memory_rw_debug(first_cpu, saved_ctx[i].addr,
> - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext), 1)) {
> + (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 1)) {
> warn_report("win-dump: failed to restore CPU #%d context", i);
> }
> }
> diff --git a/include/qemu/win_dump_defs.h b/include/qemu/win_dump_defs.h
> index 145096e8ee..5a5e5a5e09 100644
> --- a/include/qemu/win_dump_defs.h
> +++ b/include/qemu/win_dump_defs.h
> @@ -97,8 +97,8 @@ typedef struct WinDumpHeader64 {
> #define WIN_CTX_FP 0x00000008L
> #define WIN_CTX_DBG 0x00000010L
>
> -#define WIN_CTX_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT |
> WIN_CTX_FP)
> -#define WIN_CTX_ALL (WIN_CTX_FULL | WIN_CTX_SEG | WIN_CTX_DBG)
> +#define WIN_CTX64_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT |
> WIN_CTX_FP)
> +#define WIN_CTX64_ALL (WIN_CTX64_FULL | WIN_CTX_SEG | WIN_CTX_DBG)
>
> #define LIVE_SYSTEM_DUMP 0x00000161
>
> @@ -107,7 +107,7 @@ typedef struct WinM128A {
> int64_t high;
> } QEMU_ALIGNED(16) WinM128A;
>
> -typedef struct WinContext {
> +typedef struct WinContext64 {
> uint64_t PHome[6];
>
> uint32_t ContextFlags;
> @@ -174,6 +174,6 @@ typedef struct WinContext {
> uint64_t LastBranchFromRip;
> uint64_t LastExceptionToRip;
> uint64_t LastExceptionFromRip;
> -} QEMU_ALIGNED(16) WinContext;
> +} QEMU_ALIGNED(16) WinContext64;
>
> #endif /* QEMU_WIN_DUMP_DEFS_H */
> --
> 2.35.1
>
