diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-03 08:17:40 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-03 08:17:40 +0100 |
| commit | 1ab7b51c30e1b10ac45b0bd64cefdc01da0f7f68 (patch) | |
| tree | 210ffc156c83f04fb0c61a40b4f9037d7ba8a7e1 /backend/CSE2.v | |
| parent | 222c9047d61961db9c6b19fed5ca49829223fd33 (diff) | |
| parent | 12be46d59a2483a10d77fa8ee67f7e0ca1bd702f (diff) | |
| download | compcert-kvx-1ab7b51c30e1b10ac45b0bd64cefdc01da0f7f68.tar.gz compcert-kvx-1ab7b51c30e1b10ac45b0bd64cefdc01da0f7f68.zip | |
Merge branch 'mppa-cse2' of gricad-gitlab.univ-grenoble-alpes.fr:sixcy/CompCert into mppa-work
Diffstat (limited to 'backend/CSE2.v')
| -rw-r--r-- | backend/CSE2.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/CSE2.v b/backend/CSE2.v index 19b633b0..41adba7b 100644 --- a/backend/CSE2.v +++ b/backend/CSE2.v @@ -465,7 +465,7 @@ Definition apply_instr instr (rel : RELATION.t) : RB.t := | Ijumptable _ _ => Some rel | Istore _ _ _ _ _ => Some (kill_mem rel) | Iop op args dst _ => Some (gen_oper op dst args rel) - | Iload chunk addr args dst _ => Some (load chunk addr dst args rel) + | Iload trap chunk addr args dst _ => Some (load chunk addr dst args rel) | Icall _ _ _ dst _ => Some (kill_reg dst (kill_mem rel)) | Ibuiltin _ _ res _ => Some (RELATION.top) (* TODO (kill_builtin_res res x) *) | Itailcall _ _ _ | Ireturn _ => RB.bot @@ -529,10 +529,10 @@ Definition transf_instr (fmap : option (PMap.t RB.t)) | None => Iop op args' dst s | Some src => Iop Omove (src::nil) dst s end - | Iload chunk addr args dst s => + | Iload trap chunk addr args dst s => let args' := subst_args fmap pc args in match find_load_in_fmap fmap pc chunk addr args' with - | None => Iload chunk addr args' dst s + | None => Iload trap chunk addr args' dst s | Some src => Iop Omove (src::nil) dst s end | Istore chunk addr args src s => |