1.1 --- a/src/share/vm/asm/register.hpp Mon Jul 23 13:04:59 2012 -0700
1.2 +++ b/src/share/vm/asm/register.hpp Tue Jul 24 10:51:00 2012 -0700
1.3 @@ -103,7 +103,8 @@
1.4 ) {
1.5 assert(
1.6 a != b,
1.7 - "registers must be different"
1.8 + err_msg("registers must be different: a=%d, b=%d",
1.9 + a, b)
1.10 );
1.11 }
1.12
1.13 @@ -116,7 +117,8 @@
1.14 assert(
1.15 a != b && a != c
1.16 && b != c,
1.17 - "registers must be different"
1.18 + err_msg("registers must be different: a=%d, b=%d, c=%d",
1.19 + a, b, c)
1.20 );
1.21 }
1.22
1.23 @@ -131,7 +133,8 @@
1.24 a != b && a != c && a != d
1.25 && b != c && b != d
1.26 && c != d,
1.27 - "registers must be different"
1.28 + err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d",
1.29 + a, b, c, d)
1.30 );
1.31 }
1.32
1.33 @@ -148,7 +151,8 @@
1.34 && b != c && b != d && b != e
1.35 && c != d && c != e
1.36 && d != e,
1.37 - "registers must be different"
1.38 + err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d",
1.39 + a, b, c, d, e)
1.40 );
1.41 }
1.42
1.43 @@ -167,7 +171,8 @@
1.44 && c != d && c != e && c != f
1.45 && d != e && d != f
1.46 && e != f,
1.47 - "registers must be different"
1.48 + err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d",
1.49 + a, b, c, d, e, f)
1.50 );
1.51 }
1.52
1.53 @@ -188,7 +193,8 @@
1.54 && d != e && d != f && d != g
1.55 && e != f && e != g
1.56 && f != g,
1.57 - "registers must be different"
1.58 + err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d",
1.59 + a, b, c, d, e, f, g)
1.60 );
1.61 }
1.62
1.63 @@ -211,7 +217,34 @@
1.64 && e != f && e != g && e != h
1.65 && f != g && f != h
1.66 && g != h,
1.67 - "registers must be different"
1.68 + err_msg("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d",
1.69 + a, b, c, d, e, f, g, h)
1.70 + );
1.71 +}
1.72 +
1.73 +
1.74 +inline void assert_different_registers(
1.75 + AbstractRegister a,
1.76 + AbstractRegister b,
1.77 + AbstractRegister c,
1.78 + AbstractRegister d,
1.79 + AbstractRegister e,
1.80 + AbstractRegister f,
1.81 + AbstractRegister g,
1.82 + AbstractRegister h,
1.83 + AbstractRegister i
1.84 +) {
1.85 + assert(
1.86 + a != b && a != c && a != d && a != e && a != f && a != g && a != h && a != i
1.87 + && b != c && b != d && b != e && b != f && b != g && b != h && b != i
1.88 + && c != d && c != e && c != f && c != g && c != h && c != i
1.89 + && d != e && d != f && d != g && d != h && d != i
1.90 + && e != f && e != g && e != h && e != i
1.91 + && f != g && f != h && f != i
1.92 + && g != h && g != i
1.93 + && h != i,
1.94 + 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.95 + a, b, c, d, e, f, g, h, i)
1.96 );
1.97 }
1.98
