diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-03-08 06:33:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-08 06:33:51 -0800 |
| commit | 575cba490198959913af6c4b4599f39f5532551e (patch) | |
| tree | b2f2bfa2ced281bd214b69886106faccd07f6dee /vm/compiler/Compiler.h | |
| parent | 3c88565bd18dcbdde3ae358e8680c2cf3a0eaf56 (diff) | |
| parent | fc519dc8f4444f6d93806ec15ce7445b322070fd (diff) | |
| download | android_dalvik-575cba490198959913af6c4b4599f39f5532551e.tar.gz android_dalvik-575cba490198959913af6c4b4599f39f5532551e.tar.bz2 android_dalvik-575cba490198959913af6c4b4599f39f5532551e.zip | |
am fc519dc8: Jit: Make most Jit compile failures non-fatal; just abort offending translation
Merge commit 'fc519dc8f4444f6d93806ec15ce7445b322070fd' into dalvik-dev
* commit 'fc519dc8f4444f6d93806ec15ce7445b322070fd':
Jit: Make most Jit compile failures non-fatal; just abort offending translation
Diffstat (limited to 'vm/compiler/Compiler.h')
| -rw-r--r-- | vm/compiler/Compiler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vm/compiler/Compiler.h b/vm/compiler/Compiler.h index de3068697..f264c5b16 100644 --- a/vm/compiler/Compiler.h +++ b/vm/compiler/Compiler.h @@ -15,6 +15,7 @@ */ #include <Thread.h> +#include <setjmp.h> #ifndef _DALVIK_VM_COMPILER #define _DALVIK_VM_COMPILER @@ -56,6 +57,7 @@ typedef struct CompilerWorkOrder { WorkOrderKind kind; void* info; JitTranslationInfo result; + jmp_buf *bailPtr; } CompilerWorkOrder; /* Chain cell for predicted method invocation */ @@ -152,7 +154,7 @@ bool dvmCompilerWorkEnqueue(const u2* pc, WorkOrderKind kind, void* info); void *dvmCheckCodeCache(void *method); bool dvmCompileMethod(const Method *method, JitTranslationInfo *info); bool dvmCompileTrace(JitTraceDescription *trace, int numMaxInsts, - JitTranslationInfo *info); + JitTranslationInfo *info, jmp_buf *bailPtr); void dvmCompilerDumpStats(void); void dvmCompilerDrainQueue(void); void dvmJitUnchainAll(void); @@ -185,5 +187,4 @@ void dvmCompilerDataFlowAnalysisDispatcher(struct CompilationUnit *cUnit, void dvmCompilerStateRefresh(void); JitTraceDescription *dvmCopyTraceDescriptor(const u2 *pc, const struct JitEntry *desc); - #endif /* _DALVIK_VM_COMPILER */ |