Merge branch 'master' into json_export

1 files changed, 9 insertions, 22 deletions

diff --git a/ia32/Machregsaux.ml b/ia32/Machregsaux.ml
index 5e98b58b..6485e752 100644
--- a/ia32/Machregsaux.ml
+++ b/ia32/Machregsaux.ml
@@ -12,38 +12,25 @@
 
 (** Auxiliary functions on machine registers *)
 
+open Camlcoq
 open Machregs
 
-let register_names = [
-  ("EAX", AX); ("EBX", BX); ("ECX", CX); ("EDX", DX);
-  ("ESI", SI); ("EDI", DI); ("EBP", BP);
-  ("XMM0", X0); ("XMM1", X1); ("XMM2", X2); ("XMM3", X3);
-  ("XMM4", X4); ("XMM5", X5); ("XMM6", X6); ("XMM7", X7);
-  ("ST0", FP0)
-]
+let register_names : (mreg, string) Hashtbl.t = Hashtbl.create 31
+
+let _ =
+  List.iter
+    (fun (s, r) -> Hashtbl.add register_names r (camlstring_of_coqstring s))
+    Machregs.register_names
 
 let scratch_register_names = []
 
 let name_of_register r =
-  let rec rev_assoc = function
-  | [] -> None
-  | (a, b) :: rem -> if b = r then Some a else rev_assoc rem
-  in rev_assoc register_names
+  try Some (Hashtbl.find register_names r) with Not_found -> None
 
 let register_by_name s =
-  try
-    Some(List.assoc (String.uppercase s) register_names)
-  with Not_found ->
-    None
+  Machregs.register_by_name (coqstring_of_camlstring (String.uppercase s))
 
 let can_reserve_register r =
   List.mem r Conventions1.int_callee_save_regs
   || List.mem r Conventions1.float_callee_save_regs
 
-let mregs_of_clobber idl =
-  List.fold_left
-    (fun l c ->
-      match register_by_name (Camlcoq.extern_atom c) with
-      | Some r -> r :: l
-      | None -> l)
-    [] idl