diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /arm/Machregs.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'arm/Machregs.v')
-rw-r--r-- | arm/Machregs.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm/Machregs.v b/arm/Machregs.v index f4bd4613..211d2791 100644 --- a/arm/Machregs.v +++ b/arm/Machregs.v @@ -21,7 +21,7 @@ Require Import Op. (** The following type defines the machine registers that can be referenced as locations. These include: - Integer registers that can be allocated to RTL pseudo-registers ([Rxx]). -- Floating-point registers that can be allocated to RTL pseudo-registers +- Floating-point registers that can be allocated to RTL pseudo-registers ([Fxx]). The type [mreg] does not include reserved machine registers @@ -45,9 +45,9 @@ Global Opaque mreg_eq. Definition mreg_type (r: mreg): typ := match r with - | R0 | R1 | R2 | R3 | R4 | R5 | R6 | R7 + | R0 | R1 | R2 | R3 | R4 | R5 | R6 | R7 | R8 | R9 | R10 | R11 | R12 => Tany32 - | F0 | F1 | F2 | F3 | F4 | F5 | F6 | F7 + | F0 | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | F13 | F14 | F15 => Tany64 end. |