Support for GCC-style extended asm, continued:

- support "r", "m" and "i" constraints
- support "%Q" and "%R" modifiers for register pairs
- support register clobbers
- split off analysis and transformation of asm statements in
  cparser/ExtendedAsm.ml

3 files changed, 6 insertions, 5 deletions

diff --git a/common/AST.v b/common/AST.v
index 1e1e2b9d..2550844b 100644
--- a/common/AST.v
+++ b/common/AST.v
@@ -584,7 +584,7 @@ Inductive external_function : Type :=
      (** Another form of annotation that takes one argument, produces
          an event carrying the text and the value of this argument,
          and returns the value of the argument. *)
-  | EF_inline_asm (text: ident) (sg: signature).
+  | EF_inline_asm (text: ident) (sg: signature) (clobbers: list ident).
      (** Inline [asm] statements.  Semantically, treated like an
          annotation with no parameters ([EF_annot text nil]).  To be
          used with caution, as it can invalidate the semantic
@@ -606,7 +606,7 @@ Definition ef_sig (ef: external_function): signature :=
   | EF_memcpy sz al => mksignature (Tint :: Tint :: nil) None cc_default
   | EF_annot text targs => mksignature targs None cc_default
   | EF_annot_val text targ => mksignature (targ :: nil) (Some targ) cc_default
-  | EF_inline_asm text sg => sg
+  | EF_inline_asm text sg clob => sg
   end.
 
 (** Whether an external function should be inlined by the compiler. *)
@@ -624,7 +624,7 @@ Definition ef_inline (ef: external_function) : bool :=
   | EF_memcpy sz al => true
   | EF_annot text targs => true
   | EF_annot_val text targ => true
-  | EF_inline_asm text targs => true
+  | EF_inline_asm text sg clob => true
   end.
 
 (** Whether an external function must reload its arguments. *)
@@ -642,6 +642,7 @@ Proof.
   generalize ident_eq signature_eq chunk_eq typ_eq zeq Int.eq_dec; intros.
   decide equality.
   apply list_eq_dec. auto.
+  apply list_eq_dec. auto.
 Defined.
 Global Opaque external_function_eq.
 
diff --git a/common/Events.v b/common/Events.v
index 62765fd3..3bec15db 100644
--- a/common/Events.v
+++ b/common/Events.v
@@ -1480,7 +1480,7 @@ Definition external_call (ef: external_function): extcall_sem :=
   | EF_memcpy sz al      => extcall_memcpy_sem sz al
   | EF_annot txt targs   => extcall_annot_sem txt targs
   | EF_annot_val txt targ => extcall_annot_val_sem txt targ
-  | EF_inline_asm txt sg => inline_assembly_sem txt sg
+  | EF_inline_asm txt sg clb => inline_assembly_sem txt sg
   end.
 
 Theorem external_call_spec:
diff --git a/common/PrintAST.ml b/common/PrintAST.ml
index 387bf261..76305d02 100644
--- a/common/PrintAST.ml
+++ b/common/PrintAST.ml
@@ -53,7 +53,7 @@ let name_of_external = function
       sprintf "memcpy size %s align %s " (Z.to_string sz) (Z.to_string al)
   | EF_annot(text, targs) -> sprintf "annot %S" (extern_atom text)
   | EF_annot_val(text, targ) ->  sprintf "annot_val %S" (extern_atom text)
-  | EF_inline_asm(text, sg) -> sprintf "inline_asm %S" (extern_atom text)
+  | EF_inline_asm(text, sg, clob) -> sprintf "inline_asm %S" (extern_atom text)
 
 let rec print_annot_arg px oc = function
   | AA_base x -> px oc x