diff options
author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-08-21 14:08:31 +0200 |
---|---|---|
committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-08-21 14:08:31 +0200 |
commit | 44df927b7e562240ca7ecbb29be8b5b1881f3c05 (patch) | |
tree | 7ad708224a74c65a9957b416a7fecc1cebb0627d | |
parent | d0319112f1fc01b648542e66eb1597ac7b14e49c (diff) | |
download | compcert-44df927b7e562240ca7ecbb29be8b5b1881f3c05.tar.gz compcert-44df927b7e562240ca7ecbb29be8b5b1881f3c05.zip |
Asmexpand for ARM: fixed bug in Pfreeframe.
Plus: update comments and credit Bernhard Schommer.
-rw-r--r-- | arm/Asmexpand.ml | 6 | ||||
-rw-r--r-- | ia32/Asmexpand.ml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arm/Asmexpand.ml b/arm/Asmexpand.ml index 907d3199..ca30924c 100644 --- a/arm/Asmexpand.ml +++ b/arm/Asmexpand.ml @@ -3,6 +3,7 @@ (* The Compcert verified compiler *) (* *) (* Xavier Leroy, INRIA Paris-Rocquencourt *) +(* Bernhard Schommer, AbsInt Angewandte Informatik GmbH *) (* *) (* Copyright Institut National de Recherche en Informatique et en *) (* Automatique. All rights reserved. This file is distributed *) @@ -11,8 +12,7 @@ (* *********************************************************************) (* Expanding built-ins and some pseudo-instructions by rewriting - of the ARM assembly code. Currently not everything done, this - expansion is performed on the fly in PrintAsm. *) + of the ARM assembly code. *) open Asm open Asmexpandaux @@ -310,7 +310,7 @@ let expand_instruction instr = else sz in if Asmgen.is_immed_arith sz then emit (Padd (IR13,IR13,SOimm sz)) - else emit (Pldr (IR13,IR13,SOimm sz)) + else emit (Pldr (IR13,IR13,SOimm ofs)) | Pbuiltin (ef,args,res) -> begin match ef with | EF_builtin (name,sg) -> diff --git a/ia32/Asmexpand.ml b/ia32/Asmexpand.ml index 177f6989..137b61b5 100644 --- a/ia32/Asmexpand.ml +++ b/ia32/Asmexpand.ml @@ -3,6 +3,7 @@ (* The Compcert verified compiler *) (* *) (* Xavier Leroy, INRIA Paris-Rocquencourt *) +(* Bernhard Schommer, AbsInt Angewandte Informatik GmbH *) (* *) (* Copyright Institut National de Recherche en Informatique et en *) (* Automatique. All rights reserved. This file is distributed *) @@ -11,8 +12,7 @@ (* *********************************************************************) (* Expanding built-ins and some pseudo-instructions by rewriting - of the IA32 assembly code. Currently not done, this expansion - is performed on the fly in PrintAsm. *) + of the IA32 assembly code. *) open Asm open Asmexpandaux |