diff options
author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-02-08 21:00:28 +0100 |
---|---|---|
committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-02-08 21:00:28 +0100 |
commit | 68baba2d3b8c5b72cebe598a406ef7b5646bcca3 (patch) | |
tree | 8cfd7dc31012a751d58236e276ba321874090181 /riscV | |
parent | 1b6667cf268189104bc3320e83fa23fe0d053717 (diff) | |
parent | 6ca9f9bfc7119f1ca4f48de3b5a37cbaee07e4fd (diff) | |
download | compcert-kvx-68baba2d3b8c5b72cebe598a406ef7b5646bcca3.tar.gz compcert-kvx-68baba2d3b8c5b72cebe598a406ef7b5646bcca3.zip |
Merge branch 'master' of https://github.com/AbsInt/CompCert into mppa-work-upstream-merge
Diffstat (limited to 'riscV')
-rw-r--r-- | riscV/Asmexpand.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/riscV/Asmexpand.ml b/riscV/Asmexpand.ml index 3e734747..1df63308 100644 --- a/riscV/Asmexpand.ml +++ b/riscV/Asmexpand.ml @@ -483,7 +483,7 @@ let expand_instruction instr = emit (Pmv (X30, X2)); if sg.sig_cc.cc_vararg then begin let n = arguments_size sg in - let extra_sz = if n >= 8 then 0 else align 16 ((8 - n) * wordsize) in + let extra_sz = if n >= 8 then 0 else align ((8 - n) * wordsize) 16 in let full_sz = Z.add sz (Z.of_uint extra_sz) in expand_addptrofs X2 X2 (Ptrofs.repr (Z.neg full_sz)); expand_storeind_ptr X30 X2 ofs; @@ -501,7 +501,7 @@ let expand_instruction instr = let extra_sz = if sg.sig_cc.cc_vararg then begin let n = arguments_size sg in - if n >= 8 then 0 else align 16 ((8 - n) * wordsize) + if n >= 8 then 0 else align ((8 - n) * wordsize) 16 end else 0 in expand_addptrofs X2 X2 (Ptrofs.repr (Z.add sz (Z.of_uint extra_sz))) |