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/03/06 23:11:21 UTC
svn commit: r515319 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src:
exception/exceptions_jit.cpp util/em64t/base/compile_em64t.cpp
Author: gshimansky
Date: Tue Mar 6 14:11:19 2007
New Revision: 515319
URL: http://svn.apache.org/viewvc?view=rev&rev=515319
Log:
Applied HARMONY-3315 [drlvm][winx64] Corrected compile_protect_arguments() function and argument size in stubs
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp?view=diff&rev=515319&r1=515318&r2=515319
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp Tue Mar 6 14:11:19 2007
@@ -615,7 +615,7 @@
}
const unsigned cap_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->capacity;
- const unsigned next_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next;
+ const POINTER_SIZE_INT next_off = (POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next;
const unsigned handles_size = (unsigned)(sizeof(ObjectHandlesNew)+sizeof(ManagedObject*)*16);
const unsigned cap_and_size = (unsigned)((0<<16) | 16);
@@ -654,7 +654,7 @@
}
const unsigned cap_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->capacity;
- const unsigned next_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next;
+ const POINTER_SIZE_INT next_off = (POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next;
const unsigned handles_size = (unsigned)(sizeof(ObjectHandlesNew)+sizeof(ManagedObject*)*16);
const unsigned cap_and_size = (unsigned)((0<<16) | 16);
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=515319&r1=515318&r2=515319
==============================================================================
--- 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 Tue Mar 6 14:11:19 2007
@@ -74,7 +74,11 @@
Method_Signature_Handle msh = method_get_signature(method);
unsigned num_gp_used = 0;
+#ifdef _WIN64
+#define num_fp_used num_gp_used
+#else // _WIN64
unsigned num_fp_used = 0;
+#endif // _WIN64
for(unsigned i = 0; i < method_args_get_number(msh); i++) {
Type_Info_Handle tih = method_args_get_type_info(msh, i);
switch (type_info_get_type(tih)) {