diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-10-05 18:31:45 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-05 18:31:45 +0200 |
| commit | 38252c229184b1116620db564fb056e2ee0c26f8 (patch) | |
| tree | 1d1495bc039ad6dc41db9b5f72142a46fe5c3140 /target-i386/cpu.h | |
| parent | Adjust pre_save()/post_load() vmstate callbacks to upstream usage (diff) | |
| parent | x86: split FPReg union (diff) | |
| download | qemu-kvm-38252c229184b1116620db564fb056e2ee0c26f8.tar.gz qemu-kvm-38252c229184b1116620db564fb056e2ee0c26f8.tar.bz2 qemu-kvm-38252c229184b1116620db564fb056e2ee0c26f8.zip | |
Merge commit 'acc68836793228a1eaf173a41793259637797b69' into upstream-merge
* commit 'acc68836793228a1eaf173a41793259637797b69':
x86: split FPReg union
Conflicts:
target-i386/cpu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e59e99dc6..47bb17c00 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -572,6 +572,15 @@ typedef union { #endif #define MMX_Q(n) q +typedef union { +#ifdef USE_X86LDOUBLE + CPU86_LDouble d __attribute__((aligned(16))); +#else + CPU86_LDouble d; +#endif + MMXReg mmx; +} FPReg; + #define CPU_NB_REGS64 16 #define CPU_NB_REGS32 8 @@ -618,14 +627,7 @@ typedef struct CPUX86State { uint16_t fpregs_format_vmstate; uint16_t fpuc; uint8_t fptags[8]; /* 0 = valid, 1 = empty */ - union { -#ifdef USE_X86LDOUBLE - CPU86_LDouble d __attribute__((aligned(16))); -#else - CPU86_LDouble d; -#endif - MMXReg mmx; - } fpregs[8]; + FPReg fpregs[8]; /* emulator internal variables */ float_status fp_status; |