diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-03-29 15:01:33 +0100 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-03-29 15:01:33 +0100 |
| commit | 5f38e0401747a59a821852fdefb7b588a818bdcf (patch) | |
| tree | 345f4a16f2d450b05602c0be71fa13a54ce90d4b /mppa_k1c/Asm.v | |
| parent | e9a05f4ca3157a88a03f71ab31ef59bd96650142 (diff) | |
| parent | 7633cb38e0440160acf3f60f7795a19224850eec (diff) | |
| download | compcert-kvx-5f38e0401747a59a821852fdefb7b588a818bdcf.tar.gz compcert-kvx-5f38e0401747a59a821852fdefb7b588a818bdcf.zip | |
Merge remote-tracking branch 'origin/mppa_postpass' into mppa-jumptable
Conflicts:
mppa_k1c/Asmblock.v
mppa_k1c/Asmblockdeps.v
Diffstat (limited to 'mppa_k1c/Asm.v')
| -rw-r--r-- | mppa_k1c/Asm.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mppa_k1c/Asm.v b/mppa_k1c/Asm.v index 421f3d2c..2d708b79 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.
@@ -477,7 +477,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. *)
@@ -608,7 +608,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.
|