src/cpu/ppc/vm/c1_Runtime1_ppc.cpp

rev 13203 : 8183571: PPC64 build broken after 8178499
Reviewed-by: simonis

@@ -250,11 +250,11 @@
 
   for (i = 0; i < FrameMap::nof_fpu_regs; i++) {
     fpu_reg_save_offsets[i] = sp_offset;
     sp_offset += BytesPerWord;
   }
-  frame_size_in_bytes = align_up(sp_offset, frame::alignment_in_bytes);
+  frame_size_in_bytes = align_up(sp_offset, (int)frame::alignment_in_bytes);
 }
 
 
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
   // Make a frame and preserve the caller's caller-save registers.

@@ -274,11 +274,11 @@
 }
 
 static OopMapSet* generate_exception_throw_with_stack_parms(StubAssembler* sasm, address target,
                                                             int stack_parms) {
   // Make a frame and preserve the caller's caller-save registers.
-  const int parm_size_in_bytes = align_up(stack_parms << LogBytesPerWord, frame::alignment_in_bytes);
+  const int parm_size_in_bytes = align_up(stack_parms << LogBytesPerWord, (int)frame::alignment_in_bytes);
   const int padding = parm_size_in_bytes - (stack_parms << LogBytesPerWord);
   OopMap* oop_map = save_live_registers(sasm, true, noreg, parm_size_in_bytes);
 
   int call_offset = 0;
   switch (stack_parms) {

@@ -286,10 +286,11 @@
     __ ld(R6_ARG4, frame_size_in_bytes + padding + 16, R1_SP);
     case 2:
     __ ld(R5_ARG3, frame_size_in_bytes + padding + 8, R1_SP);
     case 1:
     __ ld(R4_ARG2, frame_size_in_bytes + padding + 0, R1_SP);
+    case 0:
     call_offset = __ call_RT(noreg, noreg, target);
     break;
     default: Unimplemented(); break;
   }
   OopMapSet* oop_maps = new OopMapSet();

@@ -324,11 +325,11 @@
 }
 
 static OopMapSet* stub_call_with_stack_parms(StubAssembler* sasm, Register result, address target,
                                              int stack_parms, bool do_return = true) {
   // Make a frame and preserve the caller's caller-save registers.
-  const int parm_size_in_bytes = align_up(stack_parms << LogBytesPerWord, frame::alignment_in_bytes);
+  const int parm_size_in_bytes = align_up(stack_parms << LogBytesPerWord, (int)frame::alignment_in_bytes);
   const int padding = parm_size_in_bytes - (stack_parms << LogBytesPerWord);
   OopMap* oop_map = save_live_registers(sasm, true, noreg, parm_size_in_bytes);
 
   int call_offset = 0;
   switch (stack_parms) {

@@ -336,10 +337,11 @@
     __ ld(R6_ARG4, frame_size_in_bytes + padding + 16, R1_SP);
     case 2:
     __ ld(R5_ARG3, frame_size_in_bytes + padding + 8, R1_SP);
     case 1:
     __ ld(R4_ARG2, frame_size_in_bytes + padding + 0, R1_SP);
+    case 0:
     call_offset = __ call_RT(result, noreg, target);
     break;
     default: Unimplemented(); break;
   }
   OopMapSet* oop_maps = new OopMapSet();