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/methodHandles_ppc.cpp
          +++ new/hotspot/src/cpu/ppc/vm/methodHandles_ppc.cpp
   1    1  /*
   2      - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
        2 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   3    3   * Copyright 2012, 2014 SAP AG. All rights reserved.
   4    4   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   5    5   *
   6    6   * This code is free software; you can redistribute it and/or modify it
   7    7   * under the terms of the GNU General Public License version 2 only, as
   8    8   * published by the Free Software Foundation.
   9    9   *
  10   10   * This code is distributed in the hope that it will be useful, but WITHOUT
  11   11   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  12   12   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
↓ open down ↓ 444 lines elided ↑ open up ↑
 457  457  #ifndef PRODUCT
 458  458  void trace_method_handle_stub(const char* adaptername,
 459  459                                oopDesc* mh,
 460  460                                intptr_t* entry_sp,
 461  461                                intptr_t* saved_regs) {
 462  462  
 463  463    bool has_mh = (strstr(adaptername, "/static") == NULL &&
 464  464                   strstr(adaptername, "linkTo") == NULL);    // static linkers don't have MH
 465  465    const char* mh_reg_name = has_mh ? "R23_method_handle" : "G23";
 466  466    tty->print_cr("MH %s %s="INTPTR_FORMAT " sp=" INTPTR_FORMAT,
 467      -                adaptername, mh_reg_name, (intptr_t) mh, entry_sp);
      467 +                adaptername, mh_reg_name, (intptr_t) mh, (intptr_t) entry_sp);
 468  468  
 469  469    if (Verbose) {
 470  470      tty->print_cr("Registers:");
 471  471      const int abi_offset = frame::abi_reg_args_size / 8;
 472  472      for (int i = R3->encoding(); i <= R12->encoding(); i++) {
 473  473        Register r = as_Register(i);
 474  474        int count = i - R3->encoding();
 475  475        // The registers are stored in reverse order on the stack (by save_volatile_gprs(R1_SP, abi_reg_args_size)).
 476  476        tty->print("%3s=" PTR_FORMAT, r->name(), saved_regs[abi_offset + count]);
 477  477        if ((count + 1) % 4 == 0) {
↓ open down ↓ 81 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX