diff options
author | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-07-16 12:30:25 +0200 |
---|---|---|
committer | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-07-16 12:30:25 +0200 |
commit | fd4d085aa988a6044f89fc17e8422be23bc87f9d (patch) | |
tree | 82639fb19304110566c52df31ab6c876cb206995 /kvx/Asmblockdeps.v | |
parent | 70f5867e441e253869cb3b432af77636a186d1cb (diff) | |
parent | 56498b6437ea8deb89a4e1fadbbfec490b8341aa (diff) | |
download | compcert-kvx-fd4d085aa988a6044f89fc17e8422be23bc87f9d.tar.gz compcert-kvx-fd4d085aa988a6044f89fc17e8422be23bc87f9d.zip |
Merge remote-tracking branch 'origin/kvx-work' into kvx-sched-w-reg-press
Diffstat (limited to 'kvx/Asmblockdeps.v')
-rw-r--r-- | kvx/Asmblockdeps.v | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kvx/Asmblockdeps.v b/kvx/Asmblockdeps.v index b6d18c3e..a9786e0a 100644 --- a/kvx/Asmblockdeps.v +++ b/kvx/Asmblockdeps.v @@ -164,17 +164,17 @@ Definition arith_eval (ao: arith_op) (l: list value) := | _, _ => None end. -Definition exec_incorrect_load trap chunk := +Definition exec_incorrect_load trap := match trap with | TRAP => None - | NOTRAP => Some (Val (concrete_default_notrap_load_value chunk)) + | NOTRAP => Some (Val Vundef) end. Definition exec_load_deps_offset (trap: trapping_mode) (chunk: memory_chunk) (m: mem) (v: val) (ofs: offset) := let (ge, fn) := Ge in match (eval_offset ofs) with | OK ptr => match Mem.loadv chunk m (Val.offset_ptr v ptr) with - | None => exec_incorrect_load trap chunk + | None => exec_incorrect_load trap | Some vl => Some (Val vl) end | _ => None @@ -182,13 +182,13 @@ Definition exec_load_deps_offset (trap: trapping_mode) (chunk: memory_chunk) (m: Definition exec_load_deps_reg (trap: trapping_mode) (chunk: memory_chunk) (m: mem) (v vo: val) := match Mem.loadv chunk m (Val.addl v vo) with - | None => exec_incorrect_load trap chunk + | None => exec_incorrect_load trap | Some vl => Some (Val vl) end. Definition exec_load_deps_regxs (trap: trapping_mode) (chunk: memory_chunk) (m: mem) (v vo: val) := match Mem.loadv chunk m (Val.addl v (Val.shll vo (scale_of_chunk chunk))) with - | None => exec_incorrect_load trap chunk + | None => exec_incorrect_load trap | Some vl => Some (Val vl) end. |