Commit c498d8e3 authored by Eric Farman's avatar Eric Farman Committed by Cornelia Huck
Browse files

s390x: Common access to floating point registers 



Provide a routine to access the correct floating point register,
to simplify future expansion.

Suggested-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Farman <farman@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 0915aed5

linux-user/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -4098,7 +4098,7 @@ static void save_sigregs(CPUS390XState *env, target_sigregs *sregs) 
     */

    //save_fp_regs(&current->thread.fp_regs); FIXME

    for (i = 0; i < 16; i++) {

        __put_user(env->fregs[i].ll, &sregs->fpregs.fprs[i]);

        __put_user(get_freg(env, i)->ll, &sregs->fpregs.fprs[i]);

    }

}
@@ -4239,7 +4239,7 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc) 
        __get_user(env->aregs[i], &sc->regs.acrs[i]);

    }

    for (i = 0; i < 16; i++) {

        __get_user(env->fregs[i].ll, &sc->fpregs.fprs[i]);

        __get_user(get_freg(env, i)->ll, &sc->fpregs.fprs[i]);

    }



    return err;

target-s390x/arch_dump.c

+2 −1
Original line number Diff line number Diff line
@@ -78,11 +78,12 @@ static void s390x_write_elf64_prstatus(Note *note, S390CPU *cpu) 
static void s390x_write_elf64_fpregset(Note *note, S390CPU *cpu)

{

    int i;

    CPUS390XState *cs = &cpu->env;



    note->hdr.n_type = cpu_to_be32(NT_FPREGSET);

    note->contents.fpregset.fpc = cpu_to_be32(cpu->env.fpc);

    for (i = 0; i <= 15; i++) {

        note->contents.fpregset.fprs[i] = cpu_to_be64(cpu->env.fregs[i].ll);

        note->contents.fpregset.fprs[i] = cpu_to_be64(get_freg(cs, i)->ll);

    }

}

target-s390x/cpu.h

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ typedef struct CPUS390XState { 


} CPUS390XState;



static inline CPU_DoubleU *get_freg(CPUS390XState *cs, int nr)

{

    return &cs->fregs[nr];

}



#include "cpu-qom.h"

#include <sysemu/kvm.h>

target-s390x/gdbstub.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int cpu_read_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n) 
    case S390_FPC_REGNUM:

        return gdb_get_reg32(mem_buf, env->fpc);

    case S390_F0_REGNUM ... S390_F15_REGNUM:

        return gdb_get_reg64(mem_buf, env->fregs[n - S390_F0_REGNUM].ll);

        return gdb_get_reg64(mem_buf, get_freg(env, n - S390_F0_REGNUM)->ll);

    default:

        return 0;

    }
@@ -124,7 +124,7 @@ static int cpu_write_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n) 
        env->fpc = ldl_p(mem_buf);

        return 4;

    case S390_F0_REGNUM ... S390_F15_REGNUM:

        env->fregs[n - S390_F0_REGNUM].ll = ldtul_p(mem_buf);

        get_freg(env, n - S390_F0_REGNUM)->ll = ldtul_p(mem_buf);

        return 8;

    default:

        return 0;

target-s390x/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static void do_mchk_interrupt(CPUS390XState *env) 
    lowcore = cpu_map_lowcore(env);



    for (i = 0; i < 16; i++) {

        lowcore->floating_pt_save_area[i] = cpu_to_be64(env->fregs[i].ll);

        lowcore->floating_pt_save_area[i] = cpu_to_be64(get_freg(env, i)->ll);

        lowcore->gpregs_save_area[i] = cpu_to_be64(env->regs[i]);

        lowcore->access_regs_save_area[i] = cpu_to_be32(env->aregs[i]);

        lowcore->cregs_save_area[i] = cpu_to_be64(env->cregs[i]);