diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-04-12 19:23:28 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-04-12 19:23:28 +0200 |
| commit | 9e00dd1645b6adcdb46739562cba0fc314ec3bed (patch) | |
| tree | 9519a4d28224197b93d25dc55687322730757487 /arm/AsmToJSON.ml | |
| parent | 47ecb1ec8d00636d6e7bb4cebd21df5d0b9b5ac7 (diff) | |
| parent | 9e7f5e5611c5b5281b74b075b4524aef7bc05437 (diff) | |
| download | compcert-kvx-9e00dd1645b6adcdb46739562cba0fc314ec3bed.tar.gz compcert-kvx-9e00dd1645b6adcdb46739562cba0fc314ec3bed.zip | |
Merge remote-tracking branch 'origin/mppa-profiling' into mppa-features
Diffstat (limited to 'arm/AsmToJSON.ml')
| -rw-r--r-- | arm/AsmToJSON.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arm/AsmToJSON.ml b/arm/AsmToJSON.ml index e850fed6..669d8c0c 100644 --- a/arm/AsmToJSON.ml +++ b/arm/AsmToJSON.ml @@ -177,6 +177,7 @@ let pp_instructions pp ic = | EF_annot_val _ | EF_builtin _ | EF_debug _ + | EF_profiling _ | EF_external _ | EF_free | EF_malloc |