mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: make a20_mask int32_t

Browse Source 
This makes the savevm code correct, and sign extensins gives us exactly
what we need (namely, sign extend to 64 bits when used with 64bit addresess.

Once there, change 0x100000 for 1 << 20, that maks all a20 use the same syntax.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-29 22:48:49 +02:00 committed by Anthony Liguori
parent 1f76b9b9b3
commit 5ee0ffaa42
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-i386/cpu.h
View File

@ -589,7 +589,7 @@ typedef struct CPUX86State {
SegmentCache idt; /* only base and limit are used */ SegmentCache idt; /* only base and limit are used */
target_ulong cr[5]; /* NOTE: cr1 is unused */ target_ulong cr[5]; /* NOTE: cr1 is unused */
uint64_t a20_mask; int32_t a20_mask;
/* FPU state */ /* FPU state */
unsigned int fpstt; /* top of stack index */ unsigned int fpstt; /* top of stack index */

6
target-i386/helper.c
View File

@ -780,7 +780,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
eflags & CC_C ? 'C' : '-', eflags & CC_C ? 'C' : '-',
env->hflags & HF_CPL_MASK, env->hflags & HF_CPL_MASK,
(env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1, (env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1,
(int)(env->a20_mask >> 20) & 1, (env->a20_mask >> 20) & 1,
(env->hflags >> HF_SMM_SHIFT) & 1, (env->hflags >> HF_SMM_SHIFT) & 1,
env->halted); env->halted);
} else } else
@ -807,7 +807,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
eflags & CC_C ? 'C' : '-', eflags & CC_C ? 'C' : '-',
env->hflags & HF_CPL_MASK, env->hflags & HF_CPL_MASK,
(env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1, (env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1,
(int)(env->a20_mask >> 20) & 1, (env->a20_mask >> 20) & 1,
(env->hflags >> HF_SMM_SHIFT) & 1, (env->hflags >> HF_SMM_SHIFT) & 1,
env->halted); env->halted);
} }
@ -938,7 +938,7 @@ void cpu_x86_set_a20(CPUX86State *env, int a20_state)
/* when a20 is changed, all the MMU mappings are invalid, so /* when a20 is changed, all the MMU mappings are invalid, so
we must flush everything */ we must flush everything */
tlb_flush(env, 1); tlb_flush(env, 1);
env->a20_mask = (~0x100000) | (a20_state << 20); env->a20_mask = ~(1 << 20) | (a20_state << 20);
} }
} }

9
target-i386/machine.c
View File

@ -27,7 +27,6 @@ void cpu_save(QEMUFile *f, void *opaque)
{ {
CPUState *env = opaque; CPUState *env = opaque;
uint16_t fptag, fpus, fpuc, fpregs_format; uint16_t fptag, fpus, fpuc, fpregs_format;
int32_t a20_mask;
int32_t pending_irq; int32_t pending_irq;
int i, bit; int i, bit;
@ -98,8 +97,7 @@ void cpu_save(QEMUFile *f, void *opaque)
qemu_put_betls(f, &env->dr[i]); qemu_put_betls(f, &env->dr[i]);
/* MMU */ /* MMU */
a20_mask = (int32_t) env->a20_mask; qemu_put_sbe32s(f, &env->a20_mask);
qemu_put_sbe32s(f, &a20_mask);
/* XMM */ /* XMM */
qemu_put_be32s(f, &env->mxcsr); qemu_put_be32s(f, &env->mxcsr);
@ -201,7 +199,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
CPUState *env = opaque; CPUState *env = opaque;
int i, guess_mmx; int i, guess_mmx;
uint16_t fpus, fpuc, fptag, fpregs_format; uint16_t fpus, fpuc, fptag, fpregs_format;
int32_t a20_mask;
int32_t pending_irq; int32_t pending_irq;
cpu_synchronize_state(env); cpu_synchronize_state(env);
@ -300,9 +297,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
hw_breakpoint_insert(env, i); hw_breakpoint_insert(env, i);
/* MMU */ qemu_get_sbe32s(f, &env->a20_mask);
qemu_get_sbe32s(f, &a20_mask);
env->a20_mask = a20_mask;
qemu_get_be32s(f, &env->mxcsr); qemu_get_be32s(f, &env->mxcsr);
for(i = 0; i < CPU_NB_REGS; i++) { for(i = 0; i < CPU_NB_REGS; i++) {