*** old/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed Sep 21 11:38:18 2011
--- new/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed Sep 21 11:38:17 2011

*** 43,52 ****
--- 43,55 ----
  # include "thread_solaris.inline.hpp"
  #endif
  #ifdef TARGET_OS_FAMILY_windows
  # include "thread_windows.inline.hpp"
  #endif
+ #ifdef TARGET_OS_FAMILY_bsd
+ # include "thread_bsd.inline.hpp"
+ #endif
  
  
  // Implementation of InterpreterMacroAssembler
  #ifdef CC_INTERP
  void InterpreterMacroAssembler::get_method(Register reg) {

*** 1156,1166 ****
--- 1159,1169 ----
  
    // Fill in the receiver field and increment the count.
    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);
    if (start_row > 0) {
      jmp(done);
    }
  }

*** 1299,1309 ****
--- 1302,1312 ----
  
      // If no method data exists, go to profile_continue.
      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);
      addptr(index, in_bytes(MultiBranchData::case_array_offset()));