summaryrefslogtreecommitdiffstats
path: root/oatdump
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-07-12 03:08:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-11 21:38:38 +0000
commit0ee33c32388f49853b7f7003047047d7f9e9cb75 (patch)
tree8113de95a8ccdbc6fb854edd0cadef8f852c7dee /oatdump
parent8c4728186f038e2ae09e74cbdcef5e5ca598ba64 (diff)
parent22f8e5c82d12951be38cd893426e13bee33fd69d (diff)
downloadart-0ee33c32388f49853b7f7003047047d7f9e9cb75.zip
art-0ee33c32388f49853b7f7003047047d7f9e9cb75.tar.gz
art-0ee33c32388f49853b7f7003047047d7f9e9cb75.tar.bz2
Merge "Revert "Revert "ART: Key-Value Store in Oat header"""
Diffstat (limited to 'oatdump')
-rw-r--r--oatdump/oatdump.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 3f8e925..0fa1a96 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -171,10 +171,18 @@ class OatDumper {
os << "IMAGE FILE LOCATION OAT BEGIN:\n";
os << StringPrintf("0x%08x\n\n", oat_header.GetImageFileLocationOatDataBegin());
- os << "IMAGE FILE LOCATION:\n";
- const std::string image_file_location(oat_header.GetImageFileLocation());
- os << image_file_location;
- os << "\n\n";
+ // Print the key-value store.
+ {
+ os << "KEY VALUE STORE:\n";
+ size_t index = 0;
+ const char* key;
+ const char* value;
+ while (oat_header.GetStoreKeyValuePairByIndex(index, &key, &value)) {
+ os << key << " = " << value << "\n";
+ index++;
+ }
+ os << "\n";
+ }
os << "BEGIN:\n";
os << reinterpret_cast<const void*>(oat_file_.Begin()) << "\n\n";