This PR is dual to the QEMU PR#7 [1] (#6)

1. The bfd library is removed and merged into frames library.
   Now we have `Frame_arch` and `Frame_mach` modules.

2. piqi files are gathered in the `piqi` folder

3. arch.hpp is renamed to `frame_arch.h`

4. frame reader is now more sloppy and will try to guess architecture
   even if it is slightly miss-specified.

[1]: BinaryAnalysisPlatform/qemu#7

Author: ivg

Makefile

@@ -9,7 +9,6 @@ doc: setup.data build
 test: setup.data build
 	$(SETUP) -test $(TESTFLAGS)
 
-all: build install
 
 install: setup.data
 	$(SETUP) -install $(INSTALLFLAGS)

README.md

@@ -1,30 +1,49 @@
 # Overview
 `Frames` is a format for storing execution traces. This repository contains:
 - A description in [piqi](http://piqi.org/) language of the `frames` format;
-- A `C` library for writing data in the `frames` format
+- A `C++` library for writing data in the `frames` format
 - An `OCaml` library `bap-frames` for reading data in the `frames` format
 - A BAP plugin `frame` that provides `frames` format reader for the `bap-plugins` library
-- A playground `test/tracedump` to inspect the traces
 
 # Build and install
 
-## From sources 
+## OCaml bap-frames library
+### From sources
 ```
   oasis setup
   ./configure --prefix=`opam config var prefix`
-  make 
+  make
   make install
 ```
 
-## From opam
+### From opam
 
 1. Add our opam repository if you don't have one
 
    ```
    opam repository add bap git://github.com/BinaryAnalysisPlatform/opam-repository.git
    ```
-2. install 
+2. install
 
    ```
    opam install bap-frames
    ```
+
+## C++ `libtrace` library
+
+1. Generate configuration files
+   ```
+   cd libtrace
+   ./autogen.sh
+   ```
+
+2. Configure (use configuration options to your taste)
+   ```
+   ./configure
+   ```
+
+3. Compile and install
+   ```
+   make
+   make install
+   ```

_oasis

@@ -7,22 +7,14 @@ License:     MIT
 Plugins:     META (0.4)
 BuildTools:  ocamlbuild
 
-Library bfd
-  Path:            lib/bfd
-  Modules:         Bfd
-  FindlibName:     bfd
-  CompiledObject:  best
-  BuildDepends:    ppx_deriving.std
-
-
 Library "bap-frames"
-  Path:            lib/frames
-  Modules:         Frame_events, Frame_piqi, Frame_reader
+  Path:            lib/
+  Modules:         Frame_arch, Frame_events, Frame_mach, Frame_piqi, Frame_reader
   FindlibName:     bap-frames
   BuildTools:      piqi
-  BuildDepends:    bap, bap-traces, bfd, core_kernel, piqirun.pb, ppx_jane, ppx_deriving.std
+  BuildDepends:    bap, bap-traces, core_kernel, piqirun.pb, ppx_jane, ppx_deriving.std
   CompiledObject:  best
-  DataFiles:       ../../*.piqi
+  DataFiles:       ../piqi/*.piqi
 
 Library "bap-plugin-frames"
   Path:            plugin

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2af87a2cce103ee0987cdf9582dfc68f)
+# DO NOT EDIT (digest: c47fcdcf848520d4c6201f726377213a)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -14,18 +14,14 @@ true: annot, bin_annot
 ".git": not_hygienic
 "_darcs": -traverse
 "_darcs": not_hygienic
-# Library bfd
-"lib/bfd/bfd.cmxs": use_bfd
-<lib/bfd/*.ml{,i,y}>: pkg_ppx_deriving.std
 # Library bap-frames
-"lib/frames/bap-frames.cmxs": use_bap-frames
-<lib/frames/*.ml{,i,y}>: pkg_bap
-<lib/frames/*.ml{,i,y}>: pkg_bap-traces
-<lib/frames/*.ml{,i,y}>: pkg_core_kernel
-<lib/frames/*.ml{,i,y}>: pkg_piqirun.pb
-<lib/frames/*.ml{,i,y}>: pkg_ppx_deriving.std
-<lib/frames/*.ml{,i,y}>: pkg_ppx_jane
-<lib/frames/*.ml{,i,y}>: use_bfd
+"lib/bap-frames.cmxs": use_bap-frames
+<lib/*.ml{,i,y}>: pkg_bap
+<lib/*.ml{,i,y}>: pkg_bap-traces
+<lib/*.ml{,i,y}>: pkg_core_kernel
+<lib/*.ml{,i,y}>: pkg_piqirun.pb
+<lib/*.ml{,i,y}>: pkg_ppx_deriving.std
+<lib/*.ml{,i,y}>: pkg_ppx_jane
 # Library bap-plugin-frames
 "plugin/bap-plugin-frames.cmxs": use_bap-plugin-frames
 <plugin/*.ml{,i,y}>: pkg_bap
@@ -35,5 +31,5 @@ true: annot, bin_annot
 <plugin/*.ml{,i,y}>: pkg_ppx_deriving.std
 <plugin/*.ml{,i,y}>: pkg_ppx_jane
 <plugin/*.ml{,i,y}>: use_bap-frames
-<plugin/*.ml{,i,y}>: use_bfd
 # OASIS_STOP
+<libtrace>: -traverse

configure

@@ -1,7 +1,4 @@
 #!/bin/sh
-
-# OASIS_START
-# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
 set -e
 
 FST=true
@@ -24,4 +21,3 @@ for i in "$@"; do
 done
 
 ocaml setup.ml -configure "$@"
-# OASIS_STOP

lib/.merlin

@@ -1,2 +1,4 @@
 REC
-PKG ppx_deriving.std
+PKG ppx_deriving.std
+PKG piqirun
+B ../_build/lib