Skip to content

Make compatible with OCaml 5 and Ghidra 11.4 #1632

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.

Sign up for GitHub

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

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Make compatible with OCaml 5 and Ghidra 11.4 #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
85e6f3f
make compatible to ocaml 5
PerfectLaugh Apr 9, 2025
2e18fb1
compat with ghidra 11.4
PerfectLaugh Jul 3, 2025
b497ab3
fix doc
PerfectLaugh Jul 29, 2025
b2a28f7
enable ocamlformat
PerfectLaugh Sep 18, 2025
59387eb
format all code
PerfectLaugh Sep 18, 2025
bd1f247
ignore formatting commit in git blame
PerfectLaugh Sep 18, 2025
4b75e4d
fix doc except bap.mli
PerfectLaugh Sep 19, 2025
13741ea
fix doc and fmts
PerfectLaugh Sep 19, 2025
a1342c2
chore(doc): adding line for reference
PerfectLaugh Sep 21, 2025
b911020
chore(build): remove unnecessary dune options
PerfectLaugh Sep 21, 2025
183c91d
fix(build): fix up warnings in ghidra_disasm.cpp
PerfectLaugh Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# format all code
59387eb56421aca501f92dd99cd147114e8fc19a
2 changes: 2 additions & 0 deletions .ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
profile = default
version = 0.27.0
2 changes: 1 addition & 1 deletion bap-abi.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-analyze.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"bap-main" {= version}
"bap-std" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"linenoise" {>= "1.1.0" & < "2.0.0"}
"monads" {= version}
"bap-common" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-api.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"bap-common" {= version}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"fileutils"
"ppx_bap" {= version}
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-arm.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ depends: [
"bap-traces" {= version}
"bitvec-order" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"ogre" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-beagle-strings.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"bap-beagle" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-beagle.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"bap-primus" {= version}
"bap-std" {= version}
"bap-strings" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-bil.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ depends: [
"bap-std" {= version}
"bitvec-order" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"ogre" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-bml.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-build.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ocamlbuild"
"ocamlfind"
Expand Down
3 changes: 2 additions & 1 deletion bap-bundle.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"camlzip" {>= "1.0" & < "2.0"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"core_kernel"
"fileutils"
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-byteweight-frontend.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"bap-byteweight" {= version}
"bap-std" {= version}
"cmdliner" {>= "1.0" & < "2.0"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"fileutils"
"bap-common" {= version}
"ocurl" {>= "0.9.0"}
Expand Down
2 changes: 1 addition & 1 deletion bap-byteweight.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"bap-signatures" {= version}
"bap-std" {= version}
"camlzip" {>= "1.0" & < "2.0"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-c.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"bap-core-theory" {= version}
"bap-knowledge" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-cache.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"fileutils"
"mmap"
"bap-common" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-callgraph-collator.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"graphlib" {= version}
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-callsites.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"odoc" {with-doc}
]
Expand Down
6 changes: 3 additions & 3 deletions bap-common.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ tags: ["bap" "meta"]
homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"base" {>= "v0.14" & < "v0.16"}
"base"
"dune" {>= "3.1"}
"dune-configurator"
"dune-site"
"ocaml" {> "4.08.0"}
"stdio" {>= "v0.14" & < "v0.16"}
"ocaml"
"stdio"
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion bap-constant-tracker.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-primus" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion bap-core-theory.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ depends: [
"bitvec-binprot" {= version}
"bitvec-order" {= version}
"bitvec-sexp" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-cxxfilt.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"bap-demangle" {= version}
"bap-std" {= version}
"conf-binutils" {>= "0.3"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion bap-demangle.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"bap-core-theory" {= version}
"bap-knowledge" {= version}
"bap-main" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion bap-dependencies.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ogre" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-disassemble.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ depends: [
"bitvec-order" {= version}
"bitvec-sexp" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"ogre" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-dump-symbols.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"graphlib" {= version}
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-dwarf.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-elementary.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"bap-knowledge" {= version}
"bap-std" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion bap-elf.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-dwarf" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"ppx_bitstring" {>= "4.0.0" & < "5.0.0"}
Expand Down
2 changes: 1 addition & 1 deletion bap-flatten.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion bap-frontc.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-c" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"FrontC" {>= "4.1.0"}
"bap-common" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-frontend.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ depends: [
"bap-knowledge" {= version}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ocamlfind"
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-future.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-ghidra.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"ppx_bap" {= version}
"bap-common" {= version}
"bap-std" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-glibc-runtime.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ depends: [
"bap-c" {= version}
"bap-main" {= version}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ogre" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion bap-ida-plugin.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ppx_bap" {= version}
"regular" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-ida.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"regular" {= version}
"fileutils"
"bap-common" {= version}
Expand Down
3 changes: 2 additions & 1 deletion bap-knowledge.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ homepage: "https://github.com/BinaryAnalysisPlatform/bap"
bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"core_unix"
"ppx_bap" {= version}
"bap-common" {= version}
"monads" {= version}
Expand Down
4 changes: 1 addition & 3 deletions bap-llvm.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"conf-bap-llvm" {>= "1.8"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"mmap"
"monads" {= version}
"bap-common" {= version}
Expand All @@ -25,7 +24,6 @@ build: [
["dune" "subst"] {dev}
[
"ocaml" "tools/configure.ml"
"--with-llvm-config=%{conf-bap-llvm:config}%"
"--%{llvm-shared?disable:enable}%-llvm-static"
]
[
Expand Down
1 change: 0 additions & 1 deletion bap-llvm.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ build: [
["dune" "subst"] {dev}
[
"ocaml" "tools/configure.ml"
"--with-llvm-config=%{conf-bap-llvm:config}%"
"--%{llvm-shared?disable:enable}%-llvm-static"
]
[
Expand Down
5 changes: 3 additions & 2 deletions bap-main.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ depends: [
"bap-future" {= version}
"bap-plugins" {= version}
"bap-recipe" {= version}
"base" {>= "v0.14" & < "v0.16"}
"base"
"core_kernel"
"cmdliner" {>= "1.0" & < "2.0"}
"bap-common" {= version}
"stdio" {>= "v0.14" & < "v0.16"}
"stdio"
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion bap-mc.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"bap-main" {= version}
"bap-std" {= version}
"bitvec" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"bap-common" {= version}
"ogre" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion bap-microx.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/BinaryAnalysisPlatform/bap/issues"
depends: [
"dune" {>= "3.1"}
"bap-std" {= version}
"core_kernel" {>= "v0.14" & < "v0.16"}
"core"
"monads" {= version}
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
Loading