Skip to content

Remove cvt_emit #3816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,6 @@ ocaml/primitives.new
/tools/dumpobj.opt
/tools/ocamlobjinfo
/tools/ocamlobjinfo.opt
/tools/cvt_emit
/tools/cvt_emit.opt
/tools/cvt_emit.ml
/tools/ocamlcp
/tools/ocamlcp.opt
/tools/ocamloptp
Expand Down
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"switch": "4.14.1"
},
"files.associations": {
"*.mlp": "ocaml",
"smmintrin.h": "c",
"tmmintrin.h": "c",
"pmmintrin.h": "c",
Expand Down
2 changes: 1 addition & 1 deletion backend/amd64/emit.ml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module String = Misc.Stdlib.String
module Int = Numbers.Int

(* [Branch_relaxation] is not used in this file, but is required by
emit.mlp files for certain other targets; the reference here ensures
emit.ml files for certain other targets; the reference here ensures
that when releases are being prepared the .depend files are correct
for all targets. *)
[@@@ocaml.warning "-66"]
Expand Down
2 changes: 1 addition & 1 deletion backend/amd64/proc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ let destroyed_at_c_call_unix =

let destroyed_at_c_call =
(* C calling conventions preserve rbx, but it is clobbered
by the code sequence used for C calls in emit.mlp, so it
by the code sequence used for C calls in emit.ml, so it
is marked as destroyed. *)
if win64 then destroyed_at_c_call_win64 else destroyed_at_c_call_unix

Expand Down
2 changes: 1 addition & 1 deletion backend/arm64_ast.mli
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ module DSL : sig
val mem_literal : string -> Operand.t

(* CR gyorsh: [print_*] functions below are exposed temporarily to use DSL for
some but not all instructions in [emit.mlp]. They can eventually*)
some but not all instructions in [emit.ml]. They can eventually*)
val print_ins : Instruction_name.t -> Operand.t array -> string

val print_ins_cond :
Expand Down
2 changes: 1 addition & 1 deletion middle_end/flambda2/terms/code_size.ml
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ let apply apply =
let apply_cont apply_cont =
let size =
match Apply_cont_expr.trap_action apply_cont with
(* Current rough estimates are from amd64/emit.mlp *)
(* Current rough estimates are from amd64/emit.ml *)
| None -> 0
| Some (Push _) -> 4
| Some (Pop _) -> 2
Expand Down
13 changes: 0 additions & 13 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,19 +175,6 @@ else
done
endif

# The preprocessor for asm generators

cvt_emit := cvt_emit$(EXE)

$(eval $(call PROGRAM_SYNONYM,cvt_emit))

$(cvt_emit): cvt_emit.cmo
$(CAMLC) $(LINKFLAGS) -o $@ $^

clean::
rm -f cvt_emit.ml cvt_emit cvt_emit.exe

beforedepend:: cvt_emit.ml

# Reading cmt files

Expand Down
16 changes: 0 additions & 16 deletions tools/cvt_emit.mli

This file was deleted.

106 changes: 0 additions & 106 deletions tools/cvt_emit.mll

This file was deleted.

7 changes: 2 additions & 5 deletions tools/dune
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,13 @@
(package ocaml))

(executables
(names make_opcodes cvt_emit)
(modules make_opcodes cvt_emit))
(names make_opcodes)
(modules make_opcodes))

(ocamllex
(modules make_opcodes)
(mode fallback))

(ocamllex
(modules cvt_emit)
(mode fallback))

(executable
(name ocamldep)
Expand Down