diff options
| author | James Pollard <james@pollard.dev> | 2020-06-17 20:05:05 +0100 |
|---|---|---|
| committer | James Pollard <james@pollard.dev> | 2020-06-17 20:05:05 +0100 |
| commit | 58f0022a8b5f9ab42e1a8515a77820a9d086ba76 (patch) | |
| tree | 336644e59bdc3b678ef038a6028a90ef0cd2c708 /src | |
| parent | dfea5f0f6307177a9127ce29db496a819dcdb232 (diff) | |
| download | vericert-58f0022a8b5f9ab42e1a8515a77820a9d086ba76.tar.gz vericert-58f0022a8b5f9ab42e1a8515a77820a9d086ba76.zip | |
Use NBAs for loads and stores.
Diffstat (limited to 'src')
| -rw-r--r-- | src/translation/HTLgen.v | 4 | ||||
| -rw-r--r-- | src/translation/HTLgenspec.v | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/translation/HTLgen.v b/src/translation/HTLgen.v index 1c67fe7..73f2b63 100644 --- a/src/translation/HTLgen.v +++ b/src/translation/HTLgen.v @@ -366,10 +366,10 @@ Definition transf_instr (fin rtrn stack: reg) (ni: node * instruction) : mon uni | Iload mem addr args dst n' => do src <- translate_arr_access mem addr args stack; do _ <- declare_reg None dst 32; - add_instr n n' (block dst src) + add_instr n n' (nonblock dst src) | Istore mem addr args src n' => do dst <- translate_arr_access mem addr args stack; - add_instr n n' (Vblock dst (Vvar src)) (* TODO: Could juse use add_instr? reg exists. *) + add_instr n n' (Vnonblock dst (Vvar src)) (* TODO: Could juse use add_instr? reg exists. *) | Icall _ _ _ _ _ => error (Errors.msg "Calls are not implemented.") | Itailcall _ _ _ => error (Errors.msg "Tailcalls are not implemented.") | Ibuiltin _ _ _ _ => error (Errors.msg "Builtin functions not implemented.") diff --git a/src/translation/HTLgenspec.v b/src/translation/HTLgenspec.v index 57d7d62..1a9144c 100644 --- a/src/translation/HTLgenspec.v +++ b/src/translation/HTLgenspec.v @@ -163,11 +163,11 @@ Inductive tr_instr (fin rtrn st stk : reg) : RTL.instruction -> stmnt -> stmnt - | tr_instr_Iload : forall mem addr args s s' i c dst n, translate_arr_access mem addr args stk s = OK c s' i -> - tr_instr fin rtrn st stk (RTL.Iload mem addr args dst n) (block dst c) (state_goto st n) + tr_instr fin rtrn st stk (RTL.Iload mem addr args dst n) (nonblock dst c) (state_goto st n) | tr_instr_Istore : forall mem addr args s s' i c src n, translate_arr_access mem addr args stk s = OK c s' i -> - tr_instr fin rtrn st stk (RTL.Istore mem addr args src n) (Vblock c (Vvar src)) + tr_instr fin rtrn st stk (RTL.Istore mem addr args src n) (Vnonblock c (Vvar src)) (state_goto st n). Hint Constructors tr_instr : htlspec. |