--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Fri Jan 23 10:41:28 2009 -0500
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Mon Jan 26 12:07:54 2009 -0800
@@ -137,7 +137,7 @@
// Do the actual store
// noreg means NULL
if (val == noreg) {
- __ movl(Address(rdx, 0), (int32_t)NULL_WORD);
+ __ movptr(Address(rdx, 0), NULL_WORD);
// No post barrier for NULL
} else {
__ movl(Address(rdx, 0), val);
@@ -152,7 +152,7 @@
case BarrierSet::CardTableExtension:
{
if (val == noreg) {
- __ movl(obj, NULL_WORD);
+ __ movptr(obj, NULL_WORD);
} else {
__ movl(obj, val);
// flatten object address if needed
@@ -168,7 +168,7 @@
case BarrierSet::ModRef:
case BarrierSet::Other:
if (val == noreg) {
- __ movl(obj, NULL_WORD);
+ __ movptr(obj, NULL_WORD);
} else {
__ movl(obj, val);
}