diff options
author | Daniel Moody <daniel.moody@mongodb.com> | 2022-02-18 14:24:37 -0600 |
---|---|---|
committer | Dave Watson <dade.watson@gmail.com> | 2022-03-10 15:33:16 -0800 |
commit | e85b65cec757ef589f28957d0c6c21c498a03bdf (patch) | |
tree | 1c114d1467144a50768804d7cb102fcba59df9be /src/aarch64 | |
parent | b06ef3d1afd12dc349e21869ed22b8da9821b5ad (diff) | |
download | libunwind-e85b65cec757ef589f28957d0c6c21c498a03bdf.tar.gz |
Updated to determine PAGE_SIZE dynamically.
Diffstat (limited to 'src/aarch64')
-rw-r--r-- | src/aarch64/Ginit.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c index 2b08feb3..fe6e511d 100644 --- a/src/aarch64/Ginit.c +++ b/src/aarch64/Ginit.c @@ -84,8 +84,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, return 0; } -#define PAGE_SIZE 4096 -#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1)) static int mem_validate_pipe[2] = {-1, -1}; @@ -197,11 +195,14 @@ tdep_init_mem_validate (void) #ifdef HAVE_MINCORE unsigned char present = 1; - unw_word_t addr = PAGE_START((unw_word_t)&present); + size_t len = unw_page_size; + unw_word_t addr = uwn_page_start((unw_word_t)&present); unsigned char mvec[1]; int ret; - while ((ret = mincore ((void*)addr, PAGE_SIZE, (unsigned char *)mvec)) == -1 && - errno == EAGAIN) {} + while ((ret = mincore((void *)addr, len, (unsigned char *)mvec)) == -1 && + errno == EAGAIN) + { + } if (ret == 0) { Debug(1, "using mincore to validate memory\n"); @@ -295,12 +296,8 @@ validate_mem (unw_word_t addr) { size_t len; - if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr)) - len = PAGE_SIZE; - else - len = PAGE_SIZE * 2; - - addr = PAGE_START(addr); + len = unw_page_size; + addr = uwn_page_start(addr); if (addr == 0) return -1; |