mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Revert 2.393, elimination of pre-decrementing, which

Browse source 
did not stand-up to additional timings.
This commit is contained in:
Raymond Hettinger 2004-04-10 23:34:17 +00:00
parent 249369c7f0
commit 5bed456056
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Python/ceval.c
View file

@ -625,8 +625,7 @@ eval_frame(PyFrameObject *f)
#define INSTR_OFFSET() (next_instr - first_instr) #define INSTR_OFFSET() (next_instr - first_instr)
#define NEXTOP() (*next_instr++) #define NEXTOP() (*next_instr++)
#define OPARG() (next_instr[0] + (next_instr[1]<<8)) #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
#define SKIPARG() (next_instr += 2)
#define JUMPTO(x) (next_instr = first_instr + (x)) #define JUMPTO(x) (next_instr = first_instr + (x))
#define JUMPBY(x) (next_instr += (x)) #define JUMPBY(x) (next_instr += (x))
@ -862,10 +861,8 @@ eval_frame(PyFrameObject *f)
/* Extract opcode and argument */ /* Extract opcode and argument */
opcode = NEXTOP(); opcode = NEXTOP();
if (HAS_ARG(opcode)) { if (HAS_ARG(opcode))
oparg = OPARG(); oparg = NEXTARG();
SKIPARG();
}
dispatch_opcode: dispatch_opcode:
#ifdef DYNAMIC_EXECUTION_PROFILE #ifdef DYNAMIC_EXECUTION_PROFILE
#ifdef DXPAIRS #ifdef DXPAIRS
@ -1901,7 +1898,7 @@ eval_frame(PyFrameObject *f)
case BUILD_TUPLE: case BUILD_TUPLE:
x = PyTuple_New(oparg); x = PyTuple_New(oparg);
if (x != NULL) { if (x != NULL) {
while (oparg--) { for (; --oparg >= 0;) {
w = POP(); w = POP();
PyTuple_SET_ITEM(x, oparg, w); PyTuple_SET_ITEM(x, oparg, w);
} }
@ -1913,7 +1910,7 @@ eval_frame(PyFrameObject *f)
case BUILD_LIST: case BUILD_LIST:
x = PyList_New(oparg); x = PyList_New(oparg);
if (x != NULL) { if (x != NULL) {
while (oparg--) { for (; --oparg >= 0;) {
w = POP(); w = POP();
PyList_SET_ITEM(x, oparg, w); PyList_SET_ITEM(x, oparg, w);
} }
@ -2185,7 +2182,7 @@ eval_frame(PyFrameObject *f)
x = NULL; x = NULL;
break; break;
} }
while (oparg--) { while (--oparg >= 0) {
w = POP(); w = POP();
PyTuple_SET_ITEM(v, oparg, w); PyTuple_SET_ITEM(v, oparg, w);
} }
@ -2210,7 +2207,7 @@ eval_frame(PyFrameObject *f)
x = NULL; x = NULL;
break; break;
} }
while (nfree--) { while (--nfree >= 0) {
w = POP(); w = POP();
PyTuple_SET_ITEM(v, nfree, w); PyTuple_SET_ITEM(v, nfree, w);
} }
@ -2224,7 +2221,7 @@ eval_frame(PyFrameObject *f)
x = NULL; x = NULL;
break; break;
} }
while (oparg--) { while (--oparg >= 0) {
w = POP(); w = POP();
PyTuple_SET_ITEM(v, oparg, w); PyTuple_SET_ITEM(v, oparg, w);
} }
@ -2252,8 +2249,7 @@ eval_frame(PyFrameObject *f)
case EXTENDED_ARG: case EXTENDED_ARG:
opcode = NEXTOP(); opcode = NEXTOP();
oparg = oparg<<16 | OPARG(); oparg = oparg<<16 | NEXTARG();
SKIPARG();
goto dispatch_opcode; goto dispatch_opcode;
default: default:
@ -3202,7 +3198,7 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
} }
if (size > 0) { if (size > 0) {
while (size--) { while (--size >= 0) {
addr += *p++; addr += *p++;
if (*p++) if (*p++)
break; break;
@ -3617,7 +3613,7 @@ update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack,
} }
if (kwdict == NULL) if (kwdict == NULL)
return NULL; return NULL;
while (nk--) { while (--nk >= 0) {
int err; int err;
PyObject *value = EXT_POP(*pp_stack); PyObject *value = EXT_POP(*pp_stack);
PyObject *key = EXT_POP(*pp_stack); PyObject *key = EXT_POP(*pp_stack);
@ -3662,7 +3658,7 @@ update_star_args(int nstack, int nstar, PyObject *stararg,
PyTuple_SET_ITEM(callargs, nstack + i, a); PyTuple_SET_ITEM(callargs, nstack + i, a);
} }
} }
while (nstack--) { while (--nstack >= 0) {
w = EXT_POP(*pp_stack); w = EXT_POP(*pp_stack);
PyTuple_SET_ITEM(callargs, nstack, w); PyTuple_SET_ITEM(callargs, nstack, w);
} }
@ -3677,7 +3673,7 @@ load_args(PyObject ***pp_stack, int na)
if (args == NULL) if (args == NULL)
return NULL; return NULL;
while (na--) { while (--na >= 0) {
w = EXT_POP(*pp_stack); w = EXT_POP(*pp_stack);
PyTuple_SET_ITEM(args, na, w); PyTuple_SET_ITEM(args, na, w);
} }