summaryrefslogtreecommitdiffstats
path: root/src/compiler/dex/quick/gen_invoke.cc
diff options
context:
space:
mode:
authorbuzbee <buzbee@google.com>2013-04-12 14:39:29 -0700
committerbuzbee <buzbee@google.com>2013-05-13 12:34:28 -0700
commita5abf7091711eed1e9f1d0e1538fe9963ebdf31c (patch)
treee256df83ca632744d144854403a326d90cb683a7 /src/compiler/dex/quick/gen_invoke.cc
parentbf47e5f28b1aa39748dce8ac5abbabca1baee093 (diff)
downloadandroid_art-a5abf7091711eed1e9f1d0e1538fe9963ebdf31c.tar.gz
android_art-a5abf7091711eed1e9f1d0e1538fe9963ebdf31c.tar.bz2
android_art-a5abf7091711eed1e9f1d0e1538fe9963ebdf31c.zip
Compiler: replace DOM traversal computation
Originally the old trace JIT used a few recursive graph walking algorithms - which was perfectly reasonable given that the graph size was capped at a few dozen nodes at most. These were replaced with iterative walk order computations - or at least I thought they all were. Missed one of them, which caused a stack overflow on a pathologically large method compilation. Renaming of some arena_allocator items for consistency and clarity. More detailed memory usage logging. Reworked the allocator to waste less space when an allocation doesn't fit and a new block must be allocated. Change-Id: I4d84dded3c47819eefa0de90ebb821dd12eb8be8
Diffstat (limited to 'src/compiler/dex/quick/gen_invoke.cc')
-rw-r--r--src/compiler/dex/quick/gen_invoke.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/dex/quick/gen_invoke.cc b/src/compiler/dex/quick/gen_invoke.cc
index efacff0ab2..9fd4a86c74 100644
--- a/src/compiler/dex/quick/gen_invoke.cc
+++ b/src/compiler/dex/quick/gen_invoke.cc
@@ -1158,11 +1158,13 @@ bool Mir2Lir::GenInlinedUnsafePut(CallInfo* info, bool is_long,
}
RegLocation rl_object = LoadValue(rl_src_obj, kCoreReg);
RegLocation rl_offset = LoadValue(rl_src_offset, kCoreReg);
- RegLocation rl_value = LoadValue(rl_src_value, kCoreReg);
+ RegLocation rl_value;
if (is_long) {
+ rl_value = LoadValueWide(rl_src_value, kCoreReg);
OpRegReg(kOpAdd, rl_object.low_reg, rl_offset.low_reg);
StoreBaseDispWide(rl_object.low_reg, 0, rl_value.low_reg, rl_value.high_reg);
} else {
+ rl_value = LoadValue(rl_src_value, kCoreReg);
StoreBaseIndexed(rl_object.low_reg, rl_offset.low_reg, rl_value.low_reg, 0, kWord);
}
if (is_volatile) {