1.1 --- a/src/share/vm/asm/register.hpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/asm/register.hpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -118,8 +118,8 @@
1.11 ) {
1.12 assert(
1.13 a != b,
1.14 - err_msg_res("registers must be different: a=%d, b=%d",
1.15 - a, b)
1.16 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT "",
1.17 + p2i(a), p2i(b))
1.18 );
1.19 }
1.20
1.21 @@ -132,8 +132,9 @@
1.22 assert(
1.23 a != b && a != c
1.24 && b != c,
1.25 - err_msg_res("registers must be different: a=%d, b=%d, c=%d",
1.26 - a, b, c)
1.27 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.28 + ", c=" INTPTR_FORMAT "",
1.29 + p2i(a), p2i(b), p2i(c))
1.30 );
1.31 }
1.32
1.33 @@ -148,8 +149,9 @@
1.34 a != b && a != c && a != d
1.35 && b != c && b != d
1.36 && c != d,
1.37 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d",
1.38 - a, b, c, d)
1.39 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.40 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT "",
1.41 + p2i(a), p2i(b), p2i(c), p2i(d))
1.42 );
1.43 }
1.44
1.45 @@ -166,8 +168,9 @@
1.46 && b != c && b != d && b != e
1.47 && c != d && c != e
1.48 && d != e,
1.49 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d",
1.50 - a, b, c, d, e)
1.51 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.52 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT "",
1.53 + p2i(a), p2i(b), p2i(c), p2i(d), p2i(e))
1.54 );
1.55 }
1.56
1.57 @@ -186,8 +189,10 @@
1.58 && c != d && c != e && c != f
1.59 && d != e && d != f
1.60 && e != f,
1.61 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d",
1.62 - a, b, c, d, e, f)
1.63 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.64 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
1.65 + ", f=" INTPTR_FORMAT "",
1.66 + p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f))
1.67 );
1.68 }
1.69
1.70 @@ -208,8 +213,10 @@
1.71 && d != e && d != f && d != g
1.72 && e != f && e != g
1.73 && f != g,
1.74 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d",
1.75 - a, b, c, d, e, f, g)
1.76 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.77 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
1.78 + ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT "",
1.79 + p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g))
1.80 );
1.81 }
1.82
1.83 @@ -232,8 +239,10 @@
1.84 && e != f && e != g && e != h
1.85 && f != g && f != h
1.86 && g != h,
1.87 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d",
1.88 - a, b, c, d, e, f, g, h)
1.89 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.90 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
1.91 + ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT "",
1.92 + p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h))
1.93 );
1.94 }
1.95
1.96 @@ -258,8 +267,11 @@
1.97 && f != g && f != h && f != i
1.98 && g != h && g != i
1.99 && h != i,
1.100 - err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d, i=%d",
1.101 - a, b, c, d, e, f, g, h, i)
1.102 + err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
1.103 + ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
1.104 + ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
1.105 + ", i=" INTPTR_FORMAT "",
1.106 + p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i))
1.107 );
1.108 }
1.109
