diff options
| author | Jérémie Dimino <jeremie@dimino.org> | 2015-09-08 15:29:33 +0000 |
|---|---|---|
| committer | Jérémie Dimino <jeremie@dimino.org> | 2015-09-08 15:29:33 +0000 |
| commit | eeced22d266caca85f6d0de1f950bfad4ed2ce81 (patch) | |
| tree | ede377b590d2a5832147f1552c567248b8e99a5d | |
| parent | 2db27c031bf4df6704f70d140325737560f4cbac (diff) | |
| download | ocaml-eeced22d266caca85f6d0de1f950bfad4ed2ce81.tar.gz | |
Use [intnat] instead of [long] in tests/unboxed-primitive-args
Because sizeof(long)=4 on Win64.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16409 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/tests/unboxed-primitive-args/gen_test.ml | 16 | ||||
| -rw-r--r-- | testsuite/tests/unboxed-primitive-args/test_common.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/tests/unboxed-primitive-args/gen_test.ml b/testsuite/tests/unboxed-primitive-args/gen_test.ml index 6739c45fdc..bb275c48b7 100644 --- a/testsuite/tests/unboxed-primitive-args/gen_test.ml +++ b/testsuite/tests/unboxed-primitive-args/gen_test.ml @@ -99,8 +99,8 @@ let c_type_of_repr = function | Unboxed_float -> "double" | Unboxed_integer Pint32 -> "int32_t" | Unboxed_integer Pint64 -> "int64_t" - | Unboxed_integer Pnativeint -> "long" - | Untagged_int -> "long" + | Unboxed_integer Pnativeint -> "intnat" + | Untagged_int -> "intnat" type proto = { params : native_repr list @@ -210,21 +210,21 @@ let generate_stubs () = List.iteri proto.params ~f:(fun i p -> pr " %(%d%d%);" (match p with - | Same_as_ocaml_repr -> "set_long(%d, Long_val(x%d))" + | Same_as_ocaml_repr -> "set_intnat(%d, Long_val(x%d))" | Unboxed_float -> "set_double(%d, x%d)" | Unboxed_integer Pint32 -> "set_int32(%d, x%d)" | Unboxed_integer Pint64 -> "set_int64(%d, x%d)" - | Unboxed_integer Pnativeint -> "set_long(%d, x%d)" - | Untagged_int -> "set_long(%d, x%d)") + | Unboxed_integer Pnativeint -> "set_intnat(%d, x%d)" + | Untagged_int -> "set_intnat(%d, x%d)") i i); pr " return %(%d%);" (match proto.return with - | Same_as_ocaml_repr -> "Val_long(get_long(%d))" + | Same_as_ocaml_repr -> "Val_long(get_intnat(%d))" | Unboxed_float -> "get_double(%d)" | Unboxed_integer Pint32 -> "get_int32(%d)" | Unboxed_integer Pint64 -> "get_int64(%d)" - | Unboxed_integer Pnativeint -> "get_long(%d)" - | Untagged_int -> "get_long(%d)") + | Unboxed_integer Pnativeint -> "get_intnat(%d)" + | Untagged_int -> "get_intnat(%d)") (List.length proto.params); pr "}" ) diff --git a/testsuite/tests/unboxed-primitive-args/test_common.h b/testsuite/tests/unboxed-primitive-args/test_common.h index f568d17d9e..06ed341eb7 100644 --- a/testsuite/tests/unboxed-primitive-args/test_common.h +++ b/testsuite/tests/unboxed-primitive-args/test_common.h @@ -28,12 +28,12 @@ extern char *ocaml_buffer; equal. */ extern char *c_buffer; -#define get_long(n) *(long*)(ocaml_buffer+((n)*8)) +#define get_intnat(n) *(intnat*)(ocaml_buffer+((n)*8)) #define get_int32(n) *(int32_t*)(ocaml_buffer+((n)*8)) #define get_int64(n) *(int64_t*)(ocaml_buffer+((n)*8)) #define get_double(n) *(double*)(ocaml_buffer+((n)*8)) -#define set_long(n, x) *(long*)(c_buffer+((n)*8)) = (x) +#define set_intnat(n, x) *(intnat*)(c_buffer+((n)*8)) = (x) #define set_int32(n, x) *(int32_t*)(c_buffer+((n)*8)) = (x) #define set_int64(n, x) *(int64_t*)(c_buffer+((n)*8)) = (x) #define set_double(n, x) *(double*)(c_buffer+((n)*8)) = (x) |