Recorded merge of revisions 81029 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........

1 files changed, 256 insertions, 256 deletions

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index deaf0a3..20c9f25 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -1,258 +1,258 @@
 static void *opcode_targets[256] = {
-	&&_unknown_opcode,
-	&&TARGET_POP_TOP,
-	&&TARGET_ROT_TWO,
-	&&TARGET_ROT_THREE,
-	&&TARGET_DUP_TOP,
-	&&TARGET_ROT_FOUR,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_NOP,
-	&&TARGET_UNARY_POSITIVE,
-	&&TARGET_UNARY_NEGATIVE,
-	&&TARGET_UNARY_NOT,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_UNARY_INVERT,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_BINARY_POWER,
-	&&TARGET_BINARY_MULTIPLY,
-	&&_unknown_opcode,
-	&&TARGET_BINARY_MODULO,
-	&&TARGET_BINARY_ADD,
-	&&TARGET_BINARY_SUBTRACT,
-	&&TARGET_BINARY_SUBSCR,
-	&&TARGET_BINARY_FLOOR_DIVIDE,
-	&&TARGET_BINARY_TRUE_DIVIDE,
-	&&TARGET_INPLACE_FLOOR_DIVIDE,
-	&&TARGET_INPLACE_TRUE_DIVIDE,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_STORE_MAP,
-	&&TARGET_INPLACE_ADD,
-	&&TARGET_INPLACE_SUBTRACT,
-	&&TARGET_INPLACE_MULTIPLY,
-	&&_unknown_opcode,
-	&&TARGET_INPLACE_MODULO,
-	&&TARGET_STORE_SUBSCR,
-	&&TARGET_DELETE_SUBSCR,
-	&&TARGET_BINARY_LSHIFT,
-	&&TARGET_BINARY_RSHIFT,
-	&&TARGET_BINARY_AND,
-	&&TARGET_BINARY_XOR,
-	&&TARGET_BINARY_OR,
-	&&TARGET_INPLACE_POWER,
-	&&TARGET_GET_ITER,
-	&&TARGET_STORE_LOCALS,
-	&&TARGET_PRINT_EXPR,
-	&&TARGET_LOAD_BUILD_CLASS,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_INPLACE_LSHIFT,
-	&&TARGET_INPLACE_RSHIFT,
-	&&TARGET_INPLACE_AND,
-	&&TARGET_INPLACE_XOR,
-	&&TARGET_INPLACE_OR,
-	&&TARGET_BREAK_LOOP,
-	&&TARGET_WITH_CLEANUP,
-	&&_unknown_opcode,
-	&&TARGET_RETURN_VALUE,
-	&&TARGET_IMPORT_STAR,
-	&&_unknown_opcode,
-	&&TARGET_YIELD_VALUE,
-	&&TARGET_POP_BLOCK,
-	&&TARGET_END_FINALLY,
-	&&TARGET_POP_EXCEPT,
-	&&TARGET_STORE_NAME,
-	&&TARGET_DELETE_NAME,
-	&&TARGET_UNPACK_SEQUENCE,
-	&&TARGET_FOR_ITER,
-	&&TARGET_UNPACK_EX,
-	&&TARGET_STORE_ATTR,
-	&&TARGET_DELETE_ATTR,
-	&&TARGET_STORE_GLOBAL,
-	&&TARGET_DELETE_GLOBAL,
-	&&TARGET_DUP_TOPX,
-	&&TARGET_LOAD_CONST,
-	&&TARGET_LOAD_NAME,
-	&&TARGET_BUILD_TUPLE,
-	&&TARGET_BUILD_LIST,
-	&&TARGET_BUILD_SET,
-	&&TARGET_BUILD_MAP,
-	&&TARGET_LOAD_ATTR,
-	&&TARGET_COMPARE_OP,
-	&&TARGET_IMPORT_NAME,
-	&&TARGET_IMPORT_FROM,
-	&&TARGET_JUMP_FORWARD,
-	&&TARGET_JUMP_IF_FALSE_OR_POP,
-	&&TARGET_JUMP_IF_TRUE_OR_POP,
-	&&TARGET_JUMP_ABSOLUTE,
-	&&TARGET_POP_JUMP_IF_FALSE,
-	&&TARGET_POP_JUMP_IF_TRUE,
-	&&TARGET_LOAD_GLOBAL,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_CONTINUE_LOOP,
-	&&TARGET_SETUP_LOOP,
-	&&TARGET_SETUP_EXCEPT,
-	&&TARGET_SETUP_FINALLY,
-	&&_unknown_opcode,
-	&&TARGET_LOAD_FAST,
-	&&TARGET_STORE_FAST,
-	&&TARGET_DELETE_FAST,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_RAISE_VARARGS,
-	&&TARGET_CALL_FUNCTION,
-	&&TARGET_MAKE_FUNCTION,
-	&&TARGET_BUILD_SLICE,
-	&&TARGET_MAKE_CLOSURE,
-	&&TARGET_LOAD_CLOSURE,
-	&&TARGET_LOAD_DEREF,
-	&&TARGET_STORE_DEREF,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&TARGET_CALL_FUNCTION_VAR,
-	&&TARGET_CALL_FUNCTION_KW,
-	&&TARGET_CALL_FUNCTION_VAR_KW,
-	&&TARGET_SETUP_WITH,
-	&&TARGET_EXTENDED_ARG,
-	&&TARGET_LIST_APPEND,
-	&&TARGET_SET_ADD,
-	&&TARGET_MAP_ADD,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode,
-	&&_unknown_opcode
+    &&_unknown_opcode,
+    &&TARGET_POP_TOP,
+    &&TARGET_ROT_TWO,
+    &&TARGET_ROT_THREE,
+    &&TARGET_DUP_TOP,
+    &&TARGET_ROT_FOUR,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_NOP,
+    &&TARGET_UNARY_POSITIVE,
+    &&TARGET_UNARY_NEGATIVE,
+    &&TARGET_UNARY_NOT,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_UNARY_INVERT,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_BINARY_POWER,
+    &&TARGET_BINARY_MULTIPLY,
+    &&_unknown_opcode,
+    &&TARGET_BINARY_MODULO,
+    &&TARGET_BINARY_ADD,
+    &&TARGET_BINARY_SUBTRACT,
+    &&TARGET_BINARY_SUBSCR,
+    &&TARGET_BINARY_FLOOR_DIVIDE,
+    &&TARGET_BINARY_TRUE_DIVIDE,
+    &&TARGET_INPLACE_FLOOR_DIVIDE,
+    &&TARGET_INPLACE_TRUE_DIVIDE,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_STORE_MAP,
+    &&TARGET_INPLACE_ADD,
+    &&TARGET_INPLACE_SUBTRACT,
+    &&TARGET_INPLACE_MULTIPLY,
+    &&_unknown_opcode,
+    &&TARGET_INPLACE_MODULO,
+    &&TARGET_STORE_SUBSCR,
+    &&TARGET_DELETE_SUBSCR,
+    &&TARGET_BINARY_LSHIFT,
+    &&TARGET_BINARY_RSHIFT,
+    &&TARGET_BINARY_AND,
+    &&TARGET_BINARY_XOR,
+    &&TARGET_BINARY_OR,
+    &&TARGET_INPLACE_POWER,
+    &&TARGET_GET_ITER,
+    &&TARGET_STORE_LOCALS,
+    &&TARGET_PRINT_EXPR,
+    &&TARGET_LOAD_BUILD_CLASS,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_INPLACE_LSHIFT,
+    &&TARGET_INPLACE_RSHIFT,
+    &&TARGET_INPLACE_AND,
+    &&TARGET_INPLACE_XOR,
+    &&TARGET_INPLACE_OR,
+    &&TARGET_BREAK_LOOP,
+    &&TARGET_WITH_CLEANUP,
+    &&_unknown_opcode,
+    &&TARGET_RETURN_VALUE,
+    &&TARGET_IMPORT_STAR,
+    &&_unknown_opcode,
+    &&TARGET_YIELD_VALUE,
+    &&TARGET_POP_BLOCK,
+    &&TARGET_END_FINALLY,
+    &&TARGET_POP_EXCEPT,
+    &&TARGET_STORE_NAME,
+    &&TARGET_DELETE_NAME,
+    &&TARGET_UNPACK_SEQUENCE,
+    &&TARGET_FOR_ITER,
+    &&TARGET_UNPACK_EX,
+    &&TARGET_STORE_ATTR,
+    &&TARGET_DELETE_ATTR,
+    &&TARGET_STORE_GLOBAL,
+    &&TARGET_DELETE_GLOBAL,
+    &&TARGET_DUP_TOPX,
+    &&TARGET_LOAD_CONST,
+    &&TARGET_LOAD_NAME,
+    &&TARGET_BUILD_TUPLE,
+    &&TARGET_BUILD_LIST,
+    &&TARGET_BUILD_SET,
+    &&TARGET_BUILD_MAP,
+    &&TARGET_LOAD_ATTR,
+    &&TARGET_COMPARE_OP,
+    &&TARGET_IMPORT_NAME,
+    &&TARGET_IMPORT_FROM,
+    &&TARGET_JUMP_FORWARD,
+    &&TARGET_JUMP_IF_FALSE_OR_POP,
+    &&TARGET_JUMP_IF_TRUE_OR_POP,
+    &&TARGET_JUMP_ABSOLUTE,
+    &&TARGET_POP_JUMP_IF_FALSE,
+    &&TARGET_POP_JUMP_IF_TRUE,
+    &&TARGET_LOAD_GLOBAL,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_CONTINUE_LOOP,
+    &&TARGET_SETUP_LOOP,
+    &&TARGET_SETUP_EXCEPT,
+    &&TARGET_SETUP_FINALLY,
+    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST,
+    &&TARGET_STORE_FAST,
+    &&TARGET_DELETE_FAST,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_RAISE_VARARGS,
+    &&TARGET_CALL_FUNCTION,
+    &&TARGET_MAKE_FUNCTION,
+    &&TARGET_BUILD_SLICE,
+    &&TARGET_MAKE_CLOSURE,
+    &&TARGET_LOAD_CLOSURE,
+    &&TARGET_LOAD_DEREF,
+    &&TARGET_STORE_DEREF,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&TARGET_CALL_FUNCTION_VAR,
+    &&TARGET_CALL_FUNCTION_KW,
+    &&TARGET_CALL_FUNCTION_VAR_KW,
+    &&TARGET_SETUP_WITH,
+    &&TARGET_EXTENDED_ARG,
+    &&TARGET_LIST_APPEND,
+    &&TARGET_SET_ADD,
+    &&TARGET_MAP_ADD,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode,
+    &&_unknown_opcode
 };