From e79e6fe5e4da4cf4c9852456f5ad82e633551cc9 Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Mon, 9 Nov 2015 12:46:26 +0100 Subject: bug 17544, use json-printer function for mfcr instruction --- powerpc/AsmToJSON.ml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'powerpc/AsmToJSON.ml') diff --git a/powerpc/AsmToJSON.ml b/powerpc/AsmToJSON.ml index 80fce39e..02d2dc84 100644 --- a/powerpc/AsmToJSON.ml +++ b/powerpc/AsmToJSON.ml @@ -93,7 +93,7 @@ let p_freg oc = function let p_preg oc = function | IR ir -> p_ireg oc ir | FR fr -> p_freg oc fr - | _ -> assert false (* This registers should not be used. *) + | _ -> assert false (* This register should not be used. *) let p_atom oc a = p_jstring oc (extern_atom a) @@ -127,7 +127,6 @@ let p_crbit oc c = | CRbit_6 -> 6 in fprintf oc "{\"CRbit\":%d}" number - let p_label oc l = fprintf oc "{\"Label\":%ld}" (P.to_int32 l) let p_list elem oc l = @@ -269,7 +268,7 @@ let p_instruction oc ic = | Plwarx (ir1,ir2,ir3) -> instruction "Plwarx" [Ireg ir1; Ireg ir2; Ireg ir3] | Plwbrx (ir1,ir2,ir3) -> instruction "Plwbrx" [Ireg ir1; Ireg ir2; Ireg ir3] | Pmbar c -> instruction "Pmbar" [Constant (Cint c)] - | Pmfcr ir -> fprintf oc "{%a,\"Args\":[%a]}" inst_name "Pmfcr" p_ireg ir + | Pmfcr ir -> instruction "Pmfcr" [Ireg ir] | Pmfcrbit (ir,crb) -> () (* Should not occur *) | Pmflr ir -> instruction "Pmflr" [Ireg ir] | Pmr (ir1,ir2) -> instruction "Pmr" [Ireg ir1; Ireg ir2] -- cgit