diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-13 08:05:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-11 15:59:20 +0000 |
| commit | b08f63c21de64f8b74003e3638e100471bd099f3 (patch) | |
| tree | ce0feab2c5a04e5a2d811e0b4b88d34bebc22730 /compiler/optimizing/code_generator.h | |
| parent | 3316ff53b8745707a492d0442a94174abc679ece (diff) | |
| parent | e27f31a81636ad74bd3376ee39cf215941b85c0e (diff) | |
| download | art-b08f63c21de64f8b74003e3638e100471bd099f3.tar.gz art-b08f63c21de64f8b74003e3638e100471bd099f3.tar.bz2 art-b08f63c21de64f8b74003e3638e100471bd099f3.zip | |
Merge "Enable the register allocator on ARM."
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 3 |
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; |