summaryrefslogtreecommitdiffstats
path: root/oatdump
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-03-13 14:39:40 +0000
committerNicolas Geoffray <ngeoffray@google.com>2015-03-13 18:28:19 +0000
commitfead4e4f397455aa31905b2982d4d861126ab89d (patch)
tree21e4ccd99472bbf5cf1fac3bc20d0bca6f176022 /oatdump
parentcc22e3946baf035c8732e9417ab132bfe663aa45 (diff)
downloadart-fead4e4f397455aa31905b2982d4d861126ab89d.tar.gz
art-fead4e4f397455aa31905b2982d4d861126ab89d.tar.bz2
art-fead4e4f397455aa31905b2982d4d861126ab89d.zip
[optimizing] Don't record None locations in the stack maps.
- moved environment recording from code generator to stack map stream - added creation/loading factory methods for the DexRegisterMap (hides internal details) - added new tests Change-Id: Ic8b6d044f0d8255c6759c19a41df332ef37876fe
Diffstat (limited to 'oatdump')
-rw-r--r--oatdump/oatdump.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 9512376f39..344d2b5dba 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -1084,9 +1084,13 @@ class OatDumper {
if (stack_map.HasDexRegisterMap()) {
DexRegisterMap dex_register_map =
code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers);
+ // TODO: Display the bit mask of live Dex registers.
for (size_t j = 0; j < number_of_dex_registers; ++j) {
- DexRegisterLocation location = dex_register_map.GetLocationKindAndValue(j);
- DumpRegisterMapping(os, j, location.GetInternalKind(), location.GetValue());
+ if (dex_register_map.IsDexRegisterLive(j)) {
+ DexRegisterLocation location =
+ dex_register_map.GetLocationKindAndValue(j, number_of_dex_registers);
+ DumpRegisterMapping(os, j, location.GetInternalKind(), location.GetValue());
+ }
}
}
}