diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-03-28 05:05:47 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-03-28 05:05:47 +0100 |
| commit | 251e184d2d972e2bfbf6f36d0c607e6d89801a30 (patch) | |
| tree | 5876f4ba816b5403f87e60ac1735864b5d4ecf1a /mppa_k1c/Asm.v | |
| parent | 061c1a394b0c540d2c8bf996b2ef2776549e74bf (diff) | |
| parent | 4c39f19e2bb7de48ad9f3252f38fd4a035c1b787 (diff) | |
| download | compcert-kvx-251e184d2d972e2bfbf6f36d0c607e6d89801a30.tar.gz compcert-kvx-251e184d2d972e2bfbf6f36d0c607e6d89801a30.zip | |
Merge remote-tracking branch 'origin/mppa_vliw_essai_sylvain' into mppa_postpass
Diffstat (limited to 'mppa_k1c/Asm.v')
| -rw-r--r-- | mppa_k1c/Asm.v | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mppa_k1c/Asm.v b/mppa_k1c/Asm.v index 493f4a05..7afed212 100644 --- a/mppa_k1c/Asm.v +++ b/mppa_k1c/Asm.v @@ -30,7 +30,7 @@ Require Import Smallstep. Require Import Locations.
Require Stacklayout.
Require Import Conventions.
-Require Import Asmblock.
+Require Import Asmvliw.
Require Import Linking.
Require Import Errors.
@@ -50,9 +50,6 @@ Inductive instruction : Type := | Psemi (**r semi colon separating bundles *)
| Pnop (**r instruction that does nothing *)
- | Pdiv (**r 32 bits integer division *)
- | Pdivu (**r 32 bits integer division *)
-
(** builtins *)
| Pclzll (rd rs: ireg)
| Pstsud (rd rs1 rs2: ireg)
@@ -218,8 +215,6 @@ Inductive instruction : Type := Definition control_to_instruction (c: control) :=
match c with
| PExpand (Asmblock.Pbuiltin ef args res) => Pbuiltin ef args res
- | PExpand (Asmblock.Pdiv) => Pdiv
- | PExpand (Asmblock.Pdivu) => Pdivu
| PCtlFlow Asmblock.Pret => Pret
| PCtlFlow (Asmblock.Pcall l) => Pcall l
| PCtlFlow (Asmblock.Picall r) => Picall r
@@ -480,7 +475,7 @@ Definition program_proj (p: program) : Asmblock.program := End RELSEM.
-Definition semantics (p: program) := Asmblock.semantics (program_proj p).
+Definition semantics (p: program) := Asmvliw.semantics (program_proj p).
(** Determinacy of the [Asm] semantics. *)
@@ -611,7 +606,7 @@ Proof (Genv.senv_match TRANSF). Theorem transf_program_correct:
- forward_simulation (Asmblock.semantics prog) (semantics tprog).
+ forward_simulation (Asmvliw.semantics prog) (semantics tprog).
Proof.
pose proof (match_program_transf prog tprog TRANSF) as TR.
subst. unfold semantics. rewrite transf_program_proj.
|