From e49b41f3b9760e11e34b4f2df7ec43ccbeed696f Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 8 May 2005 04:40:47 +0000 Subject: [PATCH] fix reversed logic in x86 %jump-f and %jump-t --- library/compiler/x86/fixnum.factor | 18 ------------------ library/compiler/x86/generator.factor | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/library/compiler/x86/fixnum.factor b/library/compiler/x86/fixnum.factor index b5539fbc05..afb7893814 100644 --- a/library/compiler/x86/fixnum.factor +++ b/library/compiler/x86/fixnum.factor @@ -130,21 +130,3 @@ M: %fixnum>= generate-node ( vop -- ) M: %eq? generate-node ( vop -- ) fixnum-compare \ JE conditional ; -! -! \ arithmetic-type [ -! drop -! EAX [ ESI -4 ] MOV -! EAX BIN: 111 AND -! EDX [ ESI ] MOV -! EDX BIN: 111 AND -! EAX EDX CMP -! 0 JE just-compiled >r -! \ arithmetic-type compile-call -! 0 JMP just-compiled -! compiled-offset r> patch -! EAX 3 SHL -! PUSH-DS -! compiled-offset swap patch -! ] "generator" set-word-prop -! -! \ arithmetic-type [ \ arithmetic-type self ] "infer" set-word-prop diff --git a/library/compiler/x86/generator.factor b/library/compiler/x86/generator.factor index 349cb8c7cc..eb421ffcde 100644 --- a/library/compiler/x86/generator.factor +++ b/library/compiler/x86/generator.factor @@ -30,10 +30,10 @@ M: %jump generate-node ( vop -- ) vop-label dup postpone-word JMP ; M: %jump-f generate-node ( vop -- ) - dup vop-source v>operand f address CMP vop-label JNE ; + dup vop-source v>operand f address CMP vop-label JE ; M: %jump-t generate-node ( vop -- ) - dup vop-source v>operand f address CMP vop-label JE ; + dup vop-source v>operand f address CMP vop-label JNE ; M: %return-to generate-node ( vop -- ) 0 PUSH vop-label absolute ;