Commit Graph

92 Commits (ee8f71101b80496b2ec2c996d29ac33bbaf7cf00)

Author SHA1 Message Date
Damien Doligez ee8f71101b clean up whitespace and cut long lines 2016-02-17 13:36:27 +01:00
Damien Doligez ff8e891242 deduplicate definition of `inline` 2015-12-21 14:27:46 +01:00
alainfrisch e888e099e2 Revert commits related to #330.
1. Revert "Switch to -custom for bytecode tests."
This reverts commit 6b7f81caf5.

2. Revert "Fix Changelog."
This reverts commit d94488d7b5.

3.Revert "Fix testsuite: use binary channels."
This reverts commit 840f7ca506.

4. Revert "Fix testsuite: do not require a globally installed ocamlrun."
This reverts commit 0388ef46d9.

5. Revert "Merge branch 'trunk' of https://github.com/bvaugon/ocaml into bvaugon-trunk"
This reverts commit 1ff6db10bf, reversing
changes made to 89d116c514.
2015-12-08 14:44:29 +01:00
Benoit Vaugon 5e3964da86 Fix "weak hash of serialised closures" from mantis #0005942. 2015-12-04 00:51:44 +01:00
alainfrisch a9ef6428fc MSVC (at least some old version) does not support inline. Use _inline instead. This #define should perhaps go somewhere else, e.g. caml/misc.h (defined as caml_inline?). 2015-11-23 09:58:44 +01:00
Xavier Leroy 782d12c327 Minor fixes following the discussion on pull request 224:
- intern.c: watch out for left shift overflow
- extern.c: refactor caml_output_value_to_block


git-svn-id: http://caml.inria.fr/svn/ocaml/branches/big-marshal@16522 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-10-19 11:21:49 +00:00
Xavier Leroy c065a0995c Typo: >> should have been <<.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/big-marshal@16425 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-09-15 14:28:12 +00:00
Xavier Leroy e2d0a13165 Add alternate marshaling format, used when marshaled data is >= 4 Gb.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/big-marshal@16324 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-08-03 12:27:15 +00:00
Gabriel Scherer 6e224a76a1 GPR#221: use CAMLnoreturn_{start,end} in the same way as CAMLunused_{start,end}
This is ugly. C pragmas are ugly. At least we're ugly and consistent now.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16315 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-08-02 16:54:24 +00:00
Gabriel Scherer edb714dc15 GPR#221: keep Noreturn and add CAMLnoreturn_{start,end}
(Bernhard Schommer)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16313 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-08-02 16:54:20 +00:00
Gabriel Scherer 34ab11fbcc GPR#165: Changed the definition of the Noreturn macro to also work with Visual Studio Version >= 2008 using the __declspec(noreturn).
(Bernhard Schommer)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16262 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-07-26 19:28:50 +00:00
Gabriel Scherer 7ca29ef3f7 PR#5887: move the byterun/*.h headers to byterun/caml/*.h to avoid header name clashes
(Jérôme Vouillon and Adrien Nader and Peter Zotov)


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15757 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-12-27 14:41:49 +00:00
Damien Doligez 1cb0b23a08 Start tidying up the runtime:
- document most of the "size" and "length" parameters and global variables,
  specifying bytes or words. Change some of them from bytes to words.
- start getting rid of "char *" and use sensible types instead.
- other small changes


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15647 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-12-12 15:18:04 +00:00
Xavier Leroy b868c05ec9 PR#6517: use ISO C99 types {,u}int{32,64}_t in preference to our homegrown
types {,u}int{32,64}.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15131 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-08-27 09:58:33 +00:00
Gabriel Scherer 97b302a1ce Add missing Noreturn qualifiers
(patch by Peter Zotov, review by Max Mouratov)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-08-06 15:17:07 +00:00
Damien Doligez 7844495624 Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
  svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-04 15:12:37 +00:00
