[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)

* Updated to 6721 and 676
* Fixed TrinityScript logo
* Version updated to 0.2.6721.676

--HG--
branch : trunk
rename : 6700-670 => 6721-676

1 files changed, 60 insertions, 0 deletions

diff --git a/dep/ACE_wrappers/ace/gethrtime.cpp b/dep/ACE_wrappers/ace/gethrtime.cpp
new file mode 100644
index 00000000000..69de03153a1
--- /dev/null
+++ b/dep/ACE_wrappers/ace/gethrtime.cpp
@@ -0,0 +1,60 @@
+// $Id: gethrtime.cpp 80826 2008-03-04 14:51:23Z wotte $
+//
+// Build this file with g++.  It can be linked in to a ACE application
+// that was compiled with GreenHills.  It wouldn't be necessary if I
+// knew a way to correctly move values from registers to a 64-bit
+// variable in GHS asm code.  That's easy with g++ asm.
+
+#include "ace/config-all.h"
+
+ACE_RCSID(ace, gethrtime, "$Id: gethrtime.cpp 80826 2008-03-04 14:51:23Z wotte $")
+
+#if defined (ghs) && (defined (i386) || defined(__i386__))
+
+#include "ace/OS_NS_time.h"
+
+extern "C"
+ACE_hrtime_t
+ACE_GETHRTIME_NAME (void)
+{
+#if defined (ACE_HAS_PENTIUM)
+  // ACE_TRACE ("ACE_GETHRTIME_NAME");
+
+#if defined (ACE_LACKS_LONGLONG_T)
+  double now;
+#else  /* ! ACE_LACKS_LONGLONG_T */
+  ACE_hrtime_t now;
+#endif /* ! ACE_LACKS_LONGLONG_T */
+
+  // Read the high-res tick counter directly into memory variable
+  // "now".  The A constraint signifies a 64-bit int.
+#if defined (__GNUG__)
+  asm volatile ("rdtsc" : "=A" (now) : : "memory");
+// #elif defined (ghs)
+// The following doesn't work.  For now, this file must be compile with g++.
+//  asm ("rdtsc");
+//  asm ("movl %edx,-16(%ebp)");
+//  asm ("movl %eax,-12(%ebp)");
+#else
+# error unsupported compiler
+#endif
+
+#if defined (ACE_LACKS_LONGLONG_T)
+  // ACE_U_LongLong doesn't have the same layout as now, so construct
+  // it "properly".
+  ACE_UINT32 least, most;
+  ACE_OS::memcpy (&least, &now, sizeof (ACE_UINT32));
+  ACE_OS::memcpy (&most, (unsigned char *) &now + sizeof (ACE_UINT32),
+                  sizeof (ACE_UINT32));
+
+  const ACE_hrtime_t ret (least, most);
+  return ret;
+#else  /* ! ACE_LACKS_LONGLONG_T */
+  return now;
+#endif /* ! ACE_LACKS_LONGLONG_T */
+
+#else  /* ! ACE_HAS_PENTIUM */
+# error This file can _only_ be compiled with ACE_HAS_PENTIUM.
+#endif /* ! ACE_HAS_PENTIUM */
+}
+#endif /* ghs */