diff options
| author | Avi Kivity <avi@redhat.com> | 2008-09-23 14:00:13 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-09-23 14:00:13 +0300 |
| commit | 5ac2e29d7efaec87bca7928c89c7703daa922908 (patch) | |
| tree | 1cce433d3a3d5fa6215622b3b444188db60da9bc /qemu/gdbstub.c | |
| parent | 9d2968fbb1f99f6d2589f600c7b75b26f828afd1 (diff) | |
| parent | fc246fe28d9308a2c57893cdd5ccd5d324d76b44 (diff) | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu/gdbstub.c')
| -rw-r--r-- | qemu/gdbstub.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c index d17e74a5..d57cd617 100644 --- a/qemu/gdbstub.c +++ b/qemu/gdbstub.c @@ -732,16 +732,16 @@ static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) for (i = 0; i < 32; i++) { if (env->CP0_Status & (1 << CP0St_FR)) - *(target_ulong *)ptr = tswapl(env->fpu->fpr[i].d); + *(target_ulong *)ptr = tswapl(env->active_fpu.fpr[i].d); else - *(target_ulong *)ptr = tswap32(env->fpu->fpr[i].w[FP_ENDIAN_IDX]); + *(target_ulong *)ptr = tswap32(env->active_fpu.fpr[i].w[FP_ENDIAN_IDX]); ptr += sizeof(target_ulong); } - *(target_ulong *)ptr = (int32_t)tswap32(env->fpu->fcr31); + *(target_ulong *)ptr = (int32_t)tswap32(env->active_fpu.fcr31); ptr += sizeof(target_ulong); - *(target_ulong *)ptr = (int32_t)tswap32(env->fpu->fcr0); + *(target_ulong *)ptr = (int32_t)tswap32(env->active_fpu.fcr0); ptr += sizeof(target_ulong); } @@ -772,7 +772,7 @@ static unsigned int ieee_rm[] = float_round_down }; #define RESTORE_ROUNDING_MODE \ - set_float_rounding_mode(ieee_rm[env->fpu->fcr31 & 3], &env->fpu->fp_status) + set_float_rounding_mode(ieee_rm[env->active_fpu.fcr31 & 3], &env->active_fpu.fp_status) static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) { @@ -809,13 +809,13 @@ static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) for (i = 0; i < 32; i++) { if (env->CP0_Status & (1 << CP0St_FR)) - env->fpu->fpr[i].d = tswapl(*(target_ulong *)ptr); + env->active_fpu.fpr[i].d = tswapl(*(target_ulong *)ptr); else - env->fpu->fpr[i].w[FP_ENDIAN_IDX] = tswapl(*(target_ulong *)ptr); + env->active_fpu.fpr[i].w[FP_ENDIAN_IDX] = tswapl(*(target_ulong *)ptr); ptr += sizeof(target_ulong); } - env->fpu->fcr31 = tswapl(*(target_ulong *)ptr) & 0xFF83FFFF; + env->active_fpu.fcr31 = tswapl(*(target_ulong *)ptr) & 0xFF83FFFF; ptr += sizeof(target_ulong); /* The remaining registers are assumed to be read-only. */ |