diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
| commit | e30aa60a06817ed67c14a80430a7275defc41e76 (patch) | |
| tree | b4bb512416a40578db1f32eb3a7836ddb6f8582d /cfrontend/Cshmgen.v | |
| parent | aa780c7145a418b4a7264e828258034fc4629313 (diff) | |
| parent | 2f31c1867b75040067a1ef74ae32f197e8d296c1 (diff) | |
| download | compcert-kvx-e30aa60a06817ed67c14a80430a7275defc41e76.tar.gz compcert-kvx-e30aa60a06817ed67c14a80430a7275defc41e76.zip | |
Merge branch 'master' into json_export
Conflicts:
driver/Driver.ml
Diffstat (limited to 'cfrontend/Cshmgen.v')
| -rw-r--r-- | cfrontend/Cshmgen.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cfrontend/Cshmgen.v b/cfrontend/Cshmgen.v index cb83731a..a80f4c15 100644 --- a/cfrontend/Cshmgen.v +++ b/cfrontend/Cshmgen.v @@ -260,7 +260,7 @@ Definition make_sub (ce: composite_env) (e1: expr) (ty1: type) (e2: expr) (ty2: OK (Ebinop Osub e1 (Ebinop Omul n e2)) | sub_case_pp ty => let n := make_intconst (Int.repr (Ctypes.sizeof ce ty)) in - OK (Ebinop Odivu (Ebinop Osub e1 e2) n) + OK (Ebinop Odiv (Ebinop Osub e1 e2) n) | sub_case_pl ty => let n := make_intconst (Int.repr (Ctypes.sizeof ce ty)) in OK (Ebinop Osub e1 (Ebinop Omul n (Eunop Ointoflong e2))) |