Sync with oprofile CVS HEAD from Jan 11, 2011.
There have been a few patches to oprofile for newer ARM architectures
since 0.9.6.
Pruned out irrelevant auto-generated files from the previous dump
so this is closer to being a mirror of the actual oprofile repository.
Change-Id: I889053d30aae433a199a0a18585c66b88ff8de14
diff --git a/libabi/opimport.cpp b/libabi/opimport.cpp
index 77d869e..b772c88 100644
--- a/libabi/opimport.cpp
+++ b/libabi/opimport.cpp
@@ -78,7 +78,8 @@
unsigned char const * src = static_cast<unsigned char const *>(src_)
+ theabi.need(off);
size_t nbytes = theabi.need(sz);
-
+
+ targ = 0;
if (nbytes == 0)
return;
@@ -91,7 +92,6 @@
<< " bytes @ " << off << " = " << (src - begin)
<< " : ";
- targ = 0;
if (little_endian)
while(nbytes--)
targ = (targ << 8) | src[nbytes];
@@ -114,8 +114,6 @@
extractor ext(abi, src, len);
memcpy(head->magic, src + abi.need("offsetof_header_magic"), 4);
- if (verbose)
- cerr << hex << "magic = " << (int) head->magic[0] << ":" << (int) head->magic[1] << ":" << (int) head->magic[2] << ":" << (int) head->magic[3] << endl;
// begin extracting opd header
ext.extract(head->version, src, "sizeof_u32", "offsetof_header_version");