diff options
| author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-03-02 15:44:29 +0000 |
|---|---|---|
| committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-03-02 15:44:29 +0000 |
| commit | 06d89fd503342ee3e7aeaf9dc0629b053da2ab9e (patch) | |
| tree | f2880d8e58a90cca906786032b87047c83b7fedc /asmcomp/cmmgen.ml | |
| parent | 14472225e729da87eb0bc86d2af5870534344acc (diff) | |
| parent | 41548a735900a74202b07f918521ef9ac52ece1e (diff) | |
| download | ocaml-06d89fd503342ee3e7aeaf9dc0629b053da2ab9e.tar.gz | |
Merge commit '41548a735900a74202b07f918521ef9ac52ece1e' into parallel_minor_gc_4_12
Diffstat (limited to 'asmcomp/cmmgen.ml')
| -rw-r--r-- | asmcomp/cmmgen.ml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml index dbbf8483f7..699dbee3d8 100644 --- a/asmcomp/cmmgen.ml +++ b/asmcomp/cmmgen.ml @@ -180,8 +180,8 @@ let transl_constant dbg = function int_const dbg n | Uconst_ptr n -> if n <= max_repr_int && n >= min_repr_int - then Cconst_pointer((n lsl 1) + 1, dbg) - else Cconst_natpointer + then Cconst_int((n lsl 1) + 1, dbg) + else Cconst_natint (Nativeint.add (Nativeint.shift_left (Nativeint.of_int n) 1) 1n, dbg) | Uconst_ref (label, _) -> @@ -813,8 +813,8 @@ and transl_prim_1 env p arg dbg = | Pnot -> transl_if env Then_false_else_true dbg arg - dbg (Cconst_pointer (1, dbg)) - dbg (Cconst_pointer (3, dbg)) + dbg (Cconst_int (1, dbg)) + dbg (Cconst_int (3, dbg)) (* Test integer/block *) | Pisint -> tag_int(Cop(Cand, [transl env arg; Cconst_int (1, dbg)], dbg)) dbg @@ -887,8 +887,8 @@ and transl_prim_2 env p arg1 arg2 dbg = transl_sequand env Then_true_else_false dbg arg1 dbg' arg2 - dbg (Cconst_pointer (3, dbg)) - dbg' (Cconst_pointer (1, dbg)) + dbg (Cconst_int (3, dbg)) + dbg' (Cconst_int (1, dbg)) (* let id = V.create_local "res1" in Clet(id, transl env arg1, Cifthenelse(test_bool dbg (Cvar id), transl env arg2, Cvar id)) *) @@ -897,8 +897,8 @@ and transl_prim_2 env p arg1 arg2 dbg = transl_sequor env Then_true_else_false dbg arg1 dbg' arg2 - dbg (Cconst_pointer (3, dbg)) - dbg' (Cconst_pointer (1, dbg)) + dbg (Cconst_int (3, dbg)) + dbg' (Cconst_int (1, dbg)) (* Integer operations *) | Paddint -> add_int_caml (transl env arg1) (transl env arg2) dbg |