From 8a4ff6816597442554246290b5a2b31b3c87ef7d Mon Sep 17 00:00:00 2001 From: Dmitry Boulytchev Date: Thu, 29 Aug 2024 21:13:23 +0300 Subject: [PATCH] Intermediate step to X32/X86 --- src/Makefile | 2 +- src/{X32.ml => X86_32.ml} | 2 +- src/dune | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename src/{X32.ml => X86_32.ml} (99%) diff --git a/src/Makefile b/src/Makefile index c60fbf970..f8587f4a9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -47,4 +47,4 @@ clean: $(OCAMLOPT) -c $(OFLAGS) $(STATIC) $(PXFLAGS) $< %.cmx: %.ml - $(OCAMLOPT) -c $(OFLAGS) $(STATIC) $(PXFLAGS) $< \ No newline at end of file + $(OCAMLOPT) -c $(OFLAGS) $(STATIC) $(PXFLAGS) $< diff --git a/src/X32.ml b/src/X86_32.ml similarity index 99% rename from src/X32.ml rename to src/X86_32.ml index 2b5418cd0..cf1ea17a8 100644 --- a/src/X32.ml +++ b/src/X86_32.ml @@ -551,7 +551,7 @@ let compile cmd env imports code = invalid_arg (Printf.sprintf "invalid SM insn: %s\n" (GT.show(insn) i)) in let env'', code'' = compile' env' scode' in - env'', [Meta (Printf.sprintf "# %s / % s" (GT.show(SM.insn) instr) stack)] @ code' @ code'' + env'', [Meta (Printf.sprintf "# %s / %s" (GT.show(SM.insn) instr) stack)] @ code' @ code'' in compile' env code diff --git a/src/dune b/src/dune index 5c4e0d7c1..4c845da60 100644 --- a/src/dune +++ b/src/dune @@ -45,7 +45,7 @@ (library (name liba) - (modules Language Pprinter stdpath version X86_64 SM Options) + (modules Language Pprinter stdpath version X86_32 X86_64 SM Options) (libraries GT ostap posix-uname) (flags (:standard @@ -59,11 +59,12 @@ (per_module ((pps GT.ppx_all) SM - X86) + X86_64) ((action (run %{project_root}/src/pp5+gt+plugins+ostap+dump.byte %{input-file})) Language Pprinter + X86_32 stdpath version))) (preprocessor_deps