Mercurial > hg > truffle

comparison src/cpu/x86/vm/c1_MacroAssembler_x86.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 0bf37f737702
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
347 const int ic_cmp_size = LP64_ONLY(10) NOT_LP64(9); 347 const int ic_cmp_size = LP64_ONLY(10) NOT_LP64(9);
348 assert(UseCompressedClassPointers || offset() - start_offset == ic_cmp_size, "check alignment in emit_method_entry"); 348 assert(UseCompressedClassPointers || offset() - start_offset == ic_cmp_size, "check alignment in emit_method_entry");
349 } 349 }
350 350
351 351
352 void C1_MacroAssembler::build_frame(int frame_size_in_bytes) { 352 void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_bytes) {
353 assert(bang_size_in_bytes >= frame_size_in_bytes, "stack bang size incorrect");
353 // Make sure there is enough stack space for this method's activation. 354 // Make sure there is enough stack space for this method's activation.
354 // Note that we do this before doing an enter(). This matches the 355 // Note that we do this before doing an enter(). This matches the
355 // ordering of C2's stack overflow check / rsp decrement and allows 356 // ordering of C2's stack overflow check / rsp decrement and allows
356 // the SharedRuntime stack overflow handling to be consistent 357 // the SharedRuntime stack overflow handling to be consistent
357 // between the two compilers. 358 // between the two compilers.
358 generate_stack_overflow_check(frame_size_in_bytes); 359 generate_stack_overflow_check(bang_size_in_bytes);
359 360
360 push(rbp); 361 push(rbp);
361 #ifdef TIERED 362 #ifdef TIERED
362 // c2 leaves fpu stack dirty. Clean it on entry 363 // c2 leaves fpu stack dirty. Clean it on entry
363 if (UseSSE < 2 ) { 364 if (UseSSE < 2 ) {