From 54f97d1988f623ba7422e13a504caeb5701ba93c Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Fri, 21 Aug 2015 11:05:36 +0200
Subject: Refactoring of builtins and annotations in the back-end.

Before, the back-end languages had distinct instructions
- Iannot for annotations, taking structured expressions (annot_arg)
  as arguments, and producing no results'
- Ibuiltin for other builtins, using simple pseudoregs/locations/registers
  as arguments and results.

This branch enriches Ibuiltin instructions so that they take structured
expressions (builtin_arg and builtin_res) as arguments and results.
This way,
- Annotations fit the general pattern of builtin functions,
  so Iannot instructions are removed.
- EF_vload_global and EF_vstore_global become useless, as the
  same optimization can be achieved by EF_vload/vstore taking
  a structured argument of the "address of global" kind.
- Better code can be generated for builtin_memcpy between stack locations,
  or volatile accesses to stack locations.

Finally, this commit also introduces a new kind of external function,
EF_debug, which is like EF_annot but produces no observable events.
It will be used later to transport debug info through the back-end,
without preventing optimizations.
---
 backend/XTL.ml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'backend/XTL.ml')

diff --git a/backend/XTL.ml b/backend/XTL.ml
index 0e5ce0c4..e05b90d1 100644
--- a/backend/XTL.ml
+++ b/backend/XTL.ml
@@ -34,8 +34,7 @@ type instruction =
   | Xstore of memory_chunk * addressing * var list * var
   | Xcall of signature * (var, ident) sum * var list * var list
   | Xtailcall of signature * (var, ident) sum * var list
-  | Xbuiltin of external_function * var list * var list
-  | Xannot of external_function * var annot_arg list
+  | Xbuiltin of external_function * var builtin_arg list * var builtin_res
   | Xbranch of node
   | Xcond of condition * var list * node * node
   | Xjumptable of var * node list
@@ -125,10 +124,22 @@ let rec set_vars_type vl tyl =
 let unify_var_type v1 v2 =
   if typeof v1 <> typeof v2 then raise Type_error
 
-let rec type_annot_arg a ty =
+let rec type_builtin_arg a ty =
   match a with
-  | AA_base v -> set_var_type v ty
-  | AA_longofwords(a1, a2) -> type_annot_arg a1 Tint; type_annot_arg a2 Tint
+  | BA v -> set_var_type v ty
+  | BA_longofwords(a1, a2) -> type_builtin_arg a1 Tint; type_builtin_arg a2 Tint
+  | _ -> ()
+
+let rec type_builtin_args al tyl =
+  match al, tyl with
+  | [], [] -> ()
+  | a :: al, ty :: tyl -> type_builtin_arg a ty; type_builtin_args al tyl
+  | _, _ -> raise Type_error
+
+let rec type_builtin_res a ty =
+  match a with
+  | BR v -> set_var_type v ty
+  | BR_longofwords(a1, a2) -> type_builtin_res a1 Tint; type_builtin_res a2 Tint
   | _ -> ()
 
 let type_instr = function
@@ -158,13 +169,8 @@ let type_instr = function
       ()
   | Xbuiltin(ef, args, res) ->
       let sg = ef_sig ef in
-      set_vars_type args sg.sig_args;
-      set_vars_type res (Events.proj_sig_res' sg)
-  | Xannot(ef, args) ->
-      let sg = ef_sig ef in
-      if List.length args = List.length sg.sig_args
-      then List.iter2 type_annot_arg args sg.sig_args
-      else raise Type_error
+      type_builtin_args args sg.sig_args;
+      type_builtin_res res (proj_sig_res sg)
   | Xbranch s ->
       ()
   | Xcond(cond, args, s1, s2) ->
-- 
cgit