steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update cpu.x86.assembler to use dip instead of >r/r>

db4
Slava Pestov 2008-12-02 03:10:01 -06:00
parent f0ee3d355b
commit e4db2afb7e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/cpu/x86/assembler/assembler.factor
View File

@ -130,7 +130,7 @@ M: register modifier drop BIN: 11 ;
GENERIC# n, 1 ( value n -- ) GENERIC# n, 1 ( value n -- )
M: integer n, >le % ; M: integer n, >le % ;
M: byte n, >r value>> r> n, ; M: byte n, [ value>> ] dip n, ;
: 1, ( n -- ) 1 n, ; inline : 1, ( n -- ) 1 n, ; inline
: 4, ( n -- ) 4 n, ; inline : 4, ( n -- ) 4 n, ; inline
: 2, ( n -- ) 2 n, ; inline : 2, ( n -- ) 2 n, ; inline
@ -209,7 +209,7 @@ M: object operand-64? drop f ;
: short-operand ( reg rex.w n -- ) : short-operand ( reg rex.w n -- )
#! Some instructions encode their single operand as part of #! Some instructions encode their single operand as part of
#! the opcode. #! the opcode.
>r dupd prefix-1 reg-code r> + , ; [ dupd prefix-1 reg-code ] dip + , ;
: opcode, ( opcode -- ) dup array? [ % ] [ , ] if ; : opcode, ( opcode -- ) dup array? [ % ] [ , ] if ;
@ -224,7 +224,7 @@ M: object operand-64? drop f ;
: 1-operand ( op reg,rex.w,opcode -- ) : 1-operand ( op reg,rex.w,opcode -- )
#! The 'reg' is not really a register, but a value for the #! The 'reg' is not really a register, but a value for the
#! 'reg' field of the mod-r/m byte. #! 'reg' field of the mod-r/m byte.
first3 >r >r over r> prefix-1 r> opcode, swap addressing ; first3 [ [ over ] dip prefix-1 ] dip opcode, swap addressing ;
: immediate-operand-size-bit ( imm dst reg,rex.w,opcode -- imm dst reg,rex.w,opcode ) : immediate-operand-size-bit ( imm dst reg,rex.w,opcode -- imm dst reg,rex.w,opcode )
pick integer? [ first3 BIN: 1 opcode-or 3array ] when ; pick integer? [ first3 BIN: 1 opcode-or 3array ] when ;
@ -250,7 +250,7 @@ M: object operand-64? drop f ;
] if ; ] if ;
: (2-operand) ( dst src op -- ) : (2-operand) ( dst src op -- )
>r 2dup t rex-prefix r> opcode, [ 2dup t rex-prefix ] dip opcode,
reg-code swap addressing ; reg-code swap addressing ;
: direction-bit ( dst src op -- dst' src' op' ) : direction-bit ( dst src op -- dst' src' op' )
@ -271,11 +271,11 @@ M: object operand-64? drop f ;
PRIVATE> PRIVATE>
: [] ( reg/displacement -- indirect ) : [] ( reg/displacement -- indirect )
dup integer? [ >r f f f r> ] [ f f f ] if <indirect> ; dup integer? [ [ f f f ] dip ] [ f f f ] if <indirect> ;
: [+] ( reg displacement -- indirect ) : [+] ( reg displacement -- indirect )
dup integer? dup integer?
[ dup zero? [ drop f ] when >r f f r> ] [ dup zero? [ drop f ] when [ f f ] dip ]
[ f f ] if [ f f ] if
<indirect> ; <indirect> ;

4
basis/cpu/x86/assembler/syntax/syntax.factor
View File

@ -4,8 +4,8 @@ USING: kernel words sequences lexer parser fry ;
IN: cpu.x86.assembler.syntax IN: cpu.x86.assembler.syntax
: define-register ( name num size -- ) : define-register ( name num size -- )
>r >r "cpu.x86.assembler" create dup define-symbol r> r> [ "cpu.x86.assembler" create dup define-symbol ] 2dip
>r dupd "register" set-word-prop r> [ dupd "register" set-word-prop ] dip
"register-size" set-word-prop ; "register-size" set-word-prop ;
: define-registers ( names size -- ) : define-registers ( names size -- )