Xavier Leroy abb832f430 PR#5986 continued: check string and array lengths if Compat_32 requested.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13724 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-01 08:12:21 +00:00
Damien Doligez c3bf54a7b6 merge changes from version/4.00 from 4.00.1 to r13697
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13699 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-22 12:56:54 +00:00
Xavier Leroy e29c9d2956 PR#5986: added flag Marshal.Compat_32 and ocamlc option -compat-32.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13554 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-18 11:58:59 +00:00
Xavier Clerc 2885577f83 PR#5793: integer marshalling is inconsistent between architectures
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13241 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-16 08:35:09 +00:00
Benedikt Meurer b04d8284f0 Fix several C compiler warnings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13171 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-29 10:41:08 +00:00
Damien Doligez def31744f9 remove all $Id keywords
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
Xavier Leroy a731103898 PR#5772: problem with marshaling of mutually-recursive functions
(culled from version/4.00, commit 12991)


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-05 16:04:13 +00:00
Damien Doligez 997a678d5e clean up TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 18:04:46 +00:00
Xavier Leroy 498b864c14 One missing call to free_extern_output. Added a couple of comments.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12271 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-26 08:26:44 +00:00
Wojciech Meyer 3eee9d124b PR#5318: Proper finalization of stack and replay the trail after stack overflow
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-21 00:03:35 +00:00
Wojciech Meyer f66308e569 PR#5318: Non-recursive version of extern_rec and intern_rec, to allow marshaling and un-marshaling of deeper data structures
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12247 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-18 02:03:30 +00:00
Xavier Leroy 4e5eb94ed9 PR#5215: Marshalling of closures now supported if the closures come from dynamically-loaded code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12229 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-13 14:50:41 +00:00
Damien Doligez 3b507dd1aa renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 14:17:02 +00:00
Xavier Leroy 11eada96d0 PR#4486: caml_serialize_float_8 incorrect on platforms with mixed-endian floats (e.g. ARM)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8978 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-04 11:45:58 +00:00
Damien Doligez df023f535b lazy: do not short-circuit to pointers outside the heap
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8954 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-28 12:03:55 +00:00
Xavier Leroy a3c0366f4e PR#4448: replace dense page table by sparse hash table.
Introduction and use of macros Is_in_value_area, Is_in_heap_or_young.
Removal of USE_MMAP_INSTEAD_OF_MALLOC.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8743 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-03 09:37:10 +00:00
Damien Doligez fbea66a95e fusion des changements 3.09.2 -> 3.09.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-20 11:14:37 +00:00
Xavier Leroy b89cda5f86 Nettoyages pour modele IL32LLP64
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7394 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-05-04 12:41:26 +00:00
Damien Doligez 125ea40d4c fusion 3.09.0 -> 3.09.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7307 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-04 16:55:50 +00:00
Xavier Leroy 3de54dec26 Remplacement long/unsigned long par intnat/uintnat
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7064 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-09-22 14:21:50 +00:00
Xavier Leroy 1945d78909 Revision de output_value: plus de table de hachage, meilleure gestion du buffer de sortie
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6558 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-07-19 13:21:10 +00:00
Xavier Leroy 9de985cc70 Unused variables
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6422 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-06-19 16:02:07 +00:00
Jacques Garrigue 6a940ef65d switch to new vtable representation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-05-26 11:10:52 +00:00
Damien Doligez db3745919b suppression des warnings "unused variable" de gcc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6299 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-05-17 17:10:00 +00:00
Damien Doligez bde72ee4d5 PR#2328
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-04-13 17:12:46 +00:00
Damien Doligez 0c7aecb88d depollution suite (et fin?) (PR#1914 et PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-02 19:23:29 +00:00
Damien Doligez 5a678d29f5 depollution suite (PR#1914 et PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6045 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-01 16:42:43 +00:00
Damien Doligez 331b2d89c3 depollution suite (PR#1914, PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6044 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-12-31 14:20:40 +00:00
Damien Doligez 31943bac1d depollution suite (PR#1914 et PR#1956); byterun/weak.c: PR#1929 suite
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6041 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-12-29 22:15:02 +00:00
Damien Doligez aa46693dc5 depollution (PR#1914, PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6023 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-12-16 18:09:44 +00:00
Damien Doligez 1a9f5599dd decontamination (PR#1914, PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6021 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-12-15 18:10:51 +00:00
Damien Doligez e969e8ad9f PR#1878
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5873 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-16 23:22:23 +00:00
Xavier Leroy b55c04a788 failwith -> extern_invalid_argument
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5601 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-19 13:05:17 +00:00
Xavier Leroy 6dfe97c192 Correction bug input_value/output_value sur des blocs de plus de 4 mega-mots (PR#784). La limite globale a 4Go reste pour le moment.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5298 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-11-25 14:40:32 +00:00