Auxv user stack for FreeBSD, last part

Clean up, didn't need an extra func for user stack limit.
This commit is contained in:
Paul Floyd 2022-10-19 00:51:05 +02:00
parent 802f2d21d9
commit 12d2a3c85d
5 changed files with 28 additions and 8 deletions

View File

@ -718,7 +718,7 @@ Addr setup_client_stack( void* init_sp,
auxv->u.a_val = VG_(get_usrstack)();
break;
case AT_USRSTACKLIM:
auxv->u.a_val = VG_(get_usrstacklim)();
auxv->u.a_val = clstack_max_size;
break;
#endif

View File

@ -3908,11 +3908,6 @@ Word VG_(get_usrstack)(void)
{
return VG_PGROUNDDN(the_iicii.clstack_end) + VKI_PAGE_SIZE;
}
Word VG_(get_usrstacklim)(void)
{
return the_iifii.clstack_max_size;
}
#endif

View File

@ -387,7 +387,6 @@ extern Bool VG_(am_search_for_new_segment)(Addr *start, SizeT *size,
#if defined(VGO_freebsd)
/* For kern.usrstack syscall on FreeBSD */
extern Word VG_(get_usrstack)(void);
extern Word VG_(get_usrstacklim)(void);
#endif
#endif // __PUB_CORE_ASPACEMGR_H

View File

@ -55,7 +55,7 @@ Elf_AuxStr aux_map[AT_COUNT] = {
#endif
#if (FREEBSD_VERS >= FREEBSD_14)
{"AT_USRSTACKBASE", 35},
{"AT_USRSTACKLIM", 36),
{"AT_USRSTACKLIM", 36},
// {"AT_COUNT", 37},
#endif
};

View File

@ -0,0 +1,26 @@
val: AT_PHDR int: 03 ptr: 0x........
val: AT_PHENT int: 04 ptr: 0x........
val: AT_PHNUM int: 05 ptr: 0x........
val: AT_PAGESZ int: 06 ptr: 0x........
val: AT_FLAGS int: 08 ptr: 0x........
val: AT_ENTRY int: 09 ptr: 0x........
val: AT_BASE int: 07 ptr: 0x........
val: AT_EHDRFLAGS int: 24 ptr: 0x........
val: AT_EXECPATH int: 15 ptr: 0x........
val: AT_OSRELDATE int: 18 ptr: 0x........
val: AT_CANARY int: 16 ptr: 0x........
val: AT_CANARYLEN int: 17 ptr: 0x........
val: AT_NCPUS int: 19 ptr: 0x........
val: AT_PAGESIZES int: 20 ptr: 0x........
val: AT_PAGESIZESLEN int: 21 ptr: 0x........
val: AT_IGNORE int: 01 ptr: 0x........
val: AT_STACKPROT int: 23 ptr: 0x........
val: AT_IGNORE int: 01 ptr: 0x........
val: AT_ARGC int: 28 ptr: 0x........
val: AT_ARGV int: 29 ptr: 0x........
val: AT_ENVC int: 30 ptr: 0x........
val: AT_ENVV int: 31 ptr: 0x........
val: AT_PS_STRINGS int: 32 ptr: 0x........
val: AT_IGNORE int: 01 ptr: 0x........
val: AT_USRSTACKBASE int: 35 ptr: 0x........
val: AT_USRSTACKLIM int: 36 ptr: 0x........