diff options
Diffstat (limited to 'x86')
-rw-r--r-- | x86/Asm.v | 6 | ||||
-rw-r--r-- | x86/Asmgen.v | 4 | ||||
-rw-r--r-- | x86/Asmgenproof1.v | 2 | ||||
-rw-r--r-- | x86/SelectLongproof.v | 4 | ||||
-rw-r--r-- | x86/SelectOp.vp | 2 | ||||
-rw-r--r-- | x86/SelectOpproof.v | 2 |
6 files changed, 11 insertions, 9 deletions
@@ -310,8 +310,10 @@ Module Pregmap := EMap(PregEq). Definition regset := Pregmap.t val. Definition genv := Genv.t fundef unit. -Notation "a # b" := (a b) (at level 1, only parsing). -Notation "a # b <- c" := (Pregmap.set b c a) (at level 1, b at next level). +Notation "a # b" := (a b) (at level 1, only parsing) : asm. +Notation "a # b <- c" := (Pregmap.set b c a) (at level 1, b at next level) : asm. + +Open Scope asm. (** Undefining some registers *) diff --git a/x86/Asmgen.v b/x86/Asmgen.v index bb26d507..a627881b 100644 --- a/x86/Asmgen.v +++ b/x86/Asmgen.v @@ -16,8 +16,8 @@ Require Import Coqlib Errors. Require Import AST Integers Floats Memdata. Require Import Op Locations Mach Asm. -Open Local Scope string_scope. -Open Local Scope error_monad_scope. +Local Open Scope string_scope. +Local Open Scope error_monad_scope. (** The code generation functions take advantage of several characteristics of the [Mach] code generated by earlier passes of the compiler: - Argument and result registers are of the correct type. diff --git a/x86/Asmgenproof1.v b/x86/Asmgenproof1.v index 401be7d7..6191ea39 100644 --- a/x86/Asmgenproof1.v +++ b/x86/Asmgenproof1.v @@ -17,7 +17,7 @@ Require Import AST Errors Integers Floats Values Memory Globalenvs. Require Import Op Locations Conventions Mach Asm. Require Import Asmgen Asmgenproof0. -Open Local Scope error_monad_scope. +Local Open Scope error_monad_scope. (** * Correspondence between Mach registers and x86 registers *) diff --git a/x86/SelectLongproof.v b/x86/SelectLongproof.v index f7d5df10..2262a70b 100644 --- a/x86/SelectLongproof.v +++ b/x86/SelectLongproof.v @@ -19,8 +19,8 @@ Require Import Cminor Op CminorSel. Require Import SelectOp SelectOpproof SplitLong SplitLongproof. Require Import SelectLong. -Open Local Scope cminorsel_scope. -Open Local Scope string_scope. +Local Open Scope cminorsel_scope. +Local Open Scope string_scope. (** * Correctness of the instruction selection functions for 64-bit operators *) diff --git a/x86/SelectOp.vp b/x86/SelectOp.vp index db546d99..f8010f0a 100644 --- a/x86/SelectOp.vp +++ b/x86/SelectOp.vp @@ -41,7 +41,7 @@ Require Import Compopts. Require Import AST Integers Floats. Require Import Op CminorSel. -Open Local Scope cminorsel_scope. +Local Open Scope cminorsel_scope. (** ** Constants **) diff --git a/x86/SelectOpproof.v b/x86/SelectOpproof.v index ce15b6e1..cdb79c6f 100644 --- a/x86/SelectOpproof.v +++ b/x86/SelectOpproof.v @@ -24,7 +24,7 @@ Require Import Op. Require Import CminorSel. Require Import SelectOp. -Open Local Scope cminorsel_scope. +Local Open Scope cminorsel_scope. (** * Useful lemmas and tactics *) |