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/amd64 | |
| 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/amd64')
| -rw-r--r-- | asmcomp/amd64/reload.ml | 4 | ||||
| -rw-r--r-- | asmcomp/amd64/selection.ml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asmcomp/amd64/reload.ml b/asmcomp/amd64/reload.ml index 6901b5594e..50b962f891 100644 --- a/asmcomp/amd64/reload.ml +++ b/asmcomp/amd64/reload.ml @@ -62,7 +62,7 @@ class reload = object (self) inherit Reloadgen.reload_generic as super -method reload_operation op arg res = +method! reload_operation op arg res = match op with Iintop(Iadd|Isub|Iand|Ior|Ixor|Icomp _|Icheckbound) -> (* One of the two arguments can reside in the stack, but not both *) @@ -99,7 +99,7 @@ method reload_operation op arg res = | _ -> (* Other operations: all args and results in registers *) super#reload_operation op arg res -method reload_test tst arg = +method! reload_test tst arg = match tst with Iinttest cmp -> (* One of the two arguments can reside on stack *) diff --git a/asmcomp/amd64/selection.ml b/asmcomp/amd64/selection.ml index 26955f4099..4921e5110a 100644 --- a/asmcomp/amd64/selection.ml +++ b/asmcomp/amd64/selection.ml @@ -138,7 +138,7 @@ method select_addressing exp = | Ascaledadd(e1, e2, scale) -> (Iindexed2scaled(scale, d), Ctuple[e1; e2]) -method select_store addr exp = +method! select_store addr exp = match exp with Cconst_int n when self#is_immediate n -> (Ispecific(Istore_int(Nativeint.of_int n, addr)), Ctuple []) @@ -153,7 +153,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 -> @@ -217,7 +217,7 @@ method select_floatarith commutative regular_op mem_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) = pseudoregs_for_operation op rs rd in self#insert_moves rs rsrc; @@ -227,7 +227,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 end |