diff options
| author | Ian Rogers <irogers@google.com> | 2013-07-29 11:07:13 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-07-30 16:00:24 -0700 |
| commit | 7655f29fabc0a12765de828914a18314382e5a35 (patch) | |
| tree | 219f2df20cf7f053a73a345ae20e131a73759c79 /compiler/utils/arm/assembler_arm.cc | |
| parent | 1a8080d4c2e1772cfcc5e9d6587bc63bba3945d9 (diff) | |
| download | android_art-7655f29fabc0a12765de828914a18314382e5a35.tar.gz android_art-7655f29fabc0a12765de828914a18314382e5a35.tar.bz2 android_art-7655f29fabc0a12765de828914a18314382e5a35.zip | |
Portable refactorings.
Separate quick from portable entrypoints.
Move architectural dependencies into arch.
Change-Id: I9adbc0a9782e2959fdc3308215f01e3107632b7c
Diffstat (limited to 'compiler/utils/arm/assembler_arm.cc')
| -rw-r--r-- | compiler/utils/arm/assembler_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc index 0778cd3bbc..fa202c3017 100644 --- a/compiler/utils/arm/assembler_arm.cc +++ b/compiler/utils/arm/assembler_arm.cc @@ -1884,7 +1884,7 @@ void ArmExceptionSlowPath::Emit(Assembler* sasm) { // Don't care about preserving R0 as this call won't return __ mov(R0, ShifterOperand(scratch_.AsCoreRegister())); // Set up call to Thread::Current()->pDeliverException - __ LoadFromOffset(kLoadWord, R12, TR, ENTRYPOINT_OFFSET(pDeliverException)); + __ LoadFromOffset(kLoadWord, R12, TR, QUICK_ENTRYPOINT_OFFSET(pDeliverException)); __ blx(R12); // Call never returns __ bkpt(0); |