Skip to content

Commit

Permalink
More renaming to OCaml
Browse files Browse the repository at this point in the history
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information
doligez committed Feb 10, 2012
1 parent b4c0831 commit 3d19349
Show file tree
Hide file tree
Showing 81 changed files with 264 additions and 264 deletions.
2 changes: 1 addition & 1 deletion Changes
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Shedding weight:


OCaml 3.12.1:
----------------------
-------------

Bug fixes:
- PR#4345, PR#4767: problems with camlp4 printing of float values
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The "configure" script accepts the following options:
Directory where the binaries will be installed

-libdir <dir> (default: /usr/local/lib/ocaml)
Directory where the Caml library will be installed
Directory where the OCaml library will be installed

-mandir <dir> (default: /usr/local/man/man1)
Directory where the manual pages will be installed
Expand Down Expand Up @@ -237,9 +237,9 @@ autoconfiguration):
ocamllex the lexer generator
ocaml the interactive, toplevel-based system
ocamlmktop a tool to make toplevel systems that integrate
user-defined C primitives and Caml code
user-defined C primitives and OCaml code
ocamldebug the source-level replay debugger
ocamldep generator of "make" dependencies for Caml sources
ocamldep generator of "make" dependencies for OCaml sources
ocamldoc documentation generator
ocamlprof execution count profiler
ocamlcp the bytecode compiler in profiling mode
Expand Down Expand Up @@ -271,7 +271,7 @@ In the latter case, the destination directory defaults to the

9- After installation, do *not* strip the ocamldebug and ocamlbrowser
executables. (These are mixed-mode executables, containing both
compiled C code and Caml bytecode; stripping erases the bytecode!)
compiled C code and OCaml bytecode; stripping erases the bytecode!)
Other executables such as ocamlrun can safely be stripped.

IF SOMETHING GOES WRONG:
Expand Down
12 changes: 6 additions & 6 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ the generated programs deliver excellent performance, while retaining
the moderate memory requirements of the bytecode compiler. The
native-code compiler currently runs on the following platforms:

Tier 1 (actively used and maintained by the core Caml team):
Tier 1 (actively used and maintained by the core OCaml team):

AMD64 (Opteron) Linux, MacOS X, MS Windows
IA32 (Pentium) Linux, FreeBSD, MacOS X, MS Windows
Expand Down Expand Up @@ -48,7 +48,7 @@ CONTENTS:
LICENSE license and copyright notice
Makefile main Makefile
README this file
README.win32 infos on the MS Windows ports of O.Caml
README.win32 infos on the MS Windows ports of OCaml
asmcomp/ native-code compiler and linker
asmrun/ native-code runtime library
boot/ bootstrap compiler
Expand All @@ -58,7 +58,7 @@ CONTENTS:
config/ autoconfiguration stuff
debugger/ source-level replay debugger
driver/ driver code for the compilers
emacs/ Caml editing mode and debugger interface for GNU Emacs
emacs/ OCaml editing mode and debugger interface for GNU Emacs
lex/ lexer generator
maccaml/ the Macintosh GUI
ocamldoc/ documentation generator
Expand Down Expand Up @@ -99,10 +99,10 @@ The complete OCaml distribution can be accessed at

KEEPING IN TOUCH WITH THE CAML COMMUNITY:

There exists a mailing list of users of the Caml implementations
There exists a mailing list of users of the OCaml implementations
developed at INRIA. The purpose of this list is to share
experience, exchange ideas (and even code), and report on applications
of the Caml language. Messages can be written in English or in
of the OCaml language. Messages can be written in English or in
French. The list has more than 1000 subscribers.

Messages to the list should be sent to:
Expand All @@ -117,7 +117,7 @@ Archives of the list are available on the Web site above.

The Usenet news groups comp.lang.ml and comp.lang.functional
also contains discussions about the ML family of programming languages,
including Caml.
including OCaml.

BUG REPORTS AND USER FEEDBACK:

Expand Down
8 changes: 4 additions & 4 deletions README.win32
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ runs without any additional tools.
The native-code compiler (ocamlopt) requires the Microsoft Windows SDK
(item [1]) and the flexdll tool (item [2]).

Statically linking Caml bytecode with C code (ocamlc -custom) also requires
Statically linking OCaml bytecode with C code (ocamlc -custom) also requires
items [1] and [2].

The LablTk GUI requires Tcl/Tk 8.5 (item [3]).
Expand Down Expand Up @@ -177,7 +177,7 @@ CREDITS:

The initial port of Caml Special Light (the ancestor of OCaml) to
Windows NT was done by Kevin Gallo at Microsoft Research, who kindly
contributed his changes to the Caml project.
contributed his changes to the OCaml project.

