Revert "Revert "Revert "Use trampolines for calls to helpers"""
This reverts commit f9487c039efb4112616d438593a2ab02792e0304.
Change-Id: Id48a4aae4ecce73db468587967968a3f7618b700
diff --git a/compiler/dex/quick/arm/assemble_arm.cc b/compiler/dex/quick/arm/assemble_arm.cc
index 0e1275d..f77b0a6 100644
--- a/compiler/dex/quick/arm/assemble_arm.cc
+++ b/compiler/dex/quick/arm/assemble_arm.cc
@@ -1035,11 +1035,6 @@
kFmtBitBlt, 7, 0,
IS_QUAD_OP | REG_USE0 | REG_USE1 | REG_USE2 | IS_STORE,
"strd", "!0C, !1C, [!2C, #!3E]", 4, kFixupNone),
- ENCODING_MAP(kThumb2BlTramp, 0xf000d000,
- kFmtBitBlt, 10, 0, kFmtUnused, -1, -1, kFmtUnused, -1, -1,
- kFmtUnused, -1, -1,
- IS_UNARY_OP | IS_BRANCH | REG_DEF_LR | NEEDS_FIXUP,
- "bl", "!0t", 4, kFixupTrampCall),
};
// new_lir replaces orig_lir in the pcrel_fixup list.
@@ -1229,7 +1224,6 @@
while (true) {
offset_adjustment = 0;
AssemblerStatus res = kSuccess; // Assume success
-
generation ^= 1;
// Note: nodes requring possible fixup linked in ascending order.
lir = first_fixup_;
@@ -1583,17 +1577,6 @@
}
break;
}
- case kFixupTrampCall: {
- // This is a call to a trampoline. The value for the trampoline call needs
- // both the offset into the code and the trampoline to call. It will be
- // added to the list of calls when we actually insert this instruction into
- // the code_buffer (when we have a stable instruction stream).
- uint32_t instoffset = lir->offset;
- // LOG(INFO) << "adding trampoline call: offset: " << instoffset <<
- // " entrypoint: " << lir->operands[0];
- trampoline_calls_.push_back(TrampolineCall(instoffset, lir->operands[0]));
- break;
- }
default:
LOG(FATAL) << "Unexpected case " << lir->flags.fixup;
}
@@ -1612,7 +1595,6 @@
starting_offset += offset_adjustment;
data_offset_ = (starting_offset + 0x3) & ~0x3;
AssignDataOffsets();
- trampoline_calls_.clear(); // These are invalid now.
}
}
@@ -1693,4 +1675,5 @@
total_size_ = AssignFillArrayDataOffset(offset);
}
+
} // namespace art