Remove unnecessary register store in the profiling prologue.

3 files changed, 19 insertions, 21 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 013243bd880..c4a677d97b3 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/07/10 12:28:55 jtb Exp $
+$NetBSD: distinfo,v 1.12 2003/07/11 07:47:44 jtb Exp $
 
 SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863
 Size (ocaml-3.06.tar.gz) = 2436887 bytes
@@ -9,8 +9,8 @@ SHA1 (patch-ad) = e9d32fe1ee760610c92348b560a79bce1c7e099a
 SHA1 (patch-ae) = 4e2905ecb57e1e1a4c8b3799b5a3e5dd37ead7ec
 SHA1 (patch-af) = eeb03f9ceac69ab36542f2725392789b7cecd48c
 SHA1 (patch-ag) = 8f67b8c13a0b008e3b77eb6f15fce1cac4f43d32
-SHA1 (patch-ah) = 792709f05174590853dad8267afd3c8f1a4e4981
+SHA1 (patch-ah) = e3e4b3fd9f8b370b44f8ff22134710d194d60805
 SHA1 (patch-ai) = 5b3a27cbe5c7dcebc6899859b24ebe2bd0248862
-SHA1 (patch-aj) = b4ae592a113f10102737df1d114120ec78aa5742
+SHA1 (patch-aj) = 5a9365b0ee1153cfddb7780422f5ba451a85ae9a
 SHA1 (patch-ak) = cd5a93e7530f6864ee6f591f9f7ba5722428408c
-SHA1 (patch-al) = 9c3d37b4d849fb8de033bf927c8d3f7a3aaee4de
+SHA1 (patch-al) = 97cad6e699ef1e973973c1ebc27b441a52fd1b78
diff --git a/lang/ocaml/patches/patch-ah b/lang/ocaml/patches/patch-ah
index d921617afe0..7b13e9d69b6 100644
--- a/lang/ocaml/patches/patch-ah
+++ b/lang/ocaml/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2003/07/10 07:44:02 jtb Exp $
+$NetBSD: patch-ah,v 1.3 2003/07/11 07:47:44 jtb Exp $
 
 --- asmcomp/power/emit.mlp.orig
 +++ asmcomp/power/emit.mlp
@@ -63,7 +63,7 @@ $NetBSD: patch-ah,v 1.2 2003/07/10 07:44:02 jtb Exp $
        emit_fun arg; emit_string "@l"
    | "rhapsody" ->
        emit_string "lo16("; emit_fun arg; emit_string ")"
-@@ -935,6 +935,31 @@
+@@ -935,6 +935,30 @@
        emit_instr i None;
        emit_all i.next
  
@@ -73,7 +73,6 @@ $NetBSD: patch-ah,v 1.2 2003/07/10 07:44:02 jtb Exp $
 +  match Config.system with
 +    "bsd" ->
 +      `	stwu 1, -32(1)\n`;
-+      `	stw 1, 0(3)\n`;
 +      `	mflr 0\n`;
 +      `	stw 0, 4(1)\n`;
 +      `	stw 2, 8(1)\n`;
@@ -95,7 +94,7 @@ $NetBSD: patch-ah,v 1.2 2003/07/10 07:44:02 jtb Exp $
  (* Emission of a function declaration *)
  
  let fundecl fundecl =
-@@ -951,10 +976,11 @@
+@@ -951,10 +975,11 @@
        `	.csect	{emit_symbol fundecl.fun_name}[DS]\n`;
        `{emit_symbol fundecl.fun_name}:\n`;
        `	.long	.{emit_symbol fundecl.fun_name}, TOC[tc0], 0\n`
@@ -108,7 +107,7 @@ $NetBSD: patch-ah,v 1.2 2003/07/10 07:44:02 jtb Exp $
    emit_string code_space;
    `	.align	2\n`;
    `{emit_codesymbol fundecl.fun_name}:\n`;
-@@ -996,7 +1022,7 @@
+@@ -996,7 +1021,7 @@
  
  let declare_global_data s =
    `	.globl	{emit_symbol s}\n`;
diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj
index 48276b27f0d..91510225d45 100644
--- a/lang/ocaml/patches/patch-aj
+++ b/lang/ocaml/patches/patch-aj
@@ -1,15 +1,14 @@
-$NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2003/07/11 07:47:44 jtb Exp $
 
 --- asmrun/power-bsd.S.orig
 +++ asmrun/power-bsd.S
-@@ -13,6 +13,36 @@
+@@ -13,6 +13,35 @@
  
- /* $Id: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $ */
+ /* $Id: patch-aj,v 1.2 2003/07/11 07:47:44 jtb Exp $ */
  
 +#if defined(PROFILING)
 +#define PROFILE_CAML \
 +        stwu 1, -32(1) \
-+        stw 1, 0(3) \
 +        mflr 0 \
 +        stw 0, 4(1) \
 +        stw 2, 8(1) \
@@ -39,7 +38,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
  #define Addrglobal(reg,glob) \
          addis   reg, 0, glob@ha; \
          addi    reg, reg, glob@l
-@@ -30,6 +60,7 @@
+@@ -30,6 +59,7 @@
          .globl  caml_call_gc
          .type   caml_call_gc, @function
  caml_call_gc:
@@ -47,7 +46,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
      /* Set up stack frame */
          stwu    1, -0x1A0(1)
      /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */
-@@ -182,6 +213,7 @@
+@@ -182,6 +212,7 @@
          .globl  caml_c_call
          .type   caml_c_call, @function
  caml_c_call:
@@ -55,7 +54,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
      /* Save return address */
          mflr    25
      /* Get ready to call C function (address in 11) */
-@@ -210,6 +242,7 @@
+@@ -210,6 +241,7 @@
          .globl  raise_caml_exception
          .type   raise_caml_exception, @function
  raise_caml_exception:
@@ -63,7 +62,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
      /* Reload Caml global registers */
          Loadglobal(1, caml_exception_pointer, 11)
          Loadglobal(31, young_ptr, 11)
-@@ -230,6 +263,7 @@
+@@ -230,6 +262,7 @@
          .globl  caml_start_program
          .type   caml_start_program, @function
  caml_start_program:
@@ -71,7 +70,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
          Addrglobal(12, caml_program)
  
  /* Code shared between caml_start_program and callback */
-@@ -380,6 +414,7 @@
+@@ -380,6 +413,7 @@
          .globl  callback_exn
          .type   callback_exn, @function
  callback_exn:
@@ -79,7 +78,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
      /* Initial shuffling of arguments */
          mr      0, 3            /* Closure */
          mr      3, 4            /* Argument */
-@@ -390,6 +425,7 @@
+@@ -390,6 +424,7 @@
          .globl  callback2_exn
          .type   callback2_exn, @function
  callback2_exn:
@@ -87,7 +86,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
          mr      0, 3            /* Closure */
          mr      3, 4            /* First argument */
          mr      4, 5            /* Second argument */
-@@ -400,6 +436,7 @@
+@@ -400,6 +435,7 @@
          .globl  callback3_exn
          .type   callback3_exn, @function
  callback3_exn:
@@ -95,7 +94,7 @@ $NetBSD: patch-aj,v 1.1 2003/07/10 07:44:02 jtb Exp $
          mr      0, 3            /* Closure */
          mr      3, 4            /* First argument */
          mr      4, 5            /* Second argument */
-@@ -418,4 +455,3 @@
+@@ -418,4 +454,3 @@
          .long   .L105 + 4       /* return address into callback */
          .short  -1              /* negative size count => use callback link */
          .short  0               /* no roots here */