forked from Mirrors/wine-wine
dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
bd620ffb44
commit
bb53152faa
|
@ -1270,29 +1270,56 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
|
||||||
|
|
||||||
if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism))
|
if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism))
|
||||||
{
|
{
|
||||||
Elf_Dyn dyn;
|
|
||||||
char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
|
char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
|
||||||
unsigned long len;
|
unsigned long len;
|
||||||
|
|
||||||
if (load_offset) ptr += load_offset - fmap->u.elf.elf_start;
|
if (load_offset) ptr += load_offset - fmap->u.elf.elf_start;
|
||||||
|
|
||||||
do
|
if (fmap->addr_size == 32)
|
||||||
{
|
{
|
||||||
if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) ||
|
Elf32_Dyn dyn;
|
||||||
len != sizeof(dyn))
|
|
||||||
return ret;
|
do
|
||||||
if (dyn.d_tag == DT_DEBUG)
|
|
||||||
{
|
{
|
||||||
elf_info->dbg_hdr_addr = dyn.d_un.d_ptr;
|
if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) ||
|
||||||
if (load_offset == 0 && dyn_addr == 0) /* likely the case */
|
len != sizeof(dyn))
|
||||||
/* Assume this module (the Wine loader) has been loaded at its preferred address */
|
return ret;
|
||||||
dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
|
if (dyn.d_tag == DT_DEBUG)
|
||||||
break;
|
{
|
||||||
}
|
elf_info->dbg_hdr_addr = dyn.d_un.d_ptr;
|
||||||
ptr += sizeof(dyn);
|
if (load_offset == 0 && dyn_addr == 0) /* likely the case */
|
||||||
} while (dyn.d_tag != DT_NULL);
|
/* Assume this module (the Wine loader) has been
|
||||||
if (dyn.d_tag == DT_NULL) return ret;
|
* loaded at its preferred address */
|
||||||
}
|
dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ptr += sizeof(dyn);
|
||||||
|
} while (dyn.d_tag != DT_NULL);
|
||||||
|
if (dyn.d_tag == DT_NULL) return ret;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Elf64_Dyn dyn;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) ||
|
||||||
|
len != sizeof(dyn))
|
||||||
|
return ret;
|
||||||
|
if (dyn.d_tag == DT_DEBUG)
|
||||||
|
{
|
||||||
|
elf_info->dbg_hdr_addr = dyn.d_un.d_ptr;
|
||||||
|
if (load_offset == 0 && dyn_addr == 0) /* likely the case */
|
||||||
|
/* Assume this module (the Wine loader) has been
|
||||||
|
* loaded at its preferred address */
|
||||||
|
dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ptr += sizeof(dyn);
|
||||||
|
} while (dyn.d_tag != DT_NULL);
|
||||||
|
if (dyn.d_tag == DT_NULL) return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
elf_end_find(fmap);
|
elf_end_find(fmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,11 +59,9 @@ typedef struct section macho_section;
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
|
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#define Elf_Dyn Elf64_Dyn
|
|
||||||
#define Elf_Sym Elf64_Sym
|
#define Elf_Sym Elf64_Sym
|
||||||
#define Elf_auxv_t Elf64_auxv_t
|
#define Elf_auxv_t Elf64_auxv_t
|
||||||
#else
|
#else
|
||||||
#define Elf_Dyn Elf32_Dyn
|
|
||||||
#define Elf_Sym Elf32_Sym
|
#define Elf_Sym Elf32_Sym
|
||||||
#define Elf_auxv_t Elf32_auxv_t
|
#define Elf_auxv_t Elf32_auxv_t
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue