mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix whitespace

Browse source
This commit is contained in:
Raymond Hettinger 2012-07-20 17:47:59 -07:00
parent 715a63b783
commit dee8af225b
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Python/peephole.c
View file

@ -347,7 +347,7 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
codestr = (unsigned char *)memcpy(codestr, codestr = (unsigned char *)memcpy(codestr,
PyString_AS_STRING(code), codelen); PyString_AS_STRING(code), codelen);
/* Verify that RETURN_VALUE terminates the codestring. This allows /* Verify that RETURN_VALUE terminates the codestring. This allows
the various transformation patterns to look ahead several the various transformation patterns to look ahead several
instructions without additional checks to make sure they are not instructions without additional checks to make sure they are not
looking beyond the end of the code string. looking beyond the end of the code string.
@ -445,8 +445,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
case BUILD_LIST: case BUILD_LIST:
j = GETARG(codestr, i); j = GETARG(codestr, i);
h = i - 3 * j; h = i - 3 * j;
if (h >= 0 && if (h >= 0 &&
j <= lastlc && j <= lastlc &&
((opcode == BUILD_TUPLE && ((opcode == BUILD_TUPLE &&
ISBASICBLOCK(blocks, h, 3*(j+1))) || ISBASICBLOCK(blocks, h, 3*(j+1))) ||
(opcode == BUILD_LIST && (opcode == BUILD_LIST &&
@ -490,8 +490,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
case BINARY_AND: case BINARY_AND:
case BINARY_XOR: case BINARY_XOR:
case BINARY_OR: case BINARY_OR:
if (lastlc >= 2 && if (lastlc >= 2 &&
ISBASICBLOCK(blocks, i-6, 7) && ISBASICBLOCK(blocks, i-6, 7) &&
fold_binops_on_constants(&codestr[i-6], consts)) { fold_binops_on_constants(&codestr[i-6], consts)) {
i -= 2; i -= 2;
assert(codestr[i] == LOAD_CONST); assert(codestr[i] == LOAD_CONST);
@ -500,13 +500,13 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
break; break;
/* Fold unary ops on constants. /* Fold unary ops on constants.
LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */ LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */
case UNARY_NEGATIVE: case UNARY_NEGATIVE:
case UNARY_CONVERT: case UNARY_CONVERT:
case UNARY_INVERT: case UNARY_INVERT:
if (lastlc >= 1 && if (lastlc >= 1 &&
ISBASICBLOCK(blocks, i-3, 4) && ISBASICBLOCK(blocks, i-3, 4) &&
fold_unaryops_on_constants(&codestr[i-3], consts)) { fold_unaryops_on_constants(&codestr[i-3], consts)) {
i -= 2; i -= 2;
assert(codestr[i] == LOAD_CONST); assert(codestr[i] == LOAD_CONST);
cumlc = 1; cumlc = 1;
@ -532,8 +532,7 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
tgt = GETJUMPTGT(codestr, i); tgt = GETJUMPTGT(codestr, i);
j = codestr[tgt]; j = codestr[tgt];
if (CONDITIONAL_JUMP(j)) { if (CONDITIONAL_JUMP(j)) {
/* NOTE: all possible jumps here are /* NOTE: all possible jumps here are absolute! */
absolute! */
if (JUMPS_ON_TRUE(j) == JUMPS_ON_TRUE(opcode)) { if (JUMPS_ON_TRUE(j) == JUMPS_ON_TRUE(opcode)) {
/* The second jump will be /* The second jump will be
taken iff the first is. */ taken iff the first is. */
@ -544,13 +543,10 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
SETARG(codestr, i, tgttgt); SETARG(codestr, i, tgttgt);
goto reoptimize_current; goto reoptimize_current;
} else { } else {
/* The second jump is not taken /* The second jump is not taken if the first is (so
if the first is (so jump past jump past it), and all conditional jumps pop their
it), and all conditional argument when they're not taken (so change the
jumps pop their argument when first jump to pop its argument when it's taken). */
they're not taken (so change
the first jump to pop its
argument when it's taken). */
if (JUMPS_ON_TRUE(opcode)) if (JUMPS_ON_TRUE(opcode))
codestr[i] = POP_JUMP_IF_TRUE; codestr[i] = POP_JUMP_IF_TRUE;
else else
@ -586,8 +582,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */ if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */
opcode = JUMP_ABSOLUTE; opcode = JUMP_ABSOLUTE;
if (!ABSOLUTE_JUMP(opcode)) if (!ABSOLUTE_JUMP(opcode))
tgttgt -= i + 3; /* Calc relative jump addr */ tgttgt -= i + 3; /* Calc relative jump addr */
if (tgttgt < 0) /* No backward relative jumps */ if (tgttgt < 0) /* No backward relative jumps */
continue; continue;
codestr[i] = opcode; codestr[i] = opcode;
SETARG(codestr, i, tgttgt); SETARG(codestr, i, tgttgt);