diff options
| author | buzbee <buzbee@google.com> | 2010-12-14 11:18:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 11:18:49 -0800 |
| commit | bab7a89783d8b04d8e531cc6c750198f44724dc7 (patch) | |
| tree | 8e67f12869d9ff24074013ff76e7a28be52b02ea /vm/compiler/codegen/x86 | |
| parent | 824290c8a9102db31f3fb69fc530ebb3d8462d71 (diff) | |
| parent | 13fbc2e4bfa04cce8e181ac37d7f2b13a54aa037 (diff) | |
| download | android_dalvik-bab7a89783d8b04d8e531cc6c750198f44724dc7.tar.gz android_dalvik-bab7a89783d8b04d8e531cc6c750198f44724dc7.tar.bz2 android_dalvik-bab7a89783d8b04d8e531cc6c750198f44724dc7.zip | |
Merge "Stamp out some x86/host mode warnings" into dalvik-dev
Diffstat (limited to 'vm/compiler/codegen/x86')
| -rw-r--r-- | vm/compiler/codegen/x86/ArchUtility.c | 6 | ||||
| -rw-r--r-- | vm/compiler/codegen/x86/Assemble.c | 1 | ||||
| -rw-r--r-- | vm/compiler/codegen/x86/CodegenDriver.c | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/vm/compiler/codegen/x86/ArchUtility.c b/vm/compiler/codegen/x86/ArchUtility.c index 171c3b5ef..f7c48d628 100644 --- a/vm/compiler/codegen/x86/ArchUtility.c +++ b/vm/compiler/codegen/x86/ArchUtility.c @@ -22,3 +22,9 @@ void dvmCompilerCodegenDump(CompilationUnit *cUnit) { } + +/* Target-specific cache flushing (not needed for x86 */ +int dvmCompilerCacheFlush(long start, long end, long flags) +{ + return 0; +} diff --git a/vm/compiler/codegen/x86/Assemble.c b/vm/compiler/codegen/x86/Assemble.c index 31264ce64..3c0b3c7d6 100644 --- a/vm/compiler/codegen/x86/Assemble.c +++ b/vm/compiler/codegen/x86/Assemble.c @@ -20,7 +20,6 @@ #include "../../CompilerInternals.h" #include "X86LIR.h" #include "Codegen.h" -#include <unistd.h> /* for cacheflush */ #include <sys/mman.h> /* for protection change */ #define MAX_ASSEMBLER_RETRIES 10 diff --git a/vm/compiler/codegen/x86/CodegenDriver.c b/vm/compiler/codegen/x86/CodegenDriver.c index 4a5d481b9..4f31563ea 100644 --- a/vm/compiler/codegen/x86/CodegenDriver.c +++ b/vm/compiler/codegen/x86/CodegenDriver.c @@ -35,6 +35,7 @@ extern X86LIR *opReg(CompilationUnit *cUnit, OpKind op, int rDestSrc); static int opcodeCoverage[kNumPackedOpcodes]; static intptr_t templateEntryOffsets[TEMPLATE_LAST_MARK]; +#if 0 // Avoid compiler warnings when x86 disabled during development /* * Bail to the interpreter. Will not return to this trace. * On entry, rPC must be set correctly. @@ -79,6 +80,7 @@ static void genInterpSingleStep(CompilationUnit *cUnit, MIR *mir) storeWordDisp(cUnit, rESP, OUT_ARG0, rECX); opReg(cUnit, kOpCall, rEAX); } +#endif /* * The following are the first-level codegen routines that analyze the format @@ -211,6 +213,7 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit) /* Accept the work and start compiling */ bool dvmCompilerDoWork(CompilerWorkOrder *work) { + JitTraceDescription *desc; bool res; if (gDvmJit.codeCacheFull) { @@ -220,14 +223,16 @@ bool dvmCompilerDoWork(CompilerWorkOrder *work) switch (work->kind) { case kWorkOrderTrace: /* Start compilation with maximally allowed trace length */ - res = dvmCompileTrace(work->info, JIT_MAX_TRACE_LEN, &work->result, + desc = (JitTraceDescription *)work->info; + res = dvmCompileTrace(desc, JIT_MAX_TRACE_LEN, &work->result, work->bailPtr, 0 /* no hints */); break; case kWorkOrderTraceDebug: { bool oldPrintMe = gDvmJit.printMe; gDvmJit.printMe = true; /* Start compilation with maximally allowed trace length */ - res = dvmCompileTrace(work->info, JIT_MAX_TRACE_LEN, &work->result, + desc = (JitTraceDescription *)work->info; + res = dvmCompileTrace(desc, JIT_MAX_TRACE_LEN, &work->result, work->bailPtr, 0 /* no hints */); gDvmJit.printMe = oldPrintMe; break; |