The graphical user interface for the toplevel was initially developed
by Jacob Navia, then significantly improved by Christopher A. Watford.
Expand All @@ -195,7 +195,7 @@ The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
runs without any additional tools.

The native-code compiler (ocamlopt), as well as static linking of
Caml bytecode with C code (ocamlc -custom), require
OCaml bytecode with C code (ocamlc -custom), require
the Cygwin development tools, available at
http://www.cygwin.com/
and the flexdll tool, available at
Expand Down Expand Up @@ -344,7 +344,7 @@ Windows 7 64 on Intel64/AMD64 machines.
The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
runs without any additional tools.

Statically linking Caml bytecode with C code (ocamlc -custom) requires the
Statically linking OCaml bytecode with C code (ocamlc -custom) requires the
Microsoft Platform SDK compiler (item [1] in the section
"third-party software" below) and the flexdll tool (item [2]).

Expand Down
2 changes: 1 addition & 1 deletion asmcomp/amd64/emit.mlp
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ let emit_profile () =
| "linux" | "gnu" ->
(* mcount preserves rax, rcx, rdx, rsi, rdi, r8, r9 explicitly
and rbx, rbp, r12-r15 like all C functions.
We need to preserve r10 and r11 ourselves, since Caml can
We need to preserve r10 and r11 ourselves, since OCaml can
use them for argument passing. *)
` pushq %r10\n`;
` movq %rsp, %rbp\n`;
Expand Down
8 changes: 4 additions & 4 deletions asmcomp/amd64/proc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ let masm =
xmm0 - xmm15 100 - 115 *)

(* Conventions:
rax - r11: Caml function arguments
rax: Caml and C function results
xmm0 - xmm9: Caml function arguments
xmm0: Caml and C function results
rax - r11: OCaml function arguments
rax: OCaml and C function results
xmm0 - xmm9: OCaml function arguments
xmm0: OCaml and C function results
Under Unix:
rdi, rsi, rdx, rcx, r8, r9: C function arguments
xmm0 - xmm7: C function arguments
Expand Down
2 changes: 1 addition & 1 deletion asmcomp/selectgen.ml
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ method emit_fundecl f =
end

(* Tail call criterion (estimated). Assumes:
- all arguments are of type "int" (always the case for Caml function calls)
- all arguments are of type "int" (always the case for OCaml function calls)
- one extra argument representing the closure environment (conservative).
*)

Expand Down
12 changes: 6 additions & 6 deletions asmrun/amd64.S
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
#endif

#ifdef SYS_mingw64
/* Calls from Caml to C must reserve 32 bytes of extra stack space */
/* Calls from OCaml to C must reserve 32 bytes of extra stack space */
# define PREPARE_FOR_C_CALL subq $32, %rsp
# define CLEANUP_AFTER_C_CALL addq $32, %rsp
#else
Expand Down Expand Up @@ -355,7 +355,7 @@ LBL(103):
popq %rax /* recover desired size */
jmp LBL(caml_allocN)

/* Call a C function from Caml */
/* Call a C function from OCaml */

FUNCTION(G(caml_c_call))
LBL(caml_c_call):
Expand All @@ -376,7 +376,7 @@ LBL(caml_c_call):
pushq %r12
ret

/* Start the Caml program */
/* Start the OCaml program */

FUNCTION(G(caml_start_program))
/* Save callee-save registers */
Expand All @@ -398,7 +398,7 @@ LBL(caml_start_program):
pushq %r13
pushq %r14
movq %rsp, %r14
/* Call the Caml code */
/* Call the OCaml code */
call *%r12
LBL(107):
/* Pop the exception handler */
Expand Down Expand Up @@ -437,7 +437,7 @@ LBL(108):
#define C_ARG_4 %rcx
#endif

/* Raise an exception from Caml */
/* Raise an exception from OCaml */

FUNCTION(G(caml_raise_exn))
TESTL_VAR($1, caml_backtrace_active)
Expand Down Expand Up @@ -482,7 +482,7 @@ LBL(111):
LOAD_VAR(caml_young_ptr,%r15) /* Reload alloc ptr */
ret

/* Callback from C to Caml */
/* Callback from C to OCaml */

FUNCTION(G(caml_callback_exn))
/* Save callee-save registers */
Expand Down
10 changes: 5 additions & 5 deletions asmrun/amd64nt.asm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ L103:
pop rax ; recover desired size
jmp caml_allocN

; Call a C function from Caml
; Call a C function from OCaml

PUBLIC caml_c_call
ALIGN 16
Expand All @@ -212,7 +212,7 @@ caml_c_call:
push r12
ret

; Start the Caml program
; Start the OCaml program

PUBLIC caml_start_program
ALIGN 16
Expand Down Expand Up @@ -254,7 +254,7 @@ L106:
push r13
push r14
mov r14, rsp
; Call the Caml code
; Call the OCaml code
call r12
L107:
; Pop the exception handler
Expand Down Expand Up @@ -297,7 +297,7 @@ L108:
or rax, 2
jmp L109

; Raise an exception from Caml
; Raise an exception from OCaml

PUBLIC caml_raise_exn
ALIGN 16
Expand Down Expand Up @@ -346,7 +346,7 @@ L111:
mov r15, caml_young_ptr ; Reload alloc ptr
ret

; Callback from C to Caml
; Callback from C to OCaml

PUBLIC caml_callback_exn
ALIGN 16
Expand Down
16 changes: 8 additions & 8 deletions asmrun/arm.S
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ caml_allocN:
.type caml_allocN, %function
.size caml_allocN, .-caml_allocN

/* Call a C function from Caml */
/* Call a C function from OCaml */
/* Function to call is in r7 */

.align 2
Expand Down Expand Up @@ -213,7 +213,7 @@ caml_c_call:
.type caml_c_call, %function
.size caml_c_call, .-caml_c_call

/* Start the Caml program */
/* Start the OCaml program */

.align 2
.globl caml_start_program
Expand All @@ -222,8 +222,8 @@ caml_start_program:
ldr r12, =caml_program

/* Code shared with caml_callback* */
/* Address of Caml code to call is in r12 */
/* Arguments to the Caml code are in r0...r3 */
/* Address of OCaml code to call is in r12 */
/* Arguments to the OCaml code are in r0...r3 */

.Ljump_to_caml:
/* Save return address and callee-save registers */
Expand All @@ -240,7 +240,7 @@ caml_start_program:
str r4, [sp, 0]
str r5, [sp, 4]
str r6, [sp, 8]
/* Setup a trap frame to catch exceptions escaping the Caml code */
/* Setup a trap frame to catch exceptions escaping the OCaml code */
sub sp, sp, 2*4
ldr r6, =caml_exception_pointer
ldr r5, =.Ltrap_handler
Expand All @@ -253,7 +253,7 @@ caml_start_program:
ldr alloc_ptr, [r4]
ldr r4, =caml_young_limit
ldr alloc_limit, [r4]
/* Call the Caml code */
/* Call the OCaml code */
blx r12
.Lcaml_retaddr:
/* Pop the trap frame, restoring caml_exception_pointer */
Expand Down Expand Up @@ -299,7 +299,7 @@ caml_start_program:
.type .Ltrap_handler, %function
.size .Ltrap_handler, .-.Ltrap_handler

/* Raise an exception from Caml */
/* Raise an exception from OCaml */

.align 2
.globl caml_raise_exn
Expand Down Expand Up @@ -359,7 +359,7 @@ caml_raise_exception:
.type caml_raise_exception, %function
.size caml_raise_exception, .-caml_raise_exception

/* Callback from C to Caml */
/* Callback from C to OCaml */

.align 2
.globl caml_callback_exn
Expand Down
2 changes: 1 addition & 1 deletion asmrun/backtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void caml_print_exception_backtrace(void)
}
}

