Author: Matti Picus <[email protected]>
Branch:
Changeset: r96816:c3622918429e
Date: 2019-06-18 10:01 +0300
http://bitbucket.org/pypy/pypy/changeset/c3622918429e/
Log: fix vmprof for 32 bit linux
diff --git a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
--- a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
+++ b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
@@ -280,7 +280,7 @@
// this is possible because compiler align to 8 bytes.
//
if (func_addr != 0x0) {
- depth = _write_native_stack((void*)(((uint64_t)func_addr) |
0x1), result, depth, max_depth);
+ depth = _write_native_stack((void*)(((intptr_t)func_addr) |
0x1), result, depth, max_depth);
}
}
diff --git a/rpython/rlib/rvmprof/test/test_file.py
b/rpython/rlib/rvmprof/test/test_file.py
--- a/rpython/rlib/rvmprof/test/test_file.py
+++ b/rpython/rlib/rvmprof/test/test_file.py
@@ -11,10 +11,11 @@
def get_list_of_files(shared):
files = list(shared.visit('*.[ch]'))
# in PyPy we checkin the result of ./configure; as such, these files are
- # not in github and can be skipped
+ # not in github or different and can be skipped
files.remove(shared.join('libbacktrace', 'config-x86_32.h'))
files.remove(shared.join('libbacktrace', 'config-x86_64.h'))
files.remove(shared.join('libbacktrace', 'gstdint.h'))
+ files.remove(shared.join('libbacktrace', 'config.h'))
return files
def test_same_file():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
