public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

contrib/elf2dmp: fix code style

Browse source 
Originally elf2dmp were added with some code style issues,
especially in pe.h header, and some were introduced by
2d0fc797fa. Fix them now.

Signed-off-by: Viktor Prutyanov <viktor@daynix.com>
Reviewed-by: Annie Li <annie.li@oracle.com>
Message-id: 20230222211246.883679-2-viktor@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Viktor Prutyanov 2023-02-23 00:12:44 +03:00 committed by Peter Maydell
parent 0c88f93788
commit 05adc48e1d
3 changed files with 57 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/elf2dmp/addrspace.c
View file

@ -11,6 +11,7 @@
static struct pa_block *pa_space_find_block(struct pa_space *ps, uint64_t pa) static struct pa_block *pa_space_find_block(struct pa_space *ps, uint64_t pa)
{ {
size_t i; size_t i;
for (i = 0; i < ps->block_nr; i++) { for (i = 0; i < ps->block_nr; i++) {
if (ps->block[i].paddr <= pa && if (ps->block[i].paddr <= pa &&
pa <= ps->block[i].paddr + ps->block[i].size) { pa <= ps->block[i].paddr + ps->block[i].size) {

9
contrib/elf2dmp/main.c
View file

@ -282,14 +282,16 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_space *ps,
}; };
for (i = 0; i < ps->block_nr; i++) { for (i = 0; i < ps->block_nr; i++) {
h.PhysicalMemoryBlock.NumberOfPages += ps->block[i].size / ELF2DMP_PAGE_SIZE; h.PhysicalMemoryBlock.NumberOfPages +=
ps->block[i].size / ELF2DMP_PAGE_SIZE;
h.PhysicalMemoryBlock.Run[i] = (WinDumpPhyMemRun64) { h.PhysicalMemoryBlock.Run[i] = (WinDumpPhyMemRun64) {
.BasePage = ps->block[i].paddr / ELF2DMP_PAGE_SIZE, .BasePage = ps->block[i].paddr / ELF2DMP_PAGE_SIZE,
.PageCount = ps->block[i].size / ELF2DMP_PAGE_SIZE, .PageCount = ps->block[i].size / ELF2DMP_PAGE_SIZE,
}; };
} }
h.RequiredDumpSpace += h.PhysicalMemoryBlock.NumberOfPages << ELF2DMP_PAGE_BITS; h.RequiredDumpSpace +=
h.PhysicalMemoryBlock.NumberOfPages << ELF2DMP_PAGE_BITS;
*hdr = h; *hdr = h;
@ -299,7 +301,8 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_space *ps,
static int fill_context(KDDEBUGGER_DATA64 *kdbg, static int fill_context(KDDEBUGGER_DATA64 *kdbg,
struct va_space *vs, QEMU_Elf *qe) struct va_space *vs, QEMU_Elf *qe)
{ {
int i; int i;
for (i = 0; i < qe->state_nr; i++) { for (i = 0; i < qe->state_nr; i++) {
uint64_t Prcb; uint64_t Prcb;
uint64_t Context; uint64_t Context;

100
contrib/elf2dmp/pe.h
View file

@ -33,70 +33,70 @@ typedef struct IMAGE_DOS_HEADER {
} __attribute__ ((packed)) IMAGE_DOS_HEADER; } __attribute__ ((packed)) IMAGE_DOS_HEADER;
typedef struct IMAGE_FILE_HEADER { typedef struct IMAGE_FILE_HEADER {
uint16_t Machine; uint16_t Machine;
uint16_t NumberOfSections; uint16_t NumberOfSections;
uint32_t TimeDateStamp; uint32_t TimeDateStamp;
uint32_t PointerToSymbolTable; uint32_t PointerToSymbolTable;
uint32_t NumberOfSymbols; uint32_t NumberOfSymbols;
uint16_t SizeOfOptionalHeader; uint16_t SizeOfOptionalHeader;
uint16_t Characteristics; uint16_t Characteristics;
} __attribute__ ((packed)) IMAGE_FILE_HEADER; } __attribute__ ((packed)) IMAGE_FILE_HEADER;
typedef struct IMAGE_DATA_DIRECTORY { typedef struct IMAGE_DATA_DIRECTORY {
uint32_t VirtualAddress; uint32_t VirtualAddress;
uint32_t Size; uint32_t Size;
} __attribute__ ((packed)) IMAGE_DATA_DIRECTORY; } __attribute__ ((packed)) IMAGE_DATA_DIRECTORY;
#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
typedef struct IMAGE_OPTIONAL_HEADER64 { typedef struct IMAGE_OPTIONAL_HEADER64 {
uint16_t Magic; /* 0x20b */ uint16_t Magic; /* 0x20b */
uint8_t MajorLinkerVersion; uint8_t MajorLinkerVersion;
uint8_t MinorLinkerVersion; uint8_t MinorLinkerVersion;
uint32_t SizeOfCode; uint32_t SizeOfCode;
uint32_t SizeOfInitializedData; uint32_t SizeOfInitializedData;
uint32_t SizeOfUninitializedData; uint32_t SizeOfUninitializedData;
uint32_t AddressOfEntryPoint; uint32_t AddressOfEntryPoint;
uint32_t BaseOfCode; uint32_t BaseOfCode;
uint64_t ImageBase; uint64_t ImageBase;
uint32_t SectionAlignment; uint32_t SectionAlignment;
uint32_t FileAlignment; uint32_t FileAlignment;
uint16_t MajorOperatingSystemVersion; uint16_t MajorOperatingSystemVersion;
uint16_t MinorOperatingSystemVersion; uint16_t MinorOperatingSystemVersion;
uint16_t MajorImageVersion; uint16_t MajorImageVersion;
uint16_t MinorImageVersion; uint16_t MinorImageVersion;
uint16_t MajorSubsystemVersion; uint16_t MajorSubsystemVersion;
uint16_t MinorSubsystemVersion; uint16_t MinorSubsystemVersion;
uint32_t Win32VersionValue; uint32_t Win32VersionValue;
uint32_t SizeOfImage; uint32_t SizeOfImage;
uint32_t SizeOfHeaders; uint32_t SizeOfHeaders;
uint32_t CheckSum; uint32_t CheckSum;
uint16_t Subsystem; uint16_t Subsystem;
uint16_t DllCharacteristics; uint16_t DllCharacteristics;
uint64_t SizeOfStackReserve; uint64_t SizeOfStackReserve;
uint64_t SizeOfStackCommit; uint64_t SizeOfStackCommit;
uint64_t SizeOfHeapReserve; uint64_t SizeOfHeapReserve;
uint64_t SizeOfHeapCommit; uint64_t SizeOfHeapCommit;
uint32_t LoaderFlags; uint32_t LoaderFlags;
uint32_t NumberOfRvaAndSizes; uint32_t NumberOfRvaAndSizes;
IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
} __attribute__ ((packed)) IMAGE_OPTIONAL_HEADER64; } __attribute__ ((packed)) IMAGE_OPTIONAL_HEADER64;
typedef struct IMAGE_NT_HEADERS64 { typedef struct IMAGE_NT_HEADERS64 {
uint32_t Signature; uint32_t Signature;
IMAGE_FILE_HEADER FileHeader; IMAGE_FILE_HEADER FileHeader;
IMAGE_OPTIONAL_HEADER64 OptionalHeader; IMAGE_OPTIONAL_HEADER64 OptionalHeader;
} __attribute__ ((packed)) IMAGE_NT_HEADERS64; } __attribute__ ((packed)) IMAGE_NT_HEADERS64;
typedef struct IMAGE_DEBUG_DIRECTORY { typedef struct IMAGE_DEBUG_DIRECTORY {
uint32_t Characteristics; uint32_t Characteristics;
uint32_t TimeDateStamp; uint32_t TimeDateStamp;
uint16_t MajorVersion; uint16_t MajorVersion;
uint16_t MinorVersion; uint16_t MinorVersion;
uint32_t Type; uint32_t Type;
uint32_t SizeOfData; uint32_t SizeOfData;
uint32_t AddressOfRawData; uint32_t AddressOfRawData;
uint32_t PointerToRawData; uint32_t PointerToRawData;
} __attribute__ ((packed)) IMAGE_DEBUG_DIRECTORY; } __attribute__ ((packed)) IMAGE_DEBUG_DIRECTORY;
#define IMAGE_DEBUG_TYPE_CODEVIEW 2 #define IMAGE_DEBUG_TYPE_CODEVIEW 2