--- ceval.tmp.brick.25401.s 2009-12-18 18:47:46.732242886 -0500 +++ ceval.tmp.brick.25427.s 2009-12-18 18:48:45.271242632 -0500 @@ -1553,7 +1553,7 @@ PyEval_EvalFrameEx: movl $0, -360(%ebp) .loc 1 1069 0 cmpl $89, %ebx - jle .L107 + jbe .L107 .loc 1 1070 0 addl $2, -364(%ebp) movl -364(%ebp), %eax @@ -1575,7 +1575,7 @@ PyEval_EvalFrameEx: je .L108 .loc 1 1084 0 cmpl $89, %ebx - jle .L109 + jbe .L109 .loc 1 1085 0 movl 8(%ebp), %eax movl 68(%eax), %edx @@ -10913,10 +10913,12 @@ PyEval_EvalFrameEx: movl %edx, %esi subl %eax, %esi movl %esi, %eax - addl -360(%ebp), %eax + movl -360(%ebp), %edx + leal (%eax,%edx), %edx + movl %ebx, %eax movl %ecx, 12(%esp) - movl %eax, 8(%esp) - movl %ebx, 4(%esp) + movl %edx, 8(%esp) + movl %eax, 4(%esp) movl 8(%ebp), %eax movl %eax, (%esp) call PyFrame_BlockSetup @@ -13681,7 +13683,7 @@ PyEval_EvalCodeEx: .loc 1 2982 0 cmpl $0, -152(%ebp) jne .L1524 - movl $__PRETTY_FUNCTION__.14131, 12(%esp) + movl $__PRETTY_FUNCTION__.14136, 12(%esp) movl $2982, 8(%esp) movl $.LC1, 4(%esp) movl $.LC55, (%esp) @@ -13690,7 +13692,7 @@ PyEval_EvalCodeEx: .loc 1 2983 0 cmpl $0, 12(%ebp) jne .L1525 - movl $__PRETTY_FUNCTION__.14131, 12(%esp) + movl $__PRETTY_FUNCTION__.14136, 12(%esp) movl $2983, 8(%esp) movl $.LC1, 4(%esp) movl $.LC56, (%esp) @@ -14930,7 +14932,7 @@ PyEval_EvalCodeEx: .loc 1 3218 0 cmpl $0, -152(%ebp) jne .L1629 - movl $__PRETTY_FUNCTION__.14131, 12(%esp) + movl $__PRETTY_FUNCTION__.14136, 12(%esp) movl $3218, 8(%esp) movl $.LC1, 4(%esp) movl $.LC55, (%esp) @@ -15155,7 +15157,7 @@ set_exc_info: .loc 1 3330 0 cmpl $0, 12(%ebp) jne .L1666 - movl $__PRETTY_FUNCTION__.14723, 12(%esp) + movl $__PRETTY_FUNCTION__.14728, 12(%esp) movl $3330, 8(%esp) movl $.LC1, 4(%esp) movl $.LC68, (%esp) @@ -15164,7 +15166,7 @@ set_exc_info: .loc 1 3331 0 cmpl $0, -24(%ebp) jne .L1667 - movl $__PRETTY_FUNCTION__.14723, 12(%esp) + movl $__PRETTY_FUNCTION__.14728, 12(%esp) movl $3331, 8(%esp) movl $.LC1, 4(%esp) movl $.LC69, (%esp) @@ -15180,7 +15182,7 @@ set_exc_info: movl 56(%eax), %eax testl %eax, %eax je .L1669 - movl $__PRETTY_FUNCTION__.14723, 12(%esp) + movl $__PRETTY_FUNCTION__.14728, 12(%esp) movl $3333, 8(%esp) movl $.LC1, 4(%esp) movl $.LC70, (%esp) @@ -15191,7 +15193,7 @@ set_exc_info: movl 60(%eax), %eax testl %eax, %eax je .L1670 - movl $__PRETTY_FUNCTION__.14723, 12(%esp) + movl $__PRETTY_FUNCTION__.14728, 12(%esp) movl $3334, 8(%esp) movl $.LC1, 4(%esp) movl $.LC71, (%esp) @@ -15471,7 +15473,7 @@ reset_exc_info: .loc 1 3377 0 cmpl $0, 8(%ebp) jne .L1697 - movl $__PRETTY_FUNCTION__.14837, 12(%esp) + movl $__PRETTY_FUNCTION__.14842, 12(%esp) movl $3377, 8(%esp) movl $.LC1, 4(%esp) movl $.LC55, (%esp) @@ -15484,7 +15486,7 @@ reset_exc_info: .loc 1 3379 0 cmpl $0, -24(%ebp) jne .L1698 - movl $__PRETTY_FUNCTION__.14837, 12(%esp) + movl $__PRETTY_FUNCTION__.14842, 12(%esp) movl $3379, 8(%esp) movl $.LC1, 4(%esp) movl $.LC69, (%esp) @@ -15495,7 +15497,7 @@ reset_exc_info: movl 52(%eax), %eax testl %eax, %eax jne .L1699 - movl $__PRETTY_FUNCTION__.14837, 12(%esp) + movl $__PRETTY_FUNCTION__.14842, 12(%esp) movl $3380, 8(%esp) movl $.LC1, 4(%esp) movl $.LC75, (%esp) @@ -16185,7 +16187,7 @@ do_raise: testl %eax, %eax jne .L1766 .L1767: - movl $__PRETTY_FUNCTION__.14966, 12(%esp) + movl $__PRETTY_FUNCTION__.14971, 12(%esp) movl $3501, 8(%esp) movl $.LC1, 4(%esp) movl $.LC79, (%esp) @@ -16366,7 +16368,7 @@ unpack_iterable: .loc 1 3531 0 cmpl $0, 8(%ebp) jne .L1793 - movl $__PRETTY_FUNCTION__.15227, 12(%esp) + movl $__PRETTY_FUNCTION__.15232, 12(%esp) movl $3531, 8(%esp) movl $.LC1, 4(%esp) movl $.LC81, (%esp) @@ -19045,7 +19047,7 @@ fast_function: .loc 1 4048 0 cmpl $0, -48(%ebp) jne .L2047 - movl $__PRETTY_FUNCTION__.16172, 12(%esp) + movl $__PRETTY_FUNCTION__.16177, 12(%esp) movl $4048, 8(%esp) movl $.LC1, 4(%esp) movl $.LC56, (%esp) @@ -19054,7 +19056,7 @@ fast_function: .loc 1 4053 0 cmpl $0, -24(%ebp) jne .L2048 - movl $__PRETTY_FUNCTION__.16172, 12(%esp) + movl $__PRETTY_FUNCTION__.16177, 12(%esp) movl $4053, 8(%esp) movl $.LC1, 4(%esp) movl $.LC55, (%esp) @@ -23035,29 +23037,29 @@ string_concatenate: .LFE61: .size string_concatenate, .-string_concatenate .section .rodata - .type __PRETTY_FUNCTION__.16172, @object - .size __PRETTY_FUNCTION__.16172, 14 -__PRETTY_FUNCTION__.16172: + .type __PRETTY_FUNCTION__.16177, @object + .size __PRETTY_FUNCTION__.16177, 14 +__PRETTY_FUNCTION__.16177: .string "fast_function" - .type __PRETTY_FUNCTION__.15227, @object - .size __PRETTY_FUNCTION__.15227, 16 -__PRETTY_FUNCTION__.15227: + .type __PRETTY_FUNCTION__.15232, @object + .size __PRETTY_FUNCTION__.15232, 16 +__PRETTY_FUNCTION__.15232: .string "unpack_iterable" - .type __PRETTY_FUNCTION__.14966, @object - .size __PRETTY_FUNCTION__.14966, 9 -__PRETTY_FUNCTION__.14966: + .type __PRETTY_FUNCTION__.14971, @object + .size __PRETTY_FUNCTION__.14971, 9 +__PRETTY_FUNCTION__.14971: .string "do_raise" - .type __PRETTY_FUNCTION__.14837, @object - .size __PRETTY_FUNCTION__.14837, 15 -__PRETTY_FUNCTION__.14837: + .type __PRETTY_FUNCTION__.14842, @object + .size __PRETTY_FUNCTION__.14842, 15 +__PRETTY_FUNCTION__.14842: .string "reset_exc_info" - .type __PRETTY_FUNCTION__.14723, @object - .size __PRETTY_FUNCTION__.14723, 13 -__PRETTY_FUNCTION__.14723: + .type __PRETTY_FUNCTION__.14728, @object + .size __PRETTY_FUNCTION__.14728, 13 +__PRETTY_FUNCTION__.14728: .string "set_exc_info" - .type __PRETTY_FUNCTION__.14131, @object - .size __PRETTY_FUNCTION__.14131, 18 -__PRETTY_FUNCTION__.14131: + .type __PRETTY_FUNCTION__.14136, @object + .size __PRETTY_FUNCTION__.14136, 18 +__PRETTY_FUNCTION__.14136: .string "PyEval_EvalCodeEx" .type __PRETTY_FUNCTION__.9143, @object .size __PRETTY_FUNCTION__.9143, 19 @@ -27389,7 +27391,7 @@ __PRETTY_FUNCTION__.8885: .long .LASF537 .byte 0x1 .value 0x2b5 - .long 0x5a + .long 0x1ba7 .byte 0x1 .byte 0x53 .uleb128 0x28 @@ -28289,7 +28291,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.14131 + .long __PRETTY_FUNCTION__.14136 .uleb128 0x2f .long .LASF584 .byte 0x1 @@ -28757,7 +28759,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.14723 + .long __PRETTY_FUNCTION__.14728 .byte 0x0 .uleb128 0xd .long 0xad @@ -28824,7 +28826,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.14837 + .long __PRETTY_FUNCTION__.14842 .byte 0x0 .uleb128 0xd .long 0xad @@ -28881,7 +28883,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.14966 + .long __PRETTY_FUNCTION__.14971 .uleb128 0x31 .long .LBB69 .long .LBE69 @@ -28981,7 +28983,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.15227 + .long __PRETTY_FUNCTION__.15232 .uleb128 0x2f .long .LASF607 .byte 0x1 @@ -30093,7 +30095,7 @@ __PRETTY_FUNCTION__.8885: .byte 0x1 .byte 0x5 .byte 0x3 - .long __PRETTY_FUNCTION__.16172 + .long __PRETTY_FUNCTION__.16177 .uleb128 0x2a .long .LBB81 .long .LBE81