comparison src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp @ 20644:327e7269f90d

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
author coleenp
date Mon, 30 Jun 2014 14:58:52 -0400
parents abe03600372a
children
comparison
equal deleted inserted replaced
20642:ec2c6fdd1ce6 20644:327e7269f90d
1 /* 1 /*
2 * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
3 * Copyright 2012, 2013 SAP AG. All rights reserved. 3 * Copyright 2012, 2014 SAP AG. All rights reserved.
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 * 5 *
6 * This code is free software; you can redistribute it and/or modify it 6 * This code is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 only, as 7 * under the terms of the GNU General Public License version 2 only, as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
84 "mdx " PTR_FORMAT "(%d)" \ 84 "mdx " PTR_FORMAT "(%d)" \
85 " " \ 85 " " \
86 " \t-> " PTR_FORMAT "(%d)", \ 86 " \t-> " PTR_FORMAT "(%d)", \
87 (int) THREAD->osthread()->thread_id(), \ 87 (int) THREAD->osthread()->thread_id(), \
88 BCI(), \ 88 BCI(), \
89 MDX(), \ 89 p2i(MDX()), \
90 (MDX() == NULL \ 90 (MDX() == NULL \
91 ? 0 \ 91 ? 0 \
92 : istate->method()->method_data()->dp_to_di((address)MDX())), \ 92 : istate->method()->method_data()->dp_to_di((address)MDX())), \
93 mdx, \ 93 p2i(mdx), \
94 istate->method()->method_data()->dp_to_di((address)mdx) \ 94 istate->method()->method_data()->dp_to_di((address)mdx) \
95 ); \ 95 ); \
96 }; \ 96 }; \
97 istate->set_mdx(mdx); 97 istate->set_mdx(mdx);
98 98
105 { \ 105 { \
106 ttyLocker ttyl; \ 106 ttyLocker ttyl; \
107 MethodData *md = istate->method()->method_data(); \ 107 MethodData *md = istate->method()->method_data(); \
108 tty->cr(); \ 108 tty->cr(); \
109 tty->print("method data at mdx " PTR_FORMAT "(0) for", \ 109 tty->print("method data at mdx " PTR_FORMAT "(0) for", \
110 md->data_layout_at(md->bci_to_di(0))); \ 110 p2i(md->data_layout_at(md->bci_to_di(0)))); \
111 istate->method()->print_short_name(tty); \ 111 istate->method()->print_short_name(tty); \
112 tty->cr(); \ 112 tty->cr(); \
113 if (md != NULL) { \ 113 if (md != NULL) { \
114 md->print_data_on(tty); \ 114 md->print_data_on(tty); \
115 address mdx = (address) MDX(); \ 115 address mdx = (address) MDX(); \
116 if (mdx != NULL) { \ 116 if (mdx != NULL) { \
117 tty->print_cr("current mdx " PTR_FORMAT "(%d)", \ 117 tty->print_cr("current mdx " PTR_FORMAT "(%d)", \
118 mdx, \ 118 p2i(mdx), \
119 istate->method()->method_data()->dp_to_di(mdx)); \ 119 istate->method()->method_data()->dp_to_di(mdx)); \
120 } \ 120 } \
121 } else { \ 121 } else { \
122 tty->print_cr("no method data"); \ 122 tty->print_cr("no method data"); \
123 } \ 123 } \