Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2009-09-08 21:51:21 -05:00
commit 8916fb7a3c
2 changed files with 6 additions and 6 deletions

View File

@ -563,11 +563,11 @@ M: ppc %compare-imm-branch [ (%compare-imm) ] 2dip %branch ;
branch2 [ label branch2 execute( label -- ) ] when ; inline branch2 [ label branch2 execute( label -- ) ] when ; inline
M:: ppc %compare-float-ordered-branch ( label src1 src2 cc -- ) M:: ppc %compare-float-ordered-branch ( label src1 src2 cc -- )
cc src1 src2 \ (%compare-float-ordered) \ (%compare-float) :> branch2 :> branch1 src1 src2 cc \ (%compare-float-ordered) (%compare-float) :> branch2 :> branch1
label branch1 branch2 (%branch) ; label branch1 branch2 (%branch) ;
M:: ppc %compare-float-unordered-branch ( label src1 src2 cc -- ) M:: ppc %compare-float-unordered-branch ( label src1 src2 cc -- )
cc src1 src2 \ (%compare-float-unordered) \ (%compare-float) :> branch2 :> branch1 cc src1 src2 \ (%compare-float-unordered) (%compare-float) :> branch2 :> branch1
label branch1 branch2 (%branch) ; label branch1 branch2 (%branch) ;
: load-from-frame ( dst n rep -- ) : load-from-frame ( dst n rep -- )

View File

@ -246,11 +246,11 @@ DEF(void,primitive_inline_cache_miss_tail,(void)):
bctr bctr
DEF(void,get_ppc_fpu_env,(void*)): DEF(void,get_ppc_fpu_env,(void*)):
mffs fr0 mffs f0
stfd fr0,0(r3) stfd f0,0(r3)
blr blr
DEF(void,set_ppc_fpu_env,(const void*)): DEF(void,set_ppc_fpu_env,(const void*)):
lfd fr0,0(r3) lfd f0,0(r3)
mtfsf 0xff,fr0 mtfsf 0xff,f0
blr blr