Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmmgen: correction de Pnegfloat; modifs mineures dans l'adressage des tableaux. 

proc_alpha: MAJ commentaires.
selection: les ops flottantes ne sont plus considerees comme "cheap",
pour leur laisser plus de temps pour se terminer.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@73 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 1995-07-11 08:51:10 +00:00
parent c226d5efeb
commit 650284680e
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asmcomp/cmmgen.ml
View File

@ -41,11 +41,13 @@ let add_const c n =
if n = 0 then c else Cop(Caddi, [c; Cconst_int n])
let incr_int = function
Cop(Caddi, [c; Cconst_int n]) -> add_const c (n+1)
Cconst_int n -> Cconst_int(n+1)
| Cop(Caddi, [c; Cconst_int n]) -> add_const c (n+1)
| c -> add_const c 1
let decr_int = function
Cop(Caddi, [c; Cconst_int n]) -> add_const c (n-1)
Cconst_int n -> Cconst_int(n-1)
| Cop(Caddi, [c; Cconst_int n]) -> add_const c (n-1)
| c -> add_const c (-1)
let add_int c1 c2 =
@ -152,11 +154,11 @@ let array_indexing ptr ofs =
| Cop(Caddi, [Cop(Clsl, [c; Cconst_int 1]); Cconst_int 1]) ->
Cop(Cadda, [ptr; lsl_const c log2_size_addr])
| Cop(Caddi, [c; Cconst_int n]) ->
Cop(Cadda, [ptr; add_const (lsl_const c (log2_size_addr - 1))
((n - 1) lsl (log2_size_addr - 1))])
Cop(Cadda, [Cop(Cadda, [ptr; lsl_const c (log2_size_addr - 1)]);
Cconst_int((n-1) lsl (log2_size_addr - 1))])
| _ ->
Cop(Cadda, [ptr; add_const (lsl_const ofs (log2_size_addr - 1))
((-1) lsl (log2_size_addr - 1))])
Cop(Cadda, [Cop(Cadda, [ptr; lsl_const ofs (log2_size_addr - 1)]);
Cconst_int((-1) lsl (log2_size_addr - 1))])
(* String length *)
@ -370,8 +372,12 @@ let rec transl = function
(bind "ref" (transl arg) (fun arg ->
Cop(Cstore,
[arg; add_const (Cop(Cload typ_int, [arg])) (n lsl 1)])))
| Uprim(Pfloatofint, [arg]) ->
box_float(Cop(Cfloatofint, [untag_int(transl arg)]))
| Uprim(Pintoffloat, [arg]) ->
tag_int(Cop(Cintoffloat, [transl_unbox_float arg]))
| Uprim(Pnegfloat, [arg]) ->
box_float(Cop(Caddf, [Cconst_float "0.0";
box_float(Cop(Csubf, [Cconst_float "0.0";
transl_unbox_float arg]))
| Uprim(Paddfloat, [arg1; arg2]) ->
box_float(Cop(Caddf, [transl_unbox_float arg1; transl_unbox_float arg2]))

4
asmcomp/proc_alpha.ml
View File

@ -62,8 +62,8 @@ let is_immediate (n:int) = true
$15 trap pointer
$16 - $23 13 - 20 function arguments
$24, $25 temporaries
$26-$30 stack ptr, global ptr, etc
$31 21 always zero
$26 - $30 stack ptr, global ptr, etc
$31 always zero
$f0 - $f7 100 - 107 function results
$f8 - $f15 108 - 115 general purpose ($f2 - $f9 preserved by C)

15
asmcomp/selection.ml
View File

@ -48,11 +48,20 @@ let rec size_expr env = function
| _ ->
fatal_error "Selection.size_expr"
(* Says if an operation is "safe", i.e. without side-effects *)
(* Says if an operation is "cheap". A "cheap" operation is an operation
without side-effects and whose execution can be delayed until its value
is really needed. In the case of e.g. an [alloc] instruction,
the non-cheap parts of arguments are computed in right-to-left order
first, then the block is allocated, then the cheap parts are evaluated
and stored. *)
let safe_operation = function
let cheap_operation = function
(* The following may have side effects *)
Capply _ | Cextcall(_, _, _) | Calloc | Cstore | Cstorechunk _ |
Cmodify | Craise -> false
(* The following are expensive to compute, better start them early *)
| Caddf | Csubf | Cmulf | Cdivf | Cfloatofint | Cintoffloat -> false
(* The remaining operations are cheap *)
| _ -> true
(* Default instruction selection for operators *)
@ -463,7 +472,7 @@ and emit_parts env exp seq =
(Ctuple explist, env)
| Clet(id, arg, body) ->
emit_parts (emit_let env id arg seq) body seq
| Cop(op, args) when safe_operation op ->
| Cop(op, args) when cheap_operation op ->
let (new_args, new_env) = emit_parts_list env args seq in
(Cop(op, new_args), new_env)
| _ ->