aboutsummaryrefslogtreecommitdiffstats
path: root/arm/AsmToJSON.ml
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2020-01-02 14:58:37 +0100
committerXavier Leroy <xavierleroy@users.noreply.github.com>2020-01-03 09:12:23 +0100
commit7077c2ea9e86f001e805d7a2a5e7fcdfd0a8ece8 (patch)
tree3c03dcc8cb4508ff2a58852a7e24ab73ac914f8f /arm/AsmToJSON.ml
parent4b042d572b943c8cb3b86b61e3282bba58f488ab (diff)
downloadcompcert-kvx-7077c2ea9e86f001e805d7a2a5e7fcdfd0a8ece8.tar.gz
compcert-kvx-7077c2ea9e86f001e805d7a2a5e7fcdfd0a8ece8.zip
Revert "Remove `__builtin_nop` for some architectures. (#208)"
This reverts commit 4dfcd7d4be18e8bc437ca170782212aa06635a95.
Diffstat (limited to 'arm/AsmToJSON.ml')
-rw-r--r--arm/AsmToJSON.ml3
1 files changed, 2 insertions, 1 deletions
diff --git a/arm/AsmToJSON.ml b/arm/AsmToJSON.ml
index 599d3d7b..e850fed6 100644
--- a/arm/AsmToJSON.ml
+++ b/arm/AsmToJSON.ml
@@ -34,7 +34,7 @@ let mnemonic_names = StringSet.of_list
"Pfuitos"; "Pinlineasm"; "Pisb"; "Plabel"; "Pldr"; "Ploadsymbol_lbl";
"Pldr_p"; "Pldrb"; "Pldrb_p"; "Pldrh"; "Pldrh_p"; "Pldrsb"; "Pldrsh";
"Plsl"; "Plsr"; "Pmla"; "Pmov"; "Pmovite"; "Pfmovite"; "Pmovt"; "Pmovw";
- "Pmul"; "Pmvn"; "Ploadsymbol_imm"; "Porr"; "Ppush"; "Prev";
+ "Pmul"; "Pmvn"; "Ploadsymbol_imm"; "Pnop"; "Porr"; "Ppush"; "Prev";
"Prev16"; "Prsb"; "Prsbs"; "Prsc"; "Psbc"; "Psbfx"; "Psdiv"; "Psmull";
"Pstr"; "Pstr_p"; "Pstrb"; "Pstrb_p"; "Pstrh"; "Pstrh_p"; "Psub"; "Psubs";
"Pudiv";"Pumull" ]
@@ -268,6 +268,7 @@ let pp_instructions pp ic =
| Pmovw(r1, n) -> instruction pp "Pmovw" [Ireg r1; Long n]
| Pmul(r1, r2, r3) -> instruction pp "Pmul" [Ireg r1; Ireg r2; Ireg r3]
| Pmvn(r1, so) -> instruction pp "Pmvn" [Ireg r1; Shift so]
+ | Pnop -> instruction pp "Pnop" []
| Porr(r1, r2, so) -> instruction pp "Porr" [Ireg r1; Ireg r2; Shift so]
| Ppush(rl) -> instruction pp "Ppush" (List.map (fun r -> Ireg r) rl)
| Prev(r1, r2) -> instruction pp "Prev" [Ireg r1; Ireg r2]