diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-06 19:38:53 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-06 19:38:53 +0200 |
| commit | dba05a9f6259c82a350987b511bf1a71f113d0ba (patch) | |
| tree | 6e7fee8d65b6a180447267da9a95a93827443caf /arm/Asmgen.v | |
| parent | 108db39b8b7c1d42cbc38c5aabf885ef5440f189 (diff) | |
| parent | 47d0e5256ab79b402faae14260fa2fabc1d24dcb (diff) | |
| download | compcert-dba05a9f6259c82a350987b511bf1a71f113d0ba.tar.gz compcert-dba05a9f6259c82a350987b511bf1a71f113d0ba.zip | |
X
Merge branch 'master' into debug_locations
Diffstat (limited to 'arm/Asmgen.v')
| -rw-r--r-- | arm/Asmgen.v | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arm/Asmgen.v b/arm/Asmgen.v index 5a3a48e1..2365d1d2 100644 --- a/arm/Asmgen.v +++ b/arm/Asmgen.v @@ -727,9 +727,7 @@ Definition transl_instr (f: Mach.function) (i: Mach.instruction) OK (loadind_int IR13 f.(fn_retaddr_ofs) IR14 (Pfreeframe f.(fn_stacksize) f.(fn_link_ofs) :: Pbsymb symb sig :: k)) | Mbuiltin ef args res => - OK (Pbuiltin ef (map preg_of args) (map preg_of res) :: k) - | Mannot ef args => - OK (Pannot ef (List.map (map_annot_arg preg_of) args) :: k) + OK (Pbuiltin ef (List.map (map_builtin_arg preg_of) args) (map_builtin_res preg_of res) :: k) | Mlabel lbl => OK (Plabel lbl :: k) | Mgoto lbl => |