[pypy-commit] pypy vmprof: Fixes, untested

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: vmprof
Changeset: r76342:de655e4feb4e
Date: 2015-03-12 11:29 +0100
http://bitbucket.org/pypy/pypy/changeset/de655e4feb4e/

Log:	Fixes, untested

diff --git a/pypy/module/_vmprof/src/fake_pypy_api.c b/pypy/module/_vmprof/src/fake_pypy_api.c
--- a/pypy/module/_vmprof/src/fake_pypy_api.c
+++ b/pypy/module/_vmprof/src/fake_pypy_api.c
@@ -1,25 +1,15 @@
-
-long pypy_jit_start_addr(void)
-{
-	return 3;
-}
-
-long pypy_jit_end_addr(void)
-{
-	return 3;
-}
 
 long pypy_jit_stack_depth_at_loc(long x)
 {
 	return 0;
 }
 
-long pypy_find_codemap_at_addr(long x)
+void *pypy_find_codemap_at_addr(long x)
 {
-	return 0;
+	return NULL;
 }
 
-long pypy_yield_codemap_at_addr(long x, long y, long *a)
+long pypy_yield_codemap_at_addr(void *x, long y, long *a)
 {
 	return 0;
 }
diff --git a/pypy/module/_vmprof/src/get_custom_offset.c b/pypy/module/_vmprof/src/get_custom_offset.c
--- a/pypy/module/_vmprof/src/get_custom_offset.c
+++ b/pypy/module/_vmprof/src/get_custom_offset.c
@@ -1,12 +1,12 @@
-
-long pypy_jit_start_addr();
-long pypy_jit_end_addr();
-long pypy_jit_stack_depth_at_loc(long);
-void *pypy_find_codemap_at_addr(long);
-long pypy_yield_codemap_at_addr(void *, long, long *);
 
 extern volatile int pypy_codemap_currently_invalid;
 
+void *pypy_find_codemap_at_addr(long addr);
+long pypy_yield_codemap_at_addr(void *codemap_raw, long addr,
+                                long *current_pos_addr);
+long pypy_jit_stack_depth_at_loc(long loc);
+
+
 void vmprof_set_tramp_range(void* start, void* end)
 {
 }
@@ -18,11 +18,7 @@
 
 static ptrdiff_t vmprof_unw_get_custom_offset(void* ip, unw_cursor_t *cp) {
 	intptr_t ip_l = (intptr_t)ip;
-
-	if (ip_l < pypy_jit_start_addr() || ip_l > pypy_jit_end_addr()) {
-		return -1;
-	}
-	return (void*)pypy_jit_stack_depth_at_loc(ip_l);
+	return pypy_jit_stack_depth_at_loc(ip_l);
 }
 
 static long vmprof_write_header_for_jit_addr(void **result, long n,