Enable inlining of Unsafe methods for x86.
Fixes the calculation of the size of a Mov32AR when the base reg is BP
and the displacement is 0.
Also changes time check in heap from DCHECK to unlikely branch and warning,
since time isn't kept well in the x86 emulator.
Change-Id: If8074610bd3d8ac2e20fb9d5b8066ef23ab94050
diff --git a/src/compiler/codegen/gen_invoke.cc b/src/compiler/codegen/gen_invoke.cc
index 04229f8..c47b9eb 100644
--- a/src/compiler/codegen/gen_invoke.cc
+++ b/src/compiler/codegen/gen_invoke.cc
@@ -1128,8 +1128,8 @@
bool Codegen::GenInlinedUnsafeGet(CompilationUnit* cu, CallInfo* info,
bool is_long, bool is_volatile) {
- if (cu->instruction_set == kX86 || cu->instruction_set == kMips) {
- // TODO - add x86 and Mips implementation
+ if (cu->instruction_set == kMips) {
+ // TODO - add Mips implementation
return false;
}
// Unused - RegLocation rl_src_unsafe = info->args[0];
@@ -1156,8 +1156,8 @@
bool Codegen::GenInlinedUnsafePut(CompilationUnit* cu, CallInfo* info, bool is_long,
bool is_object, bool is_volatile, bool is_ordered) {
- if (cu->instruction_set == kX86 || cu->instruction_set == kMips) {
- // TODO - add x86 and Mips implementation
+ if (cu->instruction_set == kMips) {
+ // TODO - add Mips implementation
return false;
}
// Unused - RegLocation rl_src_unsafe = info->args[0];