Fix stack effects

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 78e2bab11ded78a5e708e2b028bcd7c3c487c397..d02a965f088b60c5bd5048a1e28f7044810818c0 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,7 +1,6 @@
 + allot refactoring:
 
 - sometimes fep when closing window
-- x86: load-allot-ptr doesn't have a stack effect? why?
 - mov 0x0(%esi),%ecx  why?
 - %allot-bignum-signed-2 is broken on both platforms
 

diff --git a/library/compiler/x86/allot.factor b/library/compiler/x86/allot.factor
index 1077ff9a10064d05be624fcdc50c9e2c3949bd25..b65588404ae0e3c71c943e0cb47ad6b8c81ac20b 100644 (file)
--- a/library/compiler/x86/allot.factor
+++ b/library/compiler/x86/allot.factor
@@ -88,7 +88,7 @@ USING: kernel assembler kernel-internals namespaces math ;
             "positive" get JGE
             allot-tmp-reg 2 cells [+] 1 MOV
             over NOT
-            dup -1 IMUL
+            dup -1 IMUL2
             "end" get JMP
             "positive" resolve-label
             allot-tmp-reg 2 cells [+] 0 MOV

diff --git a/library/ui/x11/clipboard.factor b/library/ui/x11/clipboard.factor
index 3b4163513313b16248c0401388b1c05bd9264b09..672a79af35f739d685f27959274e76ab0f267620 100644 (file)
--- a/library/ui/x11/clipboard.factor
+++ b/library/ui/x11/clipboard.factor
@@ -15,7 +15,7 @@ C: x-clipboard ( atom -- clipboard )
 : selection-property ( -- n )
     "org.factorcode.Factor.SELECTION" x-atom ;
 
-: convert-selection ( win selection -- n )
+: convert-selection ( win selection -- )
     swap >r >r dpy get r> XA_STRING selection-property r>
     CurrentTime XConvertSelection drop ;
 

diff --git a/library/ui/x11/utilities.factor b/library/ui/x11/utilities.factor
index 30e50336087891cfee1957da8d86bcdf65ba750c..5166bed6bbf9618a4992643b709a6328ad1647ed 100644 (file)
--- a/library/ui/x11/utilities.factor
+++ b/library/ui/x11/utilities.factor
@@ -14,8 +14,6 @@ SYMBOL: root
 
 : flush-dpy ( -- ) dpy get XFlush drop ;
 
-: sync-dpy ( discard -- ) >r dpy get r> XSync ;
-
 : x-atom ( string -- atom ) dpy get swap 0 XInternAtom ;
 
 : check-display