diff options
| -rw-r--r-- | riscv/riscv_platform.sail | 9 | ||||
| -rw-r--r-- | src/ast_util.ml | 2 | ||||
| -rw-r--r-- | src/ocaml_backend.ml | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/riscv/riscv_platform.sail b/riscv/riscv_platform.sail index 009090f1..1c5da1df 100644 --- a/riscv/riscv_platform.sail +++ b/riscv/riscv_platform.sail @@ -18,12 +18,11 @@ val plat_rom_size = {ocaml: "Platform.rom_size", lem: "plat_rom_size"} : unit -> val plat_clint_base = {ocaml: "Platform.clint_base", lem: "plat_clint_base"} : unit -> xlenbits val plat_clint_size = {ocaml: "Platform.clint_size", lem: "plat_clint_size"} : unit -> xlenbits -val phys_mem_segments : unit -> (xlenbits, xlenbits) +val phys_mem_segments : unit -> list((xlenbits, xlenbits)) function phys_mem_segments() = -// FIXME -// (plat_rom_base (), plat_rom_size ()) :: - (plat_ram_base (), plat_ram_size ()) -// :: [||] + (plat_rom_base (), plat_rom_size ()) :: + (plat_ram_base (), plat_ram_size ()) :: + [||] val plat_insns_per_tick = {ocaml: "Platform.insns_per_tick"} : unit -> int diff --git a/src/ast_util.ml b/src/ast_util.ml index 968cb320..2ccf19cc 100644 --- a/src/ast_util.ml +++ b/src/ast_util.ml @@ -676,7 +676,7 @@ let rec string_of_exp (E_aux (exp, _)) = | E_exit exp -> "exit " ^ string_of_exp exp | E_throw exp -> "throw " ^ string_of_exp exp | E_cons (x, xs) -> string_of_exp x ^ " :: " ^ string_of_exp xs - | E_list xs -> "[||" ^ string_of_list ", " string_of_exp xs ^ "||]" + | E_list xs -> "[|" ^ string_of_list ", " string_of_exp xs ^ "|]" | E_record_update (exp, FES_aux (FES_Fexps (fexps, _), _)) -> "{ " ^ string_of_exp exp ^ " with " ^ string_of_list "; " string_of_fexp fexps ^ " }" | E_record (FES_aux (FES_Fexps (fexps, _), _)) -> diff --git a/src/ocaml_backend.ml b/src/ocaml_backend.ml index 91cd288b..60a34273 100644 --- a/src/ocaml_backend.ml +++ b/src/ocaml_backend.ml @@ -287,6 +287,7 @@ let rec ocaml_exp ctx (E_aux (exp_aux, _) as exp) = (string ("let rec loop " ^ zencode_string (string_of_id id) ^ " =") ^//^ loop_body) ^/^ string "in" ^/^ (string "loop" ^^ space ^^ ocaml_atomic_exp ctx exp_from) + | E_cons (x, xs) -> ocaml_exp ctx x ^^ string " :: " ^^ ocaml_exp ctx xs | _ -> string ("EXP(" ^ string_of_exp exp ^ ")") and ocaml_letbind ctx (LB_aux (lb_aux, _)) = match lb_aux with |