head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.4 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.2 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.11.0.66 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.64 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.62 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.60 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.58 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.56 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.54 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.52 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.50 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.48 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.46 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.44 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.42 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.40 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.38 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.36 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.34 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.32 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.30 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.28 pkgsrc-2008Q1:1.11.0.26 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.24 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.22 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.20 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.18 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.16 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.14 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.11.0.12 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.11.0.10 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.11.0.8 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.6 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.4 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.11.0.2 pkgsrc-2005Q1-base:1.11 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3; locks; strict; comment @# @; 1.12 date 2012.10.11.09.48.14; author jaapb; state dead; branches; next 1.11; 1.11 date 2005.02.06.15.25.36; author adrianp; state Exp; branches; next 1.10; 1.10 date 2005.02.05.00.49.34; author wiz; state Exp; branches; next 1.9; 1.9 date 2005.02.05.00.26.18; author adrianp; state Exp; branches; next 1.8; 1.8 date 2005.02.05.00.04.20; author adrianp; state Exp; branches; next 1.7; 1.7 date 2005.02.04.21.35.51; author adrianp; state Exp; branches; next 1.6; 1.6 date 2004.04.23.03.06.02; author danw; state Exp; branches; next 1.5; 1.5 date 2004.04.22.09.27.49; author tron; state Exp; branches; next 1.4; 1.4 date 2004.04.22.09.18.36; author tron; state Exp; branches; next 1.3; 1.3 date 2003.07.11.07.47.44; author jtb; state Exp; branches; next 1.2; 1.2 date 2003.07.10.07.44.02; author jtb; state Exp; branches; next 1.1; 1.1 date 2003.06.29.23.04.19; author jtb; state Exp; branches; next ; desc @@ 1.12 log @Removed obsolete and/or renamed patches. @ text @$NetBSD: patch-ah,v 1.11 2005/02/06 15:25:36 adrianp Exp $ --- asmrun/power-bsd.S.orig 2005-02-06 15:00:21.000000000 +0000 +++ asmrun/power-bsd.S @@@@ -15,2 +15,31 @@@@ +#if defined(PROFILING) +#define PROFILE_CAML \ + stwu 1, -32(1) \ + mflr 0 \ + stw 0, 4(1) \ + stw 2, 8(1) \ + stw 3, 12(1) \ + stw 4, 16(1) \ + stw 5, 20(1) \ + stw 6, 24(1) \ + stw 7, 28(1) \ + bl _mcount \ + lwz 2, 8(1) \ + lwz 3, 12(1) \ + lwz 4, 16(1) \ + lwz 5, 20(1) \ + lwz 6, 24(1) \ + lwz 7, 28(1) \ + addic 1, 1, 32 + +#define PROFILE_C \ + mflr 0 \ + stw 0, 4(1) \ + bl _mcount +#else +#define PROFILE_CAML +#define PROFILE_C +#endif + #define Addrglobal(reg,glob) \ @@@@ -32,2 +61,3 @@@@ caml_call_gc: + PROFILE_CAML /* Set up stack frame */ @@@@ -184,2 +214,3 @@@@ caml_call_gc: caml_c_call: + PROFILE_CAML /* Save return address */ @@@@ -212,2 +243,3 @@@@ caml_c_call: caml_raise_exception: + PROFILE_C /* Reload Caml global registers */ @@@@ -232,2 +264,3 @@@@ caml_raise_exception: caml_start_program: + PROFILE_C Addrglobal(12, caml_program) @@@@ -382,2 +415,3 @@@@ caml_start_program: caml_callback_exn: + PROFILE_C /* Initial shuffling of arguments */ @@@@ -392,2 +426,3 @@@@ caml_callback_exn: caml_callback2_exn: + PROFILE_C mr 0, 3 /* Closure */ @@@@ -402,2 +437,3 @@@@ caml_callback2_exn: caml_callback3_exn: + PROFILE_C mr 0, 3 /* Closure */ @ 1.11 log @- Fix for patch-ah on Darwin, problem spotted by Antoine Reilles in private email. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Edit down patch-ah so it does not include an RCS Id. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.9 2005/02/05 00:26:18 adrianp Exp $ d3 3 a5 3 --- asmrun/power-bsd.S.orig 2005-02-05 00:20:14.000000000 +0000 +++ asmrun/power-bsd.S 2005-02-05 00:22:01.000000000 +0000 @@@@ -15,4 +15,33 @@@@ d37 1 a37 5 addis reg, 0, glob@@ha; \ addi reg, reg, glob@@l @@@@ -30,6 +59,7 @@@@ .globl caml_call_gc .type caml_call_gc, @@function d41 1 a41 5 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 d45 1 a45 5 mflr 25 /* Get ready to call C function (address in 11) */ @@@@ -210,6 +241,7 @@@@ .globl caml_raise_exception .type caml_raise_exception, @@function d49 1 a49 5 Loadglobal(1, caml_exception_pointer, 11) Loadglobal(31, caml_young_ptr, 11) @@@@ -230,6 +262,7 @@@@ .globl caml_start_program .type caml_start_program, @@function d53 1 a53 5 /* Code shared between caml_start_program and caml_callback */ @@@@ -380,6 +413,7 @@@@ .globl caml_callback_exn .type caml_callback_exn, @@function d57 1 a57 5 mr 0, 3 /* Closure */ mr 3, 4 /* Argument */ @@@@ -390,6 +424,7 @@@@ .globl caml_callback2_exn .type caml_callback2_exn, @@function d61 1 a61 5 mr 3, 4 /* First argument */ mr 4, 5 /* Second argument */ @@@@ -400,6 +435,7 @@@@ .globl caml_callback3_exn .type caml_callback3_exn, @@function a64 2 mr 3, 4 /* First argument */ mr 4, 5 /* Second argument */ @ 1.9 log @fix broken patch from last update - ride the recent update @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 3 @@@@ -13,6 +13,35 @@@@ /* $Id: power-elf.S,v 1.18 2004/01/03 12:51:19 doligez Exp $ */ @ 1.8 log @fix broken patch from last update - ride the recent update @ text @d3 2 a4 2 --- asmrun/power-bsd.S.orig 2005-02-04 23:36:22.000000000 +0000 +++ asmrun/power-bsd.S 2005-02-04 23:42:19.000000000 +0000 d20 6 a25 6 + bl _mcount \ + lwz 2, 8(1) \ + lwz 3, 12(1) \ + lwz 4, 16(1) \ + lwz 5, 20(1) \ + lwz 6, 24(1) \ d31 6 a36 6 + stw 0, 4(1) \ + bl _mcount +#else +#define PROFILE_CAML +#define PROFILE_C +#endif @ 1.7 log @- Update from 3.06 to 3.08.2 - Lots of changes/bugfixes - see Changes for all the details @ text @d3 2 a4 2 --- asmrun/power-bsd.S.orig 2004-10-14 15:48:54.000000000 +0100 +++ asmrun/power-bsd.S 2004-10-14 15:55:11.000000000 +0100 d45 1 a45 1 + PROFILE_CAML d53 1 a53 1 + PROFILE_CAML d61 1 a61 1 + PROFILE_CAML d69 1 a69 1 + PROFILE_CAML d77 1 a77 1 + PROFILE_CAML d85 1 a85 1 + PROFILE_CAML d93 1 a93 1 + PROFILE_CAML @ 1.6 log @de-fuzz @ text @d3 5 a7 3 --- asmrun/power-bsd.S.orig Thu Apr 22 21:34:41 2004 +++ asmrun/power-bsd.S @@@@ -15,2 +15,31 @@@@ d39 5 a43 1 @@@@ -32,2 +61,3 @@@@ d45 1 a45 1 + PROFILE_CAML d47 5 a51 1 @@@@ -184,2 +214,3 @@@@ caml_call_gc: d53 1 a53 1 + PROFILE_CAML d55 7 a61 3 @@@@ -212,2 +243,3 @@@@ caml_c_call: raise_caml_exception: + PROFILE_C d63 5 a67 1 @@@@ -232,2 +264,3 @@@@ raise_caml_exception: d69 1 a69 1 + PROFILE_C d71 7 a77 3 @@@@ -382,2 +415,3 @@@@ caml_start_program: callback_exn: + PROFILE_C a78 3 @@@@ -392,2 +426,3 @@@@ callback_exn: callback2_exn: + PROFILE_C d80 14 a93 3 @@@@ -402,2 +437,3 @@@@ callback2_exn: callback3_exn: + PROFILE_C d95 2 a96 3 @@@@ -420,2 +456 @@@@ system__frametable: .short 0 /* no roots here */ - @ 1.5 log @Fix patch problem caused by embedded CVS Id. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.4 2004/04/22 09:18:36 tron Exp $ d3 3 a5 3 --- 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 @@@@ d37 1 a37 5 addis reg, 0, glob@@ha; \ addi reg, reg, glob@@l @@@@ -30,6 +59,7 @@@@ .globl caml_call_gc .type caml_call_gc, @@function d41 1 a41 5 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 d45 1 a45 5 mflr 25 /* Get ready to call C function (address in 11) */ @@@@ -210,6 +241,7 @@@@ .globl raise_caml_exception .type raise_caml_exception, @@function d49 1 a49 5 Loadglobal(1, caml_exception_pointer, 11) Loadglobal(31, young_ptr, 11) @@@@ -230,6 +262,7 @@@@ .globl caml_start_program .type caml_start_program, @@function d53 1 a53 5 /* Code shared between caml_start_program and callback */ @@@@ -380,6 +413,7 @@@@ .globl callback_exn .type callback_exn, @@function d57 1 a57 5 mr 0, 3 /* Closure */ mr 3, 4 /* Argument */ @@@@ -390,6 +424,7 @@@@ .globl callback2_exn .type callback2_exn, @@function d61 1 a61 5 mr 3, 4 /* First argument */ mr 4, 5 /* Second argument */ @@@@ -400,6 +435,7 @@@@ .globl callback3_exn .type callback3_exn, @@function d65 1 a65 5 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 */ @ 1.4 log @Fix various issues with this package: - split patches files - always enable threading which has various advantages - it fixes the build of the Tk library - it greatly simplifies the package list handling - it provides threading support under NetBSD 1.6/1.6.x - correct default dependence in "buildlink2.mk" to "build" Bump package revision because of all these changes. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 3 @@@@ -13,6 +13,35 @@@@ /* $Id: power-elf.S,v 1.14 2002/02/08 16:55:32 xleroy Exp $ */ @ 1.3 log @Remove unnecessary register store in the profiling prologue. @ text @d3 25 a27 68 --- asmcomp/power/emit.mlp.orig +++ asmcomp/power/emit.mlp @@@@ -65,7 +65,7 @@@@ let emit_symbol = match Config.system with - "aix" | "elf" -> (fun s -> Emitaux.emit_symbol '.' s) + "aix" | "elf" | "bsd" -> (fun s -> Emitaux.emit_symbol '.' s) | "rhapsody" -> (fun s -> emit_char '_'; Emitaux.emit_symbol '$' s) | _ -> assert false @@@@ -78,7 +78,7 @@@@ let label_prefix = match Config.system with "aix" -> "L.." - | "elf" -> ".L" + | "elf" | "bsd" -> ".L" | "rhapsody" -> "L" | _ -> assert false @@@@ -90,21 +90,21 @@@@ let data_space = match Config.system with "aix" -> " .csect .data[RW]\n" - | "elf" -> " .section \".data\"\n" + | "elf" | "bsd" -> " .section \".data\"\n" | "rhapsody" -> " .data\n" | _ -> assert false let code_space = match Config.system with "aix" -> " .csect .text[PR]\n" - | "elf" -> " .section \".text\"\n" + | "elf" | "bsd" -> " .section \".text\"\n" | "rhapsody" -> " .text\n" | _ -> assert false let rodata_space = match Config.system with "aix" -> " .csect .data[RW]\n" (* ?? *) - | "elf" -> " .section \".rodata\"\n" + | "elf" | "bsd" -> " .section \".rodata\"\n" | "rhapsody" -> " .const\n" | _ -> assert false @@@@ -157,7 +157,7 @@@@ let emit_upper emit_fun arg = match Config.system with - "elf" -> + "elf" | "bsd" -> emit_fun arg; emit_string "@@ha" | "rhapsody" -> emit_string "ha16("; emit_fun arg; emit_string ")" @@@@ -165,7 +165,7 @@@@ let emit_lower emit_fun arg = match Config.system with - "elf" -> + "elf" | "bsd" -> emit_fun arg; emit_string "@@l" | "rhapsody" -> emit_string "lo16("; emit_fun arg; emit_string ")" @@@@ -935,6 +935,30 @@@@ emit_instr i None; emit_all i.next +(* Emission of the profiling prelude *) d29 8 a36 21 +let emit_profile () = + match Config.system with + "bsd" -> + ` stwu 1, -32(1)\n`; + ` mflr 0\n`; + ` stw 0, 4(1)\n`; + ` stw 2, 8(1)\n`; + ` stw 3, 12(1)\n`; + ` stw 4, 16(1)\n`; + ` stw 5, 20(1)\n`; + ` stw 6, 24(1)\n`; + ` stw 7, 28(1)\n`; + ` bl {emit_symbol "_mcount"}\n`; + ` lwz 2, 8(1)\n`; + ` lwz 3, 12(1)\n`; + ` lwz 4, 16(1)\n`; + ` lwz 5, 20(1)\n`; + ` lwz 6, 24(1)\n`; + ` lwz 7, 28(1)\n`; + ` addic 1, 1, 32\n`; + | _ -> () (*unsupported yet*) d38 64 a101 25 (* Emission of a function declaration *) let fundecl fundecl = @@@@ -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` - | "elf" -> + | "elf" | "bsd" -> ` .type {emit_symbol fundecl.fun_name}, @@function\n` | _ -> () end; + if !Clflags.gprofile then emit_profile(); emit_string code_space; ` .align 2\n`; `{emit_codesymbol fundecl.fun_name}:\n`; @@@@ -996,7 +1021,7 @@@@ let declare_global_data s = ` .globl {emit_symbol s}\n`; - if Config.system = "elf" then + if Config.system = "elf" || Config.system = "bsd" then ` .type {emit_symbol s}, @@object\n` let emit_item = function @ 1.2 log @* Add support for the profiler on powerpc * Fix i386 profiling. NetBSD calls __mcount while FreeBSD calls .mcount @ text @d66 1 a66 1 @@@@ -935,6 +935,31 @@@@ a75 1 + ` stw 1, 0(3)\n`; d97 1 a97 1 @@@@ -951,10 +976,11 @@@@ d110 1 a110 1 @@@@ -996,7 +1022,7 @@@@ @ 1.1 log @* Use ".L" instead of "L" as label prefix on sparc * For consistency use SYS_bsd for system type on powerpc. We differ from SYS_elf (presumably Linux) on a few points here anyway. * Fix signal handling on powerpc which caused a seg fault when compiling native code version of coq. * Install ocamllex.opt, camlp4o.opt and camlp4r.opt too. @ text @d66 33 a98 1 @@@@ -951,7 +951,7 @@@@ d107 5 a111 1 @@@@ -996,7 +996,7 @@@@ @