Merge branch 'rt-copyprop' into scala-generic

UQ-PAC · Jul 24, 2024 · 9ed5776 · 9ed5776
2 parents 7ee3e4b + 6ec5295
commit 9ed5776
Show file tree

Hide file tree

Showing 12 changed files with 933 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,8 @@ scripts/total.txt
 build/
 
 offlineASL/aarch64_*
-offlineASL-scala/lifter/src/generated/*
 offlineASL-cpp/subprojects/aslp-lifter/src/generated/*
 offlineASL-cpp/subprojects/aslp-lifter/include/aslp/generated/*
 
+
+
diff --git a/bin/asli.ml b/bin/asli.ml
@@ -27,6 +27,7 @@ let opt_export_aarch64_dir = ref ""
 let opt_verbose = ref false
 
 
+
 let () = 
     Printexc.record_backtrace true ;
     Printexc.register_printer

diff --git a/libASL/cpp_backend.ml b/libASL/cpp_backend.ml
@@ -155,6 +155,7 @@ let rec prints_expr e st =
   | Expr_LitString s -> "\"" ^ s ^ "\""
   | Expr_Tuple(es) -> "std::make_tuple(" ^ (String.concat "," (List.map (fun e -> prints_expr e st) es)) ^ ")"
   | Expr_Unknown(ty) -> default_value ty st
+  | Expr_If(_, c, t, [], e) -> Printf.sprintf "((%s) ? (%s) : (%s))" (prints_expr c st) (prints_expr t st) (prints_expr e st)
 
   | _ -> failwith @@ "prints_expr: " ^ pp_expr e
 

diff --git a/libASL/ocaml_backend.ml b/libASL/ocaml_backend.ml
@@ -133,6 +133,7 @@ let rec prints_expr e st =
   | Expr_LitString s -> "\"" ^ s ^ "\""
   | Expr_Tuple(es) -> "(" ^ (String.concat "," (List.map (fun e -> prints_expr e st) es)) ^ ")"
   | Expr_Unknown(ty) -> default_value ty st
+  | Expr_If (ty, c, t, [], e) -> Printf.sprintf "(if (%s) then (%s) else (%s))" (prints_expr c st) (prints_expr t st) (prints_expr e st)
 
   | _ -> failwith @@ "prints_expr: " ^ pp_expr e