Print this page
rev 6900 : 8048169: Change 8037816 breaks HS build on PPC64 and CPP-Interpreter platforms
Summary: Fix the matching of format string parameter types to the actual argument types for the PPC64 and CPP-Interpreter files in the same way as 8037816 already did it for all the other files
Reviewed-by: stefank, coleenp, dholmes

Split Split Close
Expand all
Collapse all
          --- old/hotspot/src/cpu/ppc/vm/ppc.ad
          +++ new/hotspot/src/cpu/ppc/vm/ppc.ad
↓ open down ↓ 1322 lines elided ↑ open up ↑
1323 1323    Compile* C = ra_->C;
1324 1324    const long framesize = C->frame_slots() << LogBytesPerInt;
1325 1325  
1326 1326    st->print("PROLOG\n\t");
1327 1327    if (C->need_stack_bang(framesize)) {
1328 1328      st->print("stack_overflow_check\n\t");
1329 1329    }
1330 1330  
1331 1331    if (!false /* TODO: PPC port C->is_frameless_method()*/) {
1332 1332      st->print("save return pc\n\t");
1333      -    st->print("push frame %d\n\t", -framesize);
     1333 +    st->print("push frame %ld\n\t", -framesize);
1334 1334    }
1335 1335  }
1336 1336  #endif
1337 1337  
1338 1338  // Macro used instead of the common __ to emulate the pipes of PPC.
1339 1339  // Instead of e.g. __ ld(...) one hase to write ___(ld) ld(...) This enables the
1340 1340  // micro scheduler to cope with "hand written" assembler like in the prolog. Though
1341 1341  // still no scheduling of this code is possible, the micro scheduler is aware of the
1342 1342  // code and can update its internal data. The following mechanism is used to achieve this:
1343 1343  // The micro scheduler calls size() of each compound node during scheduling. size() does a
↓ open down ↓ 10782 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX