--- a/hotspot/src/share/vm/asm/register.hpp Mon Sep 28 15:05:02 2015 +0200
+++ b/hotspot/src/share/vm/asm/register.hpp Tue Sep 29 11:02:08 2015 +0200
@@ -121,8 +121,7 @@
) {
assert(
a != b,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT "",
- p2i(a), p2i(b))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT "", p2i(a), p2i(b)
);
}
@@ -135,9 +134,9 @@
assert(
a != b && a != c
&& b != c,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c)
);
}
@@ -152,9 +151,9 @@
a != b && a != c && a != d
&& b != c && b != d
&& c != d,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d)
);
}
@@ -171,9 +170,9 @@
&& b != c && b != d && b != e
&& c != d && c != e
&& d != e,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e)
);
}
@@ -192,10 +191,10 @@
&& c != d && c != e && c != f
&& d != e && d != f
&& e != f,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f)
);
}
@@ -216,10 +215,10 @@
&& d != e && d != f && d != g
&& e != f && e != g
&& f != g,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g)
);
}
@@ -242,10 +241,10 @@
&& e != f && e != g && e != h
&& f != g && f != h
&& g != h,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h)
);
}
@@ -270,11 +269,11 @@
&& f != g && f != h && f != i
&& g != h && g != i
&& h != i,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
- ", i=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
+ ", i=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i)
);
}
@@ -300,11 +299,11 @@
&& g != h && g != i && g != j
&& h != i && h != j
&& i != j,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
- ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
+ ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j)
);
}
@@ -332,11 +331,11 @@
&& h != i && h != j && h !=k
&& i != j && i !=k
&& j !=k,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
- ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT ", k=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j), p2i(k))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
+ ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT ", k=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j), p2i(k)
);
}
@@ -366,12 +365,12 @@
&& i != j && i !=k && i !=l
&& j !=k && j !=l
&& k !=l,
- err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
- ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
- ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
- ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT ", k=" INTPTR_FORMAT
- ", l=" INTPTR_FORMAT "",
- p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j), p2i(k), p2i(l))
+ "registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
+ ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
+ ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
+ ", i=" INTPTR_FORMAT ", j=" INTPTR_FORMAT ", k=" INTPTR_FORMAT
+ ", l=" INTPTR_FORMAT "",
+ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j), p2i(k), p2i(l)
);
}