summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabriel Kerneis2013-10-15 16:01:27 +0100
committerGabriel Kerneis2013-10-15 16:01:27 +0100
commitb5bcb90619b75213fb8a8a2f64017937e8572aea (patch)
treebe3e820145d84d21ea094ab92ff9f1801dd3bb8e /src
parente2de9237cfeff7141dcf4e4ab77ae7387b330b6c (diff)
Add id to register actions
Diffstat (limited to 'src')
-rw-r--r--src/lem_interp/interp.lem10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lem_interp/interp.lem b/src/lem_interp/interp.lem
index e03d999e..b6f16d4f 100644
--- a/src/lem_interp/interp.lem
+++ b/src/lem_interp/interp.lem
@@ -19,7 +19,7 @@ type env = list (id * value)
let emem = Mem 1 Pmap.empty
type reg_form =
- | Reg of typ
+ | Reg of id * typ
| SubReg of id * reg_form * index_range
(* These may need to be refined or expanded based on memory requirement *)
@@ -51,15 +51,15 @@ let rec to_registers (Defs defs) =
match def with
| DEF_spec valsp ->
match valsp with
- | VS_val_spec (TypSchm_ts tq ((Typ_app (Id "reg") _) as t)) id -> (id, Reg t):: (to_registers (Defs defs))
+ | VS_val_spec (TypSchm_ts tq ((Typ_app (Id "reg") _) as t)) id -> (id, Reg id t):: (to_registers (Defs defs))
| _ -> to_registers (Defs defs)
end
- | DEF_reg_dec typ id -> (id, Reg typ) :: (to_registers (Defs defs))
+ | DEF_reg_dec typ id -> (id, Reg id typ) :: (to_registers (Defs defs))
| DEF_type tdef ->
match tdef with
| TD_register id n1 n2 ranges ->
- (id,Reg (Typ_app (Id "vector")[]))::
- ((to_reg_ranges id (Reg (Typ_app (Id "vector")[])) ranges) @ (to_registers (Defs defs)))
+ (id,Reg id (Typ_app (Id "vector")[]))::
+ ((to_reg_ranges id (Reg id (Typ_app (Id "vector")[])) ranges) @ (to_registers (Defs defs)))
| _ -> to_registers (Defs defs)
end
| _ -> to_registers (Defs defs)