From 450b8c64f72fe6250f6b12bffbb841e5b2925552 Mon Sep 17 00:00:00 2001
From: Michalis Pardalos <m.pardalos@gmail.com>
Date: Tue, 20 Apr 2021 13:24:47 +0100
Subject: Update ocaml code match HTL changes

---
 src/hls/PrintHTL.ml | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'src/hls/PrintHTL.ml')

diff --git a/src/hls/PrintHTL.ml b/src/hls/PrintHTL.ml
index 836222e..78e422a 100644
--- a/src/hls/PrintHTL.ml
+++ b/src/hls/PrintHTL.ml
@@ -43,29 +43,6 @@ let registers a = String.concat "" (intersperse ", " (List.map register a))
 let print_instruction pp (pc, i) =
   fprintf pp "%5d:\t%s" pc (pprint_stmnt 0 i)
 
-let pprint_datapath_stmnt i = function
-  | HTLDataVstmnt s -> pprint_stmnt i s
-  | HTLfork (name, args) -> concat [
-      "fork "; extern_atom name; "("; concat (intersperse ", " (List.map register args)); ");\n"
-    ]
-  | HTLjoin (name, dst) -> concat [
-      register dst; " <= join "; extern_atom name; ";\n"
-    ]
-
-let print_datapath_instruction pp (pc, i) =
-  fprintf pp "%5d:\t%s" pc (pprint_datapath_stmnt 0 i)
-
-let pprint_control_stmnt i = function
-  | HTLCtrlVstmnt s -> pprint_stmnt i s
-  | HTLwait (name, statereg, expr) -> concat [
-      "wait("; extern_atom name; ", ";
-      register statereg; ", ";
-      pprint_expr expr; ");\n"
-    ]
-
-let print_control_instruction pp (pc, i) =
-  fprintf pp "%5d:\t%s" pc (pprint_control_stmnt 0 i)
-
 let ptree_to_list ptree =
   List.sort
     (fun (pc1, _) (pc2, _) -> compare pc2 pc1)
@@ -78,9 +55,9 @@ let print_module pp id f =
   let datapath = ptree_to_list f.mod_datapath in
   let controllogic = ptree_to_list f.mod_controllogic in
   fprintf pp "datapath {\n";
-  List.iter (print_datapath_instruction pp) datapath;
+  List.iter (print_instruction pp) datapath;
   fprintf pp "  }\n\n  controllogic {\n";
-  List.iter (print_control_instruction pp) controllogic;
+  List.iter (print_instruction pp) controllogic;
   fprintf pp "  }\n}\n\n"
 
 let print_globdef pp (id, gd) =
-- 
cgit