diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-05 13:26:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-05 13:26:47 -0700 |
| commit | 0a1e8c6523f6e0043f34b9dfda90f25a6fb56396 (patch) | |
| tree | 2ba9958780251c1ef6bcecc9bd1e785b4896bb1a /vm/compiler/Compiler.cpp | |
| parent | 21d7d95469551dbe13d896986cefa240c280b3e8 (diff) | |
| parent | b91f922c80b454fa579deaee262bdd51225b82ee (diff) | |
am b91f922c: am f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit 'b91f922c80b454fa579deaee262bdd51225b82ee':
Rename unreasonable function name dmvCompilerTemplateEnd
Diffstat (limited to 'vm/compiler/Compiler.cpp')
| -rw-r--r-- | vm/compiler/Compiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp index fbde41f5b..e18e6e603 100644 --- a/vm/compiler/Compiler.cpp +++ b/vm/compiler/Compiler.cpp @@ -27,7 +27,7 @@ #endif extern "C" void dvmCompilerTemplateStart(void); -extern "C" void dmvCompilerTemplateEnd(void); +extern "C" void dvmCompilerTemplateEnd(void); static inline bool workQueueLength(void) { @@ -193,7 +193,7 @@ bool dvmCompilerSetupCodeCache(void) #ifndef ARCH_IA32 /* Copy the template code into the beginning of the code cache */ - int templateSize = (intptr_t) dmvCompilerTemplateEnd - + int templateSize = (intptr_t) dvmCompilerTemplateEnd - (intptr_t) dvmCompilerTemplateStart; memcpy((void *) gDvmJit.codeCache, (void *) dvmCompilerTemplateStart, |