1.1 --- a/src/share/vm/asm/register.hpp Fri Sep 14 22:00:41 2012 -0700 1.2 +++ b/src/share/vm/asm/register.hpp Mon Sep 17 12:57:58 2012 -0700 1.3 @@ -103,8 +103,8 @@ 1.4 ) { 1.5 assert( 1.6 a != b, 1.7 - err_msg("registers must be different: a=%d, b=%d", 1.8 - a, b) 1.9 + err_msg_res("registers must be different: a=%d, b=%d", 1.10 + a, b) 1.11 ); 1.12 } 1.13 1.14 @@ -117,8 +117,8 @@ 1.15 assert( 1.16 a != b && a != c 1.17 && b != c, 1.18 - err_msg("registers must be different: a=%d, b=%d, c=%d", 1.19 - a, b, c) 1.20 + err_msg_res("registers must be different: a=%d, b=%d, c=%d", 1.21 + a, b, c) 1.22 ); 1.23 } 1.24 1.25 @@ -133,8 +133,8 @@ 1.26 a != b && a != c && a != d 1.27 && b != c && b != d 1.28 && c != d, 1.29 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d", 1.30 - a, b, c, d) 1.31 + err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d", 1.32 + a, b, c, d) 1.33 ); 1.34 } 1.35 1.36 @@ -151,8 +151,8 @@ 1.37 && b != c && b != d && b != e 1.38 && c != d && c != e 1.39 && d != e, 1.40 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d", 1.41 - a, b, c, d, e) 1.42 + err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d", 1.43 + a, b, c, d, e) 1.44 ); 1.45 } 1.46 1.47 @@ -171,8 +171,8 @@ 1.48 && c != d && c != e && c != f 1.49 && d != e && d != f 1.50 && e != f, 1.51 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d", 1.52 - a, b, c, d, e, f) 1.53 + err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d", 1.54 + a, b, c, d, e, f) 1.55 ); 1.56 } 1.57 1.58 @@ -193,8 +193,8 @@ 1.59 && d != e && d != f && d != g 1.60 && e != f && e != g 1.61 && f != g, 1.62 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d", 1.63 - a, b, c, d, e, f, g) 1.64 + err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d", 1.65 + a, b, c, d, e, f, g) 1.66 ); 1.67 } 1.68 1.69 @@ -217,8 +217,8 @@ 1.70 && e != f && e != g && e != h 1.71 && f != g && f != h 1.72 && g != h, 1.73 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d", 1.74 - a, b, c, d, e, f, g, h) 1.75 + err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d", 1.76 + a, b, c, d, e, f, g, h) 1.77 ); 1.78 } 1.79 1.80 @@ -243,8 +243,8 @@ 1.81 && f != g && f != h && f != i 1.82 && g != h && g != i 1.83 && h != i, 1.84 - err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d, i=%d", 1.85 - a, b, c, d, e, f, g, h, i) 1.86 + 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.87 + a, b, c, d, e, f, g, h, i) 1.88 ); 1.89 } 1.90