diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-ah | 56 |
2 files changed, 14 insertions, 46 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 2d2dcf63302..6bc1ae4889b 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/04/22 09:27:49 tron Exp $ +$NetBSD: distinfo,v 1.17 2004/04/23 03:06:02 danw Exp $ SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863 Size (ocaml-3.06.tar.gz) = 2436887 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ad) = 0010feb5ff81104097dc7891f41a4e12313b0104 SHA1 (patch-ae) = 62fc3ed7610d5677d9bb201c96139ffade9aa488 SHA1 (patch-af) = 163174609a795e99eacf1d5e60a1b99ccabd5237 SHA1 (patch-ag) = b17a30a9de7c778f6e6d83bf45e39b85b005fcbe -SHA1 (patch-ah) = fc1074e23b406be60188e4fe25efd76b1c38b013 +SHA1 (patch-ah) = be5d9079b4f9557252b28514433348a6f4807ba3 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20 SHA1 (patch-aj) = c70e1a34f0853a0da64f8bd1cff76198bd7aa2c7 SHA1 (patch-ak) = b18d74b5a9d2aa40588efbe431e03682579b1f4b diff --git a/lang/ocaml/patches/patch-ah b/lang/ocaml/patches/patch-ah index 5f87249ef24..7b753271d3e 100644 --- a/lang/ocaml/patches/patch-ah +++ b/lang/ocaml/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.5 2004/04/22 09:27:49 tron Exp $ +$NetBSD: patch-ah,v 1.6 2004/04/23 03:06:02 danw Exp $ ---- asmrun/power-bsd.S.orig Thu Apr 22 10:34:28 2004 -+++ asmrun/power-bsd.S Thu Apr 22 10:34:38 2004 -@@ -15,4 +15,33 @@ +--- asmrun/power-bsd.S.orig Thu Apr 22 21:34:41 2004 ++++ asmrun/power-bsd.S +@@ -15,2 +15,31 @@ +#if defined(PROFILING) +#define PROFILE_CAML \ @@ -34,66 +34,34 @@ $NetBSD: patch-ah,v 1.5 2004/04/22 09:27:49 tron Exp $ +#endif + #define Addrglobal(reg,glob) \ - addis reg, 0, glob@ha; \ - addi reg, reg, glob@l -@@ -30,6 +59,7 @@ - .globl caml_call_gc - .type caml_call_gc, @function +@@ -32,2 +61,3 @@ caml_call_gc: + PROFILE_CAML /* Set up stack frame */ - stwu 1, -0x1A0(1) - /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */ -@@ -182,6 +212,7 @@ - .globl caml_c_call - .type caml_c_call, @function +@@ -184,2 +214,3 @@ caml_call_gc: caml_c_call: + PROFILE_CAML /* Save return address */ - mflr 25 - /* Get ready to call C function (address in 11) */ -@@ -210,6 +241,7 @@ - .globl raise_caml_exception - .type raise_caml_exception, @function +@@ -212,2 +243,3 @@ caml_c_call: raise_caml_exception: + PROFILE_C /* Reload Caml global registers */ - Loadglobal(1, caml_exception_pointer, 11) - Loadglobal(31, young_ptr, 11) -@@ -230,6 +262,7 @@ - .globl caml_start_program - .type caml_start_program, @function +@@ -232,2 +264,3 @@ raise_caml_exception: caml_start_program: + PROFILE_C Addrglobal(12, caml_program) - - /* Code shared between caml_start_program and callback */ -@@ -380,6 +413,7 @@ - .globl callback_exn - .type callback_exn, @function +@@ -382,2 +415,3 @@ caml_start_program: callback_exn: + PROFILE_C /* Initial shuffling of arguments */ - mr 0, 3 /* Closure */ - mr 3, 4 /* Argument */ -@@ -390,6 +424,7 @@ - .globl callback2_exn - .type callback2_exn, @function +@@ -392,2 +426,3 @@ callback_exn: callback2_exn: + PROFILE_C mr 0, 3 /* Closure */ - mr 3, 4 /* First argument */ - mr 4, 5 /* Second argument */ -@@ -400,6 +435,7 @@ - .globl callback3_exn - .type callback3_exn, @function +@@ -402,2 +437,3 @@ callback2_exn: callback3_exn: + PROFILE_C mr 0, 3 /* Closure */ - mr 3, 4 /* First argument */ - mr 4, 5 /* Second argument */ -@@ -418,4 +454,3 @@ - .long .L105 + 4 /* return address into callback */ - .short -1 /* negative size count => use callback link */ +@@ -420,2 +456 @@ system__frametable: .short 0 /* no roots here */ - |