Merge git://factorcode.org/git/factor
commit
f85a144340
|
@ -8,3 +8,5 @@ USING: kernel vocabs vocabs.loader sequences ;
|
||||||
"ui.cocoa.tools" require
|
"ui.cocoa.tools" require
|
||||||
] when
|
] when
|
||||||
] when
|
] when
|
||||||
|
|
||||||
|
macosx? [ "ui.tools.deploy" require ] when
|
||||||
|
|
|
@ -12,5 +12,3 @@ vocabs vocabs.loader ;
|
||||||
|
|
||||||
"ui.freetype" require
|
"ui.freetype" require
|
||||||
] when
|
] when
|
||||||
|
|
||||||
macosx? [ "ui.tools.deploy" require ] when
|
|
||||||
|
|
|
@ -278,7 +278,7 @@ M: arm-backend %alien-indirect ( -- )
|
||||||
|
|
||||||
M: arm-backend %alien-callback ( quot -- )
|
M: arm-backend %alien-callback ( quot -- )
|
||||||
R0 load-indirect
|
R0 load-indirect
|
||||||
"run_callback" f %alien-invoke ;
|
"c_to_factor" f %alien-invoke ;
|
||||||
|
|
||||||
M: arm-backend %callback-value ( ctype -- )
|
M: arm-backend %callback-value ( ctype -- )
|
||||||
! Save top of data stack
|
! Save top of data stack
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
USING: alien alien.c-types kernel math namespaces
|
USING: alien alien.c-types kernel math namespaces
|
||||||
cpu.architecture cpu.arm.architecture cpu.arm.assembler
|
cpu.architecture cpu.arm.architecture cpu.arm.assembler
|
||||||
cpu.arm.intrinsics generator generator.registers continuations
|
cpu.arm.intrinsics generator generator.registers continuations
|
||||||
compiler io vocabs.loader sequences ;
|
compiler io vocabs.loader sequences system ;
|
||||||
|
|
||||||
! EABI passes floats in integer registers.
|
! EABI passes floats in integer registers.
|
||||||
[ alien-float ]
|
[ alien-float ]
|
||||||
|
@ -53,4 +53,4 @@ T{ arm-backend } compiler-backend set-global
|
||||||
t have-BLX? set-global
|
t have-BLX? set-global
|
||||||
] when
|
] when
|
||||||
|
|
||||||
7 cells set-profiler-prologue
|
7 cells set-profiler-prologues
|
||||||
|
|
Loading…
Reference in New Issue