You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/08/02 23:41:45 UTC
svn commit: r562268 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src:
thread/helpers/thread_helpers_em64t.cpp util/em64t/base/compile_em64t.cpp
util/em64t/base/jit_lock_rt_support_em64t.cpp
Author: gshimansky
Date: Thu Aug 2 14:41:45 2007
New Revision: 562268
URL: http://svn.apache.org/viewvc?view=rev&rev=562268
Log:
Fixed compilation on x86_64 linux with gcc 4.1.2
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp?view=diff&rev=562268&r1=562267&r2=562268
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/helpers/thread_helpers_em64t.cpp Thu Aug 2 14:41:45 2007
@@ -112,7 +112,7 @@
ss = ret(ss); // ret
//check_zero:
- signed offset = (signed)ss - (signed)check_zero - 1;
+ POINTER_SIZE_SINT offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)check_zero - 1;
*check_zero = (char)offset;
ss = test(ss, rax_opnd, rax_opnd, size_16); // test ax,ax
@@ -134,18 +134,18 @@
ss = mov(ss, M_Base_Opnd(rdi_reg, 1), rax_opnd, size_8); // mov byte[ecx+1],al
//finish:
- offset = (signed)ss - (signed)finish - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)finish - 1;
*finish = (char)offset;
#endif
ss = alu(ss, add_opc, rsp_opnd, Imm_Opnd(size_8, 0x8)); // add rsp,0x8
ss = ret(ss); // ret
//failed:
- offset = (signed)ss - (signed)failed1 - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)failed1 - 1;
*failed1 = (char)offset;
- offset = (signed)ss - (signed)failed2 - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)failed2 - 1;
*failed2 = (char)offset;
- offset = (signed)ss - (signed)failed3 - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)failed3 - 1;
*failed3 = (char)offset;
#endif //ASM_MONITOR_HELPER
@@ -205,7 +205,7 @@
ss = ret(ss); // ret
//zero_rec:
- signed offset = (signed)ss - (signed)zero_rec - 1;
+ POINTER_SIZE_SINT offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)zero_rec - 1;
*zero_rec = (char)offset;
ss = mov(ss, M_Base_Opnd(rdi_reg, 2),
@@ -213,7 +213,7 @@
ss = ret(ss); // ret
//fat:
- offset = (signed)ss - (signed)fat - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)fat - 1;
*fat = (char)offset;
#endif
@@ -257,7 +257,7 @@
fast_tls_func* get_tls_helper(hythread_tls_key_t key) {
// return tm_self_tls->thread_local_storage[key];
unsigned key_offset =
- (unsigned) &(((HyThread_public *) (0))->thread_local_storage[key]);
+ (unsigned)(POINTER_SIZE_INT)&(((HyThread_public *) (0))->thread_local_storage[key]);
const int stub_size = 126;
char *stub = (char *)malloc(stub_size);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp?view=diff&rev=562268&r1=562267&r2=562268
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp Thu Aug 2 14:41:45 2007
@@ -156,7 +156,7 @@
ss = branch8(ss, Condition_NE, Imm_Opnd(size_8, 0)); // not null, branch around the mov 0
char *backpatch_address__not_managed_null = ((char *)ss) - 1;
ss = mov(ss, rdi_opnd, Imm_Opnd(0));
- signed offset = (signed)ss - (signed)backpatch_address__not_managed_null - 1;
+ POINTER_SIZE_SINT offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)backpatch_address__not_managed_null - 1;
*backpatch_address__not_managed_null = (char)offset;
}
return ss;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?view=diff&rev=562268&r1=562267&r2=562268
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp Thu Aug 2 14:41:45 2007
@@ -222,16 +222,16 @@
char *backpatch_address__fast_monitor_failed = ((char *)ss) - 1;
ss = ret(ss);
- signed offset = (signed)ss - (signed)backpatch_address__fast_monitor_failed - 1;
+ POINTER_SIZE_SINT offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)backpatch_address__fast_monitor_failed - 1;
*backpatch_address__fast_monitor_failed = (char)offset;
// Monitor illegal state happend
ss = jump(ss, (char*)exn_get_rth_throw_illegal_state_exception());
- offset = (signed)ss - (signed)backpatch_address__null_pointer - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)backpatch_address__null_pointer - 1;
*backpatch_address__null_pointer = (char)offset;
if (patch_addr_null_arg != NULL) {
- offset = (signed)ss - (signed)patch_addr_null_arg - 1;
+ offset = (POINTER_SIZE_SINT)ss - (POINTER_SIZE_SINT)patch_addr_null_arg - 1;
*patch_addr_null_arg = (char)offset;
}