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

i386: introduce ELF_NOTE_SIZE macro

Browse Source 
Factour out a common pattern to compute the ELF note size.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Marc-André Lureau 2017-06-06 21:25:10 +04:00
parent 6402cbbbfd
commit 18a1f0d767
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/i386/arch_dump.c
View File

@ -18,6 +18,11 @@
#include "elf.h" #include "elf.h"
#include "sysemu/memory_mapping.h" #include "sysemu/memory_mapping.h"
#define ELF_NOTE_SIZE(hdr_size, name_size, desc_size) \
((DIV_ROUND_UP((hdr_size), 4) \
+ DIV_ROUND_UP((name_size), 4) \
+ DIV_ROUND_UP((desc_size), 4)) * 4)
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
typedef struct { typedef struct {
target_ulong r15, r14, r13, r12, rbp, rbx, r11, r10; target_ulong r15, r14, r13, r12, rbp, rbx, r11, r10;
@ -77,8 +82,7 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction f,
regs.gs = env->segs[R_GS].selector; regs.gs = env->segs[R_GS].selector;
descsz = sizeof(x86_64_elf_prstatus); descsz = sizeof(x86_64_elf_prstatus);
note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) + note_size = ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz);
DIV_ROUND_UP(descsz, 4)) * 4;
note = g_malloc0(note_size); note = g_malloc0(note_size);
note->n_namesz = cpu_to_le32(name_size); note->n_namesz = cpu_to_le32(name_size);
note->n_descsz = cpu_to_le32(descsz); note->n_descsz = cpu_to_le32(descsz);
@ -156,8 +160,7 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f, CPUX86State *env,
x86_fill_elf_prstatus(&prstatus, env, id); x86_fill_elf_prstatus(&prstatus, env, id);
descsz = sizeof(x86_elf_prstatus); descsz = sizeof(x86_elf_prstatus);
note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) + note_size = ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz);
DIV_ROUND_UP(descsz, 4)) * 4;
note = g_malloc0(note_size); note = g_malloc0(note_size);
note->n_namesz = cpu_to_le32(name_size); note->n_namesz = cpu_to_le32(name_size);
note->n_descsz = cpu_to_le32(descsz); note->n_descsz = cpu_to_le32(descsz);
@ -211,8 +214,7 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
x86_fill_elf_prstatus(&prstatus, &cpu->env, cpuid); x86_fill_elf_prstatus(&prstatus, &cpu->env, cpuid);
descsz = sizeof(x86_elf_prstatus); descsz = sizeof(x86_elf_prstatus);
note_size = (DIV_ROUND_UP(sizeof(Elf32_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) + note_size = ELF_NOTE_SIZE(sizeof(Elf32_Nhdr), name_size, descsz);
DIV_ROUND_UP(descsz, 4)) * 4;
note = g_malloc0(note_size); note = g_malloc0(note_size);
note->n_namesz = cpu_to_le32(name_size); note->n_namesz = cpu_to_le32(name_size);
note->n_descsz = cpu_to_le32(descsz); note->n_descsz = cpu_to_le32(descsz);
@ -443,10 +445,8 @@ ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)
#endif #endif
qemu_desc_size = sizeof(QEMUCPUState); qemu_desc_size = sizeof(QEMUCPUState);
elf_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) + elf_note_size = ELF_NOTE_SIZE(note_head_size, name_size, elf_desc_size);
DIV_ROUND_UP(elf_desc_size, 4)) * 4; qemu_note_size = ELF_NOTE_SIZE(note_head_size, name_size, qemu_desc_size);
qemu_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +
DIV_ROUND_UP(qemu_desc_size, 4)) * 4;
return (elf_note_size + qemu_note_size) * nr_cpus; return (elf_note_size + qemu_note_size) * nr_cpus;
} }