debug changes

diff --git a/Python/ceval.c b/Python/ceval.c
index 3ca8378294998cc020dd26eb8e80c1297f037ec0..ada9a9fd736c9668270eb479a91cf4a352e644be 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1222,27 +1222,20 @@ tier2_dispatch:
         uopcode = next_uop->opcode;
 #ifdef Py_DEBUG
         if (frame->lltrace >= 4) {
-            if (next_uop->opcode != _YIELD_VALUE &&
-            next_uop->opcode != _FOR_ITER_GEN_FRAME &&
-            next_uop->opcode != _PUSH_FRAME &&
-            next_uop->opcode != _PY_FRAME_KW &&
-            next_uop->opcode != _SAVE_RETURN_OFFSET &&
-            next_uop->opcode != _SAVE_RETURN_OFFSET) {
-                if (next_uop->opcode != _START_EXECUTOR) {
-                    if (next_uop->format == UOP_FORMAT_TARGET) {
-                        _Py_CODEUNIT *aim = _PyFrame_GetBytecode(frame) + next_uop->target;
+            if (next_uop->opcode != _START_EXECUTOR) {
+                if (next_uop->format == UOP_FORMAT_TARGET) {
+                    _Py_CODEUNIT *aim = _PyFrame_GetBytecode(frame) + next_uop->target;
+                    printf("    aim=[%s]\n", _PyOpcode_OpName[aim->op.code]);
+                }
+                else if (next_uop->format == UOP_FORMAT_JUMP) {
+                    _PyUOpInstruction *aim_uop =  current_executor->trace + next_uop->jump_target;
+                    if (aim_uop->format == UOP_FORMAT_TARGET) {
+                        _Py_CODEUNIT *aim = _PyFrame_GetBytecode(frame) + aim_uop->target;
                         printf("    aim=[%s]\n", _PyOpcode_OpName[aim->op.code]);
                     }
-                    else if (next_uop->format == UOP_FORMAT_JUMP) {
-                        _PyUOpInstruction *aim_uop =  current_executor->trace + next_uop->jump_target;
-                        if (aim_uop->format == UOP_FORMAT_TARGET) {
-                            _Py_CODEUNIT *aim = _PyFrame_GetBytecode(frame) + aim_uop->target;
-                            printf("    aim=[%s]\n", _PyOpcode_OpName[aim->op.code]);
-                        }
-                    }
                 }
-                dump_stack(frame, stack_pointer);
             }
+            dump_stack(frame, stack_pointer);
             if (next_uop->opcode == _START_EXECUTOR) {
                 printf("%4d uop: ", 0);
             }