summaryrefslogtreecommitdiff
path: root/src/compiler/codegen/x86/Assemble.cc
diff options
context:
space:
mode:
author buzbee <buzbee@google.com> 2012-10-30 15:48:42 -0700
committer buzbee <buzbee@google.com> 2012-11-01 12:05:35 -0700
commitb046e16d8b8da318d6055f9308950131f1255e08 (patch)
treed4472622967d02fcc87bb422bddea9a9140c75f9 /src/compiler/codegen/x86/Assemble.cc
parent6e30145f1ed992be8d4e5a9973410c19f3de59f9 (diff)
Remove all TARGET_[ARM|X86|MIPS] #ifdefs
Two steps forward, one step back towards elimination of the "#include" build model for target-specific compilers. This CL does some restructuring to eliminate all of the TARGET_xxx #ifdefs and convert them to run-time tests. Considerable work is still required to fully eliminate the multiple builds. In particular, much of the "common" codegen code relies on macros defined by the target-specific [Arm|X86|Mips]Lir.h include file. Next step is more restructuring to better isolate target-independent code generation code. Change-Id: If6efbde65c48031a48423344d8dc3e2ff2c4ad9d
Diffstat (limited to 'src/compiler/codegen/x86/Assemble.cc')
-rw-r--r--src/compiler/codegen/x86/Assemble.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/codegen/x86/Assemble.cc b/src/compiler/codegen/x86/Assemble.cc
index 252228344f..c47711cab3 100644
--- a/src/compiler/codegen/x86/Assemble.cc
+++ b/src/compiler/codegen/x86/Assemble.cc
@@ -1225,7 +1225,7 @@ AssemblerStatus oatAssembleInstructions(CompilationUnit *cUnit, intptr_t startAd
<< " delta: " << delta << " old delta: " << lir->operands[0];
}
lir->opcode = kX86Jcc32;
- oatSetupResourceMasks(lir);
+ oatSetupResourceMasks(cUnit, lir);
res = kRetryAll;
}
if (kVerbosePcFixup) {
@@ -1278,7 +1278,7 @@ AssemblerStatus oatAssembleInstructions(CompilationUnit *cUnit, intptr_t startAd
LOG(INFO) << "Retry for JMP growth at " << lir->offset;
}
lir->opcode = kX86Jmp32;
- oatSetupResourceMasks(lir);
+ oatSetupResourceMasks(cUnit, lir);
res = kRetryAll;
}
lir->operands[0] = delta;