From 0955f7e470fb733aef07096536e9fba7c99250aa Mon Sep 17 00:00:00 2001 From: Matteo Franchin Date: Fri, 23 May 2014 17:32:52 +0100 Subject: AArch64: fixing some assertions. Fixing some assertions while attempting to get libartd.so to work. Fixing also the shift logic in LoadBaseIndexed() and StoreBaseIndexed(). This commit only fixes a part of the assertion issues. Change-Id: I473194d4260dd59a8ee6d73114429728c977ee0e --- compiler/dex/quick/ralloc_util.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'compiler/dex/quick/ralloc_util.cc') diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc index e5ca460e88..59ae16ed36 100644 --- a/compiler/dex/quick/ralloc_util.cc +++ b/compiler/dex/quick/ralloc_util.cc @@ -406,6 +406,10 @@ RegStorage Mir2Lir::AllocTempWide() { return res; } +RegStorage Mir2Lir::AllocTempWord() { + return (Is64BitInstructionSet(cu_->instruction_set)) ? AllocTempWide() : AllocTemp(); +} + RegStorage Mir2Lir::AllocTempSingle() { RegStorage res = AllocTempBody(reg_pool_->sp_regs_, ®_pool_->next_sp_reg_, true); DCHECK(res.IsSingle()) << "Reg: 0x" << std::hex << res.GetRawBits(); -- cgit v1.2.3-59-g8ed1b