forked from Mirrors/wine-wine
dbghelp: Use sysconf() instead of getpagesize().
parent
62f22dd4e3
commit
a81996d757
|
@ -102,9 +102,7 @@ struct elf_module_info
|
||||||
const char* elf_map_section(struct image_section_map* ism)
|
const char* elf_map_section(struct image_section_map* ism)
|
||||||
{
|
{
|
||||||
struct elf_file_map* fmap = &ism->fmap->u.elf;
|
struct elf_file_map* fmap = &ism->fmap->u.elf;
|
||||||
|
size_t ofst, size, pgsz = sysconf( _SC_PAGESIZE );
|
||||||
unsigned long pgsz = getpagesize();
|
|
||||||
unsigned long ofst, size;
|
|
||||||
|
|
||||||
assert(ism->fmap->modtype == DMT_ELF);
|
assert(ism->fmap->modtype == DMT_ELF);
|
||||||
if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum ||
|
if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum ||
|
||||||
|
@ -174,12 +172,10 @@ void elf_unmap_section(struct image_section_map* ism)
|
||||||
if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy &&
|
if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy &&
|
||||||
fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP)
|
fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP)
|
||||||
{
|
{
|
||||||
unsigned long pgsz = getpagesize();
|
size_t pgsz = sysconf( _SC_PAGESIZE );
|
||||||
unsigned long ofst, size;
|
size_t ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1);
|
||||||
|
size_t size = ((fmap->sect[ism->sidx].shdr.sh_offset +
|
||||||
ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1);
|
fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst;
|
||||||
size = ((fmap->sect[ism->sidx].shdr.sh_offset +
|
|
||||||
fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst;
|
|
||||||
if (munmap((char*)fmap->sect[ism->sidx].mapped, size) < 0)
|
if (munmap((char*)fmap->sect[ism->sidx].mapped, size) < 0)
|
||||||
WARN("Couldn't unmap the section\n");
|
WARN("Couldn't unmap the section\n");
|
||||||
fmap->sect[ism->sidx].mapped = IMAGE_NO_MAP;
|
fmap->sect[ism->sidx].mapped = IMAGE_NO_MAP;
|
||||||
|
@ -279,7 +275,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map*
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
int i;
|
int i;
|
||||||
Elf_Phdr phdr;
|
Elf_Phdr phdr;
|
||||||
unsigned long tmp, page_mask = getpagesize() - 1;
|
size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1;
|
||||||
char* filename;
|
char* filename;
|
||||||
unsigned len;
|
unsigned len;
|
||||||
BOOL ret = FALSE;
|
BOOL ret = FALSE;
|
||||||
|
|
|
@ -135,7 +135,7 @@ static void macho_calc_range(const struct macho_file_map* fmap, unsigned offset,
|
||||||
unsigned* out_aligned_end, unsigned* out_aligned_len,
|
unsigned* out_aligned_end, unsigned* out_aligned_len,
|
||||||
unsigned* out_misalign)
|
unsigned* out_misalign)
|
||||||
{
|
{
|
||||||
unsigned pagemask = getpagesize() - 1;
|
unsigned pagemask = sysconf( _SC_PAGESIZE ) - 1;
|
||||||
unsigned file_offset, misalign;
|
unsigned file_offset, misalign;
|
||||||
|
|
||||||
file_offset = fmap->arch_offset + offset;
|
file_offset = fmap->arch_offset + offset;
|
||||||
|
@ -383,7 +383,7 @@ static int macho_accum_segs_range(struct macho_file_map* fmap,
|
||||||
const struct load_command* lc, void* user)
|
const struct load_command* lc, void* user)
|
||||||
{
|
{
|
||||||
const struct segment_command* sc = (const struct segment_command*)lc;
|
const struct segment_command* sc = (const struct segment_command*)lc;
|
||||||
unsigned tmp, page_mask = getpagesize() - 1;
|
unsigned tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1;
|
||||||
|
|
||||||
TRACE("(%p/%d, %p, %p) before: 0x%08x - 0x%08x\n", fmap, fmap->fd, lc, user,
|
TRACE("(%p/%d, %p, %p) before: 0x%08x - 0x%08x\n", fmap, fmap->fd, lc, user,
|
||||||
(unsigned)fmap->segs_start, (unsigned)fmap->segs_size);
|
(unsigned)fmap->segs_start, (unsigned)fmap->segs_size);
|
||||||
|
|
Loading…
Reference in New Issue