user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix opeq.rs for LLVM by implementing simple augmented-assignment operators.

Browse source
This commit is contained in:
Jeffrey Yasskin 2010-07-18 13:37:50 +08:00 • committed by Graydon Hoare
parent 9d0d350d2c
commit 2a2ec67e6e
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -433,7 +433,6 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
obj-recursion.rs \
obj-return-polytypes.rs \
obj-with-vec.rs \
opeq.rs \
output-slot-variants.rs \
pred.rs \
preempt.rs \

1
src/boot/fe/ast.ml
View file

@ -1377,6 +1377,7 @@ let ty_children (ty:ty) : ty array =
[| |]
;;
let sprintf_binop = sprintf_fmt fmt_binop;;
let sprintf_expr = sprintf_fmt fmt_expr;;
let sprintf_name = sprintf_fmt fmt_name;;
let sprintf_name_component = sprintf_fmt fmt_name_component;;

48
src/boot/llvm/lltrans.ml
View file

@ -731,6 +731,25 @@ let trans_crate
Llvm.build_load (trans_lval lval) (anon_llid "tmp") llbuilder
in
let build_binop (op:Ast.binop) (lllhs:Llvm.llvalue) (llrhs:Llvm.llvalue)
: Llvm.llvalue =
let llid = anon_llid "expr" in
match op with
Ast.BINOP_eq ->
(* TODO: equality works on more than just integers *)
Llvm.build_icmp Llvm.Icmp.Eq lllhs llrhs llid llbuilder
(* TODO: signed/unsigned distinction, floating point *)
| Ast.BINOP_add -> Llvm.build_add lllhs llrhs llid llbuilder
| Ast.BINOP_sub -> Llvm.build_sub lllhs llrhs llid llbuilder
| Ast.BINOP_mul -> Llvm.build_mul lllhs llrhs llid llbuilder
| Ast.BINOP_div -> Llvm.build_sdiv lllhs llrhs llid llbuilder
| Ast.BINOP_mod -> Llvm.build_srem lllhs llrhs llid llbuilder
| _ -> raise
(Not_implemented ("build_binop " ^ (Ast.sprintf_binop() op)))
in
let trans_binary_expr
((op:Ast.binop), (lhs:Ast.atom), (rhs:Ast.atom))
: Llvm.llvalue =
@ -748,23 +767,7 @@ let trans_crate
let lllhs = trans_atom lhs in
(lllhs, llrhs)
in
let llid = anon_llid "expr" in
match op with
Ast.BINOP_eq ->
(* TODO: equality works on more than just integers *)
Llvm.build_icmp Llvm.Icmp.Eq lllhs llrhs llid llbuilder
(* TODO: signed/unsigned distinction, floating point *)
| Ast.BINOP_add -> Llvm.build_add lllhs llrhs llid llbuilder
| Ast.BINOP_sub -> Llvm.build_sub lllhs llrhs llid llbuilder
| Ast.BINOP_mul -> Llvm.build_mul lllhs llrhs llid llbuilder
| Ast.BINOP_div -> Llvm.build_sdiv lllhs llrhs llid llbuilder
| Ast.BINOP_mod -> Llvm.build_srem lllhs llrhs llid llbuilder
| _ -> raise
(Not_implemented
("trans_binary_expr " ^
(Ast.sprintf_expr() (Ast.EXPR_binary (op,lhs,rhs)))))
build_binop op lllhs llrhs
in
let trans_unary_expr e = raise
@ -854,6 +857,17 @@ let trans_crate
ignore (Llvm.build_store llsrc lldest llbuilder);
trans_tail ()
| Ast.STMT_copy_binop (dest, op, src) ->
let lldest = trans_lval dest in
let llsrc = trans_atom src in
(* FIXME: Handle vecs and strs. *)
let lldest_deref =
Llvm.build_load lldest (anon_llid "dest_init") llbuilder
in
let llres = build_binop op lldest_deref llsrc in
ignore (Llvm.build_store llres lldest llbuilder);
trans_tail ()
| Ast.STMT_call (dest, fn, args) ->
let llargs = Array.map trans_atom args in
let lldest = trans_lval dest in