diff options
| author | Ben Cheng <bccheng@android.com> | 2010-03-24 15:24:19 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@android.com> | 2010-03-24 15:33:26 -0700 |
| commit | 11d8f14eef83d1b7bfa8f116de56a92d5ba9e71e (patch) | |
| tree | 9fb56691082e14ac532c9e3da2d0e5803dde0754 /vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c | |
| parent | b7b9be1343b59b429b6de9b28ffffbbbde8478c2 (diff) | |
| download | android_dalvik-11d8f14eef83d1b7bfa8f116de56a92d5ba9e71e.tar.gz android_dalvik-11d8f14eef83d1b7bfa8f116de56a92d5ba9e71e.tar.bz2 android_dalvik-11d8f14eef83d1b7bfa8f116de56a92d5ba9e71e.zip | |
Fix for the JIT blocking mode plus some code cleanup.
Bug: 2517606
Change-Id: I2b5aa92ceaf23d484329330ae20de5966704280b
Diffstat (limited to 'vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c')
| -rw-r--r-- | vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c index fe2b1d485..5a14774c0 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c +++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c @@ -52,6 +52,7 @@ bool dvmCompilerArchVariantInit(void) #if defined(WITH_SELF_VERIFICATION) /* Force into blocking */ gDvmJit.blockingMode = true; + gDvm.nativeDebuggerActive = true; #endif /* Codegen-specific assumptions */ @@ -65,11 +66,11 @@ bool dvmCompilerArchVariantInit(void) assert(sizeof(StackSaveArea) < 236); /* - * EA is calculated by doing "Rn + imm5 << 2", and there are 5 entry points - * that codegen may access, make sure that the offset from the top of the - * struct is less than 108. + * EA is calculated by doing "Rn + imm5 << 2", make sure that the last + * offset from the struct is less than 128. */ - assert(offsetof(InterpState, jitToInterpEntries) < 108); + assert((offsetof(InterpState, jitToInterpEntries) + + sizeof(struct JitToInterpEntries)) <= 128); return true; } |