From 3633136560b72c6311c77dc2698e7b7b18a887bb Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Mon, 3 Feb 2020 20:44:35 +0100 Subject: NOTRAP in CSE2: progress --- backend/CSE2.v | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'backend/CSE2.v') diff --git a/backend/CSE2.v b/backend/CSE2.v index 1b3d415d..a001d073 100644 --- a/backend/CSE2.v +++ b/backend/CSE2.v @@ -397,8 +397,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 TRAP chunk addr args dst _ => Some (load chunk addr dst args rel) - | Iload NOTRAP chunk addr args dst _ => Some (kill_reg dst 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 -- cgit From 1cd3c4c9b7372ca8de128a9ce60ed00210fd0e28 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Mon, 3 Feb 2020 21:35:34 +0100 Subject: CSE2 with NOTRAP --- backend/CSE2.v | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'backend/CSE2.v') diff --git a/backend/CSE2.v b/backend/CSE2.v index a001d073..38a46c1b 100644 --- a/backend/CSE2.v +++ b/backend/CSE2.v @@ -461,14 +461,12 @@ 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 TRAP 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 TRAP chunk addr args' dst s + | None => Iload trap chunk addr args' dst s | Some src => Iop Omove (src::nil) dst s end - | Iload NOTRAP chunk addr args dst s => - Iload NOTRAP chunk addr (subst_args fmap pc args) dst s | Istore chunk addr args src s => Istore chunk addr (subst_args fmap pc args) src s | Icall sig ros args dst s => -- cgit