Commit 21a10690 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

s390x/arch_dump: also dump guarded storage control block 



Write the new note section of type 30b (guarded storage control block).

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 62deb62d

include/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -1476,6 +1476,7 @@ typedef struct elf64_shdr { 
#define NT_TASKSTRUCT	4

#define NT_AUXV		6

#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */

#define NT_S390_GS_CB   0x30b           /* s390 guarded storage registers */

#define NT_S390_VXRS_HIGH 0x30a         /* s390 vector registers 16-31 */

#define NT_S390_VXRS_LOW  0x309         /* s390 vector registers 0-15 (lower half) */

#define NT_S390_PREFIX  0x305           /* s390 prefix register */

target/s390x/arch_dump.c

+18 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ struct S390xElfVregsHiStruct { 


typedef struct S390xElfVregsHiStruct S390xElfVregsHi;



struct S390xElfGSCBStruct {

    uint64_t gsregs[4];

} QEMU_PACKED;



typedef struct S390xElfGSCBStruct S390xElfGSCB;



typedef struct noteStruct {

    Elf64_Nhdr hdr;

    char name[8];
@@ -65,6 +71,7 @@ typedef struct noteStruct { 
        S390xElfFpregset fpregset;

        S390xElfVregsLo vregslo;

        S390xElfVregsHi vregshi;

        S390xElfGSCB gscb;

        uint32_t prefix;

        uint64_t timer;

        uint64_t todcmp;
@@ -126,6 +133,16 @@ static void s390x_write_elf64_vregshi(Note *note, S390CPU *cpu, int id) 
    }

}



static void s390x_write_elf64_gscb(Note *note, S390CPU *cpu, int id)

{

    int i;



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

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

        note->contents.gscb.gsregs[i] = cpu_to_be64(cpu->env.gscb[i]);

    }

}



static void s390x_write_elf64_timer(Note *note, S390CPU *cpu, int id)

{

    note->hdr.n_type = cpu_to_be32(NT_S390_TIMER);
@@ -181,6 +198,7 @@ static const NoteFuncDesc note_linux[] = { 
    {sizeof(((Note *)0)->contents.todpreg),  s390x_write_elf64_todpreg},

    {sizeof(((Note *)0)->contents.vregslo),  s390x_write_elf64_vregslo},

    {sizeof(((Note *)0)->contents.vregshi),  s390x_write_elf64_vregshi},

    {sizeof(((Note *)0)->contents.gscb),     s390x_write_elf64_gscb},

    { 0, NULL}

};