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 /backend/Stacking.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 'backend/Stacking.v')
| -rw-r--r-- | backend/Stacking.v | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/Stacking.v b/backend/Stacking.v index ef96e4b3..ab67e213 100644 --- a/backend/Stacking.v +++ b/backend/Stacking.v @@ -71,13 +71,13 @@ Definition save_callee_save_regs List.fold_right (save_callee_save_reg bound number mkindex ty fe) k csl. Definition save_callee_save_int (fe: frame_env) := - save_callee_save_regs + save_callee_save_regs fe_num_int_callee_save index_int_callee_save FI_saved_int Tany32 fe int_callee_save_regs. Definition save_callee_save_float (fe: frame_env) := save_callee_save_regs - fe_num_float_callee_save index_float_callee_save FI_saved_float + fe_num_float_callee_save index_float_callee_save FI_saved_float Tany64 fe float_callee_save_regs. Definition save_callee_save (fe: frame_env) (k: Mach.code) := @@ -101,13 +101,13 @@ Definition restore_callee_save_regs List.fold_right (restore_callee_save_reg bound number mkindex ty fe) k csl. Definition restore_callee_save_int (fe: frame_env) := - restore_callee_save_regs + restore_callee_save_regs fe_num_int_callee_save index_int_callee_save FI_saved_int Tany32 fe int_callee_save_regs. Definition restore_callee_save_float (fe: frame_env) := restore_callee_save_regs - fe_num_float_callee_save index_float_callee_save FI_saved_float + fe_num_float_callee_save index_float_callee_save FI_saved_float Tany64 fe float_callee_save_regs. Definition restore_callee_save (fe: frame_env) (k: Mach.code) := @@ -146,7 +146,7 @@ Fixpoint transl_builtin_arg (fe: frame_env) (a: builtin_arg loc) : builtin_arg m BA_addrstack (Int.add ofs (Int.repr fe.(fe_stack_data))) | BA_loadglobal chunk id ofs => BA_loadglobal chunk id ofs | BA_addrglobal id ofs => BA_addrglobal id ofs - | BA_splitlong hi lo => + | BA_splitlong hi lo => BA_splitlong (transl_builtin_arg fe hi) (transl_builtin_arg fe lo) end. |