Merge git://factorcode.org/git/factor

2007-10-16 00:11:59 -04:00 · 2007-10-16 00:11:59 -04:00 · d8c6d2c317
parent a039910d01 d744630f41
commit d8c6d2c317
1 changed files with 2 additions and 3 deletions
--- a/core/cpu/x86/assembler/assembler.factor
+++ b/core/cpu/x86/assembler/assembler.factor
@ -255,9 +255,8 @@ UNION: operand register indirect ;
 : extended-opcode, ( opcode -- ) extended-opcode opcode, ;

 : opcode-or ( opcode mask -- opcode' )
-    over array?
-    [ 1 rot cut* first rot bitor add ]
-    [ bitor ] if ;
+    swap dup array?
+    [ 1 cut* first rot bitor add ] [ bitor ] if ;

 : 1-operand ( op reg rex.w opcode -- )
    #! The 'reg' is not really a register, but a value for the