You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by wj...@apache.org on 2007/03/29 20:05:12 UTC
svn commit: r523782 - in /harmony/enhanced/drlvm/trunk/vm:
include/open/hythread.h include/open/hythread_ext.h thread/src/hythr.def
Author: wjwashburn
Date: Thu Mar 29 11:05:06 2007
New Revision: 523782
URL: http://svn.apache.org/viewvc?view=rev&rev=523782
Log:
h3065, Thread-local Storage inlining patch for win64
Modified:
harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
harmony/enhanced/drlvm/trunk/vm/thread/src/hythr.def
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h?view=diff&rev=523782&r1=523781&r2=523782
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h Thu Mar 29 11:05:06 2007
@@ -400,7 +400,7 @@
-#if defined WIN32 && !defined _EM64T_
+#if (defined (WIN32) && !defined (_WIN64))
//use optimized asm monitor enter and exit helpers
#define ASM_MONITOR_HELPER
@@ -410,8 +410,7 @@
// http://www.microsoft.com/msj/archive/S2CE.aspx
#define FS14_TLS_USE
-#elif defined _EM64T_ && defined WINDOWS
-
+#elif defined _WIN64
#define APR_TLS_USE
#endif
@@ -430,8 +429,8 @@
return hythread_self_slow();
}
-#define tm_self_tls (hythread_self_slow())
+#define tm_self_tls (hythread_self_slow())
#ifdef __cplusplus
}
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h?view=diff&rev=523782&r1=523781&r2=523782
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h Thu Mar 29 11:05:06 2007
@@ -387,7 +387,7 @@
// Check that current thread is in default thread group.
// Justification: GC suspends and enumerates threads from
// default group only.
- assert(((HyThread_public *)tm_self_tls)->group == get_java_thread_group());
+ assert(((HyThread_public *)hythread_self())->group == get_java_thread_group());
#ifdef FS14_TLS_USE
// the macros could work for WIN32
Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/hythr.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/hythr.def?view=diff&rev=523782&r1=523781&r2=523782
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/hythr.def (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/hythr.def Thu Mar 29 11:05:06 2007
@@ -17,6 +17,7 @@
hythread_monitor_init_with_name
hythread_monitor_try_enter
hythread_self
+hythread_self_slow
hythread_tls_free
hythread_yield
hythread_suspend