# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1329995199 -3600
# Node ID 74c0b866fe8dd413eec5ac4dab1bce2996e91be3
# Parent  03ea39a3cf681771dce3843f92e8f5149e2508b3# Parent  e1c0533242103006cba241e8a986f34e565ccab4
Merge.

diff -r e1c053324210 -r 74c0b866fe8d src/cpu/x86/vm/sharedRuntime_x86_64.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Wed Feb 22 18:20:11 2012 -0800
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Feb 23 12:06:39 2012 +0100
@@ -2609,7 +2609,7 @@
   __ push(0);
 
   // Save everything in sight.
-  map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);
+  RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);
 
   // Now it is safe to overwrite any register
 
@@ -2649,7 +2649,7 @@
   // Warning: Duplicate code
 
   // Save everything in sight.
-  map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);
+  RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words);
 
   // Normal deoptimization
 
@@ -2662,7 +2662,7 @@
   //  __ movl(r14, c_rarg1); // save into r14 for later call to unpack_frames
 
   assert(r10 == rscratch1, "scratch register should be r10");
-  __ movptr(c_rarg1, Address(rsp, RegisterSaver::r10_offset_in_bytes()));
+  __ movl(c_rarg1, Address(rsp, RegisterSaver::r10_offset_in_bytes()));
   __ orq(c_rarg1, ~(int32_t)Deoptimization::make_trap_request(Deoptimization::Reason_unreached, Deoptimization::Action_none));
   __ notq(c_rarg1);
   __ movl(r14, (int32_t)Deoptimization::Unpack_reexecute);
@@ -2740,7 +2740,7 @@
   // or captured in the vframeArray.
   RegisterSaver::restore_result_registers(masm);
 
-  // All of the register save area has been poppeset_jmp_uncommon_trap_offsetd of the stack. Only the
+  // All of the register save area has been popped of the stack. Only the
   // return address remains.
 
   // Pop all the frames we must move/replace.