diff options
| author | Michael Schmidt <github@mschmidt.me> | 2016-06-07 15:28:35 +0200 |
|---|---|---|
| committer | Michael Schmidt <github@mschmidt.me> | 2016-06-07 15:28:35 +0200 |
| commit | 3c4f1377395494e8f706b829d0b69e9c33b6a5b8 (patch) | |
| tree | 21aa0ada3d340a868a20388a6d7863464145fbd0 | |
| parent | 35041fb0949304dcdb6d82687adbaa71bf8224ab (diff) | |
| download | compcert-kvx-3c4f1377395494e8f706b829d0b69e9c33b6a5b8.tar.gz compcert-kvx-3c4f1377395494e8f706b829d0b69e9c33b6a5b8.zip | |
fix '__builtin_annot_val' to '__builtin_annot_intval', such that CompCert can parse its own .compcert.c output, bug 18060
| -rw-r--r-- | arm/Asmexpand.ml | 2 | ||||
| -rw-r--r-- | cfrontend/PrintCsyntax.ml | 2 | ||||
| -rw-r--r-- | ia32/Asmexpand.ml | 2 | ||||
| -rw-r--r-- | powerpc/Asmexpand.ml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arm/Asmexpand.ml b/arm/Asmexpand.ml index 79f06991..8aef64e4 100644 --- a/arm/Asmexpand.ml +++ b/arm/Asmexpand.ml @@ -82,7 +82,7 @@ let expand_annot_val txt targ args res = | [BA(FR src)], BR(FR dst) -> if dst <> src then emit (Pfcpyd (dst,src)) | _, _ -> - raise (Error "ill-formed __builtin_annot_val") + raise (Error "ill-formed __builtin_annot_intval") (* Handling of memcpy *) diff --git a/cfrontend/PrintCsyntax.ml b/cfrontend/PrintCsyntax.ml index 9a6107ff..7933f987 100644 --- a/cfrontend/PrintCsyntax.ml +++ b/cfrontend/PrintCsyntax.ml @@ -257,7 +257,7 @@ let rec expr p (prec, e) = fprintf p "__builtin_annot@[<hov 1>(%S%a)@]" (camlstring_of_coqstring txt) exprlist (false, args) | Ebuiltin(EF_annot_val(txt, _), _, args, _) -> - fprintf p "__builtin_annot_val@[<hov 1>(%S%a)@]" + fprintf p "__builtin_annot_intval@[<hov 1>(%S%a)@]" (camlstring_of_coqstring txt) exprlist (false, args) | Ebuiltin(EF_external(id, sg), _, args, _) -> fprintf p "%s@[<hov 1>(%a)@]" (camlstring_of_coqstring id) exprlist (true, args) diff --git a/ia32/Asmexpand.ml b/ia32/Asmexpand.ml index 5e5bbb3e..6a64221e 100644 --- a/ia32/Asmexpand.ml +++ b/ia32/Asmexpand.ml @@ -67,7 +67,7 @@ let expand_annot_val txt targ args res = | [BA(FR src)], BR(FR dst) -> if dst <> src then emit (Pmovsd_ff (dst,src)) | _, _ -> - raise (Error "ill-formed __builtin_annot_val") + raise (Error "ill-formed __builtin_annot_intval") (* Translate a builtin argument into an addressing mode *) diff --git a/powerpc/Asmexpand.ml b/powerpc/Asmexpand.ml index bfec9254..d299e2cd 100644 --- a/powerpc/Asmexpand.ml +++ b/powerpc/Asmexpand.ml @@ -59,7 +59,7 @@ let expand_annot_val txt targ args res = | [BA(FR src)], BR(FR dst) -> if dst <> src then emit (Pfmr(dst, src)) | _, _ -> - raise (Error "ill-formed __builtin_annot_val") + raise (Error "ill-formed __builtin_annot_intval") end (* Handling of memcpy *) |