diff options
| author |   Matti Picus <matti.picus@gmail.com> | 2020-11-06 14:40:02 +0200 |
|---|---|---|
| committer | Matti Picus <matti.picus@gmail.com> | 2020-11-06 14:40:02 +0200 |
| commit | ae9d4390ce7be7d36e38ffc35703c63041b9d76a (patch) | |
| tree | 56371f0bd8377b972e71a9103773801605732ff9 | |
| parent | merge default into release (diff) | |
| parent | fix link for topaz (diff) | |
| download | pypy-ae9d4390ce7be7d36e38ffc35703c63041b9d76a.tar.gz pypy-ae9d4390ce7be7d36e38ffc35703c63041b9d76a.tar.bz2 pypy-ae9d4390ce7be7d36e38ffc35703c63041b9d76a.zip | |
resync from defaultrelease-pypy2.7-v7.3.3rc2release-pypy2.7-v7.3.3rc1release-pypy2.7-v7.3.3
| -rw-r--r-- | pypy/doc/faq.rst | 2 | ||||
| -rw-r--r-- | rpython/rlib/rvmprof/src/rvmprof.h | 1 | ||||
| -rw-r--r-- | rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst index df406bdda4..64d098b09d 100644 --- a/pypy/doc/faq.rst +++ b/pypy/doc/faq.rst @@ -379,7 +379,7 @@ interpreter; preliminary versions of a `JavaScript interpreter`_ (produced during a sprint). On the `PyPy bitbucket page`_ there is also a Scheme and an Io implementation; both of these are unfinished at the moment. -.. _Topaz: https://docs.topazruby.com/en/latest/ +.. _Topaz: https://github.com/topazproject/topaz .. _Hippy: https://morepypy.blogspot.ch/2012/07/hello-everyone.html .. _JavaScript interpreter: https://bitbucket.org/pypy/lang-js/ .. _Prolog interpreter: https://bitbucket.org/cfbolz/pyrolog/ diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h index 5056683a04..dd71a076cb 100644 --- a/rpython/rlib/rvmprof/src/rvmprof.h +++ b/rpython/rlib/rvmprof/src/rvmprof.h @@ -41,7 +41,6 @@ RPY_EXTERN long vmprof_get_profile_path(char *, long); RPY_EXTERN int vmprof_stop_sampling(void); RPY_EXTERN void vmprof_start_sampling(void); -void *pypy_find_codemap_at_addr(long addr, long *start_addr); long vmprof_write_header_for_jit_addr(intptr_t *result, long n, intptr_t addr, int max_depth); diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h b/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h index 3ad2ebaeaf..c39095233d 100644 --- a/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h +++ b/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h @@ -9,6 +9,7 @@ #include <stdint.h> #endif +void *pypy_find_codemap_at_addr(long addr, long *start_addr); long pypy_yield_codemap_at_addr(void *codemap_raw, long addr, long *current_pos_addr); |