diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:58:41 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:58:41 +0000 |
| commit | ee36e1d1c5fa2c90a86ae9b6a9a3f6d3666b4e2b (patch) | |
| tree | 35b439e2c89eb0463944dd6611f567deff2a218b /asmcomp/i386/selection.ml | |
| parent | cfd555426d1d99c104669d05432f689f025ea374 (diff) | |
| download | ocaml-ee36e1d1c5fa2c90a86ae9b6a9a3f6d3666b4e2b.tar.gz | |
merge branches/override
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmcomp/i386/selection.ml')
| -rw-r--r-- | asmcomp/i386/selection.ml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asmcomp/i386/selection.ml b/asmcomp/i386/selection.ml index d9600f16d7..5a8720fbeb 100644 --- a/asmcomp/i386/selection.ml +++ b/asmcomp/i386/selection.ml @@ -159,7 +159,7 @@ inherit Selectgen.selector_generic as super method is_immediate (n : int) = true -method is_simple_expr e = +method! is_simple_expr e = match e with | Cop(Cextcall(fn, _, alloc, _), args) when !fast_math && List.mem fn inline_float_ops -> @@ -181,7 +181,7 @@ method select_addressing exp = | (Ascaledadd(e1, e2, scale), d) -> (Iindexed2scaled(scale, d), Ctuple[e1; e2]) -method select_store addr exp = +method! select_store addr exp = match exp with Cconst_int n -> (Ispecific(Istore_int(Nativeint.of_int n, addr)), Ctuple []) @@ -196,7 +196,7 @@ method select_store addr exp = | _ -> super#select_store addr exp -method select_operation op args = +method! select_operation op args = match op with (* Recognize the LEA instruction *) Caddi | Cadda | Csubi | Csuba -> @@ -269,7 +269,7 @@ method select_floatarith regular_op reversed_op mem_op mem_rev_op args = (* Deal with register constraints *) -method insert_op_debug op dbg rs rd = +method! insert_op_debug op dbg rs rd = try let (rsrc, rdst, move_res) = pseudoregs_for_operation op rs rd in self#insert_moves rs rsrc; @@ -282,7 +282,7 @@ method insert_op_debug op dbg rs rd = with Use_default -> super#insert_op_debug op dbg rs rd -method insert_op op rs rd = +method! insert_op op rs rd = self#insert_op_debug op Debuginfo.none rs rd (* Selection of push instructions for external calls *) @@ -302,7 +302,7 @@ method select_push exp = (Ispecific(Ipush_load_float addr), arg) | _ -> (Ispecific(Ipush), exp) -method emit_extcall_args env args = +method! emit_extcall_args env args = let rec size_pushes = function | [] -> 0 | e :: el -> Selectgen.size_expr env e + size_pushes el in |