diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-11-07 11:02:51 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-11-07 11:02:51 +0000 |
| commit | 07e704dfd51baa2cab31a4c66c36776d59b715a1 (patch) | |
| tree | fc082c65e45c78c59736afe9bb1ca1343b778ec2 /asmcomp/sparc/emit.mlp | |
| parent | ff18f681bcbcdbd9940ff46ecc016a9a10c646e5 (diff) | |
| download | ocaml-07e704dfd51baa2cab31a4c66c36776d59b715a1.tar.gz | |
Remove use of deprecated features (#6227, patch by johnwhitington).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14271 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmcomp/sparc/emit.mlp')
| -rw-r--r-- | asmcomp/sparc/emit.mlp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asmcomp/sparc/emit.mlp b/asmcomp/sparc/emit.mlp index b8387cd7bd..258b2ca15f 100644 --- a/asmcomp/sparc/emit.mlp +++ b/asmcomp/sparc/emit.mlp @@ -64,7 +64,7 @@ let symbol_prefix = if Config.system = "sunos" then "_" else "" let emit_symbol s = - if String.length s >= 1 & s.[0] = '.' + if String.length s >= 1 && s.[0] = '.' then emit_string s else begin emit_string symbol_prefix; Emitaux.emit_symbol '$' s end @@ -629,8 +629,8 @@ let is_one_instr i = i.arg.(0).typ <> Float && i.res.(0).typ <> Float | Iconst_int n -> is_native_immediate n | Istackoffset _ -> true - | Iload(_, Iindexed n) -> i.res.(0).typ <> Float & is_immediate n - | Istore(_, Iindexed n) -> i.arg.(0).typ <> Float & is_immediate n + | Iload(_, Iindexed n) -> i.res.(0).typ <> Float && is_immediate n + | Istore(_, Iindexed n) -> i.arg.(0).typ <> Float && is_immediate n | Iintop(op) -> is_one_instr_op op | Iintop_imm(op, _) -> is_one_instr_op op | Iaddf | Isubf | Imulf | Idivf -> true @@ -660,15 +660,15 @@ let rec emit_all i = emit_instr i.next (Some i); emit_all i.next.next | {next = {desc = Lop(Itailcall_imm s)}} - when s = !function_name & is_one_instr i -> + when s = !function_name && is_one_instr i -> emit_instr i.next (Some i); emit_all i.next.next | {next = {desc = Lop(Icall_ind)}} - when is_one_instr i & no_interference i.res i.next.arg -> + when is_one_instr i && no_interference i.res i.next.arg -> emit_instr i.next (Some i); emit_all i.next.next | {next = {desc = Lcondbranch(_, _)}} - when is_one_instr i & no_interference i.res i.next.arg -> + when is_one_instr i && no_interference i.res i.next.arg -> emit_instr i.next (Some i); emit_all i.next.next | _ -> |