Mercurial > hg > truffle

diff src/cpu/x86/vm/c1_LIRAssembler_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
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Oct 16 10:21:29 2014 +0200
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Wed Oct 15 16:02:50 2014 +0200
@@ -288,7 +288,7 @@
 
   // build frame
   ciMethod* m = compilation()->method();
-  __ build_frame(initial_frame_size_in_bytes());
+  __ build_frame(initial_frame_size_in_bytes(), bang_size_in_bytes());
 
   // OSR buffer is
   //
@@ -376,7 +376,7 @@
 }
 
 // This specifies the rsp decrement needed to build the frame
-int LIR_Assembler::initial_frame_size_in_bytes() {
+int LIR_Assembler::initial_frame_size_in_bytes() const {
   // if rounding, must let FrameMap know!
 
   // The frame_map records size in slots (32bit word)
@@ -802,9 +802,9 @@
           __ movl(as_Address(addr), (int32_t)NULL_WORD);
         } else {
 #ifdef _LP64
-          __ xorptr(r10, r10);
+          __ xorptr(rscratch1, rscratch1);
           null_check_here = code_offset();
-          __ movptr(as_Address(addr), r10);
+          __ movptr(as_Address(addr), rscratch1);
 #else
           __ movptr(as_Address(addr), NULL_WORD);
 #endif