/* Convert the backtrace to a data structure usable from Caml */
/* Convert the backtrace to a data structure usable from OCaml */

CAMLprim value caml_get_exception_backtrace(value unit)
{
Expand Down
10 changes: 5 additions & 5 deletions asmrun/i386.S
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ LBL(103):
popl %eax /* recover desired size */
jmp G(caml_allocN)

/* Call a C function from Caml */
/* Call a C function from OCaml */

.globl G(caml_c_call)
.align FUNCTION_ALIGN
Expand All @@ -214,7 +214,7 @@ G(caml_c_call):
/* Call the function (address in %eax) */
jmp *%eax

/* Start the Caml program */
/* Start the OCaml program */

.globl G(caml_start_program)
.align FUNCTION_ALIGN
Expand All @@ -239,7 +239,7 @@ LBL(106):
ALIGN_STACK(8)
pushl G(caml_exception_pointer)
movl %esp, G(caml_exception_pointer)
/* Call the Caml code */
/* Call the OCaml code */
call *%esi
LBL(107):
/* Pop the exception handler */
Expand Down Expand Up @@ -267,7 +267,7 @@ LBL(108):
orl $2, %eax
jmp LBL(109)

/* Raise an exception from Caml */
/* Raise an exception from OCaml */

.globl G(caml_raise_exn)
.align FUNCTION_ALIGN
Expand Down Expand Up @@ -322,7 +322,7 @@ LBL(111):
UNDO_ALIGN_STACK(8)
ret

/* Callback from C to Caml */
/* Callback from C to OCaml */

.globl G(caml_callback_exn)
.align FUNCTION_ALIGN
Expand Down
Loading

0 comments on commit 3d19349

Please sign in to comment.