5108146: Merge i486 and amd64 cpu directories

6459804: Want client (c1) compiler for x86_64 (amd64) for faster start-up

Reviewed-by: kvn
This commit is contained in:
Tom Rodriguez 2008-08-27 00:21:55 -07:00
parent 2697216f3a
commit 26c780da72
85 changed files with 18308 additions and 15496 deletions

View file

@ -215,7 +215,7 @@ void LIR_Assembler::emit_block(BlockBegin* block) {
#endif /* PRODUCT */
assert(block->lir() != NULL, "must have LIR");
IA32_ONLY(assert(_masm->rsp_offset() == 0, "frame size should be fixed"));
X86_ONLY(assert(_masm->rsp_offset() == 0, "frame size should be fixed"));
#ifndef PRODUCT
if (CommentedAssembly) {
@ -227,7 +227,7 @@ void LIR_Assembler::emit_block(BlockBegin* block) {
emit_lir_list(block->lir());
IA32_ONLY(assert(_masm->rsp_offset() == 0, "frame size should be fixed"));
X86_ONLY(assert(_masm->rsp_offset() == 0, "frame size should be fixed"));
}
@ -434,7 +434,7 @@ void LIR_Assembler::emit_call(LIR_OpJavaCall* op) {
break;
default: ShouldNotReachHere();
}
#if defined(IA32) && defined(TIERED)
#if defined(X86) && defined(TIERED)
// C2 leave fpu stack dirty clean it
if (UseSSE < 2) {
int i;
@ -445,7 +445,7 @@ void LIR_Assembler::emit_call(LIR_OpJavaCall* op) {
ffree(0);
}
}
#endif // IA32 && TIERED
#endif // X86 && TIERED
}