[pypy-svn] r79192 - pypy/trunk/pypy/translator/c/src

[arigo at codespeak.net]

Author: arigo
Date: Wed Nov 17 13:45:47 2010
New Revision: 79192

Modified:
   pypy/trunk/pypy/translator/c/src/asm_gcc_x86.h
   pypy/trunk/pypy/translator/c/src/g_include.h
Log:
Oups.  Disabled also the READ_TIMESTAMP in assembler by mistake.


Modified: pypy/trunk/pypy/translator/c/src/asm_gcc_x86.h
==============================================================================
--- pypy/trunk/pypy/translator/c/src/asm_gcc_x86.h	(original)
+++ pypy/trunk/pypy/translator/c/src/asm_gcc_x86.h	Wed Nov 17 13:45:47 2010
@@ -2,6 +2,8 @@
  * It replaces some complex macros with native assembler instructions.
  */
 
+#if 0     /* --- disabled: does not give any speed-up --- */
+
 #undef OP_INT_ADD_OVF
 #define OP_INT_ADD_OVF(x,y,r)                   \
     asm volatile(                               \
@@ -50,6 +52,13 @@
         : "0"(x), "g"(y)     /* inputs  */      \
         : "cc", "memory")    /* clobber */
 
+extern void op_int_overflowed(void)
+     asm ("_op_int_overflowed")
+     __attribute__((used));
+
+#endif  /* 0 */
+
+
 /* Pentium only! */
 #define READ_TIMESTAMP(val) \
      asm volatile("rdtsc" : "=A" (val))
@@ -62,19 +71,15 @@
 // I don't know how important it is, comment talks about time warps
 
 
-/* prototypes */
-
-extern void op_int_overflowed(void)
-     asm ("_op_int_overflowed")
-     __attribute__((used));
-
 /* implementations */
 
 #ifndef PYPY_NOT_MAIN_FILE
 
+#  if 0   /* disabled */
 void op_int_overflowed(void)
 {
   FAIL_OVF("integer operation");
 }
+#  endif
 
 #endif

Modified: pypy/trunk/pypy/translator/c/src/g_include.h
==============================================================================
--- pypy/trunk/pypy/translator/c/src/g_include.h	(original)
+++ pypy/trunk/pypy/translator/c/src/g_include.h	Wed Nov 17 13:45:47 2010
@@ -39,10 +39,9 @@
 #include "src/instrument.h"
 
 /* optional assembler bits */
-// disabled: does not give any speed-up
-//#if defined(__GNUC__) && defined(__i386__)
-//#  include "src/asm_gcc_x86.h"
-//#endif
+#if defined(__GNUC__) && defined(__i386__)
+#  include "src/asm_gcc_x86.h"
+#endif
 
 #if defined(__GNUC__) && defined(__ppc__)
 #  include "src/asm_ppc.h"