diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/c1_Runtime1_x86.cpp --- a/src/cpu/x86/vm/c1_Runtime1_x86.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -1393,7 +1393,7 @@ __ ret(0); __ bind(miss); - __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), 0); // result + __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), NULL_WORD); // result __ pop(rax); __ pop(rcx); __ pop(rsi); diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/interp_masm_x86_32.cpp --- a/src/cpu/x86/vm/interp_masm_x86_32.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -149,7 +149,7 @@ // Clean up tos value in the thread object movl(tos_addr, (int32_t) ilgl); movptr(val_addr, NULL_WORD); - NOT_LP64(movl(val_addr1, (int32_t)NULL_WORD)); + NOT_LP64(movptr(val_addr1, NULL_WORD)); } @@ -470,10 +470,10 @@ void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) { if (TaggedStackInterpreter) { if (tag == frame::TagCategory2) { - movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (int32_t)frame::TagValue); - movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)frame::TagValue); + movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (intptr_t)frame::TagValue); + movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)frame::TagValue); } else { - movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)tag); + movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)tag); } } } @@ -482,12 +482,12 @@ if (TaggedStackInterpreter) { if (tag == frame::TagCategory2) { movptr(Address(rdi, idx, Interpreter::stackElementScale(), - Interpreter::local_tag_offset_in_bytes(1)), (int32_t)frame::TagValue); + Interpreter::local_tag_offset_in_bytes(1)), (intptr_t)frame::TagValue); movptr(Address(rdi, idx, Interpreter::stackElementScale(), - Interpreter::local_tag_offset_in_bytes(0)), (int32_t)frame::TagValue); + Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)frame::TagValue); } else { movptr(Address(rdi, idx, Interpreter::stackElementScale(), - Interpreter::local_tag_offset_in_bytes(0)), (int32_t)tag); + Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)tag); } } } @@ -1319,7 +1319,7 @@ int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row)); set_mdp_data_at(mdp, recvr_offset, receiver); int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row)); - movptr(reg2, (int32_t)DataLayout::counter_increment); + movptr(reg2, (intptr_t)DataLayout::counter_increment); set_mdp_data_at(mdp, count_offset, reg2); jmp(done); } @@ -1458,7 +1458,7 @@ test_method_data_pointer(mdp, profile_continue); // Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes() - movptr(reg2, (int32_t)in_bytes(MultiBranchData::per_case_size())); + movptr(reg2, (intptr_t)in_bytes(MultiBranchData::per_case_size())); // index is positive and so should have correct value if this code were // used on 64bits imulptr(index, reg2); diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/interpreterRT_x86_32.cpp --- a/src/cpu/x86/vm/interpreterRT_x86_32.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/interpreterRT_x86_32.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -110,7 +110,7 @@ virtual void pass_object() { // pass address of from intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0)); - *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr; + *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr; debug_only(verify_tag(frame::TagReference)); _from -= Interpreter::stackElementSize(); } diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/stubGenerator_x86_32.cpp --- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -407,7 +407,7 @@ __ get_thread(rcx); __ pop(rdx); __ movptr(rax, Address(rcx, Thread::pending_exception_offset())); - __ movptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD); + __ movptr(Address(rcx, Thread::pending_exception_offset()), NULL_WORD); #ifdef ASSERT // make sure exception is set diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/templateInterpreter_x86_32.cpp --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -382,7 +382,7 @@ // indicating if the counter overflow occurs at a backwards branch (non-NULL bcp). // The call returns the address of the verified entry point for the method or NULL // if the compilation did not complete (either went background or bailed out). - __ movptr(rax, (int32_t)false); + __ movptr(rax, (intptr_t)false); __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax); __ movptr(rbx, Address(rbp, method_offset)); // restore methodOop diff -r a87e8ceb2b1f -r ed1c211cf918 src/cpu/x86/vm/templateTable_x86_32.cpp --- a/src/cpu/x86/vm/templateTable_x86_32.cpp Fri Jan 16 21:34:21 2009 -0800 +++ b/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Jan 20 15:26:41 2009 -0500 @@ -137,10 +137,10 @@ // 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); + __ movptr(Address(rdx, 0), val); __ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi); } __ restore_bcp(); @@ -152,9 +152,9 @@ case BarrierSet::CardTableExtension: { if (val == noreg) { - __ movl(obj, NULL_WORD); + __ movptr(obj, NULL_WORD); } else { - __ movl(obj, val); + __ movptr(obj, val); // flatten object address if needed if (!precise || (obj.index() == noreg && obj.disp() == 0)) { __ store_check(obj.base()); @@ -168,9 +168,9 @@ case BarrierSet::ModRef: case BarrierSet::Other: if (val == noreg) { - __ movl(obj, NULL_WORD); + __ movptr(obj, NULL_WORD); } else { - __ movl(obj, val); + __ movptr(obj, val); } break; default :