summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing/code_generator.h
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-06-12 17:53:14 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-06-12 18:05:00 +0100
commite27f31a81636ad74bd3376ee39cf215941b85c0e (patch)
tree12dd6a1153b78b831c887f65f0bcef715e89719d /compiler/optimizing/code_generator.h
parentdfc2091d2fb8a7694f69acf8bd39ce4953e026c2 (diff)
downloadart-e27f31a81636ad74bd3376ee39cf215941b85c0e.tar.gz
art-e27f31a81636ad74bd3376ee39cf215941b85c0e.tar.bz2
art-e27f31a81636ad74bd3376ee39cf215941b85c0e.zip
Enable the register allocator on ARM.
- Also fixes a few bugs/wrong assumptions in code not hit by x86. - We need to differentiate between moves due to connecting siblings within a block, and moves due to control flow resolution. Change-Id: Idd05cf138a71c8f36f5531c473de613c0166fe38
Diffstat (limited to 'compiler/optimizing/code_generator.h')
-rw-r--r--compiler/optimizing/code_generator.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 82fa6393e0..11b3a33b48 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -67,8 +67,7 @@ class CodeGenerator : public ArenaObject {
// Note that this follows the current calling convention.
return GetFrameSize()
+ kVRegSize // Art method
- + (parameter->GetIndex() - graph_->GetNumberOfVRegs() + graph_->GetNumberOfInVRegs())
- * kVRegSize;
+ + parameter->GetIndex() * kVRegSize;
}
virtual void GenerateFrameEntry() = 0;