From b41b33b5e5f08083e35f84818b4f44d26feb4a8b Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 20 Mar 2012 14:22:54 -0700 Subject: Add 3rd argument register to X86. Implement more instructions. Change-Id: I3af7bbaf18eedc6537f1cfc2d57c4f6106fb5164 --- src/compiler/codegen/GenInvoke.cc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/compiler/codegen/GenInvoke.cc') diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc index 037a9bb5df..ebc8bc28a4 100644 --- a/src/compiler/codegen/GenInvoke.cc +++ b/src/compiler/codegen/GenInvoke.cc @@ -51,13 +51,8 @@ void flushIns(CompilationUnit* cUnit) if (cUnit->numIns == 0) return; -#if !defined(TARGET_X86) const int numArgRegs = 3; static int argRegs[] = {rARG1, rARG2, rARG3}; -#else - const int numArgRegs = 2; - static int argRegs[] = {rARG1, rARG2}; -#endif int startVReg = cUnit->numDalvikRegisters - cUnit->numIns; /* * Copy incoming arguments to their proper home locations. @@ -425,11 +420,7 @@ int genDalvikArgsNoRange(CompilationUnit* cUnit, MIR* mir, reg = rlArg.highReg; } else { // rARG2 & rARG3 can safely be used here -#if defined(TARGET_X86) - UNIMPLEMENTED(FATAL); -#else reg = rARG3; -#endif loadWordDisp(cUnit, rSP, oatSRegOffset(cUnit, rlArg.sRegLow) + 4, reg); callState = nextCallInsn(cUnit, mir, callState, dexIdx, @@ -453,12 +444,8 @@ int genDalvikArgsNoRange(CompilationUnit* cUnit, MIR* mir, highReg = rlArg.highReg; } else { lowReg = rARG2; -#if defined(TARGET_X86) - UNIMPLEMENTED(FATAL); -#else - highReg = rARG3; -#endif if (rlArg.wide) { + highReg = rARG3; loadValueDirectWideFixed(cUnit, rlArg, lowReg, highReg); } else { loadValueDirectFixed(cUnit, rlArg, lowReg); -- cgit v1.2.3-59-g8ed1b