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/assembler_ppc.cpp
          +++ new/hotspot/src/cpu/ppc/vm/assembler_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 ↓ 673 lines elided ↑ open up ↑
 686  686    frsp(  F12, F13);
 687  687    fctid( F14, F15);
 688  688    fctidz(F16, F17);
 689  689    fctiw( F18, F19);
 690  690    fctiwz(F20, F21);
 691  691    fcfid( F22, F23);
 692  692  
 693  693    // PPC 1, section 4.6.7 Floating-Point Compare Instructions
 694  694    fcmpu( CCR7, F24, F25);
 695  695  
 696      -  tty->print_cr("\ntest_asm disassembly (0x%lx 0x%lx):", code()->insts_begin(), code()->insts_end());
      696 +  tty->print_cr("\ntest_asm disassembly (0x%lx 0x%lx):", p2i(code()->insts_begin()), p2i(code()->insts_end()));
 697  697    code()->decode();
 698  698  }
 699  699  
 700  700  #endif // !PRODUCT
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX