From f9487c039efb4112616d438593a2ab02792e0304 Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Tue, 8 Apr 2014 23:08:12 +0000 Subject: Revert "Revert "Use trampolines for calls to helpers"" This reverts commit 081f73e888b3c246cf7635db37b7f1105cf1a2ff. Change-Id: Ibd777f8ce73cf8ed6c4cb81d50bf6437ac28cb61 Conflicts: compiler/dex/quick/mir_to_lir.h --- compiler/dex/compiler_enums.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'compiler/dex/compiler_enums.h') diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h index 38d37b0700..73dd2b5349 100644 --- a/compiler/dex/compiler_enums.h +++ b/compiler/dex/compiler_enums.h @@ -429,10 +429,12 @@ enum FixupKind { kFixupT2Branch, // Thumb2 Unconditional branch kFixupBlx1, // Blx1 (start of Blx1/Blx2 pair). kFixupBl1, // Bl1 (start of Bl1/Bl2 pair). + kFixup2Bl1, // Thumb2 Bl1 (start of Bl1/Bl2 pair). kFixupAdr, // Adr. kFixupMovImmLST, // kThumb2MovImm16LST. kFixupMovImmHST, // kThumb2MovImm16HST. kFixupAlign4, // Align to 4-byte boundary. + kFixupTrampCall, // Call into trampoline for runtime helper. }; std::ostream& operator<<(std::ostream& os, const FixupKind& kind); -- cgit v1.2.3-59-g8ed1b