From owner-svn-src-user@FreeBSD.ORG Sun Mar 21 16:34:55 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67B8D106567A; Sun, 21 Mar 2010 16:34:55 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 57F3C8FC44; Sun, 21 Mar 2010 16:34:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2LGYtFr056028; Sun, 21 Mar 2010 16:34:55 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2LGYsbo056024; Sun, 21 Mar 2010 16:34:54 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201003211634.o2LGYsbo056024@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 21 Mar 2010 16:34:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205418 - user/luigi/ipfw3-r8/sbin/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2010 16:34:55 -0000 Author: luigi Date: Sun Mar 21 16:34:54 2010 New Revision: 205418 URL: http://svn.freebsd.org/changeset/base/205418 Log: sync with head: - fix printing of rules with 'OR' options - accept 'm' for 'mega' - sync manpage Modified: user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Modified: user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c Sun Mar 21 16:34:54 2010 (r205418) @@ -535,7 +535,7 @@ read_bandwidth(char *arg, int *bandwidth if (*end == 'K' || *end == 'k') { end++; bw *= 1000; - } else if (*end == 'M') { + } else if (*end == 'M' || *end == 'm') { end++; bw *= 1000000; } Modified: user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 Sun Mar 21 16:34:54 2010 (r205418) @@ -1501,7 +1501,7 @@ is invalid) whenever .Cm xmit is used. .Pp -A packet may not have a receive or transmit interface: packets +A packet might not have a receive or transmit interface: packets originating from the local host have no receive interface, while packets destined for the local host have no transmit interface. Modified: user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Sun Mar 21 16:34:54 2010 (r205418) @@ -921,9 +921,9 @@ print_icmptypes(ipfw_insn_u32 *cmd) #define HAVE_DSTIP 0x0004 #define HAVE_PROTO4 0x0008 #define HAVE_PROTO6 0x0010 +#define HAVE_IP 0x0100 #define HAVE_OPTIONS 0x8000 -#define HAVE_IP (HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP) static void show_prerequisites(int *flags, int want, int cmd __unused) { @@ -1024,7 +1024,9 @@ show_ipfw(struct ip_fw *rule, int pcwidt switch(cmd->opcode) { case O_CHECK_STATE: printf("check-state"); - flags = HAVE_IP; /* avoid printing anything else */ + /* avoid printing anything else */ + flags = HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP; break; case O_ACCEPT: @@ -1164,7 +1166,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt show_prerequisites(&flags, HAVE_PROTO, 0); printf(" from any to any"); } - flags |= HAVE_IP | HAVE_OPTIONS; + flags |= HAVE_IP | HAVE_OPTIONS | HAVE_PROTO | + HAVE_SRCIP | HAVE_DSTIP; } if (co.comment_only) @@ -1253,9 +1256,12 @@ show_ipfw(struct ip_fw *rule, int pcwidt break; case O_IP_DSTPORT: - show_prerequisites(&flags, HAVE_IP, 0); + show_prerequisites(&flags, + HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP, 0); case O_IP_SRCPORT: - show_prerequisites(&flags, HAVE_PROTO|HAVE_SRCIP, 0); + show_prerequisites(&flags, + HAVE_PROTO | HAVE_SRCIP, 0); if ((cmd->len & F_OR) && !or_block) printf(" {"); if (cmd->len & F_NOT) @@ -1276,7 +1282,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt if ((flags & (HAVE_PROTO4 | HAVE_PROTO6)) && !(flags & HAVE_PROTO)) show_prerequisites(&flags, - HAVE_IP | HAVE_OPTIONS, 0); + HAVE_PROTO | HAVE_IP | HAVE_SRCIP | + HAVE_DSTIP | HAVE_OPTIONS, 0); if (flags & HAVE_OPTIONS) printf(" proto"); if (pe) @@ -1294,7 +1301,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt ((cmd->opcode == O_IP4) && (flags & HAVE_PROTO4))) break; - show_prerequisites(&flags, HAVE_IP | HAVE_OPTIONS, 0); + show_prerequisites(&flags, HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP | HAVE_OPTIONS, 0); if ((cmd->len & F_OR) && !or_block) printf(" {"); if (cmd->len & F_NOT && cmd->opcode != O_IN) @@ -1548,7 +1556,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt or_block = 0; } } - show_prerequisites(&flags, HAVE_IP, 0); + show_prerequisites(&flags, HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP + | HAVE_IP, 0); if (comment) printf(" // %s", comment); printf("\n"); From owner-svn-src-user@FreeBSD.ORG Sun Mar 21 16:38:46 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37B5F106564A; Sun, 21 Mar 2010 16:38:46 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 272AE8FC14; Sun, 21 Mar 2010 16:38:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2LGckNd056888; Sun, 21 Mar 2010 16:38:46 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2LGcjxw056881; Sun, 21 Mar 2010 16:38:45 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201003211638.o2LGcjxw056881@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 21 Mar 2010 16:38:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205419 - user/luigi/ipfw3-r8/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2010 16:38:46 -0000 Author: luigi Date: Sun Mar 21 16:38:45 2010 New Revision: 205419 URL: http://svn.freebsd.org/changeset/base/205419 Log: misc merges from HEAD Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/dn_sched.h user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_dummynet.c user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw2.c user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_private.h user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_table.c Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/dn_sched.h ============================================================================== --- user/luigi/ipfw3-r8/sys/netinet/ipfw/dn_sched.h Sun Mar 21 16:34:54 2010 (r205418) +++ user/luigi/ipfw3-r8/sys/netinet/ipfw/dn_sched.h Sun Mar 21 16:38:45 2010 (r205419) @@ -68,6 +68,18 @@ struct dn_alg { * enqueue enqueue packet 'm' on scheduler 's', queue 'q'. * q is NULL for !MULTIQUEUE. * Return 0 on success, 1 on drop (packet consumed anyways). + * Note that q should be interpreted only as a hint + * on the flow that the mbuf belongs to: while a + * scheduler will normally enqueue m into q, it is ok + * to leave q alone and put the mbuf elsewhere. + * This function is called in two cases: + * - when a new packet arrives to the scheduler; + * - when a scheduler is reconfigured. In this case the + * call is issued by the new_queue callback, with a + * non empty queue (q) and m pointing to the first + * mbuf in the queue. For this reason, the function + * should internally check for (m != q->mq.head) + * before calling dn_enqueue(). * * dequeue Called when scheduler instance 's' can * dequeue a packet. Return NULL if none are available. @@ -94,8 +106,15 @@ struct dn_alg { * * new_queue called to set the per-queue parameters, * e.g. S and F, adjust sum of weights in the parent, etc. - * If the queue has packets in it, add them to the scheduler - * as well. + * + * The new_queue callback is normally called from when + * creating a new queue. In some cases (such as a + * scheduler change or reconfiguration) it can be called + * with a non empty queue. In this case, the queue + * In case of non empty queue, the new_queue callback could + * need to call the enqueue function. In this case, + * the callback should eventually call enqueue() passing + * as m the first element in the queue. * * free_queue actions related to a queue removal, e.g. undo * all the above. If the queue has data in it, also remove Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_dummynet.c ============================================================================== --- user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_dummynet.c Sun Mar 21 16:34:54 2010 (r205418) +++ user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_dummynet.c Sun Mar 21 16:38:45 2010 (r205419) @@ -814,15 +814,15 @@ copy_obj(char **start, char *end, void * } /* Specific function to copy a queue. - * It copies only the common part of a queue, and correctly set - * the length + * Copies only the user-visible part of a queue (which is in + * a struct dn_flow), and sets len accordingly. */ static int copy_obj_q(char **start, char *end, void *_o, const char *msg, int i) { struct dn_id *o = _o; int have = end - *start; - int len = sizeof(struct dn_queue); + int len = sizeof(struct dn_flow); /* see above comment */ if (have < len || o->len == 0 || o->type != DN_QUEUE) { D("ERROR type %d %s %d have %d need %d", @@ -1783,9 +1783,13 @@ compute_space(struct dn_id *cmd, struct if (x & DN_C_LINK) { need += dn_cfg.schk_count * sizeof(struct dn_link) / 2; } - /* XXX queue space might be variable */ + /* + * When exporting a queue to userland, only pass up the + * struct dn_flow, which is the only visible part. + */ + if (x & DN_C_QUEUE) - need += dn_cfg.queue_count * sizeof(struct dn_queue); + need += dn_cfg.queue_count * sizeof(struct dn_flow); if (x & DN_C_FLOW) need += dn_cfg.si_count * (sizeof(struct dn_flow)); return need; Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw2.c ============================================================================== --- user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw2.c Sun Mar 21 16:34:54 2010 (r205418) +++ user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw2.c Sun Mar 21 16:38:45 2010 (r205419) @@ -2399,7 +2399,7 @@ vnet_ipfw_uninit(const void *unused) IPFW_WLOCK(chain); ipfw_dyn_uninit(0); /* run the callout_drain */ - ipfw_flush_tables(chain); + ipfw_destroy_tables(chain); reap = NULL; for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_private.h ============================================================================== --- user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_private.h Sun Mar 21 16:34:54 2010 (r205418) +++ user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_private.h Sun Mar 21 16:38:45 2010 (r205419) @@ -274,7 +274,6 @@ int ipfw_lookup_table(struct ip_fw_chain int ipfw_init_tables(struct ip_fw_chain *ch); void ipfw_destroy_tables(struct ip_fw_chain *ch); int ipfw_flush_table(struct ip_fw_chain *ch, uint16_t tbl); -void ipfw_flush_tables(struct ip_fw_chain *ch); int ipfw_add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, uint32_t value); int ipfw_dump_table_entry(struct radix_node *rn, void *arg); Modified: user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_table.c ============================================================================== --- user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_table.c Sun Mar 21 16:34:54 2010 (r205418) +++ user/luigi/ipfw3-r8/sys/netinet/ipfw/ip_fw_table.c Sun Mar 21 16:38:45 2010 (r205419) @@ -176,14 +176,18 @@ ipfw_flush_table(struct ip_fw_chain *ch, } void -ipfw_flush_tables(struct ip_fw_chain *ch) +ipfw_destroy_tables(struct ip_fw_chain *ch) { uint16_t tbl; + struct radix_node_head *rnh; IPFW_WLOCK_ASSERT(ch); - for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) + for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) { ipfw_flush_table(ch, tbl); + rnh = ch->tables[tbl]; + rn_detachhead((void **)&rnh); + } } int From owner-svn-src-user@FreeBSD.ORG Sun Mar 21 21:25:36 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F31FC1065670; Sun, 21 Mar 2010 21:25:35 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9DB408FC15; Sun, 21 Mar 2010 21:25:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2LLPZbh020091; Sun, 21 Mar 2010 21:25:35 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2LLPZvJ020088; Sun, 21 Mar 2010 21:25:35 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003212125.o2LLPZvJ020088@svn.freebsd.org> From: Edwin Groothuis Date: Sun, 21 Mar 2010 21:25:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205426 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2010 21:25:36 -0000 Author: edwin Date: Sun Mar 21 21:25:35 2010 New Revision: 205426 URL: http://svn.freebsd.org/changeset/base/205426 Log: On advice of Alexander, use -N and -C to specify the ncal and cal mode. Also add -3 -A and -B to the usage(). Modified: user/edwin/ncal/ncal.1 user/edwin/ncal/ncal.c Modified: user/edwin/ncal/ncal.1 ============================================================================== --- user/edwin/ncal/ncal.1 Sun Mar 21 21:03:35 2010 (r205425) +++ user/edwin/ncal/ncal.1 Sun Mar 21 21:25:35 2010 (r205426) @@ -60,6 +60,10 @@ .Op Fl A Ar number .Op Fl B Ar number .Op Ar year +.Nm ncal +.Op Fl CN +.Op Fl H Ar yyyy-mm-dd +.Op Fl d Ar yyyy-mm .Sh DESCRIPTION The .Nm @@ -127,8 +131,14 @@ of months after the current month. Display the .Ar number of months before the current month. -.It Fl b -Switch to backwards compatibility mode (for debugging). +.It Fl C +Switch to +.Nm cal +mode. +.It Fl N +Switch to +.Nm ncal +mode. .It Fl d Ar yyyy-mm Use .Ar yyyy-mm Modified: user/edwin/ncal/ncal.c ============================================================================== --- user/edwin/ncal/ncal.c Sun Mar 21 21:03:35 2010 (r205425) +++ user/edwin/ncal/ncal.c Sun Mar 21 21:25:35 2010 (r205426) @@ -256,7 +256,7 @@ main(int argc, char *argv[]) before = after = -1; - while ((ch = getopt(argc, argv, "A:B:3Jbd:eH:hjm:ops:wy")) != -1) + while ((ch = getopt(argc, argv, "3A:B:Cd:eH:hjJm:Nops:wy")) != -1) switch (ch) { case '3': flag_3months = 1; @@ -283,9 +283,12 @@ main(int argc, char *argv[]) nswitch = ndaysj(&never); flag_julian_cal = 1; break; - case 'b': + case 'C': flag_backward = 1; break; + case 'N': + flag_backward = 0; + break; case 'd': flag_today = optarg; break; @@ -500,11 +503,12 @@ usage(void) { fputs( - "usage: cal [-hjy] [[month] year]\n" - " cal [-hj] [-m month] [year]\n" - " ncal [-hJjpwy] [-s country_code] [[month] year]\n" - " ncal [-hJeo] [year]\n" - "for debug the highlighting: [-b] [-H yyyy-mm-dd] [-d yyyy-mm]\n", +"Usage: cal [general options] [-hjy] [[month] year]\n" +" cal [general options] [-hj] [-m month] [year]\n" +" ncal [general options] [-hJjpwy] [-s country_code] [[month] year]\n" +" ncal [general options] [-hJeo] [year]\n" +"General options: [-NC3] [-A months] [-B months]\n" +"For debug the highlighting: [-H yyyy-mm-dd] [-d yyyy-mm]\n", stderr); exit(EX_USAGE); } From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 06:42:31 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6596D106564A; Mon, 22 Mar 2010 06:42:31 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 54D768FC08; Mon, 22 Mar 2010 06:42:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2M6gVSU042577; Mon, 22 Mar 2010 06:42:31 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2M6gVfg042575; Mon, 22 Mar 2010 06:42:31 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003220642.o2M6gVfg042575@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 22 Mar 2010 06:42:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205436 - user/edwin/calendar X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 06:42:31 -0000 Author: edwin Date: Mon Mar 22 06:42:31 2010 New Revision: 205436 URL: http://svn.freebsd.org/changeset/base/205436 Log: Fix names of the solar Equinox and Solstice events Modified: user/edwin/calendar/calendar.1 Modified: user/edwin/calendar/calendar.1 ============================================================================== --- user/edwin/calendar/calendar.1 Mon Mar 22 04:24:19 2010 (r205435) +++ user/edwin/calendar/calendar.1 Mon Mar 22 06:42:31 2010 (r205436) @@ -126,14 +126,14 @@ Orthodox Easter. The lunar New Moon. .It FullMoon The lunar Full Moon. -.It MarSolstice -The solar solstice in March. -.It JunEquinox -The solar equinox in June. -.It MarSolstice -The solar solstice in March. -.It DecEquinox -The solar equinox in December. +.It MarEquinox +The solar equinox in March. +.It JunSolstice +The solar solstice in June. +.It SepEquinox +The solar equinox in March. +.It DecSolstice +The solar solstice in December. .It ChineseNewYear The first day of the Chinese year. .El From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 07:06:12 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2045106564A; Mon, 22 Mar 2010 07:06:12 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A11328FC13; Mon, 22 Mar 2010 07:06:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2M76CKN047779; Mon, 22 Mar 2010 07:06:12 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2M76C4I047776; Mon, 22 Mar 2010 07:06:12 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003220706.o2M76C4I047776@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 22 Mar 2010 07:06:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205437 - user/edwin/calendar X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 07:06:12 -0000 Author: edwin Date: Mon Mar 22 07:06:12 2010 New Revision: 205437 URL: http://svn.freebsd.org/changeset/base/205437 Log: Fix UTCoffset adjustments in solar events. Put a note about the (minimal) differences in solar and lunar events for communities who need the strict time. Modified: user/edwin/calendar/calendar.1 user/edwin/calendar/sunpos.c Modified: user/edwin/calendar/calendar.1 ============================================================================== --- user/edwin/calendar/calendar.1 Mon Mar 22 06:42:31 2010 (r205436) +++ user/edwin/calendar/calendar.1 Mon Mar 22 07:06:12 2010 (r205437) @@ -308,6 +308,10 @@ The new and full moons are happening on might happen in the time period in the early night or in the late evening. It doesn't indicate that they are starting in the night on that date. +.Pp +Because of minor differences between the output of the formulas +used and other sources on the Internet, Druids and Werewolves should +double-check the start and end time of solar and lunar events. .Sh BUGS The .Nm Modified: user/edwin/calendar/sunpos.c ============================================================================== --- user/edwin/calendar/sunpos.c Mon Mar 22 06:42:31 2010 (r205436) +++ user/edwin/calendar/sunpos.c Mon Mar 22 07:06:12 2010 (r205437) @@ -102,7 +102,7 @@ sunpos(int inYY, int inMM, int inDD, dou if (inMM <= 2 && isleap(inYY)) ZJ -= 1.0; - UTHM = inHOUR + inMIN / FMINSPERHOUR + inSEC / FSECSPERHOUR + UTCOFFSET; + UTHM = inHOUR + inMIN / FMINSPERHOUR + inSEC / FSECSPERHOUR - UTCOFFSET; Y = inYY - 1900; /* 1 */ D = floor(365.25 * Y) + ZJ + inDD + UTHM / FHOURSPERDAY; /* 3 */ T = D / 36525.0; /* 4 */ From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 17:57:01 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E54B51065670; Mon, 22 Mar 2010 17:57:01 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3CB08FC12; Mon, 22 Mar 2010 17:57:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2MHv1RX096934; Mon, 22 Mar 2010 17:57:01 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MHv1li096932; Mon, 22 Mar 2010 17:57:01 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201003221757.o2MHv1li096932@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 22 Mar 2010 17:57:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205453 - user/luigi/ipfw3-r8/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 17:57:02 -0000 Author: luigi Date: Mon Mar 22 17:57:00 2010 New Revision: 205453 URL: http://svn.freebsd.org/changeset/base/205453 Log: forgot this file... Modified: user/luigi/ipfw3-r8/sys/net/radix.c Modified: user/luigi/ipfw3-r8/sys/net/radix.c ============================================================================== --- user/luigi/ipfw3-r8/sys/net/radix.c Mon Mar 22 17:30:34 2010 (r205452) +++ user/luigi/ipfw3-r8/sys/net/radix.c Mon Mar 22 17:57:00 2010 (r205453) @@ -1161,8 +1161,8 @@ rn_inithead(head, off) return (1); } -#if 0 -int rn_detachhead(void **head) +int +rn_detachhead(void **head) { struct radix_node_head *rnh; @@ -1176,7 +1176,7 @@ int rn_detachhead(void **head) *head = NULL; return (1); } -#endif // XXX + void rn_init(int maxk) { From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 20:24:00 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D99D61065670; Mon, 22 Mar 2010 20:24:00 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AFC9D8FC15; Mon, 22 Mar 2010 20:24:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2MKO0e7030254; Mon, 22 Mar 2010 20:24:00 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MKO0pq030250; Mon, 22 Mar 2010 20:24:00 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201003222024.o2MKO0pq030250@svn.freebsd.org> From: Xin LI Date: Mon, 22 Mar 2010 20:24:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205466 - user/delphij/libz X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 20:24:00 -0000 Author: delphij Date: Mon Mar 22 20:24:00 2010 New Revision: 205466 URL: http://svn.freebsd.org/changeset/base/205466 Log: Versioned symbols for libz. Added: user/delphij/libz/Symbol.map user/delphij/libz/Versions.def Modified: user/delphij/libz/Makefile Modified: user/delphij/libz/Makefile ============================================================================== --- user/delphij/libz/Makefile Mon Mar 22 20:21:22 2010 (r205465) +++ user/delphij/libz/Makefile Mon Mar 22 20:24:00 2010 (r205466) @@ -47,6 +47,10 @@ SRCS+= gvmat64.S CFLAGS+= -DASMV -DNO_UNDERLINE .endif +VERSION_DEF= ${.CURDIR}/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map +CFLAGS+= -DSYMBOL_VERSIONING + INCS= zconf.h zlib.h minigzip: all minigzip.o Added: user/delphij/libz/Symbol.map ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/delphij/libz/Symbol.map Mon Mar 22 20:24:00 2010 (r205466) @@ -0,0 +1,96 @@ +/* + * $FreeBSD$ + */ + +ZLIB_1.2.4.0 { + adler32; + adler32_combine64; + compress; + compress2; + compressBound; + crc32; + crc32_combine64; + deflate; + deflateBound; + deflateCopy; + deflateEnd; + deflateInit2_; + deflateInit_; + deflateParams; + deflatePrime; + deflateReset; + deflateSetDictionary; + deflateSetHeader; + deflateTune; + get_crc_table; + gzbuffer; + gzclearerr; + gzclose; + gzclose_r; + gzclose_w; + gzdirect; + gzdopen; + gzeof; + gzerror; + gzflush; + gzgetc; + gzgets; + gzoffset64; + gzopen64; + gzprintf; + gzputc; + gzputs; + gzread; + gzrewind; + gzseek64; + gzsetparams; + gztell64; + gzungetc; + gzwrite; + inflate; + inflateBack; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + inflateEnd; + inflateGetHeader; + inflateInit2_; + inflateInit_; + inflateMark; + inflatePrime; + inflateReset; + inflateReset2; + inflateSetDictionary; + inflateSync; + inflateSyncPoint; + inflateUndermine; + uncompress; + zError; + zlibCompileFlags; + zlibVersion; +}; + +FBSD_1.2 { + zopen; +}; + +ZLIBprivate_1.0 { + _tr_align; + _tr_flush_block; + _tr_init; + _tr_stored_block; + _tr_tally; + adler32_combine; + crc32_combine; + gz_error; + gzoffset; + gzopen; + gzseek; + gztell; + inflate_fast; + inflate_table; + longest_match; + match_init; + zcalloc; + zcfree; +}; Added: user/delphij/libz/Versions.def ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/delphij/libz/Versions.def Mon Mar 22 20:24:00 2010 (r205466) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +ZLIB_1.2.4.0 { +}; + +FBSD_1.2 { +} ZLIB_1.2.4.0; + +ZLIBprivate_1.0 { +} ZLIB_1.2.4.0; + From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 21:40:01 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CC731065676; Mon, 22 Mar 2010 21:40:01 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1E46A8FC14; Mon, 22 Mar 2010 21:40:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2MLe10c047894; Mon, 22 Mar 2010 21:40:01 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MLe1q9047892; Mon, 22 Mar 2010 21:40:01 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003222140.o2MLe1q9047892@svn.freebsd.org> From: Juli Mallett Date: Mon, 22 Mar 2010 21:40:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205479 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 21:40:01 -0000 Author: jmallett Date: Mon Mar 22 21:40:00 2010 New Revision: 205479 URL: http://svn.freebsd.org/changeset/base/205479 Log: log all illegal instructions for now, not just reserved ones. Modified: user/jmallett/octeon/sys/mips/mips/trap.c Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 22 21:35:57 2010 (r205478) +++ user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 22 21:40:00 2010 (r205479) @@ -104,7 +104,7 @@ int trap_debug = 1; extern unsigned onfault_table[]; -static void log_reserved_instruction(struct trapframe *); +static void log_illegal_instruction(const char *, struct trapframe *); static void log_bad_page_fault(char *, struct trapframe *, int); static void log_frame_dump(struct trapframe *frame); static void get_mapping_info(vm_offset_t, pd_entry_t **, pt_entry_t **); @@ -884,7 +884,7 @@ dofault: } case T_RES_INST + T_USER: - log_reserved_instruction(trapframe); + log_illegal_instruction("RES_INST", trapframe); i = SIGILL; addr = trapframe->pc; break; @@ -899,11 +899,13 @@ dofault: #if !defined(CPU_HAVEFPU) /* FP (COP1) instruction */ if ((trapframe->cause & CR_COP_ERR) == 0x10000000) { + log_illegal_instruction("COP1_UNUSABLE", trapframe); i = SIGILL; break; } #endif if ((trapframe->cause & CR_COP_ERR) != 0x10000000) { + log_illegal_instruction("COPn_UNUSABLE", trapframe); i = SIGILL; /* only FPU instructions allowed */ break; } @@ -1309,7 +1311,7 @@ get_mapping_info(vm_offset_t va, pd_entr } static void -log_reserved_instruction(struct trapframe *frame) +log_illegal_instruction(const char *msg, struct trapframe *frame) { pt_entry_t *ptep; pd_entry_t *pdep; @@ -1321,8 +1323,8 @@ log_reserved_instruction(struct trapfram printf("cpuid = %d\n", PCPU_GET(cpuid)); #endif pc = frame->pc + (DELAYBRANCH(frame->cause) ? 4 : 0); - log(LOG_ERR, "RES_INST: pid %d (%s), uid %d: pc %p ra %p\n", - p->p_pid, p->p_comm, + log(LOG_ERR, "%s: pid %d (%s), uid %d: pc %p ra %p\n", + msg, p->p_pid, p->p_comm, p->p_ucred ? p->p_ucred->cr_uid : -1, (void *)(intptr_t)pc, (void *)(intptr_t)frame->ra); From owner-svn-src-user@FreeBSD.ORG Mon Mar 22 23:31:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622CC106566B; Mon, 22 Mar 2010 23:31:48 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4FD808FC0A; Mon, 22 Mar 2010 23:31:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2MNVmbA073267; Mon, 22 Mar 2010 23:31:48 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MNVmQS073258; Mon, 22 Mar 2010 23:31:48 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003222331.o2MNVmQS073258@svn.freebsd.org> From: Juli Mallett Date: Mon, 22 Mar 2010 23:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205492 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2010 23:31:48 -0000 Author: jmallett Date: Mon Mar 22 23:31:48 2010 New Revision: 205492 URL: http://svn.freebsd.org/changeset/base/205492 Log: An unfortunate mix of functional and stylistic changes. o) Use REG_{S,L} and PTR_{S,L,LA} in support.S and use width-specific instructions only where reasonable. o) Consistently use CALLFRAME_SIZ for callframe size, rather than using the mysterious STAND_ frame. o) Remove a stray ".set mips2" which would screw up instructions used by setjmp and longjmp quite astonishingly. o) Get rid of some home-grown STORE/LOAD and replace with REG_S/REG_L in a few files. o) Make pcb_onfault a pointer, the address of the function to be called, rather than using the onfault_table -- the latter being especially wrongly-used by casuptr at minimum. XXX This did require one gross hack of a slightly-less-gross nature than the one used prior to it wrt [sf].*intr functions. o) Fix compilation of TRAP_DEBUG and make a point of using intmax_t rather than trying to decide between truncating and extending addresses on a case-by-case basis when printing stuff in trap.c o) Don't NULL out pcb_onfault in the actual onfault handlers, the trap handler makes a point of doing that. Sponsored by: Packet Forensics Modified: user/jmallett/octeon/sys/mips/include/pcb.h user/jmallett/octeon/sys/mips/include/regnum.h user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/fp.S user/jmallett/octeon/sys/mips/mips/support.S user/jmallett/octeon/sys/mips/mips/swtch.S user/jmallett/octeon/sys/mips/mips/trap.c user/jmallett/octeon/sys/mips/mips/vm_machdep.c Modified: user/jmallett/octeon/sys/mips/include/pcb.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/pcb.h Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/include/pcb.h Mon Mar 22 23:31:48 2010 (r205492) @@ -51,7 +51,7 @@ struct pcb { struct trapframe pcb_regs; /* saved CPU and registers */ __register_t pcb_context[14]; /* kernel context for resume */ - int pcb_onfault; /* for copyin/copyout faults */ + void *pcb_onfault; /* for copyin/copyout faults */ register_t pcb_tpc; }; Modified: user/jmallett/octeon/sys/mips/include/regnum.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/regnum.h Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/include/regnum.h Mon Mar 22 23:31:48 2010 (r205492) @@ -42,10 +42,6 @@ #ifndef _MACHINE_REGNUM_H_ #define _MACHINE_REGNUM_H_ -#define STAND_ARG_SIZE 16 -#define STAND_FRAME_SIZE 24 -#define STAND_RA_OFFSET 20 - /* This must match the numbers * in pcb.h and is used by * swtch.S Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/mips/exception.S Mon Mar 22 23:31:48 2010 (r205492) @@ -244,20 +244,9 @@ SlowFault: * *---------------------------------------------------------------------------- */ -#if defined(ISA_MIPS32) -#define STORE sw /* 32 bit mode regsave instruction */ -#define LOAD lw /* 32 bit mode regload instruction */ -#define RSIZE 4 /* 32 bit mode register size */ -#elif defined(ISA_MIPS64) -#define STORE sd /* 64 bit mode regsave instruction */ -#define LOAD ld /* 64 bit mode regload instruction */ -#define RSIZE 8 /* 64 bit mode register size */ -#else -#error "Please write code for this isa." -#endif #define SAVE_REG(reg, offs, base) \ - STORE reg, STAND_ARG_SIZE + (RSIZE * offs) (base) + REG_S reg, CALLFRAME_SIZ + (SZREG * offs) (base) #ifdef TARGET_OCTEON #define CLEAR_STATUS \ @@ -332,11 +321,11 @@ SlowFault: PTR_ADDU v0, sp, KERN_EXC_FRAME_SIZE ;\ SAVE_REG(v0, SP, sp) ;\ CLEAR_STATUS ;\ - PTR_ADDU a0, sp, STAND_ARG_SIZE ;\ + PTR_ADDU a0, sp, CALLFRAME_SIZ ;\ ITLBNOPFIX #define RESTORE_REG(reg, offs, base) \ - LOAD reg, STAND_ARG_SIZE + (RSIZE * offs) (base) + REG_L reg, CALLFRAME_SIZ + (SZREG * offs) (base) #define RESTORE_CPU \ mtc0 zero,COP_0_STATUS_REG ;\ @@ -384,13 +373,13 @@ SlowFault: * the status register and the multiply lo and high registers. * In addition, we set this up for linkage conventions. */ -#define KERN_REG_SIZE (NUMSAVEREGS * RSIZE) -#define KERN_EXC_FRAME_SIZE (STAND_FRAME_SIZE + KERN_REG_SIZE + 16) +#define KERN_REG_SIZE (NUMSAVEREGS * SZREG) +#define KERN_EXC_FRAME_SIZE (CALLFRAME_SIZ + KERN_REG_SIZE + 16) NNON_LEAF(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra) .set noat subu sp, sp, KERN_EXC_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - KERN_EXC_FRAME_SIZE) + .mask 0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE) /* * Save CPU state, building 'frame'. */ @@ -401,7 +390,7 @@ NNON_LEAF(MipsKernGenException, KERN_EXC PTR_LA gp, _C_LABEL(_gp) PTR_LA k0, _C_LABEL(trap) jalr k0 - sw a3, STAND_RA_OFFSET + KERN_REG_SIZE(sp) # for debugging + sw a3, CALLFRAME_RA + KERN_REG_SIZE(sp) # for debugging /* * Update interrupt mask in saved status register @@ -424,10 +413,10 @@ END(MipsKernGenException) #define SAVE_U_PCB_REG(reg, offs, base) \ - STORE reg, U_PCB_REGS + (RSIZE * offs) (base) + REG_S reg, U_PCB_REGS + (SZREG * offs) (base) #define RESTORE_U_PCB_REG(reg, offs, base) \ - LOAD reg, U_PCB_REGS + (RSIZE * offs) (base) + REG_L reg, U_PCB_REGS + (SZREG * offs) (base) /*---------------------------------------------------------------------------- * @@ -443,9 +432,9 @@ END(MipsKernGenException) * *---------------------------------------------------------------------------- */ -NNON_LEAF(MipsUserGenException, STAND_FRAME_SIZE, ra) +NNON_LEAF(MipsUserGenException, CALLFRAME_SIZ, ra) .set noat - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) /* * Save all of the registers except for the kernel temporaries in u.u_pcb. */ @@ -486,7 +475,7 @@ NNON_LEAF(MipsUserGenException, STAND_FR SAVE_U_PCB_REG(gp, GP, k1) SAVE_U_PCB_REG(sp, SP, k1) SAVE_U_PCB_REG(s8, S8, k1) - subu sp, k1, STAND_FRAME_SIZE # switch to kernel SP + subu sp, k1, CALLFRAME_SIZ # switch to kernel SP SAVE_U_PCB_REG(ra, RA, k1) SAVE_U_PCB_REG(v0, MULLO, k1) SAVE_U_PCB_REG(v1, MULHI, k1) @@ -494,7 +483,7 @@ NNON_LEAF(MipsUserGenException, STAND_FR SAVE_U_PCB_REG(a1, CAUSE, k1) SAVE_U_PCB_REG(a2, BADVADDR, k1) SAVE_U_PCB_REG(a3, PC, k1) - sw a3, STAND_RA_OFFSET(sp) # for debugging + sw a3, CALLFRAME_RA(sp) # for debugging PTR_LA gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu and enter kernel mode and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_KSU_MASK | SR_INT_ENAB) @@ -611,7 +600,7 @@ END(MipsUserGenException) NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra) .set noat subu sp, sp, KERN_EXC_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - KERN_EXC_FRAME_SIZE) + .mask 0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE) /* * Save the relevant kernel registers onto the stack. */ @@ -621,10 +610,10 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S * Call the interrupt handler. */ PTR_LA gp, _C_LABEL(_gp) - PTR_ADDU a0, sp, STAND_ARG_SIZE + PTR_ADDU a0, sp, CALLFRAME_SIZ PTR_LA k0, _C_LABEL(cpu_intr) jalr k0 - sw a3, STAND_RA_OFFSET + KERN_REG_SIZE(sp) + sw a3, CALLFRAME_RA + KERN_REG_SIZE(sp) /* Why no AST processing here? */ /* @@ -642,7 +631,7 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S /* * Restore registers and return from the interrupt. */ - lw v0, STAND_RA_OFFSET + KERN_REG_SIZE(sp) + lw v0, CALLFRAME_RA + KERN_REG_SIZE(sp) RESTORE_CPU sync eret @@ -668,9 +657,9 @@ END(MipsKernIntr) * *---------------------------------------------------------------------------- */ -NNON_LEAF(MipsUserIntr, STAND_FRAME_SIZE, ra) +NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, ra) .set noat - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) /* * Save the relevant user registers into the u.u_pcb struct. * We don't need to save s0 - s8 because the compiler does it for us. @@ -721,7 +710,7 @@ NNON_LEAF(MipsUserIntr, STAND_FRAME_SIZE SAVE_U_PCB_REG(a0, SR, k1) SAVE_U_PCB_REG(a1, CAUSE, k1) SAVE_U_PCB_REG(a3, PC, k1) # PC in a3, note used later! - subu sp, k1, STAND_FRAME_SIZE # switch to kernel SP + subu sp, k1, CALLFRAME_SIZ # switch to kernel SP PTR_LA gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu, disable interrupts, set kernel mode kernel mode, clear exception level. @@ -737,7 +726,7 @@ NNON_LEAF(MipsUserIntr, STAND_FRAME_SIZE */ PTR_LA k0, _C_LABEL(cpu_intr) jalr k0 - sw a3, STAND_RA_OFFSET(sp) # for debugging + sw a3, CALLFRAME_RA(sp) # for debugging /* * Enable interrupts before doing ast(). @@ -1132,11 +1121,11 @@ END(MipsTLBMissException) * *---------------------------------------------------------------------------- */ -NON_LEAF(MipsFPTrap, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE +NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) + subu sp, sp, CALLFRAME_SIZ mfc0 t0, COP_0_STATUS_REG - sw ra, STAND_RA_OFFSET(sp) - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) + sw ra, CALLFRAME_RA(sp) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) or t1, t0, SR_COP_1_BIT mtc0 t1, COP_0_STATUS_REG @@ -1157,7 +1146,7 @@ NON_LEAF(MipsFPTrap, STAND_FRAME_SIZE, r * The instruction is in the branch delay slot so the branch will have to * be emulated to get the resulting PC. */ - sw a2, STAND_FRAME_SIZE + 8(sp) + sw a2, CALLFRAME_SIZ + 8(sp) GET_CPU_PCPU(a0) #mips64 unsafe? lw a0, PC_CURPCB(a0) @@ -1171,7 +1160,7 @@ NON_LEAF(MipsFPTrap, STAND_FRAME_SIZE, r * Now load the floating-point instruction in the branch delay slot * to be emulated. */ - lw a2, STAND_FRAME_SIZE + 8(sp) # restore EXC pc + lw a2, CALLFRAME_SIZ + 8(sp) # restore EXC pc b 2f lw a0, 4(a2) # a0 = coproc instruction /* @@ -1220,12 +1209,12 @@ NON_LEAF(MipsFPTrap, STAND_FRAME_SIZE, r */ FPReturn: mfc0 t0, COP_0_STATUS_REG - lw ra, STAND_RA_OFFSET(sp) + lw ra, CALLFRAME_RA(sp) and t0, t0, ~SR_COP_1_BIT mtc0 t0, COP_0_STATUS_REG ITLBNOPFIX j ra - PTR_ADDU sp, sp, STAND_FRAME_SIZE + PTR_ADDU sp, sp, CALLFRAME_SIZ END(MipsFPTrap) /* Modified: user/jmallett/octeon/sys/mips/mips/fp.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/fp.S Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/mips/fp.S Mon Mar 22 23:31:48 2010 (r205492) @@ -94,9 +94,9 @@ * *---------------------------------------------------------------------------- */ -NON_LEAF(MipsEmulateFP, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE - sw ra, STAND_RA_OFFSET(sp) +NON_LEAF(MipsEmulateFP, CALLFRAME_SIZ, ra) + subu sp, sp, CALLFRAME_SIZ + sw ra, CALLFRAME_RA(sp) /* * Decode the FMT field (bits 24-21) and FUNCTION field (bits 5-0). */ @@ -2247,8 +2247,8 @@ result_fs_d: # result is FS jal set_fd_d # save result (in t0,t1,t2,t3) done: - lw ra, STAND_RA_OFFSET(sp) - addu sp, sp, STAND_FRAME_SIZE + lw ra, CALLFRAME_RA(sp) + addu sp, sp, CALLFRAME_SIZ j ra END(MipsEmulateFP) Modified: user/jmallett/octeon/sys/mips/mips/support.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/support.S Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/mips/support.S Mon Mar 22 23:31:48 2010 (r205492) @@ -70,47 +70,22 @@ * Primitives */ -/* - * This table is indexed by u.u_pcb.pcb_onfault in trap(). - * The reason for using this table rather than storing an address in - * u.u_pcb.pcb_onfault is simply to make the code faster. - */ - .globl onfault_table - .data - .align 3 -onfault_table: - .word 0 # invalid index number -#define BADERR 1 - .word baderr -#define COPYERR 2 - .word copyerr -#define FSWBERR 3 - .word fswberr -#define FSWINTRBERR 4 - .word fswintrberr -#if defined(DDB) || defined(DEBUG) -#define DDBERR 5 - .word ddberr -#else - .word 0 -#endif - .text /* * See if access to addr with a len type instruction causes a machine check. - * len is length of access (1=byte, 2=short, 4=long) + * len is length of access (1=byte, 2=short, 4=int) * * badaddr(addr, len) * char *addr; * int len; */ LEAF(badaddr) - li v0, BADERR + PTR_LA v0, baderr GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) + PTR_L v1, PC_CURPCB(v1) bne a1, 1, 2f - sw v0, U_PCB_ONFAULT(v1) + PTR_S v0, U_PCB_ONFAULT(v1) b 5f lbu v0, (a0) 2: @@ -121,7 +96,7 @@ LEAF(badaddr) 4: lw v0, (a0) 5: - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero # made it w/o errors baderr: @@ -310,22 +285,22 @@ END(outsl) * u_int maxlength; * u_int *lencopied; */ -NON_LEAF(copyinstr, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) - sw ra, STAND_RA_OFFSET(sp) +NON_LEAF(copyinstr, CALLFRAME_SIZ, ra) + PTR_SUBU sp, sp, CALLFRAME_SIZ + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + PTR_LA v0, copyerr blt a0, zero, _C_LABEL(copyerr) # make sure address is in user space - li v0, COPYERR + REG_S ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) + PTR_L v1, PC_CURPCB(v1) jal _C_LABEL(copystr) - sw v0, U_PCB_ONFAULT(v1) - lw ra, STAND_RA_OFFSET(sp) + PTR_S v0, U_PCB_ONFAULT(v1) + REG_L ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw zero, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra - addu sp, sp, STAND_FRAME_SIZE + PTR_ADDU sp, sp, CALLFRAME_SIZ END(copyinstr) /* @@ -338,22 +313,22 @@ END(copyinstr) * u_int maxlength; * u_int *lencopied; */ -NON_LEAF(copyoutstr, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) - sw ra, STAND_RA_OFFSET(sp) +NON_LEAF(copyoutstr, CALLFRAME_SIZ, ra) + PTR_SUBU sp, sp, CALLFRAME_SIZ + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + PTR_LA v0, copyerr blt a1, zero, _C_LABEL(copyerr) # make sure address is in user space - li v0, COPYERR + REG_S ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) + PTR_L v1, PC_CURPCB(v1) jal _C_LABEL(copystr) - sw v0, U_PCB_ONFAULT(v1) - lw ra, STAND_RA_OFFSET(sp) + PTR_S v0, U_PCB_ONFAULT(v1) + REG_L ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw zero, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra - addu sp, sp, STAND_FRAME_SIZE + PTR_ADDU sp, sp, CALLFRAME_SIZ END(copyoutstr) /* @@ -363,21 +338,21 @@ END(copyoutstr) * caddr_t *to; (kernel destination address) * unsigned len; */ -NON_LEAF(copyin, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) - sw ra, STAND_RA_OFFSET(sp) +NON_LEAF(copyin, CALLFRAME_SIZ, ra) + PTR_SUBU sp, sp, CALLFRAME_SIZ + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + PTR_LA v0, copyerr blt a0, zero, _C_LABEL(copyerr) # make sure address is in user space - li v0, COPYERR + REG_S ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) + PTR_L v1, PC_CURPCB(v1) jal _C_LABEL(bcopy) - sw v0, U_PCB_ONFAULT(v1) - lw ra, STAND_RA_OFFSET(sp) + PTR_S v0, U_PCB_ONFAULT(v1) + REG_L ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) # bcopy modified v1, so reload - sw zero, U_PCB_ONFAULT(v1) - addu sp, sp, STAND_FRAME_SIZE + PTR_L v1, PC_CURPCB(v1) # bcopy modified v1, so reload + PTR_S zero, U_PCB_ONFAULT(v1) + PTR_ADDU sp, sp, CALLFRAME_SIZ j ra move v0, zero END(copyin) @@ -389,31 +364,28 @@ END(copyin) * caddr_t *to; (user destination address) * unsigned len; */ -NON_LEAF(copyout, STAND_FRAME_SIZE, ra) - subu sp, sp, STAND_FRAME_SIZE - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) - sw ra, STAND_RA_OFFSET(sp) +NON_LEAF(copyout, CALLFRAME_SIZ, ra) + PTR_SUBU sp, sp, CALLFRAME_SIZ + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + PTR_LA v0, copyerr blt a1, zero, _C_LABEL(copyerr) # make sure address is in user space - li v0, COPYERR + REG_S ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) + PTR_L v1, PC_CURPCB(v1) jal _C_LABEL(bcopy) - sw v0, U_PCB_ONFAULT(v1) - lw ra, STAND_RA_OFFSET(sp) + PTR_S v0, U_PCB_ONFAULT(v1) + REG_L ra, CALLFRAME_RA(sp) GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) # bcopy modified v1, so reload - sw zero, U_PCB_ONFAULT(v1) - addu sp, sp, STAND_FRAME_SIZE + PTR_L v1, PC_CURPCB(v1) # bcopy modified v1, so reload + PTR_S zero, U_PCB_ONFAULT(v1) + PTR_ADDU sp, sp, CALLFRAME_SIZ j ra move v0, zero END(copyout) LEAF(copyerr) - lw ra, STAND_RA_OFFSET(sp) - GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw zero, U_PCB_ONFAULT(v1) - addu sp, sp, STAND_FRAME_SIZE + REG_L ra, CALLFRAME_RA(sp) + PTR_ADDU sp, sp, CALLFRAME_SIZ j ra li v0, EFAULT # return error END(copyerr) @@ -427,51 +399,55 @@ END(copyerr) LEAF(fuword) ALEAF(fuword32) ALEAF(fuiword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) lw v0, 0(a0) # fetch word j ra - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) END(fuword) LEAF(fusword) ALEAF(fuisword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) lhu v0, 0(a0) # fetch short j ra - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) END(fusword) LEAF(fubyte) ALEAF(fuibyte) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) lbu v0, 0(a0) # fetch byte j ra - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) END(fubyte) LEAF(suword32) #ifndef __mips_n64 XLEAF(suword) #endif + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sw a1, 0(a0) # store word - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero END(suword32) @@ -479,13 +455,14 @@ END(suword32) #ifdef __mips_n64 LEAF(suword64) XLEAF(suword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sd a1, 0(a0) # store word - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero END(suword64) @@ -504,11 +481,12 @@ LEAF(casuword32) #ifndef __mips_n64 XLEAF(casuword) #endif + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) 1: move t0, a2 ll v0, 0(a0) @@ -522,7 +500,7 @@ XLEAF(casuword) 2: li v0, -1 3: - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) jr ra nop END(casuword32) @@ -530,11 +508,12 @@ END(casuword32) #ifdef __mips_n64 LEAF(casuword64) XLEAF(casuword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) 1: move t0, a2 lld v0, 0(a0) @@ -548,7 +527,7 @@ XLEAF(casuword) 2: li v0, -1 3: - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) jr ra nop END(casuword64) @@ -560,13 +539,14 @@ END(casuword64) * Have to flush instruction cache afterwards. */ LEAF(suiword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sw a1, 0(a0) # store word - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j _C_LABEL(Mips_SyncICache) # FlushICache sets v0 = 0. (Ugly) li a1, 4 # size of word END(suiword) @@ -577,26 +557,28 @@ END(suiword) */ LEAF(susword) ALEAF(suisword) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sh a1, 0(a0) # store short - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero END(susword) LEAF(subyte) ALEAF(suibyte) + PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space - li v0, FSWBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sb a1, 0(a0) # store byte - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero END(subyte) @@ -612,24 +594,26 @@ END(fswberr) * The important thing is to prevent sleep() and switch(). */ LEAF(fuswintr) + PTR_LA v0, fswintrberr blt a0, zero, fswintrberr # make sure address is in user space - li v0, FSWINTRBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) lhu v0, 0(a0) # fetch short j ra - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) END(fuswintr) LEAF(suswintr) + PTR_LA v0, fswintrberr blt a0, zero, fswintrberr # make sure address is in user space - li v0, FSWINTRBERR + nop GET_CPU_PCPU(v1) - lw v1, PC_CURPCB(v1) - sw v0, U_PCB_ONFAULT(v1) + PTR_L v1, PC_CURPCB(v1) + PTR_S v0, U_PCB_ONFAULT(v1) sh a1, 0(a0) # store short - sw zero, U_PCB_ONFAULT(v1) + PTR_S zero, U_PCB_ONFAULT(v1) j ra move v0, zero END(suswintr) @@ -1393,22 +1377,22 @@ END(atomic_load_64) #if defined(DDB) || defined(DEBUG) LEAF(kdbpeek) - li v1, DDBERR + PTR_LA v1, ddberr and v0, a0, 3 # unaligned ? GET_CPU_PCPU(t1) - lw t1, PC_CURPCB(t1) + PTR_L t1, PC_CURPCB(t1) bne v0, zero, 1f - sw v1, U_PCB_ONFAULT(t1) + PTR_S v1, U_PCB_ONFAULT(t1) lw v0, (a0) jr ra - sw zero, U_PCB_ONFAULT(t1) + PTR_S zero, U_PCB_ONFAULT(t1) 1: LWHI v0, 0(a0) LWLO v0, 3(a0) jr ra - sw zero, U_PCB_ONFAULT(t1) + PTR_S zero, U_PCB_ONFAULT(t1) END(kdbpeek) ddberr: @@ -1417,44 +1401,31 @@ ddberr: #if defined(DDB) LEAF(kdbpoke) - li v1, DDBERR + PTR_LA v1, ddberr and v0, a0, 3 # unaligned ? GET_CPU_PCPU(t1) - lw t1, PC_CURPCB(t1) + PTR_L t1, PC_CURPCB(t1) bne v0, zero, 1f - sw v1, U_PCB_ONFAULT(t1) + PTR_S v1, U_PCB_ONFAULT(t1) sw a1, (a0) jr ra - sw zero, U_PCB_ONFAULT(t1) + PTR_S zero, U_PCB_ONFAULT(t1) 1: SWHI a1, 0(a0) SWLO a1, 3(a0) jr ra - sw zero, U_PCB_ONFAULT(t1) + PTR_S zero, U_PCB_ONFAULT(t1) END(kdbpoke) .data .globl esym esym: .word 0 -#ifndef _MIPS_ARCH_XLR - .set mips2 -#endif #endif /* DDB */ #endif /* DDB || DEBUG */ -#ifndef MIPS_ISAIII -#define STORE sw /* 32 bit mode regsave instruction */ -#define LOAD lw /* 32 bit mode regload instruction */ -#define RSIZE 4 /* 32 bit mode register size */ -#else -#define STORE sd /* 64 bit mode regsave instruction */ -#define LOAD ld /* 64 bit mode regload instruction */ -#define RSIZE 8 /* 64 bit mode register size */ -#endif - #define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; .text @@ -1466,35 +1437,35 @@ LEAF(breakpoint) LEAF(setjmp) mfc0 v0, COP_0_STATUS_REG # Later the "real" spl value! - STORE s0, (RSIZE * PREG_S0)(a0) - STORE s1, (RSIZE * PREG_S1)(a0) - STORE s2, (RSIZE * PREG_S2)(a0) - STORE s3, (RSIZE * PREG_S3)(a0) - STORE s4, (RSIZE * PREG_S4)(a0) - STORE s5, (RSIZE * PREG_S5)(a0) - STORE s6, (RSIZE * PREG_S6)(a0) - STORE s7, (RSIZE * PREG_S7)(a0) - STORE s8, (RSIZE * PREG_S8)(a0) - STORE sp, (RSIZE * PREG_SP)(a0) - STORE ra, (RSIZE * PREG_RA)(a0) - STORE v0, (RSIZE * PREG_SR)(a0) + REG_S s0, (SZREG * PREG_S0)(a0) + REG_S s1, (SZREG * PREG_S1)(a0) + REG_S s2, (SZREG * PREG_S2)(a0) + REG_S s3, (SZREG * PREG_S3)(a0) + REG_S s4, (SZREG * PREG_S4)(a0) + REG_S s5, (SZREG * PREG_S5)(a0) + REG_S s6, (SZREG * PREG_S6)(a0) + REG_S s7, (SZREG * PREG_S7)(a0) + REG_S s8, (SZREG * PREG_S8)(a0) + REG_S sp, (SZREG * PREG_SP)(a0) + REG_S ra, (SZREG * PREG_RA)(a0) + REG_S v0, (SZREG * PREG_SR)(a0) jr ra li v0, 0 # setjmp return END(setjmp) LEAF(longjmp) - LOAD v0, (RSIZE * PREG_SR)(a0) - LOAD ra, (RSIZE * PREG_RA)(a0) - LOAD s0, (RSIZE * PREG_S0)(a0) - LOAD s1, (RSIZE * PREG_S1)(a0) - LOAD s2, (RSIZE * PREG_S2)(a0) - LOAD s3, (RSIZE * PREG_S3)(a0) - LOAD s4, (RSIZE * PREG_S4)(a0) - LOAD s5, (RSIZE * PREG_S5)(a0) - LOAD s6, (RSIZE * PREG_S6)(a0) - LOAD s7, (RSIZE * PREG_S7)(a0) - LOAD s8, (RSIZE * PREG_S8)(a0) - LOAD sp, (RSIZE * PREG_SP)(a0) + REG_L v0, (SZREG * PREG_SR)(a0) + REG_L ra, (SZREG * PREG_RA)(a0) + REG_L s0, (SZREG * PREG_S0)(a0) + REG_L s1, (SZREG * PREG_S1)(a0) + REG_L s2, (SZREG * PREG_S2)(a0) + REG_L s3, (SZREG * PREG_S3)(a0) + REG_L s4, (SZREG * PREG_S4)(a0) + REG_L s5, (SZREG * PREG_S5)(a0) + REG_L s6, (SZREG * PREG_S6)(a0) + REG_L s7, (SZREG * PREG_S7)(a0) + REG_L s8, (SZREG * PREG_S8)(a0) + REG_L sp, (SZREG * PREG_SP)(a0) mtc0 v0, COP_0_STATUS_REG # Later the "real" spl value! ITLBNOPFIX jr ra @@ -1505,7 +1476,6 @@ LEAF(fusufault) GET_CPU_PCPU(t0) lw t0, PC_CURTHREAD(t0) lw t0, TD_PCB(t0) - sw zero, U_PCB_ONFAULT(t0) li v0, -1 j ra END(fusufault) @@ -1523,8 +1493,8 @@ LEAF(casuptr) lw t1, PC_CURTHREAD(t1) lw t1, TD_PCB(t1) - lw t2, fusufault - sw t2, U_PCB_ONFAULT(t1) + PTR_LA t2, fusufault + PTR_S t2, U_PCB_ONFAULT(t1) 1: ll v0, 0(a0) /* try to load the old value */ beq v0, a1, 2f /* compare */ @@ -1532,7 +1502,7 @@ LEAF(casuptr) sc t0, 0(a0) /* write if address still locked */ beq t0, zero, 1b /* if it failed, spin */ 2: - sw zero, U_PCB_ONFAULT(t1) /* clean up */ + PTR_S zero, U_PCB_ONFAULT(t1) /* clean up */ j ra END(casuptr) @@ -1560,7 +1530,7 @@ END(octeon_get_shadow) * octeon_set_control(addr, uint32_t val) */ LEAF(octeon_set_control) - .set mips64r2 + .set push or t1, a1, zero /* dmfc0 a1, 9, 7*/ .word 0x40254807 @@ -1570,19 +1540,20 @@ LEAF(octeon_set_control) .word 0x40a54807 jr ra nop - .set mips0 + .set pop END(octeon_set_control) /* * octeon_get_control(addr) */ LEAF(octeon_get_control) + .set push .set mips64r2 /* dmfc0 a1, 9, 7 */ .word 0x40254807 sd a1, 0(a0) jr ra nop - .set mips0 + .set pop END(octeon_get_control) #endif Modified: user/jmallett/octeon/sys/mips/mips/swtch.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/swtch.S Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/mips/swtch.S Mon Mar 22 23:31:48 2010 (r205492) @@ -265,7 +265,7 @@ END(savectx) KSEG0TEXT_START; -NON_LEAF(mips_cpu_throw, STAND_FRAME_SIZE, ra) +NON_LEAF(mips_cpu_throw, CALLFRAME_SIZ, ra) mfc0 t0, COP_0_STATUS_REG # t0 = saved status register nop nop @@ -285,7 +285,7 @@ END(mips_cpu_throw) * a2 - mtx * Find the highest priority process and resume it. */ -NON_LEAF(cpu_switch, STAND_FRAME_SIZE, ra) +NON_LEAF(cpu_switch, CALLFRAME_SIZ, ra) mfc0 t0, COP_0_STATUS_REG # t0 = saved status register nop nop @@ -296,9 +296,9 @@ NON_LEAF(cpu_switch, STAND_FRAME_SIZE, r move a3, a0 lw a0, TD_PCB(a0) # load PCB addr of curproc SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0) # save old sp - subu sp, sp, STAND_FRAME_SIZE - sw ra, STAND_RA_OFFSET(sp) - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) + subu sp, sp, CALLFRAME_SIZ + sw ra, CALLFRAME_RA(sp) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0) # do a 'savectx()' SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0) SAVE_U_PCB_CONTEXT(s2, PREG_S2, a0) Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 22 23:27:08 2010 (r205491) +++ user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 22 23:31:48 2010 (r205492) @@ -102,8 +102,6 @@ __FBSDID("$FreeBSD$"); int trap_debug = 1; #endif -extern unsigned onfault_table[]; - static void log_illegal_instruction(const char *, struct trapframe *); static void log_bad_page_fault(char *, struct trapframe *, int); static void log_frame_dump(struct trapframe *frame); @@ -267,6 +265,7 @@ SYSCTL_INT(_vm, OID_AUTO, allow_unaligne static int emulate_unaligned_access(struct trapframe *frame); extern char *syscallnames[]; +extern void fswintrberr(void); /* XXX */ /* * Handle an exception. @@ -291,6 +290,7 @@ trap(struct trapframe *trapframe) ksiginfo_t ksi; char *msg = NULL; intptr_t addr = 0; + register_t pc; trapdebug_enter(trapframe, 0); @@ -333,9 +333,9 @@ trap(struct trapframe *trapframe) printf("cpuid = %d\n", PCPU_GET(cpuid)); #endif MachTLBGetPID(pid); - printf("badaddr = 0x%0x, pc = 0x%0x, ra = 0x%0x, sp = 0x%0x, sr = 0x%x, pid = %d, ASID = 0x%x\n", - trapframe->badvaddr, trapframe->pc, trapframe->ra, - trapframe->sp, trapframe->sr, + printf("badaddr = %#jx, pc = %#jx, ra = %#jx, sp = %#jx, sr = %jx, pid = %d, ASID = %u\n", + (intmax_t)trapframe->badvaddr, (intmax_t)trapframe->pc, (intmax_t)trapframe->ra, + (intmax_t)trapframe->sp, (intmax_t)trapframe->sr, (curproc ? curproc->p_pid : -1), pid); switch (type & ~T_USER) { @@ -476,22 +476,29 @@ trap(struct trapframe *trapframe) rv = vm_fault(kernel_map, va, ftype, VM_FAULT_NORMAL); if (rv == KERN_SUCCESS) return (trapframe->pc); - if ((i = td->td_pcb->pcb_onfault) != 0) { - td->td_pcb->pcb_onfault = 0; - return (onfault_table[i]); + if (td->td_pcb->pcb_onfault != NULL) { + pc = (register_t)(intptr_t)td->td_pcb->pcb_onfault; + td->td_pcb->pcb_onfault = NULL; + return (pc); } goto err; } - /* + + /* * It is an error for the kernel to access user space except * through the copyin/copyout routines. */ - if ((i = td->td_pcb->pcb_onfault) == 0) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 00:31:56 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDA56106566C; Tue, 23 Mar 2010 00:31:56 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7755C8FC22; Tue, 23 Mar 2010 00:31:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N0VuYg086662; Tue, 23 Mar 2010 00:31:56 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N0VuJa086660; Tue, 23 Mar 2010 00:31:56 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230031.o2N0VuJa086660@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 00:31:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205494 - user/jmallett/octeon/lib/libc/mips/sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 00:31:56 -0000 Author: jmallett Date: Tue Mar 23 00:31:56 2010 New Revision: 205494 URL: http://svn.freebsd.org/changeset/base/205494 Log: o) Load the address of cerror into t9 before restoring the gp and sp. We waste the load in the case of no error in exchange for not duplicating the gp and sp restore code. o) Don't overwrite ra when calling cerror -- jr not jalr. This makes truss work. Sponsored by: Packet Forensics. Modified: user/jmallett/octeon/lib/libc/mips/sys/ptrace.S Modified: user/jmallett/octeon/lib/libc/mips/sys/ptrace.S ============================================================================== --- user/jmallett/octeon/lib/libc/mips/sys/ptrace.S Mon Mar 22 23:33:40 2010 (r205493) +++ user/jmallett/octeon/lib/libc/mips/sys/ptrace.S Tue Mar 23 00:31:56 2010 (r205494) @@ -59,13 +59,13 @@ NESTED_NOPROFILE(ptrace, CALLFRAME_SIZ, li v0, SYS_ptrace syscall + # Load __cerror's address using our gp, then restore it. + PTR_LA t9, __cerror RESTORE_GP64 PTR_ADDU sp, sp, CALLFRAME_SIZ bne a3, zero, 1f j ra -1: - PTR_LA t9, __cerror - jalr t9 +1: j t9 END(ptrace) From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 01:24:24 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64AFE1065670; Tue, 23 Mar 2010 01:24:24 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 38EAB8FC12; Tue, 23 Mar 2010 01:24:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N1OO4F000785; Tue, 23 Mar 2010 01:24:24 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N1OO4H000783; Tue, 23 Mar 2010 01:24:24 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230124.o2N1OO4H000783@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 01:24:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205498 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 01:24:24 -0000 Author: jmallett Date: Tue Mar 23 01:24:23 2010 New Revision: 205498 URL: http://svn.freebsd.org/changeset/base/205498 Log: Move to properly using REG_L/REG_S/etc. Sponsored by: Packet Forensics Modified: user/jmallett/octeon/sys/mips/mips/swtch.S Modified: user/jmallett/octeon/sys/mips/mips/swtch.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 01:11:10 2010 (r205497) +++ user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 01:24:23 2010 (r205498) @@ -97,22 +97,6 @@ .set mips3 #endif -#if defined(ISA_MIPS32) -#define STORE sw /* 32 bit mode regsave instruction */ -#define LOAD lw /* 32 bit mode regload instruction */ -#define RSIZE 4 /* 32 bit mode register size */ -#define STORE_FP swc1 /* 32 bit mode fp regsave instruction */ -#define LOAD_FP lwc1 /* 32 bit mode fp regload instruction */ -#define FP_RSIZE 4 /* 32 bit mode fp register size */ -#else -#define STORE sd /* 64 bit mode regsave instruction */ -#define LOAD ld /* 64 bit mode regload instruction */ -#define RSIZE 8 /* 64 bit mode register size */ -#define STORE_FP sdc1 /* 64 bit mode fp regsave instruction */ -#define LOAD_FP ldc1 /* 64 bit mode fp regload instruction */ -#define FP_RSIZE 8 /* 64 bit mode fp register size */ -#endif - /* * FREEBSD_DEVELOPERS_FIXME * Some MIPS CPU may need delays using nops between executing CP0 Instructions @@ -125,28 +109,28 @@ #endif #define SAVE_U_PCB_REG(reg, offs, base) \ - STORE reg, U_PCB_REGS + (RSIZE * offs) (base) + REG_S reg, U_PCB_REGS + (SZREG * offs) (base) #define RESTORE_U_PCB_REG(reg, offs, base) \ - LOAD reg, U_PCB_REGS + (RSIZE * offs) (base) + REG_L reg, U_PCB_REGS + (SZREG * offs) (base) #define SAVE_U_PCB_FPREG(reg, offs, base) \ - STORE_FP reg, U_PCB_FPREGS + (FP_RSIZE * offs) (base) + FP_S reg, U_PCB_FPREGS + (SZFPREG * offs) (base) #define RESTORE_U_PCB_FPREG(reg, offs, base) \ - LOAD_FP reg, U_PCB_FPREGS + (FP_RSIZE * offs) (base) + FP_L reg, U_PCB_FPREGS + (SZFPREG * offs) (base) #define SAVE_U_PCB_FPSR(reg, offs, base) \ - STORE reg, U_PCB_FPREGS + (FP_RSIZE * offs) (base) + REG_S reg, U_PCB_FPREGS + (SZFPREG * offs) (base) #define RESTORE_U_PCB_FPSR(reg, offs, base) \ - LOAD reg, U_PCB_FPREGS + (FP_RSIZE * offs) (base) + REG_L reg, U_PCB_FPREGS + (SZFPREG * offs) (base) #define SAVE_U_PCB_CONTEXT(reg, offs, base) \ - STORE reg, U_PCB_CONTEXT + (RSIZE * offs) (base) + REG_S reg, U_PCB_CONTEXT + (SZREG * offs) (base) #define RESTORE_U_PCB_CONTEXT(reg, offs, base) \ - LOAD reg, U_PCB_CONTEXT + (RSIZE * offs) (base) + REG_L reg, U_PCB_CONTEXT + (SZREG * offs) (base) #define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 01:35:47 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 554481065670; Tue, 23 Mar 2010 01:35:47 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 441A78FC1D; Tue, 23 Mar 2010 01:35:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N1Zl1n004503; Tue, 23 Mar 2010 01:35:47 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N1ZlMI004501; Tue, 23 Mar 2010 01:35:47 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230135.o2N1ZlMI004501@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 01:35:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205501 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 01:35:47 -0000 Author: jmallett Date: Tue Mar 23 01:35:46 2010 New Revision: 205501 URL: http://svn.freebsd.org/changeset/base/205501 Log: Attempt to cast address-checking into some semblance of validity. Modified: user/jmallett/octeon/sys/mips/mips/db_trace.c Modified: user/jmallett/octeon/sys/mips/mips/db_trace.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/db_trace.c Tue Mar 23 01:27:59 2010 (r205500) +++ user/jmallett/octeon/sys/mips/mips/db_trace.c Tue Mar 23 01:35:46 2010 (r205501) @@ -184,7 +184,7 @@ loop: } /* check for bad PC */ /*XXX MIPS64 bad: These hard coded constants are lame */ - if (pc & 3 || pc < (uintptr_t)0x80000000 || pc >= (uintptr_t)edata) { + if (pc & 3 || (uintptr_t)pc < 0x80000000u || (uintptr_t)pc >= (uintptr_t)edata) { (*printfn) ("PC 0x%x: not in kernel\n", pc); ra = 0; goto done; From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 01:47:05 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFF541065672; Tue, 23 Mar 2010 01:47:05 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D39C8FC0A; Tue, 23 Mar 2010 01:47:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N1l5Jd008100; Tue, 23 Mar 2010 01:47:05 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N1l51c008095; Tue, 23 Mar 2010 01:47:05 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230147.o2N1l51c008095@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 01:47:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205503 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 01:47:05 -0000 Author: jmallett Date: Tue Mar 23 01:47:05 2010 New Revision: 205503 URL: http://svn.freebsd.org/changeset/base/205503 Log: o) Use some pointer-width and register-width macros rather than width-specific instructions. o) Eliminate insque and remque which FreeBSD doesn't use. Sponsored by: Packet Forensics Modified: user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/mips/copystr.S user/jmallett/octeon/sys/mips/mips/support.S user/jmallett/octeon/sys/mips/mips/swtch.S Modified: user/jmallett/octeon/sys/mips/include/asm.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/asm.h Tue Mar 23 01:36:50 2010 (r205502) +++ user/jmallett/octeon/sys/mips/include/asm.h Tue Mar 23 01:47:05 2010 (r205503) @@ -314,8 +314,8 @@ _C_LABEL(x): nop ;\ move a0, v0 ;\ GET_CPU_PCPU(s1) ;\ - lw s3, PC_CURPCB(s1) ;\ - lw s1, PC_CURTHREAD(s1) ;\ + PTR_L s3, PC_CURPCB(s1) ;\ + PTR_L s1, PC_CURTHREAD(s1) ;\ lw s2, TD_FLAGS(s1) ;\ li s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\ and s2, s0 ;\ @@ -765,7 +765,7 @@ _C_LABEL(x): #endif #define GET_CPU_PCPU(reg) \ - lw reg, _C_LABEL(pcpup); + PTR_L reg, _C_LABEL(pcpup); /* * Description of the setjmp buffer Modified: user/jmallett/octeon/sys/mips/mips/copystr.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/copystr.S Tue Mar 23 01:36:50 2010 (r205502) +++ user/jmallett/octeon/sys/mips/mips/copystr.S Tue Mar 23 01:47:05 2010 (r205503) @@ -98,11 +98,11 @@ END(copystr) LEAF(copyinstr) .set noreorder .set noat - lw t2, pcpup - lw v1, PC_CURPCB(t2) + GET_CPU_PCPU(t2) + PTR_L v1, PC_CURPCB(t2) PTR_LA v0, _C_LABEL(copystrerr) blt a0, zero, _C_LABEL(copystrerr) - sw v0, PCB_ONFAULT(v1) + PTR_S v0, PCB_ONFAULT(v1) move t0, a2 beq a2, zero, 4f 1: @@ -121,7 +121,7 @@ LEAF(copyinstr) sw a2, 0(a3) /*xxx mips64 unsafe -- long */ 3: j ra # v0 is 0 or ENAMETOOLONG - sw zero, PCB_ONFAULT(v1) + PTR_S zero, PCB_ONFAULT(v1) .set reorder .set at END(copyinstr) @@ -136,11 +136,11 @@ END(copyinstr) LEAF(copyoutstr) .set noreorder .set noat - lw t2, pcpup - lw v1, PC_CURPCB(t2) + GET_CPU_PCPU(t2) + PTR_L v1, PC_CURPCB(t2) PTR_LA v0, _C_LABEL(copystrerr) blt a1, zero, _C_LABEL(copystrerr) - sw v0, PCB_ONFAULT(v1) + PTR_S v0, PCB_ONFAULT(v1) move t0, a2 beq a2, zero, 4f 1: @@ -159,13 +159,12 @@ LEAF(copyoutstr) sw a2, 0(a3) /*xxx mips64 unsafe -- long */ 3: j ra # v0 is 0 or ENAMETOOLONG - sw zero, PCB_ONFAULT(v1) + PTR_S zero, PCB_ONFAULT(v1) .set reorder .set at END(copyoutstr) LEAF(copystrerr) - sw zero, PCB_ONFAULT(v1) j ra li v0, EFAULT # return EFAULT END(copystrerr) Modified: user/jmallett/octeon/sys/mips/mips/support.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/support.S Tue Mar 23 01:36:50 2010 (r205502) +++ user/jmallett/octeon/sys/mips/mips/support.S Tue Mar 23 01:47:05 2010 (r205503) @@ -623,34 +623,6 @@ LEAF(fswintrberr) li v0, -1 END(fswintrberr) -/* - * Insert 'p' after 'q'. - * _insque(p, q) - * caddr_t p, q; - */ -LEAF(_insque) - lw v0, 0(a1) # v0 = q->next - sw a1, 4(a0) # p->prev = q - sw v0, 0(a0) # p->next = q->next - sw a0, 4(v0) # q->next->prev = p - j ra - sw a0, 0(a1) # q->next = p -END(_insque) - -/* - * Remove item 'p' from queue. - * _remque(p) - * caddr_t p; - */ -LEAF(_remque) - lw v0, 0(a0) # v0 = p->next - lw v1, 4(a0) # v1 = p->prev - nop - sw v0, 0(v1) # p->prev->next = p->next - j ra - sw v1, 4(v0) # p->next->prev = p->prev -END(_remque) - /*-------------------------------------------------------------------------- * * Mips_GetCOUNT -- Modified: user/jmallett/octeon/sys/mips/mips/swtch.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 01:36:50 2010 (r205502) +++ user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 01:47:05 2010 (r205503) @@ -156,7 +156,7 @@ LEAF(fork_trampoline) */ .set noat GET_CPU_PCPU(k1) - lw k1, PC_CURPCB(k1) + PTR_L k1, PC_CURPCB(k1) RESTORE_U_PCB_REG(t0, MULLO, k1) RESTORE_U_PCB_REG(t1, MULHI, k1) @@ -278,10 +278,10 @@ NON_LEAF(cpu_switch, CALLFRAME_SIZ, ra) ITLBNOPFIX beqz a0, mips_sw1 move a3, a0 - lw a0, TD_PCB(a0) # load PCB addr of curproc + PTR_L a0, TD_PCB(a0) # load PCB addr of curproc SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0) # save old sp - subu sp, sp, CALLFRAME_SIZ - sw ra, CALLFRAME_RA(sp) + PTR_SUBU sp, sp, CALLFRAME_SIZ + REG_S ra, CALLFRAME_RA(sp) .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0) # do a 'savectx()' SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0) @@ -305,13 +305,13 @@ getpc: * to be saved with the other registers do so here. */ - sw a2, TD_LOCK(a3) # Switchout td_lock + PTR_S a2, TD_LOCK(a3) # Switchout td_lock mips_sw1: #if defined(SMP) && defined(SCHED_ULE) PTR_LA t0, _C_LABEL(blocked_lock) blocked_loop: - lw t1, TD_LOCK(a1) + PTR_L t1, TD_LOCK(a1) beq t0, t1, blocked_loop nop #endif @@ -320,10 +320,10 @@ blocked_loop: * Switch to new context. */ GET_CPU_PCPU(a3) - sw a1, PC_CURTHREAD(a3) - lw a2, TD_PCB(a1) - sw a2, PC_CURPCB(a3) - lw v0, TD_REALKSTACK(a1) + PTR_S a1, PC_CURTHREAD(a3) + PTR_L a2, TD_PCB(a1) + PTR_S a2, PC_CURPCB(a3) + PTR_L v0, TD_REALKSTACK(a1) li s0, (MIPS_KSEG2_START+VM_KERNEL_ALLOC_OFFSET) # If Uarea addr is below kseg2, bltu v0, s0, sw2 # no need to insert in TLB. lw a1, TD_UPTE+0(s7) # t0 = first u. pte @@ -350,7 +350,7 @@ entry0: nop pgm: bltz s0, entry0set - li t1, MIPS_KSEG0_START # invalidate tlb entry + REG_LI t1, MIPS_KSEG0_START # invalidate tlb entry sll s0, PAGE_SHIFT + 1 addu t1, s0 mtc0 t1, COP_0_TLB_HI @@ -380,7 +380,7 @@ sw2: /* * Restore registers and return. */ - lw a0, TD_PCB(s7) + PTR_L a0, TD_PCB(s7) RESTORE_U_PCB_CONTEXT(gp, PREG_GP, a0) RESTORE_U_PCB_CONTEXT(v0, PREG_SR, a0) # restore kernel context RESTORE_U_PCB_CONTEXT(ra, PREG_RA, a0) @@ -441,7 +441,7 @@ LEAF(MipsSwitchFPState) * First read out the status register to make sure that all FP operations * have completed. */ - lw a0, TD_PCB(a0) # get pointer to pcb for proc + PTR_L a0, TD_PCB(a0) # get pointer to pcb for proc cfc1 t0, FPC_CSR # stall til FP done cfc1 t0, FPC_CSR # now get status li t3, ~SR_COP_1_BIT @@ -551,13 +551,13 @@ END(MipsSwitchFPState) *---------------------------------------------------------------------------- */ LEAF(MipsSaveCurFPState) - lw a0, TD_PCB(a0) # get pointer to pcb for thread + PTR_L a0, TD_PCB(a0) # get pointer to pcb for thread mfc0 t1, COP_0_STATUS_REG # Disable interrupts and li t0, SR_COP_1_BIT # enable the coprocessor mtc0 t0, COP_0_STATUS_REG ITLBNOPFIX GET_CPU_PCPU(a1) - sw zero, PC_FPCURTHREAD(a1) # indicate state has been saved + PTR_S zero, PC_FPCURTHREAD(a1) # indicate state has been saved /* * First read out the status register to make sure that all FP operations * have completed. From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 02:14:23 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84A79106566B; Tue, 23 Mar 2010 02:14:23 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 72CFE8FC16; Tue, 23 Mar 2010 02:14:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N2ENSZ016651; Tue, 23 Mar 2010 02:14:23 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N2EN3M016649; Tue, 23 Mar 2010 02:14:23 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230214.o2N2EN3M016649@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 02:14:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205504 - user/jmallett/octeon/sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 02:14:23 -0000 Author: jmallett Date: Tue Mar 23 02:14:23 2010 New Revision: 205504 URL: http://svn.freebsd.org/changeset/base/205504 Log: Borrow some of nwhitehorn's approach to supporting 32-bit and 64-bit systems. Add PRI64 which expands to ll for ABIs where long long is 64-bits, but to l where long is 64-bits. Also always use the "l" prefix for pointer types as pointers and longs are the same length for MIPS ABIs (in the cases we currently do anything like support.) Modified: user/jmallett/octeon/sys/mips/include/_inttypes.h Modified: user/jmallett/octeon/sys/mips/include/_inttypes.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/_inttypes.h Tue Mar 23 01:47:05 2010 (r205503) +++ user/jmallett/octeon/sys/mips/include/_inttypes.h Tue Mar 23 02:14:23 2010 (r205504) @@ -38,177 +38,183 @@ * Macros for format specifiers. */ +#if defined(__mips_n64) +#define PRI64 "ld" +#else +#define PRI64 "lld" +#endif + /* fprintf(3) macros for signed integers. */ #define PRId8 "d" /* int8_t */ #define PRId16 "d" /* int16_t */ #define PRId32 "d" /* int32_t */ -#define PRId64 "lld" /* int64_t */ +#define PRId64 PRI64"d" /* int64_t */ #define PRIdLEAST8 "d" /* int_least8_t */ #define PRIdLEAST16 "d" /* int_least16_t */ #define PRIdLEAST32 "d" /* int_least32_t */ -#define PRIdLEAST64 "lld" /* int_least64_t */ +#define PRIdLEAST64 PRI64"d" /* int_least64_t */ #define PRIdFAST8 "d" /* int_fast8_t */ #define PRIdFAST16 "d" /* int_fast16_t */ #define PRIdFAST32 "d" /* int_fast32_t */ -#define PRIdFAST64 "lld" /* int_fast64_t */ +#define PRIdFAST64 PRI64"d" /* int_fast64_t */ #define PRIdMAX "jd" /* intmax_t */ -#define PRIdPTR "d" /* intptr_t */ +#define PRIdPTR "ld" /* intptr_t */ #define PRIi8 "i" /* int8_t */ #define PRIi16 "i" /* int16_t */ #define PRIi32 "i" /* int32_t */ -#define PRIi64 "lli" /* int64_t */ +#define PRIi64 PRI64"i" /* int64_t */ #define PRIiLEAST8 "i" /* int_least8_t */ #define PRIiLEAST16 "i" /* int_least16_t */ #define PRIiLEAST32 "i" /* int_least32_t */ -#define PRIiLEAST64 "lli" /* int_least64_t */ +#define PRIiLEAST64 PRI64"i" /* int_least64_t */ #define PRIiFAST8 "i" /* int_fast8_t */ #define PRIiFAST16 "i" /* int_fast16_t */ #define PRIiFAST32 "i" /* int_fast32_t */ -#define PRIiFAST64 "lli" /* int_fast64_t */ +#define PRIiFAST64 PRI64"i" /* int_fast64_t */ #define PRIiMAX "ji" /* intmax_t */ -#define PRIiPTR "i" /* intptr_t */ +#define PRIiPTR "li" /* intptr_t */ /* fprintf(3) macros for unsigned integers. */ #define PRIo8 "o" /* uint8_t */ #define PRIo16 "o" /* uint16_t */ #define PRIo32 "o" /* uint32_t */ -#define PRIo64 "llo" /* uint64_t */ +#define PRIo64 PRI64"o" /* uint64_t */ #define PRIoLEAST8 "o" /* uint_least8_t */ #define PRIoLEAST16 "o" /* uint_least16_t */ #define PRIoLEAST32 "o" /* uint_least32_t */ -#define PRIoLEAST64 "llo" /* uint_least64_t */ +#define PRIoLEAST64 PRI64"o" /* uint_least64_t */ #define PRIoFAST8 "o" /* uint_fast8_t */ #define PRIoFAST16 "o" /* uint_fast16_t */ #define PRIoFAST32 "o" /* uint_fast32_t */ -#define PRIoFAST64 "llo" /* uint_fast64_t */ +#define PRIoFAST64 PRI64"o" /* uint_fast64_t */ #define PRIoMAX "jo" /* uintmax_t */ -#define PRIoPTR "o" /* uintptr_t */ +#define PRIoPTR "lo" /* uintptr_t */ #define PRIu8 "u" /* uint8_t */ #define PRIu16 "u" /* uint16_t */ #define PRIu32 "u" /* uint32_t */ -#define PRIu64 "llu" /* uint64_t */ +#define PRIu64 PRI64"u" /* uint64_t */ #define PRIuLEAST8 "u" /* uint_least8_t */ #define PRIuLEAST16 "u" /* uint_least16_t */ #define PRIuLEAST32 "u" /* uint_least32_t */ -#define PRIuLEAST64 "llu" /* uint_least64_t */ +#define PRIuLEAST64 PRI64"u" /* uint_least64_t */ #define PRIuFAST8 "u" /* uint_fast8_t */ #define PRIuFAST16 "u" /* uint_fast16_t */ #define PRIuFAST32 "u" /* uint_fast32_t */ -#define PRIuFAST64 "llu" /* uint_fast64_t */ +#define PRIuFAST64 PRI64"u" /* uint_fast64_t */ #define PRIuMAX "ju" /* uintmax_t */ -#define PRIuPTR "u" /* uintptr_t */ +#define PRIuPTR "lu" /* uintptr_t */ #define PRIx8 "x" /* uint8_t */ #define PRIx16 "x" /* uint16_t */ #define PRIx32 "x" /* uint32_t */ -#define PRIx64 "llx" /* uint64_t */ +#define PRIx64 PRI64"x" /* uint64_t */ #define PRIxLEAST8 "x" /* uint_least8_t */ #define PRIxLEAST16 "x" /* uint_least16_t */ #define PRIxLEAST32 "x" /* uint_least32_t */ -#define PRIxLEAST64 "llx" /* uint_least64_t */ +#define PRIxLEAST64 PRI64"x" /* uint_least64_t */ #define PRIxFAST8 "x" /* uint_fast8_t */ #define PRIxFAST16 "x" /* uint_fast16_t */ #define PRIxFAST32 "x" /* uint_fast32_t */ -#define PRIxFAST64 "llx" /* uint_fast64_t */ +#define PRIxFAST64 PRI64"x" /* uint_fast64_t */ #define PRIxMAX "jx" /* uintmax_t */ -#define PRIxPTR "x" /* uintptr_t */ +#define PRIxPTR "lx" /* uintptr_t */ #define PRIX8 "X" /* uint8_t */ #define PRIX16 "X" /* uint16_t */ #define PRIX32 "X" /* uint32_t */ -#define PRIX64 "llX" /* uint64_t */ +#define PRIX64 PRI64"X" /* uint64_t */ #define PRIXLEAST8 "X" /* uint_least8_t */ #define PRIXLEAST16 "X" /* uint_least16_t */ #define PRIXLEAST32 "X" /* uint_least32_t */ -#define PRIXLEAST64 "llX" /* uint_least64_t */ +#define PRIXLEAST64 PRI64"X" /* uint_least64_t */ #define PRIXFAST8 "X" /* uint_fast8_t */ #define PRIXFAST16 "X" /* uint_fast16_t */ #define PRIXFAST32 "X" /* uint_fast32_t */ -#define PRIXFAST64 "llX" /* uint_fast64_t */ +#define PRIXFAST64 PRI64"X" /* uint_fast64_t */ #define PRIXMAX "jX" /* uintmax_t */ -#define PRIXPTR "X" /* uintptr_t */ +#define PRIXPTR "lX" /* uintptr_t */ /* fscanf(3) macros for signed integers. */ #define SCNd8 "hhd" /* int8_t */ #define SCNd16 "hd" /* int16_t */ #define SCNd32 "d" /* int32_t */ -#define SCNd64 "lld" /* int64_t */ +#define SCNd64 PRI64"d" /* int64_t */ #define SCNdLEAST8 "hhd" /* int_least8_t */ #define SCNdLEAST16 "hd" /* int_least16_t */ #define SCNdLEAST32 "d" /* int_least32_t */ -#define SCNdLEAST64 "lld" /* int_least64_t */ +#define SCNdLEAST64 PRI64"d" /* int_least64_t */ #define SCNdFAST8 "d" /* int_fast8_t */ #define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ -#define SCNdFAST64 "lld" /* int_fast64_t */ +#define SCNdFAST64 PRI64"d" /* int_fast64_t */ #define SCNdMAX "jd" /* intmax_t */ -#define SCNdPTR "d" /* intptr_t */ +#define SCNdPTR "ld" /* intptr_t */ #define SCNi8 "hhi" /* int8_t */ #define SCNi16 "hi" /* int16_t */ #define SCNi32 "i" /* int32_t */ -#define SCNi64 "lli" /* int64_t */ +#define SCNi64 PRI64"i" /* int64_t */ #define SCNiLEAST8 "hhi" /* int_least8_t */ #define SCNiLEAST16 "hi" /* int_least16_t */ #define SCNiLEAST32 "i" /* int_least32_t */ -#define SCNiLEAST64 "lli" /* int_least64_t */ +#define SCNiLEAST64 PRI64"i" /* int_least64_t */ #define SCNiFAST8 "i" /* int_fast8_t */ #define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ -#define SCNiFAST64 "lli" /* int_fast64_t */ +#define SCNiFAST64 PRI64"i" /* int_fast64_t */ #define SCNiMAX "ji" /* intmax_t */ -#define SCNiPTR "i" /* intptr_t */ +#define SCNiPTR "li" /* intptr_t */ /* fscanf(3) macros for unsigned integers. */ #define SCNo8 "hho" /* uint8_t */ #define SCNo16 "ho" /* uint16_t */ #define SCNo32 "o" /* uint32_t */ -#define SCNo64 "llo" /* uint64_t */ +#define SCNo64 PRI64"o" /* uint64_t */ #define SCNoLEAST8 "hho" /* uint_least8_t */ #define SCNoLEAST16 "ho" /* uint_least16_t */ #define SCNoLEAST32 "o" /* uint_least32_t */ -#define SCNoLEAST64 "llo" /* uint_least64_t */ +#define SCNoLEAST64 PRI64"o" /* uint_least64_t */ #define SCNoFAST8 "o" /* uint_fast8_t */ #define SCNoFAST16 "o" /* uint_fast16_t */ #define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "llo" /* uint_fast64_t */ +#define SCNoFAST64 PRI64"o" /* uint_fast64_t */ #define SCNoMAX "jo" /* uintmax_t */ -#define SCNoPTR "o" /* uintptr_t */ +#define SCNoPTR "lo" /* uintptr_t */ #define SCNu8 "hhu" /* uint8_t */ #define SCNu16 "hu" /* uint16_t */ #define SCNu32 "u" /* uint32_t */ -#define SCNu64 "llu" /* uint64_t */ +#define SCNu64 PRI64"u" /* uint64_t */ #define SCNuLEAST8 "hhu" /* uint_least8_t */ #define SCNuLEAST16 "hu" /* uint_least16_t */ #define SCNuLEAST32 "u" /* uint_least32_t */ -#define SCNuLEAST64 "llu" /* uint_least64_t */ +#define SCNuLEAST64 PRI64"u" /* uint_least64_t */ #define SCNuFAST8 "u" /* uint_fast8_t */ #define SCNuFAST16 "u" /* uint_fast16_t */ #define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "llu" /* uint_fast64_t */ +#define SCNuFAST64 PRI64"u" /* uint_fast64_t */ #define SCNuMAX "ju" /* uintmax_t */ -#define SCNuPTR "u" /* uintptr_t */ +#define SCNuPTR "lu" /* uintptr_t */ #define SCNx8 "hhx" /* uint8_t */ #define SCNx16 "hx" /* uint16_t */ #define SCNx32 "x" /* uint32_t */ -#define SCNx64 "llx" /* uint64_t */ +#define SCNx64 PRI64"x" /* uint64_t */ #define SCNxLEAST8 "hhx" /* uint_least8_t */ #define SCNxLEAST16 "hx" /* uint_least16_t */ #define SCNxLEAST32 "x" /* uint_least32_t */ -#define SCNxLEAST64 "llx" /* uint_least64_t */ +#define SCNxLEAST64 PRI64"x" /* uint_least64_t */ #define SCNxFAST8 "x" /* uint_fast8_t */ #define SCNxFAST16 "x" /* uint_fast16_t */ #define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "llx" /* uint_fast64_t */ +#define SCNxFAST64 PRI64"x" /* uint_fast64_t */ #define SCNxMAX "jx" /* uintmax_t */ -#define SCNxPTR "x" /* uintptr_t */ +#define SCNxPTR "lx" /* uintptr_t */ #endif /* !_MACHINE_INTTYPES_H_ */ From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 02:18:13 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E5EF106566C; Tue, 23 Mar 2010 02:18:13 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D20F8FC13; Tue, 23 Mar 2010 02:18:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N2ICR0017907; Tue, 23 Mar 2010 02:18:12 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N2ICgF017905; Tue, 23 Mar 2010 02:18:12 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230218.o2N2ICgF017905@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 02:18:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205505 - user/jmallett/octeon/sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 02:18:13 -0000 Author: jmallett Date: Tue Mar 23 02:18:12 2010 New Revision: 205505 URL: http://svn.freebsd.org/changeset/base/205505 Log: Fix spelling of PRI64 prefix. Submitted by: kan Modified: user/jmallett/octeon/sys/mips/include/_inttypes.h Modified: user/jmallett/octeon/sys/mips/include/_inttypes.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/_inttypes.h Tue Mar 23 02:14:23 2010 (r205504) +++ user/jmallett/octeon/sys/mips/include/_inttypes.h Tue Mar 23 02:18:12 2010 (r205505) @@ -39,9 +39,9 @@ */ #if defined(__mips_n64) -#define PRI64 "ld" +#define PRI64 "l" #else -#define PRI64 "lld" +#define PRI64 "ll" #endif /* fprintf(3) macros for signed integers. */ From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 06:42:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 446C41065673; Tue, 23 Mar 2010 06:42:54 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3061E8FC13; Tue, 23 Mar 2010 06:42:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2N6gspu094201; Tue, 23 Mar 2010 06:42:54 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N6grQc094185; Tue, 23 Mar 2010 06:42:53 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003230642.o2N6grQc094185@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 06:42:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205510 - in user/jmallett/octeon: . bin/ps bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9 contrib/bind9/bin/named contrib/bind9/doc/ar... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 06:42:54 -0000 Author: jmallett Date: Tue Mar 23 06:42:52 2010 New Revision: 205510 URL: http://svn.freebsd.org/changeset/base/205510 Log: Merge from head. Added: user/jmallett/octeon/crypto/openssl/engines/alpha.opt - copied unchanged from r205505, head/crypto/openssl/engines/alpha.opt user/jmallett/octeon/crypto/openssl/engines/ia64.opt - copied unchanged from r205505, head/crypto/openssl/engines/ia64.opt user/jmallett/octeon/crypto/openssl/ssl/t1_reneg.c - copied unchanged from r205505, head/crypto/openssl/ssl/t1_reneg.c user/jmallett/octeon/lib/libcompat/4.3/re_comp.c - copied unchanged from r205505, head/lib/libcompat/4.3/re_comp.c user/jmallett/octeon/lib/libz/Symbol.map - copied unchanged from r205505, head/lib/libz/Symbol.map user/jmallett/octeon/lib/libz/Versions.def - copied unchanged from r205505, head/lib/libz/Versions.def user/jmallett/octeon/lib/libz/contrib/ - copied from r205505, head/lib/libz/contrib/ user/jmallett/octeon/lib/libz/doc/ - copied from r205505, head/lib/libz/doc/ user/jmallett/octeon/lib/libz/gzclose.c - copied unchanged from r205505, head/lib/libz/gzclose.c user/jmallett/octeon/lib/libz/gzguts.h - copied unchanged from r205505, head/lib/libz/gzguts.h user/jmallett/octeon/lib/libz/gzlib.c - copied unchanged from r205505, head/lib/libz/gzlib.c user/jmallett/octeon/lib/libz/gzread.c - copied unchanged from r205505, head/lib/libz/gzread.c user/jmallett/octeon/lib/libz/gzwrite.c - copied unchanged from r205505, head/lib/libz/gzwrite.c user/jmallett/octeon/sys/arm/conf/LN2410SBC - copied unchanged from r205505, head/sys/arm/conf/LN2410SBC user/jmallett/octeon/sys/arm/s3c2xx0/ - copied from r205505, head/sys/arm/s3c2xx0/ user/jmallett/octeon/sys/dev/usb/controller/ohci_s3c24x0.c - copied unchanged from r205505, head/sys/dev/usb/controller/ohci_s3c24x0.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_prio.c - copied unchanged from r205505, head/sys/netinet/ipfw/dn_sched_prio.c user/jmallett/octeon/tools/regression/bin/sh/builtins/command11.0 - copied unchanged from r205505, head/tools/regression/bin/sh/builtins/command11.0 user/jmallett/octeon/tools/regression/bin/sh/errors/assignment-error1.0 - copied unchanged from r205505, head/tools/regression/bin/sh/errors/assignment-error1.0 user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error4.0 - copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error4.0 user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error5.0 - copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error5.0 user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error6.0 - copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error6.0 user/jmallett/octeon/tools/regression/bin/sh/expansion/cmdsubst2.0 - copied unchanged from r205505, head/tools/regression/bin/sh/expansion/cmdsubst2.0 user/jmallett/octeon/tools/regression/usr.bin/ncal/ - copied from r205505, head/tools/regression/usr.bin/ncal/ Deleted: user/jmallett/octeon/crypto/openssl/apps/genpkey.c user/jmallett/octeon/crypto/openssl/apps/pkey.c user/jmallett/octeon/crypto/openssl/apps/pkeyparam.c user/jmallett/octeon/crypto/openssl/apps/pkeyutl.c user/jmallett/octeon/crypto/openssl/apps/ts.c user/jmallett/octeon/crypto/openssl/apps/tsget user/jmallett/octeon/crypto/openssl/crypto/aes/aes_x86core.c user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-armv4.pl user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-ppc.pl user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-s390x.pl user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl user/jmallett/octeon/crypto/openssl/crypto/asn1/ameth_lib.c user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_locl.h user/jmallett/octeon/crypto/openssl/crypto/asn1/bio_asn1.c user/jmallett/octeon/crypto/openssl/crypto/asn1/bio_ndef.c user/jmallett/octeon/crypto/openssl/crypto/asn1/x_nx509.c user/jmallett/octeon/crypto/openssl/crypto/bn/asm/alpha-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/armv4-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/mips3-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/ppc-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/ppc64-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/s390x-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/s390x.S user/jmallett/octeon/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/via-mont.pl user/jmallett/octeon/crypto/openssl/crypto/bn/asm/x86-mont.pl user/jmallett/octeon/crypto/openssl/crypto/camellia/asm/cmll-x86.pl user/jmallett/octeon/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl user/jmallett/octeon/crypto/openssl/crypto/ppccpuid.pl user/jmallett/octeon/crypto/openssl/crypto/s390xcpuid.S user/jmallett/octeon/crypto/openssl/crypto/sparcv9cap.c user/jmallett/octeon/crypto/openssl/engines/axp.opt user/jmallett/octeon/include/regexp.h user/jmallett/octeon/lib/libcompat/4.3/regex.c user/jmallett/octeon/lib/libcompat/regexp/ user/jmallett/octeon/lib/libz/algorithm.txt user/jmallett/octeon/lib/libz/gzio.c Modified: user/jmallett/octeon/MAINTAINERS user/jmallett/octeon/Makefile user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/bin/ps/extern.h user/jmallett/octeon/bin/ps/keyword.c user/jmallett/octeon/bin/ps/print.c user/jmallett/octeon/bin/ps/ps.1 user/jmallett/octeon/bin/sh/eval.c user/jmallett/octeon/bin/sh/parser.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/jmallett/octeon/contrib/bind9/CHANGES user/jmallett/octeon/contrib/bind9/bin/named/server.c user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM-book.xml user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch06.html user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch07.html user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch08.html user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch09.html user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.html user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.pdf user/jmallett/octeon/contrib/bind9/doc/arm/man.dig.html user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keygen.html user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-signzone.html user/jmallett/octeon/contrib/bind9/doc/arm/man.host.html user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkconf.html user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkzone.html user/jmallett/octeon/contrib/bind9/doc/arm/man.named.html user/jmallett/octeon/contrib/bind9/doc/arm/man.nsupdate.html user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc-confgen.html user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.conf.html user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.html user/jmallett/octeon/contrib/bind9/lib/dns/api user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/rdataset.h user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/resolver.h user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/result.h user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/validator.h user/jmallett/octeon/contrib/bind9/lib/dns/ncache.c user/jmallett/octeon/contrib/bind9/lib/dns/rbtdb.c user/jmallett/octeon/contrib/bind9/lib/dns/rdatalist.c user/jmallett/octeon/contrib/bind9/lib/dns/rdataset.c user/jmallett/octeon/contrib/bind9/lib/dns/rdataslab.c user/jmallett/octeon/contrib/bind9/lib/dns/resolver.c user/jmallett/octeon/contrib/bind9/lib/dns/result.c user/jmallett/octeon/contrib/bind9/lib/dns/sdb.c user/jmallett/octeon/contrib/bind9/lib/dns/sdlz.c user/jmallett/octeon/contrib/bind9/lib/dns/validator.c user/jmallett/octeon/contrib/bind9/lib/dns/view.c user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_buffer.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_config.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_context.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gabn.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gethostent.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getipnode.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gnba.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_hstrerror.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_inetntop.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_noop.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_packet.html user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_resutil.html user/jmallett/octeon/contrib/bind9/version user/jmallett/octeon/contrib/bsnmp/gensnmptree/gensnmptree.1 user/jmallett/octeon/contrib/bsnmp/snmpd/snmpmod.3 user/jmallett/octeon/contrib/openpam/include/security/pam_appl.h user/jmallett/octeon/contrib/top/utils.c user/jmallett/octeon/contrib/tzdata/antarctica user/jmallett/octeon/contrib/tzdata/asia user/jmallett/octeon/contrib/tzdata/australasia user/jmallett/octeon/contrib/tzdata/zone.tab user/jmallett/octeon/crypto/openssl/CHANGES user/jmallett/octeon/crypto/openssl/Configure user/jmallett/octeon/crypto/openssl/FAQ user/jmallett/octeon/crypto/openssl/Makefile user/jmallett/octeon/crypto/openssl/Makefile.org user/jmallett/octeon/crypto/openssl/NEWS user/jmallett/octeon/crypto/openssl/README user/jmallett/octeon/crypto/openssl/apps/CA.sh user/jmallett/octeon/crypto/openssl/apps/Makefile user/jmallett/octeon/crypto/openssl/apps/apps.c user/jmallett/octeon/crypto/openssl/apps/ca.c user/jmallett/octeon/crypto/openssl/apps/dsa.c user/jmallett/octeon/crypto/openssl/apps/dsaparam.c user/jmallett/octeon/crypto/openssl/apps/enc.c user/jmallett/octeon/crypto/openssl/apps/gendsa.c user/jmallett/octeon/crypto/openssl/apps/genrsa.c user/jmallett/octeon/crypto/openssl/apps/openssl.c user/jmallett/octeon/crypto/openssl/apps/pkcs12.c user/jmallett/octeon/crypto/openssl/apps/req.c user/jmallett/octeon/crypto/openssl/apps/s_apps.h user/jmallett/octeon/crypto/openssl/apps/s_cb.c user/jmallett/octeon/crypto/openssl/apps/s_client.c user/jmallett/octeon/crypto/openssl/apps/s_server.c user/jmallett/octeon/crypto/openssl/apps/s_socket.c user/jmallett/octeon/crypto/openssl/apps/speed.c user/jmallett/octeon/crypto/openssl/apps/x509.c user/jmallett/octeon/crypto/openssl/config user/jmallett/octeon/crypto/openssl/crypto/aes/aes_cfb.c user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-x86_64.pl user/jmallett/octeon/crypto/openssl/crypto/asn1/a_mbstr.c user/jmallett/octeon/crypto/openssl/crypto/asn1/a_object.c user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1.h user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_err.c user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_gen.c user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_par.c user/jmallett/octeon/crypto/openssl/crypto/asn1/t_x509.c user/jmallett/octeon/crypto/openssl/crypto/bio/bio.h user/jmallett/octeon/crypto/openssl/crypto/bio/bss_dgram.c user/jmallett/octeon/crypto/openssl/crypto/bio/bss_file.c user/jmallett/octeon/crypto/openssl/crypto/bn/asm/x86_64-gcc.c user/jmallett/octeon/crypto/openssl/crypto/bn/bn_div.c user/jmallett/octeon/crypto/openssl/crypto/bn/bn_exp.c user/jmallett/octeon/crypto/openssl/crypto/bn/bn_gf2m.c user/jmallett/octeon/crypto/openssl/crypto/bn/bn_mul.c user/jmallett/octeon/crypto/openssl/crypto/bn/bntest.c user/jmallett/octeon/crypto/openssl/crypto/camellia/Makefile user/jmallett/octeon/crypto/openssl/crypto/cast/c_cfb64.c user/jmallett/octeon/crypto/openssl/crypto/cast/c_ecb.c user/jmallett/octeon/crypto/openssl/crypto/cast/c_enc.c user/jmallett/octeon/crypto/openssl/crypto/cast/c_ofb64.c user/jmallett/octeon/crypto/openssl/crypto/cast/cast.h user/jmallett/octeon/crypto/openssl/crypto/cms/cms_ess.c user/jmallett/octeon/crypto/openssl/crypto/cms/cms_lib.c user/jmallett/octeon/crypto/openssl/crypto/comp/c_zlib.c user/jmallett/octeon/crypto/openssl/crypto/cryptlib.c user/jmallett/octeon/crypto/openssl/crypto/dsa/Makefile user/jmallett/octeon/crypto/openssl/crypto/dsa/dsa_asn1.c user/jmallett/octeon/crypto/openssl/crypto/dsa/dsa_lib.c user/jmallett/octeon/crypto/openssl/crypto/dso/dso_dlfcn.c user/jmallett/octeon/crypto/openssl/crypto/ec/ec2_smpl.c user/jmallett/octeon/crypto/openssl/crypto/ecdsa/Makefile user/jmallett/octeon/crypto/openssl/crypto/ecdsa/ecs_ossl.c user/jmallett/octeon/crypto/openssl/crypto/ecdsa/ecs_sign.c user/jmallett/octeon/crypto/openssl/crypto/engine/Makefile user/jmallett/octeon/crypto/openssl/crypto/engine/eng_cnf.c user/jmallett/octeon/crypto/openssl/crypto/engine/eng_cryptodev.c user/jmallett/octeon/crypto/openssl/crypto/engine/eng_ctrl.c user/jmallett/octeon/crypto/openssl/crypto/engine/eng_err.c user/jmallett/octeon/crypto/openssl/crypto/engine/eng_table.c user/jmallett/octeon/crypto/openssl/crypto/engine/engine.h user/jmallett/octeon/crypto/openssl/crypto/err/Makefile user/jmallett/octeon/crypto/openssl/crypto/err/err_all.c user/jmallett/octeon/crypto/openssl/crypto/evp/c_allc.c user/jmallett/octeon/crypto/openssl/crypto/evp/c_alld.c user/jmallett/octeon/crypto/openssl/crypto/evp/digest.c user/jmallett/octeon/crypto/openssl/crypto/evp/evp_lib.c user/jmallett/octeon/crypto/openssl/crypto/evp/evp_locl.h user/jmallett/octeon/crypto/openssl/crypto/lhash/lhash.c user/jmallett/octeon/crypto/openssl/crypto/md5/asm/md5-x86_64.pl user/jmallett/octeon/crypto/openssl/crypto/o_init.c user/jmallett/octeon/crypto/openssl/crypto/o_str.c user/jmallett/octeon/crypto/openssl/crypto/objects/obj_dat.c user/jmallett/octeon/crypto/openssl/crypto/objects/obj_dat.h user/jmallett/octeon/crypto/openssl/crypto/objects/obj_mac.h user/jmallett/octeon/crypto/openssl/crypto/objects/obj_mac.num user/jmallett/octeon/crypto/openssl/crypto/objects/objects.txt user/jmallett/octeon/crypto/openssl/crypto/ocsp/ocsp_prn.c user/jmallett/octeon/crypto/openssl/crypto/opensslv.h user/jmallett/octeon/crypto/openssl/crypto/pem/pem_seal.c user/jmallett/octeon/crypto/openssl/crypto/perlasm/x86_64-xlate.pl user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_attr.c user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_key.c user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_utl.c user/jmallett/octeon/crypto/openssl/crypto/pkcs12/pkcs12.h user/jmallett/octeon/crypto/openssl/crypto/pkcs7/pk7_mime.c user/jmallett/octeon/crypto/openssl/crypto/rand/rand_win.c user/jmallett/octeon/crypto/openssl/crypto/rand/randfile.c user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa.h user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_eay.c user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_eng.c user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_oaep.c user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_pss.c user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_sign.c user/jmallett/octeon/crypto/openssl/crypto/sha/sha512.c user/jmallett/octeon/crypto/openssl/crypto/stack/safestack.h user/jmallett/octeon/crypto/openssl/crypto/symhacks.h user/jmallett/octeon/crypto/openssl/crypto/ui/ui_openssl.c user/jmallett/octeon/crypto/openssl/crypto/x509/by_dir.c user/jmallett/octeon/crypto/openssl/crypto/x509/x509.h user/jmallett/octeon/crypto/openssl/crypto/x509/x509_lu.c user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vfy.c user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vfy.h user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vpm.c user/jmallett/octeon/crypto/openssl/crypto/x509v3/pcy_tree.c user/jmallett/octeon/crypto/openssl/crypto/x509v3/v3_alt.c user/jmallett/octeon/crypto/openssl/crypto/x509v3/v3_ocsp.c user/jmallett/octeon/crypto/openssl/demos/x509/mkcert.c user/jmallett/octeon/crypto/openssl/demos/x509/mkreq.c user/jmallett/octeon/crypto/openssl/doc/apps/enc.pod user/jmallett/octeon/crypto/openssl/doc/apps/verify.pod user/jmallett/octeon/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod user/jmallett/octeon/crypto/openssl/doc/crypto/EVP_DigestInit.pod user/jmallett/octeon/crypto/openssl/doc/crypto/PKCS12_parse.pod user/jmallett/octeon/crypto/openssl/doc/crypto/bn_internal.pod user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509.pod user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509_CRL.pod user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509_REQ.pod user/jmallett/octeon/crypto/openssl/doc/crypto/hmac.pod user/jmallett/octeon/crypto/openssl/doc/crypto/pem.pod user/jmallett/octeon/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod user/jmallett/octeon/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod user/jmallett/octeon/crypto/openssl/engines/Makefile user/jmallett/octeon/crypto/openssl/engines/e_capi.c user/jmallett/octeon/crypto/openssl/engines/e_capi_err.c user/jmallett/octeon/crypto/openssl/engines/e_capi_err.h user/jmallett/octeon/crypto/openssl/engines/e_ubsec.c user/jmallett/octeon/crypto/openssl/fips/Makefile user/jmallett/octeon/crypto/openssl/fips/aes/fips_aesavs.c user/jmallett/octeon/crypto/openssl/fips/des/fips_desmovs.c user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsa_key.c user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsa_sign.c user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsatest.c user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dssvs.c user/jmallett/octeon/crypto/openssl/fips/fips_locl.h user/jmallett/octeon/crypto/openssl/fips/fips_test_suite.c user/jmallett/octeon/crypto/openssl/fips/fips_utl.h user/jmallett/octeon/crypto/openssl/fips/fipsalgtest.pl user/jmallett/octeon/crypto/openssl/fips/fipsld user/jmallett/octeon/crypto/openssl/fips/hmac/fips_hmac.c user/jmallett/octeon/crypto/openssl/fips/hmac/fips_hmac_selftest.c user/jmallett/octeon/crypto/openssl/fips/rand/fips_rand.c user/jmallett/octeon/crypto/openssl/fips/rand/fips_rngvs.c user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsagtest.c user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsastest.c user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsavtest.c user/jmallett/octeon/crypto/openssl/fips/sha/Makefile user/jmallett/octeon/crypto/openssl/fips/sha/fips_sha1_selftest.c user/jmallett/octeon/crypto/openssl/openssl.spec user/jmallett/octeon/crypto/openssl/ssl/Makefile user/jmallett/octeon/crypto/openssl/ssl/d1_both.c user/jmallett/octeon/crypto/openssl/ssl/d1_clnt.c user/jmallett/octeon/crypto/openssl/ssl/d1_enc.c user/jmallett/octeon/crypto/openssl/ssl/d1_lib.c user/jmallett/octeon/crypto/openssl/ssl/d1_pkt.c user/jmallett/octeon/crypto/openssl/ssl/d1_srvr.c user/jmallett/octeon/crypto/openssl/ssl/dtls1.h user/jmallett/octeon/crypto/openssl/ssl/kssl.c user/jmallett/octeon/crypto/openssl/ssl/s23_clnt.c user/jmallett/octeon/crypto/openssl/ssl/s23_srvr.c user/jmallett/octeon/crypto/openssl/ssl/s2_srvr.c user/jmallett/octeon/crypto/openssl/ssl/s3_both.c user/jmallett/octeon/crypto/openssl/ssl/s3_clnt.c user/jmallett/octeon/crypto/openssl/ssl/s3_lib.c user/jmallett/octeon/crypto/openssl/ssl/s3_pkt.c user/jmallett/octeon/crypto/openssl/ssl/s3_srvr.c user/jmallett/octeon/crypto/openssl/ssl/ssl.h user/jmallett/octeon/crypto/openssl/ssl/ssl3.h user/jmallett/octeon/crypto/openssl/ssl/ssl_algs.c user/jmallett/octeon/crypto/openssl/ssl/ssl_asn1.c user/jmallett/octeon/crypto/openssl/ssl/ssl_cert.c user/jmallett/octeon/crypto/openssl/ssl/ssl_ciph.c user/jmallett/octeon/crypto/openssl/ssl/ssl_err.c user/jmallett/octeon/crypto/openssl/ssl/ssl_lib.c user/jmallett/octeon/crypto/openssl/ssl/ssl_locl.h user/jmallett/octeon/crypto/openssl/ssl/ssl_rsa.c user/jmallett/octeon/crypto/openssl/ssl/ssl_sess.c user/jmallett/octeon/crypto/openssl/ssl/ssl_stat.c user/jmallett/octeon/crypto/openssl/ssl/ssl_txt.c user/jmallett/octeon/crypto/openssl/ssl/t1_enc.c user/jmallett/octeon/crypto/openssl/ssl/t1_lib.c user/jmallett/octeon/crypto/openssl/ssl/tls1.h user/jmallett/octeon/crypto/openssl/test/Makefile user/jmallett/octeon/crypto/openssl/test/cms-test.pl user/jmallett/octeon/crypto/openssl/util/domd user/jmallett/octeon/crypto/openssl/util/libeay.num user/jmallett/octeon/crypto/openssl/util/mk1mf.pl user/jmallett/octeon/crypto/openssl/util/mkdef.pl user/jmallett/octeon/crypto/openssl/util/mkerr.pl user/jmallett/octeon/crypto/openssl/util/pl/Mingw32.pl user/jmallett/octeon/crypto/openssl/util/pl/VC-32.pl user/jmallett/octeon/crypto/openssl/util/pod2man.pl user/jmallett/octeon/crypto/openssl/util/shlib_wrap.sh user/jmallett/octeon/etc/Makefile user/jmallett/octeon/etc/rc.d/tmp user/jmallett/octeon/games/pom/pom.6 user/jmallett/octeon/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h user/jmallett/octeon/include/Makefile user/jmallett/octeon/lib/Makefile user/jmallett/octeon/lib/bind/config.h user/jmallett/octeon/lib/csu/i386-elf/Makefile user/jmallett/octeon/lib/libc/compat-43/sigpause.2 user/jmallett/octeon/lib/libc/gen/daemon.c user/jmallett/octeon/lib/libc/gen/opendir.c user/jmallett/octeon/lib/libc/sparc64/fpu/fpu.c user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_div.c user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_explode.c user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_extern.h user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_implode.c user/jmallett/octeon/lib/libc/string/strlen.c user/jmallett/octeon/lib/libc/sys/open.2 user/jmallett/octeon/lib/libcompat/4.1/ascftime.c user/jmallett/octeon/lib/libcompat/4.1/cftime.c user/jmallett/octeon/lib/libcompat/4.1/ftime.c user/jmallett/octeon/lib/libcompat/4.1/getpw.c user/jmallett/octeon/lib/libcompat/4.3/cfree.c user/jmallett/octeon/lib/libcompat/4.3/re_comp.3 user/jmallett/octeon/lib/libcompat/Makefile user/jmallett/octeon/lib/libgssapi/gss_init_sec_context.3 user/jmallett/octeon/lib/libgssapi/gss_unwrap.3 user/jmallett/octeon/lib/libkvm/kvm_getpcpu.3 user/jmallett/octeon/lib/librpcsec_gss/rpcsec_gss.3 user/jmallett/octeon/lib/libstand/bzipfs.c user/jmallett/octeon/lib/libstand/gzipfs.c user/jmallett/octeon/lib/libz/ChangeLog user/jmallett/octeon/lib/libz/FAQ user/jmallett/octeon/lib/libz/Makefile user/jmallett/octeon/lib/libz/README user/jmallett/octeon/lib/libz/adler32.c user/jmallett/octeon/lib/libz/compress.c user/jmallett/octeon/lib/libz/crc32.c user/jmallett/octeon/lib/libz/deflate.c user/jmallett/octeon/lib/libz/deflate.h user/jmallett/octeon/lib/libz/example.c user/jmallett/octeon/lib/libz/infback.c user/jmallett/octeon/lib/libz/inffast.c user/jmallett/octeon/lib/libz/inflate.c user/jmallett/octeon/lib/libz/inflate.h user/jmallett/octeon/lib/libz/inftrees.c user/jmallett/octeon/lib/libz/inftrees.h user/jmallett/octeon/lib/libz/minigzip.c (contents, props changed) user/jmallett/octeon/lib/libz/trees.c user/jmallett/octeon/lib/libz/uncompr.c user/jmallett/octeon/lib/libz/zconf.h user/jmallett/octeon/lib/libz/zlib.3 user/jmallett/octeon/lib/libz/zlib.h user/jmallett/octeon/lib/libz/zutil.c user/jmallett/octeon/lib/libz/zutil.h user/jmallett/octeon/lib/msun/man/cimag.3 user/jmallett/octeon/libexec/tftpd/tftpd.8 user/jmallett/octeon/sbin/geom/class/multipath/geom_multipath.c user/jmallett/octeon/sbin/ifconfig/ifconfig.c user/jmallett/octeon/sbin/ipfw/dummynet.c user/jmallett/octeon/sbin/ipfw/ipfw.8 user/jmallett/octeon/sbin/ipfw/ipfw2.c user/jmallett/octeon/sbin/ipfw/ipfw2.h user/jmallett/octeon/sbin/quotacheck/quotacheck.8 user/jmallett/octeon/sbin/sysctl/sysctl.c user/jmallett/octeon/secure/lib/libcrypto/Makefile.inc user/jmallett/octeon/secure/lib/libcrypto/Makefile.man user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_length.3 user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_generate_nconf.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_ctrl.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_base64.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_buffer.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_cipher.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_md.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_null.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_ssl.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_find_type.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_push.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_read.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_accept.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_bio.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_connect.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_fd.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_file.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_mem.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_null.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_socket.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_set_callback.3 user/jmallett/octeon/secure/lib/libcrypto/man/BIO_should_retry.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_BLINDING_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_start.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_add.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_add_word.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_bn2bin.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_cmp.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_copy.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_generate_prime.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_inverse.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_num_bytes.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_rand.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_set_bit.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_swap.3 user/jmallett/octeon/secure/lib/libcrypto/man/BN_zero.3 user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_free.3 user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_load_file.3 user/jmallett/octeon/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_key.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_parameters.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_set_method.3 user/jmallett/octeon/secure/lib/libcrypto/man/DH_size.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_SIG_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_do_sign.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_dup_DH.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_key.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_parameters.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_set_method.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_sign.3 user/jmallett/octeon/secure/lib/libcrypto/man/DSA_size.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_GET_LIB.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_clear_error.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_error_string.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_get_error.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_strings.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_print_errors.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_put_error.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_remove_state.3 user/jmallett/octeon/secure/lib/libcrypto/man/ERR_set_mark.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_BytesToKey.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_DigestInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_EncryptInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_OpenInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SealInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SignInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/EVP_VerifyInit.3 user/jmallett/octeon/secure/lib/libcrypto/man/OBJ_nid2obj.3 user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_Applink.3 user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_config.3 user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 user/jmallett/octeon/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_create.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_parse.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_decrypt.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_encrypt.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_sign.3 user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_verify.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_add.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_bytes.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_cleanup.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_egd.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_load_file.3 user/jmallett/octeon/secure/lib/libcrypto/man/RAND_set_rand_method.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_blinding_on.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_check_key.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_generate_key.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_print.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_private_encrypt.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_public_encrypt.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_set_method.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 user/jmallett/octeon/secure/lib/libcrypto/man/RSA_size.3 user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_print_ex.3 user/jmallett/octeon/secure/lib/libcrypto/man/X509_new.3 user/jmallett/octeon/secure/lib/libcrypto/man/bio.3 user/jmallett/octeon/secure/lib/libcrypto/man/blowfish.3 user/jmallett/octeon/secure/lib/libcrypto/man/bn.3 user/jmallett/octeon/secure/lib/libcrypto/man/bn_internal.3 user/jmallett/octeon/secure/lib/libcrypto/man/buffer.3 user/jmallett/octeon/secure/lib/libcrypto/man/crypto.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DHparams.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_CRL.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_NAME.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_REQ.3 user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_SIG.3 user/jmallett/octeon/secure/lib/libcrypto/man/des.3 user/jmallett/octeon/secure/lib/libcrypto/man/dh.3 user/jmallett/octeon/secure/lib/libcrypto/man/dsa.3 user/jmallett/octeon/secure/lib/libcrypto/man/ecdsa.3 user/jmallett/octeon/secure/lib/libcrypto/man/engine.3 user/jmallett/octeon/secure/lib/libcrypto/man/err.3 user/jmallett/octeon/secure/lib/libcrypto/man/evp.3 user/jmallett/octeon/secure/lib/libcrypto/man/hmac.3 user/jmallett/octeon/secure/lib/libcrypto/man/lh_stats.3 user/jmallett/octeon/secure/lib/libcrypto/man/lhash.3 user/jmallett/octeon/secure/lib/libcrypto/man/md5.3 user/jmallett/octeon/secure/lib/libcrypto/man/mdc2.3 user/jmallett/octeon/secure/lib/libcrypto/man/pem.3 user/jmallett/octeon/secure/lib/libcrypto/man/rand.3 user/jmallett/octeon/secure/lib/libcrypto/man/rc4.3 user/jmallett/octeon/secure/lib/libcrypto/man/ripemd.3 user/jmallett/octeon/secure/lib/libcrypto/man/rsa.3 user/jmallett/octeon/secure/lib/libcrypto/man/sha.3 user/jmallett/octeon/secure/lib/libcrypto/man/threads.3 user/jmallett/octeon/secure/lib/libcrypto/man/ui.3 user/jmallett/octeon/secure/lib/libcrypto/man/ui_compat.3 user/jmallett/octeon/secure/lib/libcrypto/man/x509.3 user/jmallett/octeon/secure/lib/libssl/Makefile user/jmallett/octeon/secure/lib/libssl/Makefile.man user/jmallett/octeon/secure/lib/libssl/man/SSL_CIPHER_get_name.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_session.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_ctrl.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_free.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_new.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_number.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sessions.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_mode.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_options.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_timeout.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_verify.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_use_certificate.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_free.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_time.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_accept.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_alert_type_string.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_clear.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_connect.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_do_handshake.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_free.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_SSL_CTX.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ciphers.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_client_CA_list.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_current_cipher.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_default_timeout.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_error.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_new_index.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_fd.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_certificate.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_rbio.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_session.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_verify_result.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_get_version.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_library_init.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_load_client_CA_file.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_new.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_pending.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_read.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_rstate_string.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_session_reused.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_bio.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_connect_state.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_fd.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_session.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_shutdown.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_set_verify_result.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_shutdown.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_state_string.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_want.3 user/jmallett/octeon/secure/lib/libssl/man/SSL_write.3 user/jmallett/octeon/secure/lib/libssl/man/d2i_SSL_SESSION.3 user/jmallett/octeon/secure/lib/libssl/man/ssl.3 user/jmallett/octeon/secure/usr.bin/openssl/man/CA.pl.1 user/jmallett/octeon/secure/usr.bin/openssl/man/asn1parse.1 user/jmallett/octeon/secure/usr.bin/openssl/man/ca.1 user/jmallett/octeon/secure/usr.bin/openssl/man/ciphers.1 user/jmallett/octeon/secure/usr.bin/openssl/man/crl.1 user/jmallett/octeon/secure/usr.bin/openssl/man/crl2pkcs7.1 user/jmallett/octeon/secure/usr.bin/openssl/man/dgst.1 user/jmallett/octeon/secure/usr.bin/openssl/man/dhparam.1 user/jmallett/octeon/secure/usr.bin/openssl/man/dsa.1 user/jmallett/octeon/secure/usr.bin/openssl/man/dsaparam.1 user/jmallett/octeon/secure/usr.bin/openssl/man/ec.1 user/jmallett/octeon/secure/usr.bin/openssl/man/ecparam.1 user/jmallett/octeon/secure/usr.bin/openssl/man/enc.1 user/jmallett/octeon/secure/usr.bin/openssl/man/errstr.1 user/jmallett/octeon/secure/usr.bin/openssl/man/gendsa.1 user/jmallett/octeon/secure/usr.bin/openssl/man/genrsa.1 user/jmallett/octeon/secure/usr.bin/openssl/man/nseq.1 user/jmallett/octeon/secure/usr.bin/openssl/man/ocsp.1 user/jmallett/octeon/secure/usr.bin/openssl/man/openssl.1 user/jmallett/octeon/secure/usr.bin/openssl/man/passwd.1 user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs12.1 user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs7.1 user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs8.1 user/jmallett/octeon/secure/usr.bin/openssl/man/rand.1 user/jmallett/octeon/secure/usr.bin/openssl/man/req.1 user/jmallett/octeon/secure/usr.bin/openssl/man/rsa.1 user/jmallett/octeon/secure/usr.bin/openssl/man/rsautl.1 user/jmallett/octeon/secure/usr.bin/openssl/man/s_client.1 user/jmallett/octeon/secure/usr.bin/openssl/man/s_server.1 user/jmallett/octeon/secure/usr.bin/openssl/man/s_time.1 user/jmallett/octeon/secure/usr.bin/openssl/man/sess_id.1 user/jmallett/octeon/secure/usr.bin/openssl/man/smime.1 user/jmallett/octeon/secure/usr.bin/openssl/man/speed.1 user/jmallett/octeon/secure/usr.bin/openssl/man/spkac.1 user/jmallett/octeon/secure/usr.bin/openssl/man/verify.1 user/jmallett/octeon/secure/usr.bin/openssl/man/version.1 user/jmallett/octeon/secure/usr.bin/openssl/man/x509.1 user/jmallett/octeon/secure/usr.bin/openssl/man/x509v3_config.1 user/jmallett/octeon/share/dict/web2 user/jmallett/octeon/share/man/man4/acpi_wmi.4 user/jmallett/octeon/share/man/man4/altq.4 user/jmallett/octeon/share/man/man4/amdtemp.4 user/jmallett/octeon/share/man/man4/ath.4 user/jmallett/octeon/share/man/man4/cxgb.4 user/jmallett/octeon/share/man/man4/ddb.4 user/jmallett/octeon/share/man/man4/iscsi_initiator.4 user/jmallett/octeon/share/man/man4/ndis.4 user/jmallett/octeon/share/man/man4/sysmouse.4 user/jmallett/octeon/share/man/man4/textdump.4 user/jmallett/octeon/share/man/man4/uart.4 user/jmallett/octeon/share/man/man4/urio.4 user/jmallett/octeon/share/man/man9/fail.9 user/jmallett/octeon/share/man/man9/uio.9 user/jmallett/octeon/share/man/man9/vfs_mount.9 user/jmallett/octeon/share/misc/pci_vendors user/jmallett/octeon/sys/amd64/acpica/acpi_machdep.c user/jmallett/octeon/sys/amd64/amd64/mca.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/amd64/conf/GENERIC user/jmallett/octeon/sys/amd64/conf/XENHVM user/jmallett/octeon/sys/amd64/include/mca.h user/jmallett/octeon/sys/amd64/include/specialreg.h user/jmallett/octeon/sys/arm/arm/pmap.c user/jmallett/octeon/sys/arm/conf/BWCT.hints user/jmallett/octeon/sys/cam/scsi/scsi_sg.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32.h user/jmallett/octeon/sys/compat/freebsd32/freebsd32_ipc.h user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32_util.h user/jmallett/octeon/sys/compat/freebsd32/syscalls.master user/jmallett/octeon/sys/compat/linux/linux_file.c user/jmallett/octeon/sys/compat/x86bios/x86bios.c user/jmallett/octeon/sys/conf/NOTES user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/dev/aac/aac.c user/jmallett/octeon/sys/dev/agp/agp_i810.c user/jmallett/octeon/sys/dev/ahci/ahci.c user/jmallett/octeon/sys/dev/ata/ata-raid.c user/jmallett/octeon/sys/dev/bce/if_bce.c user/jmallett/octeon/sys/dev/bce/if_bcefw.h user/jmallett/octeon/sys/dev/bce/if_bcereg.h user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/drm/drm_pciids.h user/jmallett/octeon/sys/dev/drm/i915_drv.h user/jmallett/octeon/sys/dev/drm/i915_reg.h user/jmallett/octeon/sys/dev/isp/isp_freebsd.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.h user/jmallett/octeon/sys/dev/isp/isp_pci.c user/jmallett/octeon/sys/dev/isp/isp_sbus.c user/jmallett/octeon/sys/dev/mii/brgphy.c user/jmallett/octeon/sys/dev/mii/brgphyreg.h user/jmallett/octeon/sys/dev/mii/mii.c user/jmallett/octeon/sys/dev/mii/miidevs user/jmallett/octeon/sys/dev/msk/if_msk.c user/jmallett/octeon/sys/dev/msk/if_mskreg.h user/jmallett/octeon/sys/dev/mxge/if_mxge.c user/jmallett/octeon/sys/dev/ofw/ofw_standard.c user/jmallett/octeon/sys/dev/siis/siis.c user/jmallett/octeon/sys/dev/sound/pci/hda/hdac.c user/jmallett/octeon/sys/dev/usb/usbdevs user/jmallett/octeon/sys/dev/usb/wlan/if_run.c user/jmallett/octeon/sys/dev/usb/wlan/if_runreg.h user/jmallett/octeon/sys/dev/usb/wlan/if_runvar.h user/jmallett/octeon/sys/dev/xen/netback/netback.c user/jmallett/octeon/sys/fs/fdescfs/fdesc_vnops.c user/jmallett/octeon/sys/geom/gate/g_gate.c user/jmallett/octeon/sys/geom/geom_dump.c user/jmallett/octeon/sys/geom/multipath/g_multipath.c user/jmallett/octeon/sys/i386/acpica/acpi_machdep.c user/jmallett/octeon/sys/i386/conf/GENERIC user/jmallett/octeon/sys/i386/conf/XEN user/jmallett/octeon/sys/i386/i386/mca.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/i386/i386/trap.c user/jmallett/octeon/sys/i386/include/mca.h user/jmallett/octeon/sys/i386/include/specialreg.h user/jmallett/octeon/sys/ia64/conf/GENERIC user/jmallett/octeon/sys/ia64/ia64/clock.c user/jmallett/octeon/sys/ia64/ia64/db_machdep.c user/jmallett/octeon/sys/ia64/ia64/exception.S user/jmallett/octeon/sys/ia64/ia64/highfp.c user/jmallett/octeon/sys/ia64/ia64/interrupt.c user/jmallett/octeon/sys/ia64/ia64/locore.S user/jmallett/octeon/sys/ia64/ia64/machdep.c user/jmallett/octeon/sys/ia64/ia64/mp_machdep.c user/jmallett/octeon/sys/ia64/ia64/nexus.c user/jmallett/octeon/sys/ia64/ia64/pmap.c user/jmallett/octeon/sys/ia64/ia64/sal.c user/jmallett/octeon/sys/ia64/include/clock.h user/jmallett/octeon/sys/ia64/include/frame.h user/jmallett/octeon/sys/ia64/include/intr.h user/jmallett/octeon/sys/ia64/include/intrcnt.h user/jmallett/octeon/sys/ia64/include/pcb.h user/jmallett/octeon/sys/ia64/include/pcpu.h user/jmallett/octeon/sys/ia64/include/smp.h user/jmallett/octeon/sys/ia64/pci/pci_cfgreg.c user/jmallett/octeon/sys/kern/kern_syscalls.c user/jmallett/octeon/sys/kern/subr_eventhandler.c user/jmallett/octeon/sys/kern/sysv_ipc.c user/jmallett/octeon/sys/kern/sysv_msg.c user/jmallett/octeon/sys/kern/sysv_sem.c user/jmallett/octeon/sys/kern/sysv_shm.c user/jmallett/octeon/sys/kern/uipc_mqueue.c user/jmallett/octeon/sys/kern/uipc_sem.c user/jmallett/octeon/sys/kern/uipc_syscalls.c user/jmallett/octeon/sys/kern/vfs_aio.c user/jmallett/octeon/sys/kern/vfs_syscalls.c user/jmallett/octeon/sys/kern/vfs_vnops.c user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c user/jmallett/octeon/sys/mips/conf/AR71XX user/jmallett/octeon/sys/mips/include/clock.h user/jmallett/octeon/sys/mips/include/cpuregs.h user/jmallett/octeon/sys/mips/include/db_machdep.h user/jmallett/octeon/sys/mips/include/param.h user/jmallett/octeon/sys/mips/include/pmap.h user/jmallett/octeon/sys/mips/include/trap.h user/jmallett/octeon/sys/mips/mips/db_trace.c user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/mp_machdep.c user/jmallett/octeon/sys/mips/mips/nexus.c user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/tick.c user/jmallett/octeon/sys/mips/mips/trap.c user/jmallett/octeon/sys/mips/mips/vm_machdep.c user/jmallett/octeon/sys/mips/sibyte/sb_asm.S user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c user/jmallett/octeon/sys/mips/sibyte/sb_scd.c user/jmallett/octeon/sys/mips/sibyte/sb_scd.h user/jmallett/octeon/sys/modules/zfs/Makefile user/jmallett/octeon/sys/net/bpf.c user/jmallett/octeon/sys/net/flowtable.c user/jmallett/octeon/sys/net/flowtable.h user/jmallett/octeon/sys/net/if.h user/jmallett/octeon/sys/net/if_llatbl.c user/jmallett/octeon/sys/net/if_llatbl.h user/jmallett/octeon/sys/net/if_tap.c user/jmallett/octeon/sys/net/if_tun.c user/jmallett/octeon/sys/net/if_var.h user/jmallett/octeon/sys/net/if_vlan.c user/jmallett/octeon/sys/net/route.h user/jmallett/octeon/sys/net/vnet.c user/jmallett/octeon/sys/net/vnet.h user/jmallett/octeon/sys/net80211/ieee80211_adhoc.c user/jmallett/octeon/sys/net80211/ieee80211_ht.c user/jmallett/octeon/sys/net80211/ieee80211_mesh.c user/jmallett/octeon/sys/net80211/ieee80211_proto.c user/jmallett/octeon/sys/net80211/ieee80211_sta.c user/jmallett/octeon/sys/net80211/ieee80211_tdma.c user/jmallett/octeon/sys/netgraph/ng_socket.c user/jmallett/octeon/sys/netgraph/ng_socketvar.h user/jmallett/octeon/sys/netinet/in_pcb.c user/jmallett/octeon/sys/netinet/in_pcb.h user/jmallett/octeon/sys/netinet/ip_divert.c user/jmallett/octeon/sys/netinet/ip_fw.h user/jmallett/octeon/sys/netinet/ip_input.c user/jmallett/octeon/sys/netinet/ip_ipsec.c user/jmallett/octeon/sys/netinet/ip_output.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched.h user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_fw_table.c user/jmallett/octeon/sys/netinet/ipfw/test/Makefile user/jmallett/octeon/sys/netinet/raw_ip.c user/jmallett/octeon/sys/netinet/sctp_crc32.c user/jmallett/octeon/sys/netinet/sctp_crc32.h user/jmallett/octeon/sys/netinet/sctp_indata.c user/jmallett/octeon/sys/netinet/sctputil.c user/jmallett/octeon/sys/netinet/sctputil.h user/jmallett/octeon/sys/netinet/tcp_subr.c user/jmallett/octeon/sys/netinet/tcp_timer.c user/jmallett/octeon/sys/netinet/udp_usrreq.c user/jmallett/octeon/sys/netinet6/ip6_output.c user/jmallett/octeon/sys/pc98/conf/GENERIC user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c user/jmallett/octeon/sys/powerpc/aim/ofw_machdep.c user/jmallett/octeon/sys/powerpc/booke/trap_subr.S user/jmallett/octeon/sys/powerpc/conf/GENERIC user/jmallett/octeon/sys/powerpc/ofw/ofw_real.c user/jmallett/octeon/sys/powerpc/powermac/uninorth.c user/jmallett/octeon/sys/sparc64/conf/GENERIC user/jmallett/octeon/sys/sparc64/include/dcr.h user/jmallett/octeon/sys/sparc64/include/tlb.h user/jmallett/octeon/sys/sparc64/include/tte.h user/jmallett/octeon/sys/sparc64/include/ver.h user/jmallett/octeon/sys/sparc64/include/wstate.h user/jmallett/octeon/sys/sparc64/pci/schizo.c user/jmallett/octeon/sys/sparc64/pci/schizovar.h user/jmallett/octeon/sys/sparc64/sparc64/cheetah.c user/jmallett/octeon/sys/sparc64/sparc64/exception.S user/jmallett/octeon/sys/sparc64/sparc64/genassym.c user/jmallett/octeon/sys/sparc64/sparc64/locore.S user/jmallett/octeon/sys/sparc64/sparc64/machdep.c user/jmallett/octeon/sys/sparc64/sparc64/pmap.c user/jmallett/octeon/sys/sparc64/sparc64/support.S user/jmallett/octeon/sys/sparc64/sparc64/swtch.S user/jmallett/octeon/sys/sun4v/conf/GENERIC user/jmallett/octeon/sys/sys/eventhandler.h user/jmallett/octeon/sys/sys/param.h user/jmallett/octeon/sys/sys/pmc.h user/jmallett/octeon/sys/sys/sysent.h user/jmallett/octeon/sys/vm/uma_int.h user/jmallett/octeon/tools/regression/aio/aiotest/aiotest.c user/jmallett/octeon/tools/regression/mqueue/mqtest1/mqtest1.c user/jmallett/octeon/tools/regression/mqueue/mqtest2/mqtest2.c user/jmallett/octeon/tools/regression/mqueue/mqtest3/mqtest3.c user/jmallett/octeon/tools/regression/mqueue/mqtest4/mqtest4.c user/jmallett/octeon/tools/regression/mqueue/mqtest5/mqtest5.c user/jmallett/octeon/tools/regression/posixsem/posixsem.c user/jmallett/octeon/tools/regression/posixsem2/semtest.c user/jmallett/octeon/tools/regression/usr.bin/Makefile user/jmallett/octeon/usr.bin/biff/biff.1 user/jmallett/octeon/usr.bin/find/find.1 user/jmallett/octeon/usr.bin/minigzip/Makefile user/jmallett/octeon/usr.bin/ncal/ncal.1 user/jmallett/octeon/usr.bin/ncal/ncal.c user/jmallett/octeon/usr.bin/netstat/netgraph.c user/jmallett/octeon/usr.bin/tar/bsdtar.1 user/jmallett/octeon/usr.bin/unifdef/unifdef.1 user/jmallett/octeon/usr.bin/unifdef/unifdef.c user/jmallett/octeon/usr.bin/unifdef/unifdefall.sh user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def user/jmallett/octeon/usr.sbin/freebsd-update/freebsd-update.8 user/jmallett/octeon/usr.sbin/jls/jls.c user/jmallett/octeon/usr.sbin/lastlogin/lastlogin.c user/jmallett/octeon/usr.sbin/mergemaster/mergemaster.8 user/jmallett/octeon/usr.sbin/mergemaster/mergemaster.sh user/jmallett/octeon/usr.sbin/pkg_install/updating/pkg_updating.1 user/jmallett/octeon/usr.sbin/pmcannotate/pmcannotate.8 user/jmallett/octeon/usr.sbin/powerd/powerd.8 user/jmallett/octeon/usr.sbin/ppp/arp.c user/jmallett/octeon/usr.sbin/uhsoctl/uhsoctl.1 user/jmallett/octeon/usr.sbin/zic/Makefile Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/bind9/ (props changed) user/jmallett/octeon/contrib/openpam/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) user/jmallett/octeon/crypto/openssl/ (props changed) user/jmallett/octeon/lib/libz/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) Modified: user/jmallett/octeon/MAINTAINERS ============================================================================== --- user/jmallett/octeon/MAINTAINERS Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/MAINTAINERS Tue Mar 23 06:42:52 2010 (r205510) @@ -36,8 +36,6 @@ pci bus imp,jhb Pre-commit review reque cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -twe aradford@amcc.com Pre-commit review requested -twa aradford@amcc.com Pre-commit review requested CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. @@ -65,9 +63,6 @@ linprocfs des Advance notification reque lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. -pkill gad Heads-up appreciated. -ps gad I am working on a number of changes to this. Would - like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. @@ -76,9 +71,6 @@ share/mk ru This is a vital component of offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm rnoland Just keep me informed of changes, try not to break it. -libufs jmallett Willing to handle problems, help with work. -fdc(4) joerg Just keep me informed of changes, try not to break it. -sppp(4) joerg Just keep me informed of changes, try not to break it. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -144,4 +136,3 @@ $ cd /usr/src; find */* -type f|xargs eg sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org -usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org Modified: user/jmallett/octeon/Makefile ============================================================================== --- user/jmallett/octeon/Makefile Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/Makefile Tue Mar 23 06:42:52 2010 (r205510) @@ -311,6 +311,7 @@ universe_${target}: "check _.${target}.buildworld for details" | ${MAKEFAIL})) @echo ">> ${target} buildworld completed on `LC_ALL=C date`" .endif +.if !defined(MAKE_JUST_WORLDS) .if exists(${.CURDIR}/sys/${target}/conf/NOTES) @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ @@ -319,6 +320,7 @@ universe_${target}: .endif @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels +.endif @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 23 06:42:52 2010 (r205510) @@ -14,6 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100322: libz update +OLD_LIBS+=lib/libz.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libz.so.5 +.endif +# 20100314: removal of regexp.h +OLD_FILES+=usr/include/regexp.h +OLD_FILES+=usr/share/man/man3/regexp.3.gz +OLD_FILES+=usr/share/man/man3/regsub.3.gz # 20100303: actual removal of utmp.h OLD_FILES+=usr/include/utmp.h # 20100227: [ia64] removed and Modified: user/jmallett/octeon/bin/ps/extern.h ============================================================================== --- user/jmallett/octeon/bin/ps/extern.h Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/ps/extern.h Tue Mar 23 06:42:52 2010 (r205510) @@ -48,6 +48,7 @@ void command(KINFO *, VARENT *); void cputime(KINFO *, VARENT *); int donlist(void); void elapsed(KINFO *, VARENT *); +void elapseds(KINFO *, VARENT *); void emulname(KINFO *, VARENT *); VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, size_t); Modified: user/jmallett/octeon/bin/ps/keyword.c ============================================================================== --- user/jmallett/octeon/bin/ps/keyword.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/ps/keyword.c Tue Mar 23 06:42:52 2010 (r205510) @@ -89,6 +89,7 @@ static VAR var[] = { {"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR, NULL, 0}, {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, + {"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, Modified: user/jmallett/octeon/bin/ps/print.c ============================================================================== --- user/jmallett/octeon/bin/ps/print.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/ps/print.c Tue Mar 23 06:42:52 2010 (r205510) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -618,6 +619,21 @@ elapsed(KINFO *k, VARENT *ve) (void)printf("%*s", v->width, obuff); } +void +elapseds(KINFO *k, VARENT *ve) +{ + VAR *v; + time_t val; + + v = ve->var; + if (!k->ki_valid) { + (void)printf("%-*s", v->width, "-"); + return; + } + val = now - k->ki_p->ki_start.tv_sec; + (void)printf("%*jd", v->width, (intmax_t)val); +} + double getpcpu(const KINFO *k) { Modified: user/jmallett/octeon/bin/ps/ps.1 ============================================================================== --- user/jmallett/octeon/bin/ps/ps.1 Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/ps/ps.1 Tue Mar 23 06:42:52 2010 (r205510) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd March 5, 2010 +.Dd March 17, 2010 .Dt PS 1 .Os .Sh NAME @@ -479,7 +479,12 @@ command and arguments .It Cm cpu short-term CPU usage factor (for scheduling) .It Cm etime -elapsed running time +elapsed running time, format +.Op days- Ns +.Op hours: Ns +minutes:seconds. +.It Cm etimes +elapsed running time, in decimal integer seconds .It Cm flags the process flags, in hexadecimal (alias .Cm f ) Modified: user/jmallett/octeon/bin/sh/eval.c ============================================================================== --- user/jmallett/octeon/bin/sh/eval.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/sh/eval.c Tue Mar 23 06:42:52 2010 (r205510) @@ -91,6 +91,7 @@ STATIC void evalloop(union node *, int); STATIC void evalfor(union node *, int); STATIC void evalcase(union node *, int); STATIC void evalsubshell(union node *, int); +STATIC void evalredir(union node *, int); STATIC void expredir(union node *); STATIC void evalpipe(union node *); STATIC void evalcommand(union node *, int, struct backcmd *); @@ -221,10 +222,7 @@ evaltree(union node *n, int flags) evaltree(n->nbinary.ch2, flags); break; case NREDIR: - expredir(n->nredir.redirect); - redirect(n->nredir.redirect, REDIR_PUSH); - evaltree(n->nredir.n, flags); - popredir(); + evalredir(n, flags); break; case NSUBSHELL: evalsubshell(n, flags); @@ -415,6 +413,46 @@ evalsubshell(union node *n, int flags) } +/* + * Evaluate a redirected compound command. + */ + +STATIC void +evalredir(union node *n, int flags) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + volatile int in_redirect = 1; + + expredir(n->nredir.redirect); + savehandler = handler; + if (setjmp(jmploc.loc)) { + int e; + + handler = savehandler; + e = exception; + if (e == EXERROR || e == EXEXEC) { + popredir(); + if (in_redirect) { + exitstatus = 2; + return; + } + } + longjmp(handler->loc, 1); + } else { + INTOFF; + handler = &jmploc; + redirect(n->nredir.redirect, REDIR_PUSH); + in_redirect = 0; + INTON; + evaltree(n->nredir.n, flags); + } + INTOFF; + handler = savehandler; + popredir(); + INTON; +} + /* * Compute the names of the files in a redirection list. @@ -680,7 +718,7 @@ evalcommand(union node *cmd, int flags, /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; - cmdentry.special = 1; + cmdentry.special = 0; } else { static const char PATH[] = "PATH="; int cmd_flags = 0, bltinonly = 0; @@ -891,6 +929,12 @@ evalcommand(union node *cmd, int flags, } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + /* + * If there is no command word, redirection errors should + * not be fatal but assignment errors should. + */ + if (argc == 0 && !(flags & EV_BACKCMD)) + cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); commandname = argv[0]; Modified: user/jmallett/octeon/bin/sh/parser.c ============================================================================== --- user/jmallett/octeon/bin/sh/parser.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/bin/sh/parser.c Tue Mar 23 06:42:52 2010 (r205510) @@ -863,6 +863,164 @@ breakloop: } +/* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } + longjmp(handler->loc, 1); + } + INTOFF; + savelen = out - stackblock(); + if (savelen > 0) { + str = ckmalloc(savelen); + memcpy(str, stackblock(), savelen); + } + handler = &jmploc; + INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and + reread it as input, interpreting it normally. */ + char *oout; + int c; + int olen; + + + STARTSTACKSTR(oout); + for (;;) { + if (needprompt) { + setprompt(2); + needprompt = 0; + } + switch (c = pgetc()) { + case '`': + goto done; + + case '\\': + if ((c = pgetc()) == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + /* + * If eating a newline, avoid putting + * the newline into the new character + * stream (via the STPUTC after the + * switch). + */ + continue; + } + if (c != '\\' && c != '`' && c != '$' + && (!dblquote || c != '"')) + STPUTC('\\', oout); + break; + + case '\n': + plinno++; + needprompt = doprompt; + break; + + case PEOF: + startlinno = plinno; + synerror("EOF in backquote substitution"); + break; + + default: + break; + } + STPUTC(c, oout); + } +done: + STPUTC('\0', oout); + olen = oout - stackblock(); + INTOFF; + ostr = ckmalloc(olen); + memcpy(ostr, stackblock(), olen); + setinputstring(ostr, 1); + INTON; + } + nlpp = pbqlist; + while (*nlpp) + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; + + if (oldstyle) { + saveprompt = doprompt; + doprompt = 0; + } + + n = list(0); + + if (oldstyle) + doprompt = saveprompt; + else { + if (readtoken() != TRP) + synexpect(TRP); + } + + (*nlpp)->n = n; + if (oldstyle) { + /* + * Start reading from old file again, ignoring any pushed back + * tokens left from the backquote parsing + */ + popfile(); + tokpushback = 0; + } + while (stackblocksize() <= savelen) + growstackblock(); + STARTSTACKSTR(out); + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); + INTOFF; + ckfree(str); + str = NULL; + INTON; + } + if (ostr) { + INTOFF; + ckfree(ostr); + ostr = NULL; + INTON; + } + handler = savehandler; + if (quoted) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else + USTPUTC(CTLBACKQ, out); + return out; +} + /* * If eofmark is NULL, read a word or a redirection symbol. If eofmark @@ -879,8 +1037,6 @@ breakloop: #define CHECKEND() {goto checkend; checkend_return:;} #define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} -#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;} -#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int @@ -896,7 +1052,6 @@ readtoken1(int firstc, char const *synta int varnest; /* levels of variables expansion */ int arinest; /* levels of arithmetic expansion */ int parenlevel; /* levels of parens in arithmetic */ - int oldstyle; char const *prevsyntax; /* syntax before arithmetic */ int synentry; @@ -1029,7 +1184,8 @@ readtoken1(int firstc, char const *synta } break; case CBQUOTE: /* '`' */ - PARSEBACKQOLD(); + out = parsebackq(out, &bqlist, 1, dblquote, + arinest || dblquote); break; case CEOF: goto endword; /* exit outer loop */ @@ -1189,7 +1345,8 @@ parsesub: { PARSEARITH(); } else { pungetc(); - PARSEBACKQNEW(); + out = parsebackq(out, &bqlist, 0, dblquote, + arinest || dblquote); } } else { USTPUTC(CTLVAR, out); @@ -1296,167 +1453,6 @@ parsesub: { /* - * Called to parse command substitutions. Newstyle is set if the command - * is enclosed inside $(...); nlpp is a pointer to the head of the linked - * list of commands (passed by reference), and savelen is the number of - * characters on the top of the stack which must be preserved. - */ - -parsebackq: { - struct nodelist **nlpp; - union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *const savehandler = handler; - int savelen; - int saveprompt; - const int bq_startlinno = plinno; - char *volatile ostr = NULL; - struct parsefile *const savetopfile = getcurrentfile(); - - str = NULL; - if (setjmp(jmploc.loc)) { - popfilesupto(savetopfile); - if (str) - ckfree(str); - if (ostr) - ckfree(ostr); - handler = savehandler; - if (exception == EXERROR) { - startlinno = bq_startlinno; - synerror("Error in command substitution"); - } - longjmp(handler->loc, 1); - } - INTOFF; - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - } - handler = &jmploc; - INTON; - if (oldstyle) { - /* We must read until the closing backquote, giving special - treatment to some slashes, and then push the string and - reread it as input, interpreting it normally. */ - char *oout; - int c; - int olen; - - - STARTSTACKSTR(oout); - for (;;) { - if (needprompt) { - setprompt(2); - needprompt = 0; - } - switch (c = pgetc()) { - case '`': - goto done; - - case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the STPUTC after the - * switch). - */ - continue; - } - if (c != '\\' && c != '`' && c != '$' - && (!dblquote || c != '"')) - STPUTC('\\', oout); - break; - - case '\n': - plinno++; - needprompt = doprompt; - break; - - case PEOF: - startlinno = plinno; - synerror("EOF in backquote substitution"); - break; - - default: - break; - } - STPUTC(c, oout); - } -done: - STPUTC('\0', oout); - olen = oout - stackblock(); - INTOFF; - ostr = ckmalloc(olen); - memcpy(ostr, stackblock(), olen); - setinputstring(ostr, 1); - INTON; - } - nlpp = &bqlist; - while (*nlpp) - nlpp = &(*nlpp)->next; - *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - (*nlpp)->next = NULL; - - if (oldstyle) { - saveprompt = doprompt; - doprompt = 0; - } - - n = list(0); - - if (oldstyle) - doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } - - (*nlpp)->n = n; - if (oldstyle) { - /* - * Start reading from old file again, ignoring any pushed back - * tokens left from the backquote parsing - */ - popfile(); - tokpushback = 0; - } - while (stackblocksize() <= savelen) - growstackblock(); - STARTSTACKSTR(out); - if (str) { - memcpy(out, str, savelen); - STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; - } - if (ostr) { - INTOFF; - ckfree(ostr); - ostr = NULL; - INTON; - } - handler = savehandler; - if (arinest || dblquote) - USTPUTC(CTLBACKQ | CTLQUOTE, out); - else - USTPUTC(CTLBACKQ, out); - if (oldstyle) - goto parsebackq_oldreturn; - else - goto parsebackq_newreturn; -} - -/* * Parse an arithmetic expansion (indicate start of one and set state) */ parsearith: { Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 23 06:42:52 2010 (r205510) @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,11 +53,14 @@ typedef struct zfs_node { } zfs_node_t; typedef struct callback_data { - uu_avl_t *cb_avl; - int cb_flags; - zfs_type_t cb_types; - zfs_sort_column_t *cb_sortcol; - zprop_list_t **cb_proplist; + uu_avl_t *cb_avl; + int cb_flags; + zfs_type_t cb_types; + zfs_sort_column_t *cb_sortcol; + zprop_list_t **cb_proplist; + int cb_depth_limit; + int cb_depth; + uint8_t cb_props_table[ZFS_NUM_PROPS]; } callback_data_t; uu_avl_pool_t *avl_pool; @@ -98,10 +101,17 @@ zfs_callback(zfs_handle_t *zhp, void *da uu_avl_node_init(node, &node->zn_avlnode, avl_pool); if (uu_avl_find(cb->cb_avl, node, cb->cb_sortcol, &idx) == NULL) { - if (cb->cb_proplist && - zfs_expand_proplist(zhp, cb->cb_proplist) != 0) { - free(node); - return (-1); + if (cb->cb_proplist) { + if ((*cb->cb_proplist) && + !(*cb->cb_proplist)->pl_all) + zfs_prune_proplist(zhp, + cb->cb_props_table); + + if (zfs_expand_proplist(zhp, cb->cb_proplist) + != 0) { + free(node); + return (-1); + } } uu_avl_insert(cb->cb_avl, node, idx); dontclose = 1; @@ -113,11 +123,15 @@ zfs_callback(zfs_handle_t *zhp, void *da /* * Recurse if necessary. */ - if (cb->cb_flags & ZFS_ITER_RECURSE) { + if (cb->cb_flags & ZFS_ITER_RECURSE && + ((cb->cb_flags & ZFS_ITER_DEPTH_LIMIT) == 0 || + cb->cb_depth < cb->cb_depth_limit)) { + cb->cb_depth++; if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) (void) zfs_iter_filesystems(zhp, zfs_callback, data); if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps) (void) zfs_iter_snapshots(zhp, zfs_callback, data); + cb->cb_depth--; } if (!dontclose) @@ -325,10 +339,10 @@ zfs_sort(const void *larg, const void *r int zfs_for_each(int argc, char **argv, int flags, zfs_type_t types, - zfs_sort_column_t *sortcol, zprop_list_t **proplist, + zfs_sort_column_t *sortcol, zprop_list_t **proplist, int limit, zfs_iter_f callback, void *data) { - callback_data_t cb; + callback_data_t cb = {0}; int ret = 0; zfs_node_t *node; uu_avl_walk_t *walk; @@ -346,6 +360,45 @@ zfs_for_each(int argc, char **argv, int cb.cb_flags = flags; cb.cb_proplist = proplist; cb.cb_types = types; + cb.cb_depth_limit = limit; + /* + * If cb_proplist is provided then in the zfs_handles created we + * retain only those properties listed in cb_proplist and sortcol. + * The rest are pruned. So, the caller should make sure that no other + * properties other than those listed in cb_proplist/sortcol are + * accessed. + * + * If cb_proplist is NULL then we retain all the properties. We + * always retain the zoned property, which some other properties + * need (userquota & friends), and the createtxg property, which + * we need to sort snapshots. + */ + if (cb.cb_proplist && *cb.cb_proplist) { + zprop_list_t *p = *cb.cb_proplist; + + while (p) { + if (p->pl_prop >= ZFS_PROP_TYPE && + p->pl_prop < ZFS_NUM_PROPS) { + cb.cb_props_table[p->pl_prop] = B_TRUE; + } + p = p->pl_next; + } + + while (sortcol) { + if (sortcol->sc_prop >= ZFS_PROP_TYPE && + sortcol->sc_prop < ZFS_NUM_PROPS) { + cb.cb_props_table[sortcol->sc_prop] = B_TRUE; + } + sortcol = sortcol->sc_next; + } + + cb.cb_props_table[ZFS_PROP_ZONED] = B_TRUE; + cb.cb_props_table[ZFS_PROP_CREATETXG] = B_TRUE; + } else { + (void) memset(cb.cb_props_table, B_TRUE, + sizeof (cb.cb_props_table)); + } + if ((cb.cb_avl = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL) { (void) fprintf(stderr, gettext("internal error: out of memory\n")); Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Tue Mar 23 06:42:52 2010 (r205510) @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -41,9 +41,10 @@ typedef struct zfs_sort_column { #define ZFS_ITER_RECURSE (1 << 0) #define ZFS_ITER_ARGS_CAN_BE_PATHS (1 << 1) #define ZFS_ITER_PROP_LISTSNAPS (1 << 2) +#define ZFS_ITER_DEPTH_LIMIT (1 << 3) int zfs_for_each(int, char **, int options, zfs_type_t, - zfs_sort_column_t *, zprop_list_t **, zfs_iter_f, void *); + zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *); int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t); void zfs_free_sort_columns(zfs_sort_column_t *); Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Mar 23 06:42:52 2010 (r205510) @@ -190,8 +190,8 @@ get_usage(zfs_help_t idx) return (gettext("\tdestroy [-rRf] " "\n")); case HELP_GET: - return (gettext("\tget [-rHp] [-o field[,...]] " - "[-s source[,...]]\n" + return (gettext("\tget [-rHp] [-d max] " + "[-o field[,...]] [-s source[,...]]\n" "\t <\"all\" | property[,...]> " "[filesystem|volume|snapshot] ...\n")); case HELP_INHERIT: @@ -205,8 +205,8 @@ get_usage(zfs_help_t idx) case HELP_UNJAIL: return (gettext("\tunjail \n")); case HELP_LIST: - return (gettext("\tlist [-rH] [-o property[,...]] " - "[-t type[,...]] [-s property] ...\n" + return (gettext("\tlist [-rH][-d max] " + "[-o property[,...]] [-t type[,...]] [-s property] ...\n" "\t [-S property] ... " "[filesystem|volume|snapshot] ...\n")); case HELP_MOUNT: @@ -432,6 +432,27 @@ parseprop(nvlist_t *props) } +static int +parse_depth(char *opt, int *flags) +{ + char *tmp; + int depth; + + depth = (int)strtol(opt, &tmp, 0); + if (*tmp) { + (void) fprintf(stderr, + gettext("%s is not an integer\n"), optarg); + usage(B_FALSE); + } + if (depth < 0) { + (void) fprintf(stderr, + gettext("Depth can not be negative.\n")); + usage(B_FALSE); + } + *flags |= (ZFS_ITER_DEPTH_LIMIT|ZFS_ITER_RECURSE); + return (depth); +} + /* * zfs clone [-p] [-o prop=value] ... * @@ -1119,6 +1140,7 @@ zfs_do_get(int argc, char **argv) int i, c, flags = 0; char *value, *fields; int ret; + int limit = 0; zprop_list_t fake_name = { 0 }; /* @@ -1132,11 +1154,14 @@ zfs_do_get(int argc, char **argv) cb.cb_type = ZFS_TYPE_DATASET; /* check options */ - while ((c = getopt(argc, argv, ":o:s:rHp")) != -1) { + while ((c = getopt(argc, argv, ":d:o:s:rHp")) != -1) { switch (c) { case 'p': cb.cb_literal = B_TRUE; break; + case 'd': + limit = parse_depth(optarg, &flags); + break; case 'r': flags |= ZFS_ITER_RECURSE; break; @@ -1267,7 +1292,7 @@ zfs_do_get(int argc, char **argv) /* run for each object */ ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL, - &cb.cb_proplist, get_callback, &cb); + &cb.cb_proplist, limit, get_callback, &cb); if (cb.cb_proplist == &fake_name) zprop_free_list(fake_name.pl_next); @@ -1380,10 +1405,10 @@ zfs_do_inherit(int argc, char **argv) if (flags & ZFS_ITER_RECURSE) { ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, - NULL, NULL, inherit_recurse_cb, propname); + NULL, NULL, 0, inherit_recurse_cb, propname); } else { ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, - NULL, NULL, inherit_cb, propname); + NULL, NULL, 0, inherit_cb, propname); } return (ret); @@ -1578,7 +1603,7 @@ zfs_do_upgrade(int argc, char **argv) if (cb.cb_version == 0) cb.cb_version = ZPL_VERSION; ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_set_callback, &cb); + NULL, NULL, 0, upgrade_set_callback, &cb); (void) printf(gettext("%llu filesystems upgraded\n"), cb.cb_numupgraded); if (cb.cb_numsamegraded) { @@ -1596,14 +1621,14 @@ zfs_do_upgrade(int argc, char **argv) flags |= ZFS_ITER_RECURSE; ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_list_callback, &cb); + NULL, NULL, 0, upgrade_list_callback, &cb); found = cb.cb_foundone; cb.cb_foundone = B_FALSE; cb.cb_newer = B_TRUE; ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_list_callback, &cb); + NULL, NULL, 0, upgrade_list_callback, &cb); if (!cb.cb_foundone && !found) { (void) printf(gettext("All filesystems are " @@ -1615,11 +1640,12 @@ zfs_do_upgrade(int argc, char **argv) } /* - * list [-rH] [-o property[,property]...] [-t type[,type]...] + * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...] * [-s property [-s property]...] [-S property [-S property]...] * ... * * -r Recurse over all children + * -d Limit recursion by depth. * -H Scripted mode; elide headers and separate columns by tabs * -o Control which fields to display. * -t Control which object types to display. @@ -1769,16 +1795,20 @@ zfs_do_list(int argc, char **argv) char *fields = NULL; list_cbdata_t cb = { 0 }; char *value; + int limit = 0; int ret; zfs_sort_column_t *sortcol = NULL; int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS; /* check options */ - while ((c = getopt(argc, argv, ":o:rt:Hs:S:")) != -1) { + while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) { switch (c) { case 'o': fields = optarg; break; + case 'd': + limit = parse_depth(optarg, &flags); + break; case 'r': flags |= ZFS_ITER_RECURSE; break; @@ -1869,7 +1899,7 @@ zfs_do_list(int argc, char **argv) cb.cb_first = B_TRUE; ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist, - list_callback, &cb); + limit, list_callback, &cb); zprop_free_list(cb.cb_proplist); zfs_free_sort_columns(sortcol); @@ -2252,7 +2282,7 @@ zfs_do_set(int argc, char **argv) } ret = zfs_for_each(argc - 2, argv + 2, NULL, - ZFS_TYPE_DATASET, NULL, NULL, set_callback, &cb); + ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); return (ret); } @@ -2886,7 +2916,7 @@ zfs_do_unallow(int argc, char **argv) flags |= ZFS_ITER_RECURSE; error = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM|ZFS_TYPE_VOLUME, NULL, - NULL, unallow_callback, (void *)zperms); + NULL, 0, unallow_callback, (void *)zperms); if (zperms) nvlist_free(zperms); Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Mar 23 06:42:52 2010 (r205510) @@ -369,6 +369,7 @@ typedef struct zprop_list { } zprop_list_t; extern int zfs_expand_proplist(zfs_handle_t *, zprop_list_t **); +extern void zfs_prune_proplist(zfs_handle_t *, uint8_t *); #define ZFS_MOUNTPOINT_NONE "none" #define ZFS_MOUNTPOINT_LEGACY "legacy" Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Mar 23 06:19:44 2010 (r205509) +++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Mar 23 06:42:52 2010 (r205510) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2045,6 +2045,8 @@ getprop_uint64(zfs_handle_t *zhp, zfs_pr verify(nvlist_lookup_uint64(nv, ZPROP_VALUE, &value) == 0); (void) nvlist_lookup_string(nv, ZPROP_SOURCE, source); } else { + verify(!zhp->zfs_props_table || + zhp->zfs_props_table[prop] == B_TRUE); value = zfs_prop_default_numeric(prop); *source = ""; } @@ -2064,6 +2066,8 @@ getprop_string(zfs_handle_t *zhp, zfs_pr verify(nvlist_lookup_string(nv, ZPROP_VALUE, &value) == 0); (void) nvlist_lookup_string(nv, ZPROP_SOURCE, source); } else { + verify(!zhp->zfs_props_table || + zhp->zfs_props_table[prop] == B_TRUE); if ((value = (char *)zfs_prop_default_string(prop)) == NULL) value = ""; *source = ""; @@ -4267,6 +4271,30 @@ zfs_deleg_share_nfs(libzfs_handle_t *hdl return (error); } +void +zfs_prune_proplist(zfs_handle_t *zhp, uint8_t *props) +{ + nvpair_t *curr; + + /* *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 19:27:25 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 347BA1065670; Tue, 23 Mar 2010 19:27:25 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 23FFA8FC13; Tue, 23 Mar 2010 19:27:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2NJRP0i065110; Tue, 23 Mar 2010 19:27:25 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2NJRPcE065108; Tue, 23 Mar 2010 19:27:25 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003231927.o2NJRPcE065108@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 19:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205525 - user/jmallett/octeon/gnu/lib/libgomp X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 19:27:25 -0000 Author: jmallett Date: Tue Mar 23 19:27:24 2010 New Revision: 205525 URL: http://svn.freebsd.org/changeset/base/205525 Log: Add a comment on something I need to come back to later. Modified: user/jmallett/octeon/gnu/lib/libgomp/Makefile Modified: user/jmallett/octeon/gnu/lib/libgomp/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/libgomp/Makefile Tue Mar 23 19:24:17 2010 (r205524) +++ user/jmallett/octeon/gnu/lib/libgomp/Makefile Tue Mar 23 19:27:24 2010 (r205525) @@ -23,6 +23,7 @@ CFLAGS+= -I${.CURDIR} -I. -I${SRCDIR} -I VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration +# XXX/juli Need to handle different MIPS ABIs here properly. .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \ ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc OMP_LOCK_ALIGN = 4 From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 22:06:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CE89106566B; Tue, 23 Mar 2010 22:06:57 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF5D18FC12; Tue, 23 Mar 2010 22:06:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2NM6um3001596; Tue, 23 Mar 2010 22:06:56 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2NM6uOf001586; Tue, 23 Mar 2010 22:06:56 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003232206.o2NM6uOf001586@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 22:06:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205545 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 22:06:57 -0000 Author: jmallett Date: Tue Mar 23 22:06:56 2010 New Revision: 205545 URL: http://svn.freebsd.org/changeset/base/205545 Log: o) Move some stuff from to . o) Remove some gratuitous ISA setting in assembly files -- ISA must be set properly in the compiler (and assembler.) o) Use 's ISA-dependent instruction wrappers rather than hand- rolled versions in each assembly file. o) Reflect the fact that our pmap is solidly 32-bit by making PTEs and PDEs 32-bits. This lets us go back to the old segmap sizing which uses a page at a time rather than two pages at a time, which gives us a fighting chance with n64 kernels. Sponsored by: Packet Forensics Modified: user/jmallett/octeon/sys/mips/include/param.h user/jmallett/octeon/sys/mips/include/pmap.h user/jmallett/octeon/sys/mips/include/pte.h user/jmallett/octeon/sys/mips/include/vmparam.h user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/support.S user/jmallett/octeon/sys/mips/mips/swtch.S user/jmallett/octeon/sys/mips/mips/tlb.S user/jmallett/octeon/sys/mips/mips/trap.c Modified: user/jmallett/octeon/sys/mips/include/param.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/param.h Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/include/param.h Tue Mar 23 22:06:56 2010 (r205545) @@ -111,19 +111,8 @@ #define PAGE_MASK (PAGE_SIZE-1) #define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) -#define NBSEG 0x400000 /* bytes/segment */ -#define SEGOFSET (NBSEG-1) /* byte offset into segment */ -#define SEGSHIFT 22 /* LOG2(NBSEG) */ - #define MAXPAGESIZES 1 /* maximum number of supported page sizes */ -/* XXXimp: This has moved to vmparam.h */ -/* Also, this differs from the mips2 definition, but likely is better */ -/* since this means the kernel won't chew up TLBs when it is executing */ -/* code */ -#define KERNBASE 0x80000000 /* start of kernel virtual */ -#define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) - #define BLKDEV_IOSIZE 2048 /* xxx: Why is this 1/2 page? */ #define MAXDUMPPGS 1 /* xxx: why is this only one? */ Modified: user/jmallett/octeon/sys/mips/include/pmap.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/pmap.h Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/include/pmap.h Tue Mar 23 22:06:56 2010 (r205545) @@ -100,7 +100,7 @@ typedef struct pmap *pmap_t; #ifdef _KERNEL pt_entry_t *pmap_pte(pmap_t, vm_offset_t); -pd_entry_t pmap_segmap(pmap_t pmap, vm_offset_t va); +pt_entry_t *pmap_segmap(pmap_t pmap, vm_offset_t va); vm_offset_t pmap_kextract(vm_offset_t va); #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) Modified: user/jmallett/octeon/sys/mips/include/pte.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/pte.h Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/include/pte.h Tue Mar 23 22:06:56 2010 (r205545) @@ -83,8 +83,8 @@ struct tlb { int tlb_lo1; }; -typedef unsigned long pt_entry_t; -typedef pt_entry_t *pd_entry_t; +typedef int32_t pt_entry_t; +typedef int32_t pd_entry_t; #define PDESIZE sizeof(pd_entry_t) /* for assembly files */ #define PTESIZE sizeof(pt_entry_t) /* for assembly files */ Modified: user/jmallett/octeon/sys/mips/include/vmparam.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/vmparam.h Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/include/vmparam.h Tue Mar 23 22:06:56 2010 (r205545) @@ -108,6 +108,11 @@ #define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xC0000000) #define VM_KERNEL_WIRED_ADDR_END (VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET) #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xFFFFC000) +#if 0 +#define KERNBASE (VM_MIN_KERNEL_ADDRESS) +#else +#define KERNBASE ((vm_offset_t)(intptr_t)(int32_t)0x80000000) +#endif /* * Disable superpage reservations. (not sure if this is right @@ -179,21 +184,6 @@ */ #define VM_NFREEORDER 9 -/* - * XXXMIPS: This values need to be changed!!! - */ -#if 0 -#define VM_MIN_ADDRESS ((vm_offset_t)0x0000000000010000) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)MIPS_KSEG0_START-1) -#define VM_MAX_ADDRESS ((vm_offset_t)0x0000000100000000) -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_START) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_END) -#define KERNBASE (VM_MIN_KERNEL_ADDRESS) - -/* virtual sizes (bytes) for various kernel submaps */ -#define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ -#endif - #define NBSEG 0x400000 /* bytes/segment */ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ #define SEGSHIFT 22 /* LOG2(NBSEG) */ Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Tue Mar 23 22:06:56 2010 (r205545) @@ -219,11 +219,11 @@ struct local_sysmaps { static struct local_sysmaps sysmap_lmem[MAXCPU]; caddr_t virtual_sys_start = (caddr_t)0; -pd_entry_t +pt_entry_t * pmap_segmap(pmap_t pmap, vm_offset_t va) { if (pmap->pm_segtab) - return (*pmap_pde(pmap, va)); + return ((pt_entry_t *)(intptr_t)*pmap_pde(pmap, va)); else return ((pd_entry_t)0); } @@ -240,7 +240,7 @@ pmap_pte(pmap_t pmap, vm_offset_t va) pt_entry_t *pdeaddr; if (pmap) { - pdeaddr = (pt_entry_t *)pmap_segmap(pmap, va); + pdeaddr = pmap_segmap(pmap, va); if (pdeaddr) { return pdeaddr + vad_to_pte_offset(va); } @@ -424,9 +424,9 @@ again: * be somewhere above 0xC0000000 - 0xFFFFFFFF which results * in about 256 entries or so instead of the 120. */ - nkpt = ((PAGE_SIZE * 2) / sizeof(pd_entry_t)) - pmap_segshift(virtual_avail); + nkpt = (PAGE_SIZE / sizeof(pd_entry_t)) - pmap_segshift(virtual_avail); } - pgtab = (pt_entry_t *)pmap_steal_memory((PAGE_SIZE * 2) * nkpt); + pgtab = (pt_entry_t *)pmap_steal_memory(PAGE_SIZE * nkpt); /* * The R[4-7]?00 stores only one copy of the Global bit in the @@ -443,7 +443,7 @@ again: * level page table. */ for (i = 0, j = pmap_segshift(virtual_avail); i < nkpt; i++, j++) - kernel_segmap[j] = (pd_entry_t)(pgtab + (i * NPTEPG)); + kernel_segmap[j] = (pd_entry_t)(intptr_t)(pgtab + (i * NPTEPG)); /* * The kernel's pmap is statically allocated so we don't have to use @@ -1333,7 +1333,7 @@ pmap_growkernel(vm_offset_t addr) panic("Gak, can't handle a k-page table outside of lower 512Meg"); } pte = (pt_entry_t *)MIPS_PHYS_TO_KSEG0(ptppaddr); - segtab_pde(kernel_segmap, kernel_vm_end) = (pd_entry_t)pte; + segtab_pde(kernel_segmap, kernel_vm_end) = (pd_entry_t)(intptr_t)pte; /* * The R[4-7]?00 stores only one copy of the Global bit in @@ -1990,7 +1990,7 @@ validate: if (origpte & PTE_M) { KASSERT((origpte & PTE_RW), ("pmap_enter: modified page not writable:" - " va: %p, pte: 0x%lx", (void *)va, origpte)); + " va: %p, pte: 0x%x", (void *)va, origpte)); if (page_is_managed(opa)) vm_page_dirty(om); } @@ -2636,7 +2636,7 @@ pmap_remove_pages(pmap_t pmap) m = PHYS_TO_VM_PAGE(mips_tlbpfn_to_paddr(tpte)); KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %lx", tpte)); + ("pmap_remove_pages: bad tpte %x", tpte)); pv->pv_pmap->pm_stats.resident_count--; Modified: user/jmallett/octeon/sys/mips/mips/support.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/support.S Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/mips/support.S Tue Mar 23 22:06:56 2010 (r205545) @@ -1290,9 +1290,6 @@ END(atomic_subtract_8) */ .set noreorder # Noreorder is default style! -#ifndef _MIPS_ARCH_XLR - .set mips3 -#endif #if !defined(__mips_n64) && !defined(__mips_n32) /* Modified: user/jmallett/octeon/sys/mips/mips/swtch.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/mips/swtch.S Tue Mar 23 22:06:56 2010 (r205545) @@ -65,37 +65,7 @@ #include "assym.s" -#if defined(ISA_MIPS32) -#undef WITH_64BIT_CP0 -#elif defined(ISA_MIPS64) -#define WITH_64BIT_CP0 -#elif defined(ISA_MIPS3) -#define WITH_64BIT_CP0 -#else -#error "Please write the code for this ISA" -#endif - -#ifdef WITH_64BIT_CP0 -#define _SLL dsll -#define _SRL dsrl -#define _MFC0 dmfc0 -#define _MTC0 dmtc0 -#define WIRED_SHIFT 34 -#else -#define _SLL sll -#define _SRL srl -#define _MFC0 mfc0 -#define _MTC0 mtc0 -#define WIRED_SHIFT 2 -#endif .set noreorder # Noreorder is default style! -#if defined(ISA_MIPS32) - .set mips32 -#elif defined(ISA_MIPS64) - .set mips64 -#elif defined(ISA_MIPS3) - .set mips3 -#endif /* * FREEBSD_DEVELOPERS_FIXME @@ -165,7 +135,7 @@ LEAF(fork_trampoline) RESTORE_U_PCB_REG(a0, PC, k1) RESTORE_U_PCB_REG(AT, AST, k1) RESTORE_U_PCB_REG(v0, V0, k1) - _MTC0 a0, COP_0_EXC_PC # set return address + MTC0 a0, COP_0_EXC_PC # set return address RESTORE_U_PCB_REG(v1, V1, k1) RESTORE_U_PCB_REG(a0, A0, k1) Modified: user/jmallett/octeon/sys/mips/mips/tlb.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/tlb.S Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/mips/tlb.S Tue Mar 23 22:06:56 2010 (r205545) @@ -76,26 +76,11 @@ #endif #ifdef WITH_64BIT_CP0 -#define _SLL dsll -#define _SRL dsrl -#define _MFC0 dmfc0 -#define _MTC0 dmtc0 #define WIRED_SHIFT 34 #else -#define _SLL sll -#define _SRL srl -#define _MFC0 mfc0 -#define _MTC0 mtc0 #define WIRED_SHIFT 2 #endif .set noreorder # Noreorder is default style! -#if defined(ISA_MIPS32) - .set mips32 -#elif defined(ISA_MIPS64) - .set mips64 -#elif defined(ISA_MIPS3) - .set mips3 -#endif #define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; @@ -125,22 +110,22 @@ LEAF(Mips_TLBWriteIndexed) ITLBNOPFIX lw a2, 8(a1) lw a3, 12(a1) - _MFC0 t0, COP_0_TLB_HI # Save the current PID. + MFC0 t0, COP_0_TLB_HI # Save the current PID. - _MTC0 a2, COP_0_TLB_LO0 # Set up entry low0. - _MTC0 a3, COP_0_TLB_LO1 # Set up entry low1. + MTC0 a2, COP_0_TLB_LO0 # Set up entry low0. + MTC0 a3, COP_0_TLB_LO1 # Set up entry low1. lw a2, 0(a1) lw a3, 4(a1) mtc0 a0, COP_0_TLB_INDEX # Set the index. - _MTC0 a2, COP_0_TLB_PG_MASK # Set up entry mask. - _MTC0 a3, COP_0_TLB_HI # Set up entry high. + MTC0 a2, COP_0_TLB_PG_MASK # Set up entry mask. + MTC0 a3, COP_0_TLB_HI # Set up entry high. MIPS_CPU_NOP_DELAY tlbwi # Write the TLB MIPS_CPU_NOP_DELAY - _MTC0 t0, COP_0_TLB_HI # Restore the PID. + MTC0 t0, COP_0_TLB_HI # Restore the PID. nop - _MTC0 zero, COP_0_TLB_PG_MASK # Default mask value. + MTC0 zero, COP_0_TLB_PG_MASK # Default mask value. mtc0 v1, COP_0_STATUS_REG # Restore the status register ITLBNOPFIX j ra @@ -162,7 +147,7 @@ END(Mips_TLBWriteIndexed) *-------------------------------------------------------------------------- */ LEAF(Mips_SetPID) - _MTC0 a0, COP_0_TLB_HI # Write the hi reg value + MTC0 a0, COP_0_TLB_HI # Write the hi reg value nop # required for QED5230 nop # required for QED5230 j ra @@ -230,9 +215,9 @@ LEAF(Mips_TLBFlush) mtc0 zero, COP_0_STATUS_REG # Disable interrupts ITLBNOPFIX mfc0 t1, COP_0_TLB_WIRED - _MFC0 t0, COP_0_TLB_HI # Save the PID - _MTC0 zero, COP_0_TLB_LO0 # Zero out low entry0. - _MTC0 zero, COP_0_TLB_LO1 # Zero out low entry1. + MFC0 t0, COP_0_TLB_HI # Save the PID + MTC0 zero, COP_0_TLB_LO0 # Zero out low entry0. + MTC0 zero, COP_0_TLB_LO1 # Zero out low entry1. mtc0 zero, COP_0_TLB_PG_MASK # Zero out mask entry. # # Load invalid entry, each TLB entry should have it's own bogus @@ -249,7 +234,7 @@ LEAF(Mips_TLBFlush) 1: mtc0 t1, COP_0_TLB_INDEX # Set the index register. ITLBNOPFIX - _MTC0 v0, COP_0_TLB_HI # Mark entry high as invalid + MTC0 v0, COP_0_TLB_HI # Mark entry high as invalid addu t1, t1, 1 # Increment index. addu v0, v0, 8 * 1024 MIPS_CPU_NOP_DELAY @@ -257,7 +242,7 @@ LEAF(Mips_TLBFlush) MIPS_CPU_NOP_DELAY bne t1, a0, 1b nop - _MTC0 t0, COP_0_TLB_HI # Restore the PID + MTC0 t0, COP_0_TLB_HI # Restore the PID mtc0 v1, COP_0_STATUS_REG # Restore the status register ITLBNOPFIX j ra @@ -285,9 +270,9 @@ LEAF(Mips_TLBFlushAddr) ITLBNOPFIX li v0, (PTE_HVPN | PTE_ASID) and a0, a0, v0 # Make shure valid hi value. - _MFC0 t0, COP_0_TLB_HI # Get current PID + MFC0 t0, COP_0_TLB_HI # Get current PID mfc0 t3, COP_0_TLB_PG_MASK # Save current pgMask - _MTC0 a0, COP_0_TLB_HI # look for addr & PID + MTC0 a0, COP_0_TLB_HI # look for addr & PID MIPS_CPU_NOP_DELAY tlbp # Probe for the entry. MIPS_CPU_NOP_DELAY @@ -301,15 +286,15 @@ LEAF(Mips_TLBFlushAddr) # One bogus value for every TLB entry might cause MCHECK exception sll v0, PGSHIFT + 1 addu t1, v0 - _MTC0 t1, COP_0_TLB_HI # Mark entry high as invalid + MTC0 t1, COP_0_TLB_HI # Mark entry high as invalid - _MTC0 zero, COP_0_TLB_LO0 # Zero out low entry. - _MTC0 zero, COP_0_TLB_LO1 # Zero out low entry. + MTC0 zero, COP_0_TLB_LO0 # Zero out low entry. + MTC0 zero, COP_0_TLB_LO1 # Zero out low entry. MIPS_CPU_NOP_DELAY tlbwi MIPS_CPU_NOP_DELAY 1: - _MTC0 t0, COP_0_TLB_HI # restore PID + MTC0 t0, COP_0_TLB_HI # restore PID mtc0 t3, COP_0_TLB_PG_MASK # Restore pgMask mtc0 v1, COP_0_STATUS_REG # Restore the status register ITLBNOPFIX @@ -338,13 +323,13 @@ LEAF(Mips_TLBUpdate) and t1, a0, 0x1000 # t1 = Even/Odd flag li v0, (PTE_HVPN | PTE_ASID) and a0, a0, v0 - _MFC0 t0, COP_0_TLB_HI # Save current PID - _MTC0 a0, COP_0_TLB_HI # Init high reg + MFC0 t0, COP_0_TLB_HI # Save current PID + MTC0 a0, COP_0_TLB_HI # Init high reg and a2, a1, PTE_G # Copy global bit MIPS_CPU_NOP_DELAY tlbp # Probe for the entry. - _SLL a1, a1, WIRED_SHIFT - _SRL a1, a1, WIRED_SHIFT + PTR_SLL a1, a1, WIRED_SHIFT + PTR_SRL a1, a1, WIRED_SHIFT nop mfc0 v0, COP_0_TLB_INDEX # See what we got bne t1, zero, 2f # Decide even odd @@ -355,16 +340,16 @@ LEAF(Mips_TLBUpdate) tlbr # update, read entry first MIPS_CPU_NOP_DELAY - _MTC0 a1, COP_0_TLB_LO0 # init low reg0. + MTC0 a1, COP_0_TLB_LO0 # init low reg0. MIPS_CPU_NOP_DELAY tlbwi # update slot found b 4f nop 1: mtc0 zero, COP_0_TLB_PG_MASK # init mask. - _MTC0 a0, COP_0_TLB_HI # init high reg. - _MTC0 a1, COP_0_TLB_LO0 # init low reg0. - _MTC0 a2, COP_0_TLB_LO1 # init low reg1. + MTC0 a0, COP_0_TLB_HI # init high reg. + MTC0 a1, COP_0_TLB_LO0 # init low reg0. + MTC0 a2, COP_0_TLB_LO1 # init low reg1. MIPS_CPU_NOP_DELAY tlbwr # enter into a random slot MIPS_CPU_NOP_DELAY @@ -378,7 +363,7 @@ LEAF(Mips_TLBUpdate) tlbr # read the entry first MIPS_CPU_NOP_DELAY - _MTC0 a1, COP_0_TLB_LO1 # init low reg1. + MTC0 a1, COP_0_TLB_LO1 # init low reg1. MIPS_CPU_NOP_DELAY tlbwi # update slot found MIPS_CPU_NOP_DELAY @@ -386,15 +371,15 @@ LEAF(Mips_TLBUpdate) nop 3: mtc0 zero, COP_0_TLB_PG_MASK # init mask. - _MTC0 a0, COP_0_TLB_HI # init high reg. - _MTC0 a2, COP_0_TLB_LO0 # init low reg0. - _MTC0 a1, COP_0_TLB_LO1 # init low reg1. + MTC0 a0, COP_0_TLB_HI # init high reg. + MTC0 a2, COP_0_TLB_LO0 # init low reg0. + MTC0 a1, COP_0_TLB_LO1 # init low reg1. MIPS_CPU_NOP_DELAY tlbwr # enter into a random slot 4: # Make shure pipeline MIPS_CPU_NOP_DELAY - _MTC0 t0, COP_0_TLB_HI # restore PID + MTC0 t0, COP_0_TLB_HI # restore PID mtc0 v1, COP_0_STATUS_REG # Restore the status register ITLBNOPFIX j ra @@ -419,17 +404,17 @@ LEAF(Mips_TLBRead) mfc0 v1, COP_0_STATUS_REG # Save the status register. mtc0 zero, COP_0_STATUS_REG # Disable interrupts ITLBNOPFIX - _MFC0 t0, COP_0_TLB_HI # Get current PID + MFC0 t0, COP_0_TLB_HI # Get current PID mtc0 a0, COP_0_TLB_INDEX # Set the index register MIPS_CPU_NOP_DELAY tlbr # Read from the TLB MIPS_CPU_NOP_DELAY mfc0 t2, COP_0_TLB_PG_MASK # fetch the hi entry - _MFC0 t3, COP_0_TLB_HI # fetch the hi entry - _MFC0 ta0, COP_0_TLB_LO0 # See what we got - _MFC0 ta1, COP_0_TLB_LO1 # See what we got - _MTC0 t0, COP_0_TLB_HI # restore PID + MFC0 t3, COP_0_TLB_HI # fetch the hi entry + MFC0 ta0, COP_0_TLB_LO0 # See what we got + MFC0 ta1, COP_0_TLB_LO1 # See what we got + MTC0 t0, COP_0_TLB_HI # restore PID MIPS_CPU_NOP_DELAY mtc0 v1, COP_0_STATUS_REG # Restore the status register ITLBNOPFIX @@ -453,7 +438,7 @@ END(Mips_TLBRead) *-------------------------------------------------------------------------- */ LEAF(Mips_TLBGetPID) - _MFC0 v0, COP_0_TLB_HI # get PID + MFC0 v0, COP_0_TLB_HI # get PID j ra and v0, v0, VMTLB_PID # mask off PID END(Mips_TLBGetPID) @@ -473,7 +458,7 @@ LEAF(mips_TBIAP) mfc0 v1, COP_0_STATUS_REG # save status register mtc0 zero, COP_0_STATUS_REG # disable interrupts - _MFC0 ta0, COP_0_TLB_HI # Get current PID + MFC0 ta0, COP_0_TLB_HI # Get current PID move t2, a0 mfc0 t1, COP_0_TLB_WIRED # @@ -494,14 +479,14 @@ LEAF(mips_TBIAP) MIPS_CPU_NOP_DELAY tlbr # obtain an entry MIPS_CPU_NOP_DELAY - _MFC0 a0, COP_0_TLB_LO1 + MFC0 a0, COP_0_TLB_LO1 and a0, a0, PTE_G # check to see it has G bit bnez a0, 2f nop - _MTC0 v0, COP_0_TLB_HI # make entryHi invalid - _MTC0 zero, COP_0_TLB_LO0 # zero out entryLo0 - _MTC0 zero, COP_0_TLB_LO1 # zero out entryLo1 + MTC0 v0, COP_0_TLB_HI # make entryHi invalid + MTC0 zero, COP_0_TLB_LO0 # zero out entryLo0 + MTC0 zero, COP_0_TLB_LO1 # zero out entryLo1 mtc0 zero, COP_0_TLB_PG_MASK # zero out mask entry MIPS_CPU_NOP_DELAY tlbwi # invalidate the TLB entry @@ -511,11 +496,10 @@ LEAF(mips_TBIAP) bne t1, t2, 1b nop - _MTC0 ta0, COP_0_TLB_HI # restore PID + MTC0 ta0, COP_0_TLB_HI # restore PID mtc0 t3, COP_0_TLB_PG_MASK # restore pgMask MIPS_CPU_NOP_DELAY mtc0 v1, COP_0_STATUS_REG # restore status register j ra # new ASID will be set soon nop - .set mips2 END(mips_TBIAP) Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Tue Mar 23 22:04:18 2010 (r205544) +++ user/jmallett/octeon/sys/mips/mips/trap.c Tue Mar 23 22:06:56 2010 (r205545) @@ -1310,7 +1310,7 @@ get_mapping_info(vm_offset_t va, pd_entr pd_entry_t *pdep; struct proc *p = curproc; - pdep = (&(p->p_vmspace->vm_pmap.pm_segtab[va >> SEGSHIFT])); + pdep = (&(p->p_vmspace->vm_pmap.pm_segtab[(uint32_t)va >> SEGSHIFT])); if (*pdep) ptep = pmap_pte(&p->p_vmspace->vm_pmap, va); else @@ -1351,8 +1351,8 @@ log_illegal_instruction(const char *msg, if (!(pc & 3) && useracc((caddr_t)(intptr_t)pc, sizeof(int) * 4, VM_PROT_READ)) { /* dump page table entry for faulting instruction */ - log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = 0x%lx\n", - (intmax_t)pc, *pdep, ptep ? *ptep : 0); + log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#x\n", + (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); addr = (unsigned int *)(intptr_t)pc; log(LOG_ERR, "Dumping 4 words starting at pc address %p: \n", @@ -1360,8 +1360,8 @@ log_illegal_instruction(const char *msg, log(LOG_ERR, "%08x %08x %08x %08x\n", addr[0], addr[1], addr[2], addr[3]); } else { - log(LOG_ERR, "pc address %#jx is inaccessible, pde = 0x%p, pte = 0x%lx\n", - (intmax_t)pc, *pdep, ptep ? *ptep : 0); + log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#x\n", + (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); } } @@ -1415,8 +1415,8 @@ log_bad_page_fault(char *msg, struct tra (trap_type != T_BUS_ERR_IFETCH) && useracc((caddr_t)(intptr_t)pc, sizeof(int) * 4, VM_PROT_READ)) { /* dump page table entry for faulting instruction */ - log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = 0x%lx\n", - (intmax_t)pc, *pdep, ptep ? *ptep : 0); + log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#x\n", + (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); addr = (unsigned int *)(intptr_t)pc; log(LOG_ERR, "Dumping 4 words starting at pc address %p: \n", @@ -1424,8 +1424,8 @@ log_bad_page_fault(char *msg, struct tra log(LOG_ERR, "%08x %08x %08x %08x\n", addr[0], addr[1], addr[2], addr[3]); } else { - log(LOG_ERR, "pc address %#jx is inaccessible, pde = 0x%p, pte = 0x%lx\n", - (intmax_t)pc, *pdep, ptep ? *ptep : 0); + log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#x\n", + (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); } /* panic("Bad trap");*/ } From owner-svn-src-user@FreeBSD.ORG Tue Mar 23 22:17:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB7F1065672; Tue, 23 Mar 2010 22:17:30 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 194A28FC20; Tue, 23 Mar 2010 22:17:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2NMHT1i004392; Tue, 23 Mar 2010 22:17:29 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2NMHT4w004390; Tue, 23 Mar 2010 22:17:29 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003232217.o2NMHT4w004390@svn.freebsd.org> From: Juli Mallett Date: Tue, 23 Mar 2010 22:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205551 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 22:17:30 -0000 Author: jmallett Date: Tue Mar 23 22:17:29 2010 New Revision: 205551 URL: http://svn.freebsd.org/changeset/base/205551 Log: Attempt to make exception.S correct for pointer and register widths on n32 and n64. Sponsored by: Packet Forensics Modified: user/jmallett/octeon/sys/mips/mips/exception.S Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Tue Mar 23 22:16:57 2010 (r205550) +++ user/jmallett/octeon/sys/mips/mips/exception.S Tue Mar 23 22:17:29 2010 (r205551) @@ -150,11 +150,11 @@ MipsDoTLBMiss: bltz k0, 1f #02: k0<0 -> 1f (kernel fault) srl k0, k0, SEGSHIFT - 2 #03: k0=seg offset (almost) GET_CPU_PCPU(k1) - lw k1, PC_SEGBASE(k1) + PTR_L k1, PC_SEGBASE(k1) beqz k1, 2f #05: make sure segbase is not null andi k0, k0, 0x7fc #06: k0=seg offset (mask 0x3) #xxx mips64 unsafe? - addu k1, k0, k1 #07: k1=seg entry address + PTR_ADDU k1, k0, k1 #07: k1=seg entry address lw k1, 0(k1) #08: k1=seg entry mfc0 k0, COP_0_BAD_VADDR #09: k0=bad address (again) beq k1, zero, 2f #0a: ==0 -- no page table @@ -162,7 +162,7 @@ MipsDoTLBMiss: andi k0, k0, ((NPTEPG/2) - 1) << 3 #0c: k0=page tab offset #xxx mips64 unsafe? - addu k1, k1, k0 #0d: k1=pte address + PTR_ADDU k1, k1, k0 #0d: k1=pte address lw k0, 0(k1) #0e: k0=lo0 pte lw k1, 4(k1) #0f: k1=lo1 pte _SLL k0, k0, WIRED_SHIFT #10: keep bottom 30 bits @@ -197,7 +197,11 @@ VECTOR(MipsException, unknown) and k0, k0, SR_KSU_USER # test for user mode # sneaky but the bits are # with us........ +#if defined(__mips_n64) + sll k0, k0, 4 # shift user bit for cause index +#else sll k0, k0, 3 # shift user bit for cause index +#endif and k1, k1, CR_EXC_CODE # Mask out the cause bits. or k1, k1, k0 # change index to user table 1: @@ -207,7 +211,7 @@ VECTOR(MipsException, unknown) # the cause is already # shifted left by 2 bits so # we dont have to shift. - lw k0, 0(k0) # Get the function address + PTR_L k0, 0(k0) # Get the function address nop j k0 # Jump to the function. nop @@ -378,7 +382,7 @@ SlowFault: NNON_LEAF(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra) .set noat - subu sp, sp, KERN_EXC_FRAME_SIZE + PTR_SUBU sp, sp, KERN_EXC_FRAME_SIZE .mask 0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE) /* * Save CPU state, building 'frame'. @@ -390,7 +394,7 @@ NNON_LEAF(MipsKernGenException, KERN_EXC PTR_LA gp, _C_LABEL(_gp) PTR_LA k0, _C_LABEL(trap) jalr k0 - sw a3, CALLFRAME_RA + KERN_REG_SIZE(sp) # for debugging + REG_S a3, CALLFRAME_RA + KERN_REG_SIZE(sp) # for debugging /* * Update interrupt mask in saved status register @@ -439,7 +443,7 @@ NNON_LEAF(MipsUserGenException, CALLFRAM * Save all of the registers except for the kernel temporaries in u.u_pcb. */ GET_CPU_PCPU(k1) - lw k1, PC_CURPCB(k1) + PTR_L k1, PC_CURPCB(k1) SAVE_U_PCB_REG(AT, AST, k1) .set at SAVE_U_PCB_REG(v0, V0, k1) @@ -475,7 +479,7 @@ NNON_LEAF(MipsUserGenException, CALLFRAM SAVE_U_PCB_REG(gp, GP, k1) SAVE_U_PCB_REG(sp, SP, k1) SAVE_U_PCB_REG(s8, S8, k1) - subu sp, k1, CALLFRAME_SIZ # switch to kernel SP + PTR_SUBU sp, k1, CALLFRAME_SIZ # switch to kernel SP SAVE_U_PCB_REG(ra, RA, k1) SAVE_U_PCB_REG(v0, MULLO, k1) SAVE_U_PCB_REG(v1, MULHI, k1) @@ -483,7 +487,7 @@ NNON_LEAF(MipsUserGenException, CALLFRAM SAVE_U_PCB_REG(a1, CAUSE, k1) SAVE_U_PCB_REG(a2, BADVADDR, k1) SAVE_U_PCB_REG(a3, PC, k1) - sw a3, CALLFRAME_RA(sp) # for debugging + REG_S a3, CALLFRAME_RA(sp) # for debugging PTR_LA gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu and enter kernel mode and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_KSU_MASK | SR_INT_ENAB) @@ -518,7 +522,7 @@ NNON_LEAF(MipsUserGenException, CALLFRAM * by the interrupt code. */ GET_CPU_PCPU(k1) - lw k1, PC_CURPCB(k1) + PTR_L k1, PC_CURPCB(k1) /* * Update interrupt mask in saved status register @@ -599,7 +603,7 @@ END(MipsUserGenException) NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra) .set noat - subu sp, sp, KERN_EXC_FRAME_SIZE + PTR_SUBU sp, sp, KERN_EXC_FRAME_SIZE .mask 0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE) /* * Save the relevant kernel registers onto the stack. @@ -613,7 +617,7 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S PTR_ADDU a0, sp, CALLFRAME_SIZ PTR_LA k0, _C_LABEL(cpu_intr) jalr k0 - sw a3, CALLFRAME_RA + KERN_REG_SIZE(sp) + REG_S a3, CALLFRAME_RA + KERN_REG_SIZE(sp) /* Why no AST processing here? */ /* @@ -631,7 +635,7 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S /* * Restore registers and return from the interrupt. */ - lw v0, CALLFRAME_RA + KERN_REG_SIZE(sp) + REG_L v0, CALLFRAME_RA + KERN_REG_SIZE(sp) RESTORE_CPU sync eret @@ -665,7 +669,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, r * We don't need to save s0 - s8 because the compiler does it for us. */ GET_CPU_PCPU(k1) - lw k1, PC_CURPCB(k1) + PTR_L k1, PC_CURPCB(k1) SAVE_U_PCB_REG(AT, AST, k1) .set at SAVE_U_PCB_REG(v0, V0, k1) @@ -710,7 +714,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, r SAVE_U_PCB_REG(a0, SR, k1) SAVE_U_PCB_REG(a1, CAUSE, k1) SAVE_U_PCB_REG(a3, PC, k1) # PC in a3, note used later! - subu sp, k1, CALLFRAME_SIZ # switch to kernel SP + PTR_SUBU sp, k1, CALLFRAME_SIZ # switch to kernel SP PTR_LA gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu, disable interrupts, set kernel mode kernel mode, clear exception level. @@ -726,7 +730,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, r */ PTR_LA k0, _C_LABEL(cpu_intr) jalr k0 - sw a3, CALLFRAME_RA(sp) # for debugging + REG_S a3, CALLFRAME_RA(sp) # for debugging /* * Enable interrupts before doing ast(). @@ -754,7 +758,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, r ITLBNOPFIX GET_CPU_PCPU(k1) - lw k1, PC_CURPCB(k1) + PTR_L k1, PC_CURPCB(k1) /* * Update interrupt mask in saved status register @@ -830,12 +834,12 @@ NLEAF(MipsTLBInvalidException) /* badvaddr = kernel address */ lui k1, %hi(_C_LABEL(kernel_segmap)) b 2f - lw k1, %lo(_C_LABEL(kernel_segmap))(k1) + PTR_L k1, %lo(_C_LABEL(kernel_segmap))(k1) 1: /* badvaddr = user address */ GET_CPU_PCPU(k1) - lw k1, PC_SEGBASE(k1) + PTR_L k1, PC_SEGBASE(k1) 2: beqz k1, 3f /* invalid page directory pointer */ @@ -843,7 +847,7 @@ NLEAF(MipsTLBInvalidException) srl k0, SEGSHIFT - 2 andi k0, 0xffc - addu k1, k1, k0 + PTR_ADDU k1, k1, k0 lw k1, 0(k1) beqz k1, 3f /* invalid page table page pointer */ nop @@ -851,7 +855,7 @@ NLEAF(MipsTLBInvalidException) mfc0 k0, COP_0_BAD_VADDR srl k0, PGSHIFT - 2 andi k0, 0xffc - addu k1, k1, k0 + PTR_ADDU k1, k1, k0 lw k0, 0(k1) andi k0, PTE_V @@ -916,8 +920,8 @@ tlb_insert_random: * Check for kernel stack overflow. */ GET_CPU_PCPU(k1) - lw k0, PC_CURTHREAD(k1) - lw k0, TD_REALKSTACK(k0) + PTR_L k0, PC_CURTHREAD(k1) + PTR_L k0, TD_REALKSTACK(k0) sltu k0, k0, sp bnez k0, _C_LABEL(MipsKernGenException) nop @@ -933,8 +937,8 @@ tlb_insert_random: sll k1, k1, PAGE_SHIFT + 1 PTR_LA k0, _C_LABEL(pcpu_space) - addiu k0, (NBPG * 2) - addu k0, k0, k1 + PTR_ADDU k0, (NBPG * 2) + PTR_ADDU k0, k0, k1 /* * Stash the original value of 'sp' so we can update trapframe later. @@ -943,12 +947,12 @@ tlb_insert_random: move k1, sp move sp, k0 - subu sp, sp, KERN_EXC_FRAME_SIZE + PTR_SUBU sp, sp, KERN_EXC_FRAME_SIZE move k0, ra move ra, zero - sw ra, CALLFRAME_RA(sp) /* stop the ddb backtrace right here */ - sw zero, CALLFRAME_SP(sp) + REG_S ra, CALLFRAME_RA(sp) /* stop the ddb backtrace right here */ + REG_S zero, CALLFRAME_SP(sp) move ra, k0 SAVE_CPU @@ -963,8 +967,8 @@ tlb_insert_random: * Squelch any more overflow checks by setting the stack base to 0. */ GET_CPU_PCPU(k1) - lw k0, PC_CURTHREAD(k1) - sw zero, TD_REALKSTACK(k0) + PTR_L k0, PC_CURTHREAD(k1) + PTR_S zero, TD_REALKSTACK(k0) move a1, a0 PANIC("kernel stack overflow - trapframe at %p") @@ -1003,18 +1007,18 @@ NLEAF(MipsTLBMissException) bnez k1, _C_LABEL(MipsKernGenException) # out of bound lui k1, %hi(_C_LABEL(kernel_segmap)) # k1=hi of segbase srl k0, 20 # k0=seg offset (almost) - lw k1, %lo(_C_LABEL(kernel_segmap))(k1) # k1=segment tab base + PTR_L k1, %lo(_C_LABEL(kernel_segmap))(k1) # k1=segment tab base beq k1, zero, _C_LABEL(MipsKernGenException) # ==0 -- no seg tab andi k0, k0, 0xffc # k0=seg offset (mask 0x3) #xxx mips64 unsafe - addu k1, k0, k1 # k1=seg entry address + PTR_ADDU k1, k0, k1 # k1=seg entry address lw k1, 0(k1) # k1=seg entry mfc0 k0, COP_0_BAD_VADDR # k0=bad address (again) beq k1, zero, _C_LABEL(MipsKernGenException) # ==0 -- no page table srl k0, 10 # k0=VPN (aka va>>10) andi k0, k0, 0xff8 # k0=page tab offset #xxx mips64 unsafe - addu k1, k1, k0 # k1=pte address + PTR_ADDU k1, k1, k0 # k1=pte address lw k0, 0(k1) # k0=lo0 pte lw k1, 4(k1) # k1=lo1 pte _SLL k0, WIRED_SHIFT # chop bits [31..30] @@ -1051,9 +1055,9 @@ END(MipsTLBMissException) *---------------------------------------------------------------------------- */ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) - subu sp, sp, CALLFRAME_SIZ + PTR_SUBU sp, sp, CALLFRAME_SIZ mfc0 t0, COP_0_STATUS_REG - sw ra, CALLFRAME_RA(sp) + REG_S ra, CALLFRAME_RA(sp) .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) or t1, t0, SR_COP_1_BIT @@ -1075,10 +1079,10 @@ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) * The instruction is in the branch delay slot so the branch will have to * be emulated to get the resulting PC. */ - sw a2, CALLFRAME_SIZ + 8(sp) + PTR_S a2, CALLFRAME_SIZ + 8(sp) GET_CPU_PCPU(a0) #mips64 unsafe? - lw a0, PC_CURPCB(a0) + PTR_L a0, PC_CURPCB(a0) PTR_ADDU a0, a0, U_PCB_REGS # first arg is ptr to CPU registers move a1, a2 # second arg is instruction PC move a2, t1 # third arg is floating point CSR @@ -1089,7 +1093,7 @@ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) * Now load the floating-point instruction in the branch delay slot * to be emulated. */ - lw a2, CALLFRAME_SIZ + 8(sp) # restore EXC pc + PTR_L a2, CALLFRAME_SIZ + 8(sp) # restore EXC pc b 2f lw a0, 4(a2) # a0 = coproc instruction /* @@ -1099,10 +1103,10 @@ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) 1: lw a0, 0(a2) # a0 = coproc instruction #xxx mips64 unsafe? - addu v0, a2, 4 # v0 = next pc + PTR_ADDU v0, a2, 4 # v0 = next pc 2: GET_CPU_PCPU(t2) - lw t2, PC_CURPCB(t2) + PTR_L t2, PC_CURPCB(t2) SAVE_U_PCB_REG(v0, PC, t2) # save new pc /* * Check to see if the instruction to be emulated is a floating-point @@ -1116,7 +1120,7 @@ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) */ 3: GET_CPU_PCPU(a0) - lw a0, PC_CURTHREAD(a0) # get current thread + PTR_L a0, PC_CURTHREAD(a0) # get current thread cfc1 a2, FPC_CSR # code = FP execptions ctc1 zero, FPC_CSR # Clear exceptions PTR_LA t3, _C_LABEL(trapsignal) @@ -1138,7 +1142,7 @@ NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra) */ FPReturn: mfc0 t0, COP_0_STATUS_REG - lw ra, CALLFRAME_RA(sp) + PTR_L ra, CALLFRAME_RA(sp) and t0, t0, ~SR_COP_1_BIT mtc0 t0, COP_0_STATUS_REG ITLBNOPFIX From owner-svn-src-user@FreeBSD.ORG Wed Mar 24 04:37:19 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77044106566C; Wed, 24 Mar 2010 04:37:19 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 66EA18FC21; Wed, 24 Mar 2010 04:37:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2O4bJ8Y089561; Wed, 24 Mar 2010 04:37:19 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2O4bJZP089559; Wed, 24 Mar 2010 04:37:19 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003240437.o2O4bJZP089559@svn.freebsd.org> From: Juli Mallett Date: Wed, 24 Mar 2010 04:37:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205575 - user/jmallett/octeon/gnu/lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2010 04:37:19 -0000 Author: jmallett Date: Wed Mar 24 04:37:19 2010 New Revision: 205575 URL: http://svn.freebsd.org/changeset/base/205575 Log: Temporarily disable libgomp for N64 builds. Modified: user/jmallett/octeon/gnu/lib/Makefile Modified: user/jmallett/octeon/gnu/lib/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/Makefile Wed Mar 24 03:13:24 2010 (r205574) +++ user/jmallett/octeon/gnu/lib/Makefile Wed Mar 24 04:37:19 2010 (r205575) @@ -2,7 +2,16 @@ .include -SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp +SUBDIR= csu libgcc libgcov libdialog libregex libreadline libssp + +# XXX/juli +# The values to substitute for libgomp are elusive for MIPS N64. Using the +# definitions used by other LP64 architectures does not seem to work. It seems +# that not building it is the best available choice for now. Will run the +# configure script and see what it comes up with on a running system. +.if ${MACHINE_ARCH} != "mips" || !defined(TARGET_ABI) || ${TARGET_ABI} != "n64" +SUBDIR+= libgomp +.endif # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. From owner-svn-src-user@FreeBSD.ORG Wed Mar 24 05:55:45 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D432D106564A; Wed, 24 Mar 2010 05:55:45 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A88DF8FC1F; Wed, 24 Mar 2010 05:55:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2O5tjcH006826; Wed, 24 Mar 2010 05:55:45 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2O5tj1g006823; Wed, 24 Mar 2010 05:55:45 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003240555.o2O5tj1g006823@svn.freebsd.org> From: Juli Mallett Date: Wed, 24 Mar 2010 05:55:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205577 - in user/jmallett/octeon/gnu/usr.bin/binutils: . libbfd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2010 05:55:45 -0000 Author: jmallett Date: Wed Mar 24 05:55:45 2010 New Revision: 205577 URL: http://svn.freebsd.org/changeset/base/205577 Log: o) Recognize that N64 MIPS defaults to 64-bit. o) Set default vector for libbfd correctly. Modified: user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0 user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips Modified: user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0 Wed Mar 24 04:52:15 2010 (r205576) +++ user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0 Wed Mar 24 05:55:45 2010 (r205577) @@ -23,7 +23,8 @@ RELSRC= ${RELTOP}/../../../contrib/binut SRCDIR= ${.CURDIR}/${RELSRC} .if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \ - ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips" + ${TARGET_ARCH} == "powerpc" || \ + (${TARGET_ARCH} == "mips" && (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64")) CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 Modified: user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips ============================================================================== --- user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips Wed Mar 24 04:52:15 2010 (r205576) +++ user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips Wed Mar 24 05:55:45 2010 (r205577) @@ -1,8 +1,24 @@ # $FreeBSD$ -#xxxIMPxxx: endian and size +#xxxIMPxxx: TARGET_BIG_ENDIAN is lame. We should use the netbsd convention +# of mipsel and mips. +.if !defined(TARGET_BIG_ENDIAN) +_EMULATION_ENDIAN=little +.else +_EMULATION_ENDIAN=big +.endif + DEFAULT_VECTOR= bfd_elf32_tradbigmips_vec +.if defined(TARGET_ABI) && ${TARGET_ABI} != "o32" +.if ${TARGET_ABI} == "n32" +DEFAULT_VECTOR= bfd_elf32_ntrad${_EMULATION_ENDIAN}mips_vec +.elif ${TARGET_ABI} == "n64" +DEFAULT_VECTOR= bfd_elf64_trad${_EMULATION_ENDIAN}mips_vec +.endif +.endif +DEFAULT_VECTOR?=bfd_elf32_trad${_EMULATION_ENDIAN}mips_vec + SRCS+= coff-mips.c \ cpu-mips.c \ ecoff.c \ From owner-svn-src-user@FreeBSD.ORG Wed Mar 24 06:23:05 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FFB1106564A; Wed, 24 Mar 2010 06:23:05 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F2758FC16; Wed, 24 Mar 2010 06:23:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2O6N57k012904; Wed, 24 Mar 2010 06:23:05 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2O6N5H1012902; Wed, 24 Mar 2010 06:23:05 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003240623.o2O6N5H1012902@svn.freebsd.org> From: Juli Mallett Date: Wed, 24 Mar 2010 06:23:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205579 - user/jmallett/octeon/sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2010 06:23:05 -0000 Author: jmallett Date: Wed Mar 24 06:23:04 2010 New Revision: 205579 URL: http://svn.freebsd.org/changeset/base/205579 Log: Add (currently unchecked) flag for new ABI use. This is the flag to use to e.g. tell an o32 binary from an n32 one. Modified: user/jmallett/octeon/sys/mips/include/elf.h Modified: user/jmallett/octeon/sys/mips/include/elf.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/elf.h Wed Mar 24 06:08:51 2010 (r205578) +++ user/jmallett/octeon/sys/mips/include/elf.h Wed Mar 24 06:23:04 2010 (r205579) @@ -83,6 +83,7 @@ #define EF_MIPS_NOREORDER 1 /* .noreorder was used */ #define EF_MIPS_PIC 2 /* Contains PIC code */ #define EF_MIPS_CPIC 4 /* Uses PIC calling sequence */ +#define EF_MIPS_ABI2 32 /* Use new ABI */ #define EF_MIPS_ARCH 0xf0000000 /* MIPS architecture level */ /* From owner-svn-src-user@FreeBSD.ORG Wed Mar 24 07:03:11 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8E0F106564A; Wed, 24 Mar 2010 07:03:11 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6AAD8FC13; Wed, 24 Mar 2010 07:03:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2O73Be1021842; Wed, 24 Mar 2010 07:03:11 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2O73Bxq021833; Wed, 24 Mar 2010 07:03:11 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003240703.o2O73Bxq021833@svn.freebsd.org> From: Edwin Groothuis Date: Wed, 24 Mar 2010 07:03:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205580 - user/edwin/calendar X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2010 07:03:11 -0000 Author: edwin Date: Wed Mar 24 07:03:11 2010 New Revision: 205580 URL: http://svn.freebsd.org/changeset/base/205580 Log: Make the code WARNS=7 errors free. Well, except for something in io.c, therefore it won't be enabled in the Makefile. Modified: user/edwin/calendar/calendar.c user/edwin/calendar/calendar.h user/edwin/calendar/dates.c user/edwin/calendar/day.c user/edwin/calendar/locale.c user/edwin/calendar/parsedata.c user/edwin/calendar/pom.c user/edwin/calendar/sunpos.c Modified: user/edwin/calendar/calendar.c ============================================================================== --- user/edwin/calendar/calendar.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/calendar.c Wed Mar 24 07:03:11 2010 (r205580) @@ -65,20 +65,21 @@ struct passwd *pw; int doall = 0; int debug = 0; char *DEBUG = NULL; -double UTCoffset = UTCOFFSET_NOTSET; -int eastlongitude = LONGITUDE_NOTSET; time_t f_time = 0; - -int f_dayAfter = 0; /* days after current date */ -int f_dayBefore = 0; /* days before current date */ -int Friday = 5; /* day before weekend */ +double UTCOffset = UTCOFFSET_NOTSET; +int EastLongitude = LONGITUDE_NOTSET; static void usage(void) __dead2; int main(int argc, char *argv[]) { + int f_dayAfter = 0; /* days after current date */ + int f_dayBefore = 0; /* days before current date */ + int Friday = 5; /* day before weekend */ + int ch; + struct tm tp1, tp2; (void)setlocale(LC_ALL, ""); @@ -113,10 +114,10 @@ main(int argc, char *argv[]) Friday = atoi(optarg); break; case 'l': /* Change longitudal position */ - eastlongitude = strtol(optarg, NULL, 10); + EastLongitude = strtol(optarg, NULL, 10); break; case 'U': /* Change UTC offset */ - UTCoffset = strtod(optarg, NULL); + UTCOffset = strtod(optarg, NULL); break; case 'd': @@ -146,8 +147,8 @@ main(int argc, char *argv[]) /* if not set, determine where I could be */ { - if (UTCoffset == UTCOFFSET_NOTSET && - eastlongitude == LONGITUDE_NOTSET) { + if (UTCOffset == UTCOFFSET_NOTSET && + EastLongitude == LONGITUDE_NOTSET) { /* Calculate on difference between here and UTC */ time_t t; struct tm tm; @@ -169,18 +170,18 @@ main(int argc, char *argv[]) uo /= 60.0 / 100.0; uo = hh + uo / 100; - UTCoffset = uo; - eastlongitude = UTCoffset * 15; - } else if (UTCoffset == UTCOFFSET_NOTSET) { + UTCOffset = uo; + EastLongitude = UTCOffset * 15; + } else if (UTCOffset == UTCOFFSET_NOTSET) { /* Base on information given */ - UTCoffset = eastlongitude / 15; - } else if (eastlongitude == LONGITUDE_NOTSET) { + UTCOffset = EastLongitude / 15; + } else if (EastLongitude == LONGITUDE_NOTSET) { /* Base on information given */ - eastlongitude = UTCoffset * 15; + EastLongitude = UTCOffset * 15; } } - settimes(f_time, f_dayBefore, f_dayAfter, &tp1, &tp2); + settimes(f_time, f_dayBefore, f_dayAfter, Friday, &tp1, &tp2); generatedates(&tp1, &tp2); /* Modified: user/edwin/calendar/calendar.h ============================================================================== --- user/edwin/calendar/calendar.h Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/calendar.h Wed Mar 24 07:03:11 2010 (r205580) @@ -55,14 +55,13 @@ extern struct passwd *pw; extern int doall; extern struct iovec header[]; -extern struct tm tp1, tp2; extern time_t t1, t2; extern const char *calendarFile; extern int yrdays; extern struct fixs neaster, npaskha, ncny, nfullmoon, nnewmoon; extern struct fixs nmarequinox, nsepequinox, njunsolstice, ndecsolstice; -extern double UTCoffset; -extern int eastlongitude; +extern double UTCOffset; +extern int EastLongitude; #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) @@ -113,9 +112,6 @@ extern int eastlongitude; #define UTCOFFSET_CNY 8.0 extern int debug; /* show parsing of the input */ -extern int f_dayAfter; /* days after current date */ -extern int f_dayBefore; /* days before current date */ -extern int Friday; /* day before weekend */ extern int year1, year2; /* events.c */ @@ -143,7 +139,7 @@ struct event { struct fixs { char *name; - int len; + size_t len; }; extern const char *days[]; @@ -162,7 +158,7 @@ void setnsequences(char *); /* day.c */ extern const struct tm tm0; -void settimes(time_t,int, int, struct tm *tp1, struct tm *tp2); +void settimes(time_t,int before, int after, int friday, struct tm *tp1, struct tm *tp2); time_t Mktime(char *); /* parsedata.c */ Modified: user/edwin/calendar/dates.c ============================================================================== --- user/edwin/calendar/dates.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/dates.c Wed Mar 24 07:03:11 2010 (r205580) @@ -171,7 +171,6 @@ generatedates(struct tm *tp1, struct tm int y1, m1, d1; int y2, m2, d2; int y, m, d; - int *mondays; y1 = tp1->tm_year; m1 = tp1->tm_mon + 1; Modified: user/edwin/calendar/day.c ============================================================================== --- user/edwin/calendar/day.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/day.c Wed Mar 24 07:03:11 2010 (r205580) @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include "calendar.h" -struct tm tp1, tp2; +//struct tm tp1, tp2; time_t time1, time2; const struct tm tm0; char dayname[10]; @@ -51,7 +51,7 @@ int year1, year2; void -settimes(time_t now, int before, int after, struct tm *tp1, struct tm *tp2) +settimes(time_t now, int before, int after, int friday, struct tm *tp1, struct tm *tp2) { char *oldl, *lbufp; struct tm tp; @@ -59,13 +59,13 @@ settimes(time_t now, int before, int aft localtime_r(&now, &tp); /* Friday displays Monday's events */ - if (f_dayAfter == 0 && f_dayBefore == 0 && Friday != -1) - f_dayAfter = tp.tm_wday == Friday ? 3 : 1; + if (after == 0 && before == 0 && friday != -1) + after = tp.tm_wday == friday ? 3 : 1; - time1 = now - SECSPERDAY * f_dayBefore; + time1 = now - SECSPERDAY * before; localtime_r(&time1, tp1); year1 = 1900 + tp1->tm_year; - time2 = now + SECSPERDAY * f_dayAfter; + time2 = now + SECSPERDAY * after; localtime_r(&time2, tp2); year2 = 1900 + tp2->tm_year; @@ -121,49 +121,3 @@ Mktime(char *dp) #endif return (mktime(&tm)); } - - - -/* return offset for variable weekdays - * -1 -> last weekday in month - * +1 -> first weekday in month - * ... etc ... - */ -int -getdayvar(char *s) -{ - int offs; - - offs = strlen(s); - - /* Sun+1 or Wednesday-2 - * ^ ^ */ - - /* fprintf(stderr, "x: %s %s %d\n", s, s + offs - 2, offs); */ - switch (*(s + offs - 2)) { - case '-': - return (-(atoi(s + offs - 1))); - case '+': - return (atoi(s + offs - 1)); - } - - /* - * some aliases: last, first, second, third, fourth - */ - - /* last */ - if (offs > 4 && !strcasecmp(s + offs - 4, "last")) - return (-1); - else if (offs > 5 && !strcasecmp(s + offs - 5, "first")) - return (+1); - else if (offs > 6 && !strcasecmp(s + offs - 6, "second")) - return (+2); - else if (offs > 5 && !strcasecmp(s + offs - 5, "third")) - return (+3); - else if (offs > 6 && !strcasecmp(s + offs - 6, "fourth")) - return (+4); - - /* no offset detected */ - return (0); -} - Modified: user/edwin/calendar/locale.c ============================================================================== --- user/edwin/calendar/locale.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/locale.c Wed Mar 24 07:03:11 2010 (r205580) @@ -147,7 +147,7 @@ setnsequences(char *seq) if ((p = strchr(p, ' ')) == NULL) { for (i = 0; i < 5; i++) { nsequences[i].name = NULL; - nsequences[i].len = -1; + nsequences[i].len = 0; return; } Modified: user/edwin/calendar/parsedata.c ============================================================================== --- user/edwin/calendar/parsedata.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/parsedata.c Wed Mar 24 07:03:11 2010 (r205580) @@ -37,12 +37,11 @@ __FBSDID("$FreeBSD$"); #include "calendar.h" static char *showflags(int flags); -static int isonlydigits(char *s, int star); -static char *getmonthname(int i); -static int checkmonth(char *s, int *len, int *offset, char **month); -static char *getdayofweekname(int i); -static int checkdayofweek(char *s, int *len, int *offset, char **dow); static int isonlydigits(char *s, int nostar); +static const char *getmonthname(int i); +static int checkmonth(char *s, int *len, int *offset, const char **month); +static const char *getdayofweekname(int i); +static int checkdayofweek(char *s, int *len, int *offset, const char **dow); static int indextooffset(char *s); static int parseoffset(char *s); static char *floattoday(int year, double f); @@ -89,9 +88,10 @@ determinestyle(char *date, int *flags, char *dayofweek, int *idayofweek, char *modifieroffset, char *modifierindex, char *specialday) { - char *p, *dow, *pmonth, *p1, *p2; + char *p, *p1, *p2; + const char *dow, *pmonth; char pold; - int len, offset; + size_t len, offset; *flags = F_NONE; *month = '\0'; @@ -298,25 +298,25 @@ allfine: } static void -remember(int *index, int *y, int *m, int *d, char **ed, int yy, int mm, int dd, - char *extra) +remember(int *rememberindex, int *y, int *m, int *d, char **ed, int yy, int mm, + int dd, char *extra) { static int warned = 0; - if (*index >= MAXCOUNT - 1) { + if (*rememberindex >= MAXCOUNT - 1) { if (warned == 0) warnx("Index > %d, ignored", MAXCOUNT); warned++; return; } - y[*index] = yy; - m[*index] = mm; - d[*index] = dd; + y[*rememberindex] = yy; + m[*rememberindex] = mm; + d[*rememberindex] = dd; if (extra != NULL) - strcpy(ed[*index], extra); + strcpy(ed[*rememberindex], extra); else - ed[*index][0] = '\0'; - *index += 1; + ed[*rememberindex][0] = '\0'; + *rememberindex += 1; } static void @@ -371,7 +371,7 @@ parsedaymonth(char *date, int *yearp, in { char month[100], dayofmonth[100], dayofweek[100], modifieroffset[100]; char modifierindex[100], specialday[100]; - int idayofweek, imonth, idayofmonth, year, index; + int idayofweek = -1, imonth = -1, idayofmonth = -1, year, remindex; int d, m, dow, rm, rd, offset; char *ed; int retvalsign = 1; @@ -407,7 +407,7 @@ parsedaymonth(char *date, int *yearp, in dayofmonth, idayofmonth, dayofweek, idayofweek, modifieroffset, modifierindex, specialday); - index = 0; + remindex = 0; for (year = year1; year <= year2; year++) { /* Get important dates for this year */ yearinfo = years; @@ -427,11 +427,11 @@ parsedaymonth(char *date, int *yearp, in yearinfo->mondays = mondaytab[isleap(year)]; yearinfo->ieaster = easter(year); - fpom(year, UTCoffset, yearinfo->ffullmoon, + fpom(year, UTCOffset, yearinfo->ffullmoon, yearinfo->fnewmoon); fpom(year, UTCOFFSET_CNY, yearinfo->ffullmooncny, yearinfo->fnewmooncny); - fequinoxsolstice(year, UTCoffset, + fequinoxsolstice(year, UTCOffset, yearinfo->equinoxdays, yearinfo->solsticedays); /* @@ -454,7 +454,7 @@ parsedaymonth(char *date, int *yearp, in if (*flags == (F_MONTH | F_DAYOFMONTH)) { if (!remember_ymd(year, imonth, idayofmonth)) continue; - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, idayofmonth, NULL); continue; } @@ -463,7 +463,7 @@ parsedaymonth(char *date, int *yearp, in if (*flags == (F_MONTH | F_DAYOFMONTH | F_VARIABLE)) { if (!remember_ymd(year, imonth, idayofmonth)) continue; - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, idayofmonth, NULL); continue; } @@ -473,7 +473,7 @@ parsedaymonth(char *date, int *yearp, in for (m = 1; m <= 12; m++) { if (!remember_ymd(year, m, idayofmonth)) continue; - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, m, idayofmonth, NULL); } continue; @@ -484,7 +484,7 @@ parsedaymonth(char *date, int *yearp, in for (d = 1; d <= yearinfo->mondays[imonth]; d++) { if (!remember_ymd(year, imonth, d)) continue; - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, d, NULL); } continue; @@ -495,7 +495,7 @@ parsedaymonth(char *date, int *yearp, in for (m = 1; m <= 12; m++) { if (!remember_ymd(year, m, idayofmonth)) continue; - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, m, idayofmonth, NULL); } continue; @@ -507,7 +507,7 @@ parsedaymonth(char *date, int *yearp, in d = (idayofweek - dow + 8) % 7; while (d <= 366) { if (remember_yd(year, d, &rm, &rd)) - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, NULL); d += 7; @@ -526,7 +526,7 @@ parsedaymonth(char *date, int *yearp, in while (d <= yearinfo->mondays[imonth]) { if (--offset == 0 && remember_ymd(year, imonth, d)) { - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, d, NULL); continue; @@ -543,7 +543,7 @@ parsedaymonth(char *date, int *yearp, in d -= 7; } if (remember_ymd(year, imonth, d)) - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, d, NULL); continue; @@ -557,7 +557,7 @@ parsedaymonth(char *date, int *yearp, in d = (idayofweek - dow + 8) % 7; while (d <= yearinfo->mondays[imonth]) { if (remember_ymd(year, imonth, d)) - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, imonth, d, NULL); d += 7; @@ -573,7 +573,7 @@ parsedaymonth(char *date, int *yearp, in offset = parseoffset(modifieroffset); if (remember_yd(year, yearinfo->ieaster + offset, &rm, &rd)) - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, NULL); continue; } @@ -586,7 +586,7 @@ parsedaymonth(char *date, int *yearp, in offset = parseoffset(modifieroffset); if (remember_yd(year, yearinfo->ipaskha + offset, &rm, &rd)) - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, NULL); continue; } @@ -599,7 +599,7 @@ parsedaymonth(char *date, int *yearp, in offset = parseoffset(modifieroffset); if (remember_yd(year, yearinfo->firstcnyday + offset, &rm, &rd)) - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, NULL); continue; } @@ -618,7 +618,7 @@ parsedaymonth(char *date, int *yearp, in &rm, &rd)) { ed = floattotime( yearinfo->ffullmoon[i]); - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } @@ -639,7 +639,7 @@ parsedaymonth(char *date, int *yearp, in floor(yearinfo->fnewmoon[i]) + offset, &rm, &rd)) { ed = floattotime(yearinfo->fnewmoon[i]); - remember(&index, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } @@ -656,7 +656,7 @@ parsedaymonth(char *date, int *yearp, in if (remember_yd(year, yearinfo->equinoxdays[0] + offset, &rm, &rd)) { ed = floattotime(yearinfo->equinoxdays[0]); - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } continue; @@ -669,7 +669,7 @@ parsedaymonth(char *date, int *yearp, in if (remember_yd(year, yearinfo->equinoxdays[1] + offset, &rm, &rd)) { ed = floattotime(yearinfo->equinoxdays[1]); - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } continue; @@ -684,7 +684,7 @@ parsedaymonth(char *date, int *yearp, in if (remember_yd(year, yearinfo->solsticedays[0] + offset, &rm, &rd)) { ed = floattotime(yearinfo->solsticedays[0]); - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } continue; @@ -697,7 +697,7 @@ parsedaymonth(char *date, int *yearp, in if (remember_yd(year, yearinfo->solsticedays[1] + offset, &rm, &rd)) { ed = floattotime(yearinfo->solsticedays[1]); - remember(&index, yearp, monthp, dayp, edp, + remember(&remindex, yearp, monthp, dayp, edp, year, rm, rd, ed); } continue; @@ -711,9 +711,9 @@ parsedaymonth(char *date, int *yearp, in } if (retvalsign == -1) - return (-index - 1); + return (-remindex - 1); else - return (index); + return (remindex); } static char * @@ -762,16 +762,16 @@ showflags(int flags) return s; } -static char * +static const char * getmonthname(int i) { if (nmonths[i - 1].len != 0 && nmonths[i - 1].name != NULL) return (nmonths[i - 1].name); - return ((char *)months[i - 1]); + return (months[i - 1]); } static int -checkmonth(char *s, int *len, int *offset, char **month) +checkmonth(char *s, int *len, int *offset, const char **month) { struct fixs *n; int i; @@ -797,7 +797,7 @@ checkmonth(char *s, int *len, int *offse for (i = 0; fmonths[i] != NULL; i++) { *len = strlen(fmonths[i]); if (strncasecmp(s, fmonths[i], *len) == 0) { - *month = (char *)fmonths[i]; + *month = fmonths[i]; *offset = i + 1; return (1); } @@ -805,7 +805,7 @@ checkmonth(char *s, int *len, int *offse for (i = 0; months[i] != NULL; i++) { if (strncasecmp(s, months[i], 3) == 0) { *len = 3; - *month = (char *)months[i]; + *month = months[i]; *offset = i + 1; return (1); } @@ -813,16 +813,16 @@ checkmonth(char *s, int *len, int *offse return (0); } -static char * +static const char * getdayofweekname(int i) { if (ndays[i].len != 0 && ndays[i].name != NULL) return (ndays[i].name); - return ((char *)days[i]); + return (days[i]); } static int -checkdayofweek(char *s, int *len, int *offset, char **dow) +checkdayofweek(char *s, int *len, int *offset, const char **dow) { struct fixs *n; int i; @@ -848,7 +848,7 @@ checkdayofweek(char *s, int *len, int *o for (i = 0; fdays[i] != NULL; i++) { *len = strlen(fdays[i]); if (strncasecmp(s, fdays[i], *len) == 0) { - *dow = (char *)fdays[i]; + *dow = fdays[i]; *offset = i; return (1); } @@ -856,7 +856,7 @@ checkdayofweek(char *s, int *len, int *o for (i = 0; days[i] != NULL; i++) { if (strncasecmp(s, days[i], 3) == 0) { *len = 3; - *dow = (char *)days[i]; + *dow = days[i]; *offset = i; return (1); } @@ -892,7 +892,7 @@ indextooffset(char *s) } for (i = 0; i < 6; i++) { n = nsequences + i; - if (n->len == -1) + if (n->len == 0) continue; if (strncasecmp(s, n->name, n->len) == 0) { if (i == 5) @@ -953,37 +953,20 @@ floattoday(int year, double f) return (buf); } -char * -inttoday(int year, int f) -{ - static char buf[100]; - int i, m, d; - int *cumdays = cumdaytab[isleap(year)]; - - for (i = 0; 1 + cumdays[i] < f; i++) - ;; - m = --i; - d = floor(f - 1 - cumdays[i]); - f -= floor(f); - - sprintf(buf, "%02d-%02d", m, d); - return (buf); -} - void dodebug(char *what) { int year; - printf("UTCOffset: %g\n", UTCoffset); - printf("eastlongitude: %d\n", eastlongitude); + printf("UTCOffset: %g\n", UTCOffset); + printf("eastlongitude: %d\n", EastLongitude); if (strcmp(what, "moon") == 0) { double ffullmoon[MAXMOONS], fnewmoon[MAXMOONS]; int i; for (year = year1; year <= year2; year++) { - fpom(year, UTCoffset, ffullmoon, fnewmoon); + fpom(year, UTCOffset, ffullmoon, fnewmoon); printf("Full moon %d:\t", year); for (i = 0; ffullmoon[i] >= 0; i++) { printf("%g (%s) ", ffullmoon[i], @@ -1005,7 +988,7 @@ dodebug(char *what) double equinoxdays[2], solsticedays[2]; for (year = year1; year <= year2; year++) { printf("Sun in %d:\n", year); - fequinoxsolstice(year, UTCoffset, equinoxdays, + fequinoxsolstice(year, UTCOffset, equinoxdays, solsticedays); printf("e[0] - %g (%s)\n", equinoxdays[0], Modified: user/edwin/calendar/pom.c ============================================================================== --- user/edwin/calendar/pom.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/pom.c Wed Mar 24 07:03:11 2010 (r205580) @@ -81,8 +81,8 @@ __FBSDID("$FreeBSD$"); static void adj360(double *); static double dtor(double); -static double potm(double); -static double potm_minute(double days, int olddir); +static double potm(double onday); +static double potm_minute(double onday, int olddir); void pom(int year, double utcoffset, int *fms, int *nms) @@ -93,6 +93,7 @@ pom(int year, double utcoffset, int *fms fpom(year, utcoffset, ffms, fnms); + j = 0; for (i = 0; ffms[i] != 0; i++) fms[j++] = round(ffms[i]); fms[i] = -1; @@ -183,7 +184,7 @@ fpom(int year, double utcoffset, double } static double -potm_minute(double days, int olddir) { +potm_minute(double onday, int olddir) { double period = FSECSPERDAY / 2.0; double p1, p2; double before, after; @@ -191,7 +192,7 @@ potm_minute(double days, int olddir) { // printf("---> days:%g olddir:%d\n", days, olddir); - p1 = days + (period / SECSPERDAY); + p1 = onday + (period / SECSPERDAY); period /= 2; while (period > 30) { /* half a minute */ @@ -219,23 +220,23 @@ potm_minute(double days, int olddir) { * return phase of the moon, as a percentage [0 ... 100] */ static double -potm(double days) +potm(double onday) { double N, Msol, Ec, LambdaSol, l, Mm, Ev, Ac, A3, Mmprime; double A4, lprime, V, ldprime, D, Nm; - N = 360 * days / 365.2422; /* sec 42 #3 */ + N = 360 * onday / 365.2422; /* sec 42 #3 */ adj360(&N); Msol = N + EPSILONg - RHOg; /* sec 42 #4 */ adj360(&Msol); Ec = 360 / PI * ECCEN * sin(dtor(Msol)); /* sec 42 #5 */ LambdaSol = N + Ec + EPSILONg; /* sec 42 #6 */ adj360(&LambdaSol); - l = 13.1763966 * days + lzero; /* sec 61 #4 */ + l = 13.1763966 * onday + lzero; /* sec 61 #4 */ adj360(&l); - Mm = l - (0.1114041 * days) - Pzero; /* sec 61 #5 */ + Mm = l - (0.1114041 * onday) - Pzero; /* sec 61 #5 */ adj360(&Mm); - Nm = Nzero - (0.0529539 * days); /* sec 61 #6 */ + Nm = Nzero - (0.0529539 * onday); /* sec 61 #6 */ adj360(&Nm); Ev = 1.2739 * sin(dtor(2*(l - LambdaSol) - Mm)); /* sec 61 #7 */ Ac = 0.1858 * sin(dtor(Msol)); /* sec 61 #8 */ Modified: user/edwin/calendar/sunpos.c ============================================================================== --- user/edwin/calendar/sunpos.c Wed Mar 24 06:23:04 2010 (r205579) +++ user/edwin/calendar/sunpos.c Wed Mar 24 07:03:11 2010 (r205580) @@ -366,12 +366,13 @@ calculatesunlongitude30(int year, int de double dec; double curL, prevL; int *pichinesemonths, *monthdays, *cumdays, i; - int firstmonth330; + int firstmonth330 = -1; cumdays = cumdaytab[isleap(year)]; monthdays = mondaytab[isleap(year)]; pichinesemonths = ichinesemonths; + h = 0; sunpos(year - 1, 12, 31, -24 * (degreeGMToffset / 360.0), HOUR(h), MIN(h), SEC(h), 0.0, 0.0, &prevL, &dec); From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 01:57:13 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4ABF91065670; Fri, 26 Mar 2010 01:57:13 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A31F8FC14; Fri, 26 Mar 2010 01:57:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q1vDJP001194; Fri, 26 Mar 2010 01:57:13 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q1vDDW001192; Fri, 26 Mar 2010 01:57:13 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260157.o2Q1vDDW001192@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 01:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205664 - user/jmallett/octeon/contrib/gcc/config/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 01:57:13 -0000 Author: jmallett Date: Fri Mar 26 01:57:12 2010 New Revision: 205664 URL: http://svn.freebsd.org/changeset/base/205664 Log: Use the same 64-bit MIPS definition that the other GCC configurations use. This fixes whether TARGET_64BIT is set in a few cases, particularly wrt libgcc2. And that's not a good thing, but better to fix those problems than be inconsistent. Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h ============================================================================== --- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Fri Mar 26 01:35:19 2010 (r205663) +++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Fri Mar 26 01:57:12 2010 (r205664) @@ -124,7 +124,7 @@ Boston, MA 02110-1301, USA. */ builtin_define ("__mips__"); \ \ if (TARGET_64BIT) \ - builtin_define ("__mips64__"); \ + builtin_define ("__mips64"); \ \ if (TARGET_FLOAT64) \ builtin_define ("__mips_fpr=64"); \ From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 05:19:53 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 877F91065670; Fri, 26 Mar 2010 05:19:53 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 760D28FC13; Fri, 26 Mar 2010 05:19:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q5JrKp048201; Fri, 26 Mar 2010 05:19:53 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q5JrVn048192; Fri, 26 Mar 2010 05:19:53 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260519.o2Q5JrVn048192@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 05:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205668 - user/jmallett/octeon/contrib/gcc/config X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 05:19:53 -0000 Author: jmallett Date: Fri Mar 26 05:19:53 2010 New Revision: 205668 URL: http://svn.freebsd.org/changeset/base/205668 Log: Add Adam Nemet's 64-bit softfloat<->int functions. Original message: http://gcc.gnu.org/ml/gcc-patches/2006-05/msg00350.html Added: user/jmallett/octeon/contrib/gcc/config/fixdfdi.c user/jmallett/octeon/contrib/gcc/config/fixsfdi.c user/jmallett/octeon/contrib/gcc/config/fixunsdfsi.c user/jmallett/octeon/contrib/gcc/config/fixunssfsi.c user/jmallett/octeon/contrib/gcc/config/floatdidf.c user/jmallett/octeon/contrib/gcc/config/floatdisf.c user/jmallett/octeon/contrib/gcc/config/floatundidf.c user/jmallett/octeon/contrib/gcc/config/floatundisf.c Added: user/jmallett/octeon/contrib/gcc/config/fixdfdi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/fixdfdi.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,28 @@ +/* Public domain. */ +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef float DFtype __attribute__ ((mode (DF))); + +DItype __fixdfdi (DFtype); + +/* This version is needed to prevent recursion; fixunsdfdi in libgcc + calls fixdfdi, which in turn calls calls fixunsdfdi. */ + +static DItype +local_fixunsdfdi (DFtype a) +{ + USItype hi, lo; + + hi = a / (((UDItype) 1) << (sizeof (USItype) * 8)); + lo = a - ((DFtype) hi) * (((UDItype) 1) << (sizeof (USItype) * 8)); + return ((UDItype) hi << (sizeof (USItype) * 8)) | lo; +} + +DItype +__fixdfdi (DFtype a) +{ + if (a < 0) + return - local_fixunsdfdi (-a); + return local_fixunsdfdi (a); +} Added: user/jmallett/octeon/contrib/gcc/config/fixsfdi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/fixsfdi.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,30 @@ +/* Public domain. */ +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef float SFtype __attribute__ ((mode (SF))); +typedef float DFtype __attribute__ ((mode (DF))); + +DItype __fixsfdi (SFtype); + +/* This version is needed to prevent recursion; fixunssfdi in libgcc + calls fixsfdi, which in turn calls calls fixunssfdi. */ + +static DItype +local_fixunssfdi (SFtype original_a) +{ + DFtype a = original_a; + USItype hi, lo; + + hi = a / (((UDItype) 1) << (sizeof (USItype) * 8)); + lo = a - ((DFtype) hi) * (((UDItype) 1) << (sizeof (USItype) * 8)); + return ((UDItype) hi << (sizeof (USItype) * 8)) | lo; +} + +DItype +__fixsfdi (SFtype a) +{ + if (a < 0) + return - local_fixunssfdi (-a); + return local_fixunssfdi (a); +} Added: user/jmallett/octeon/contrib/gcc/config/fixunsdfsi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/fixunsdfsi.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,18 @@ +/* Public domain. */ +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int SItype __attribute__ ((mode (SI))); +typedef float SFtype __attribute__ ((mode (SF))); +typedef float DFtype __attribute__ ((mode (DF))); + +USItype __fixunsdfsi (DFtype); + +#define SItype_MIN \ + (- ((SItype) (((USItype) 1 << ((sizeof (SItype) * 8) - 1)) - 1)) - 1) + +USItype +__fixunsdfsi (DFtype a) +{ + if (a >= - (DFtype) SItype_MIN) + return (SItype) (a + SItype_MIN) - SItype_MIN; + return (SItype) a; +} Added: user/jmallett/octeon/contrib/gcc/config/fixunssfsi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/fixunssfsi.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,17 @@ +/* Public domain. */ +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int SItype __attribute__ ((mode (SI))); +typedef float SFtype __attribute__ ((mode (SF))); + +USItype __fixunssfsi (SFtype); + +#define SItype_MIN \ + (- ((SItype) (((USItype) 1 << ((sizeof (SItype) * 8) - 1)) - 1)) - 1) + +USItype +__fixunssfsi (SFtype a) +{ + if (a >= - (SFtype) SItype_MIN) + return (SItype) (a + SItype_MIN) - SItype_MIN; + return (SItype) a; +} Added: user/jmallett/octeon/contrib/gcc/config/floatdidf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/floatdidf.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,17 @@ +/* Public domain. */ +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef float DFtype __attribute__ ((mode (DF))); + +DFtype __floatdidf (DItype); + +DFtype +__floatdidf (DItype u) +{ + /* When the word size is small, we never get any rounding error. */ + DFtype f = (SItype) (u >> (sizeof (SItype) * 8)); + f *= 0x1p32f; + f += (USItype) u; + return f; +} Added: user/jmallett/octeon/contrib/gcc/config/floatdisf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/floatdisf.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,38 @@ +/* Public domain. */ +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef float SFtype __attribute__ ((mode (SF))); +typedef float DFtype __attribute__ ((mode (DF))); + +SFtype __floatdisf (DItype); + +SFtype +__floatdisf (DItype u) +{ + /* Protect against double-rounding error. + Represent any low-order bits, that might be truncated by a bit that + won't be lost. The bit can go in anywhere below the rounding position + of SFtype. A fixed mask and bit position handles all usual + configurations. */ + if (53 < (sizeof (DItype) * 8) + && 53 > ((sizeof (DItype) * 8) - 53 + 24)) + { + if (!(- ((DItype) 1 << 53) < u + && u < ((DItype) 1 << 53))) + { + if ((UDItype) u & (((UDItype) 1 << (sizeof (DItype) * 8 - 53)) - 1)) + { + u &= ~ (((UDItype) 1 << (sizeof (DItype) * 8 - 53)) - 1); + u |= (UDItype) 1 << (sizeof (DItype) * 8 - 53); + } + } + } + /* Do the calculation in a wider type so that we don't lose any of + the precision of the high word while multiplying it. */ + DFtype f = (SItype) (u >> (sizeof (SItype) * 8)); + f *= 0x1p32f; + f += (USItype) u; + return (SFtype) f; +} Added: user/jmallett/octeon/contrib/gcc/config/floatundidf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/floatundidf.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,16 @@ +/* Public domain. */ +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef float DFtype __attribute__ ((mode (DF))); + +DFtype __floatundidf (UDItype); + +DFtype +__floatundidf (UDItype u) +{ + /* When the word size is small, we never get any rounding error. */ + DFtype f = (USItype) (u >> (sizeof (USItype) * 8)); + f *= 0x1p32f; + f += (USItype) u; + return f; +} Added: user/jmallett/octeon/contrib/gcc/config/floatundisf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/contrib/gcc/config/floatundisf.c Fri Mar 26 05:19:53 2010 (r205668) @@ -0,0 +1,36 @@ +/* Public domain. */ +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef float SFtype __attribute__ ((mode (SF))); +typedef float DFtype __attribute__ ((mode (DF))); + +SFtype __floatundisf (UDItype); + +SFtype +__floatundisf (UDItype u) +{ + /* Protect against double-rounding error. + Represent any low-order bits, that might be truncated by a bit that + won't be lost. The bit can go in anywhere below the rounding position + of SFTYPE. A fixed mask and bit position handles all usual + configurations. */ + if (53 < (sizeof (DItype) * 8) + && 53 > ((sizeof (DItype) * 8) - 53 + 24)) + { + if (u >= ((UDItype) 1 << 53)) + { + if ((UDItype) u & (((UDItype) 1 << (sizeof (DItype) * 8 - 53)) - 1)) + { + u &= ~ (((UDItype) 1 << (sizeof (DItype) * 8 - 53)) - 1); + u |= (UDItype) 1 << (sizeof (DItype) * 8 - 53); + } + } + } + /* Do the calculation in a wider type so that we don't lose any of + the precision of the high word while multiplying it. */ + DFtype f = (USItype) (u >> (sizeof (USItype) * 8)); + f *= 0x1p32f; + f += (USItype) u; + return (SFtype) f; +} From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 05:20:18 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBDC51065742; Fri, 26 Mar 2010 05:20:18 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBB288FC0A; Fri, 26 Mar 2010 05:20:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q5KIRe048339; Fri, 26 Mar 2010 05:20:18 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q5KIgb048337; Fri, 26 Mar 2010 05:20:18 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260520.o2Q5KIgb048337@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 05:20:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205669 - user/jmallett/octeon/lib/libc/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 05:20:18 -0000 Author: jmallett Date: Fri Mar 26 05:20:18 2010 New Revision: 205669 URL: http://svn.freebsd.org/changeset/base/205669 Log: Use 64-bit softfloat on MIPS like NetBSD does. Modified: user/jmallett/octeon/lib/libc/mips/Makefile.inc Modified: user/jmallett/octeon/lib/libc/mips/Makefile.inc ============================================================================== --- user/jmallett/octeon/lib/libc/mips/Makefile.inc Fri Mar 26 05:19:53 2010 (r205668) +++ user/jmallett/octeon/lib/libc/mips/Makefile.inc Fri Mar 26 05:20:18 2010 (r205669) @@ -1,8 +1,6 @@ # $NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $ # $FreeBSD$ -SOFTFLOAT_BITS=32 - CFLAGS+=-DSOFTFLOAT MDSRCS+= machdep_ldisd.c From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 05:20:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACEAA1065677; Fri, 26 Mar 2010 05:20:59 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB0B8FC1D; Fri, 26 Mar 2010 05:20:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q5Kx67048533; Fri, 26 Mar 2010 05:20:59 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q5Kx3b048531; Fri, 26 Mar 2010 05:20:59 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260520.o2Q5Kx3b048531@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 05:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205670 - user/jmallett/octeon/gnu/lib/libgcc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 05:20:59 -0000 Author: jmallett Date: Fri Mar 26 05:20:59 2010 New Revision: 205670 URL: http://svn.freebsd.org/changeset/base/205670 Log: Add Adam Nemet's 64-bit softfloat<->int conversion functions to libgcc on MIPS. Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/libgcc/Makefile Fri Mar 26 05:20:18 2010 (r205669) +++ user/jmallett/octeon/gnu/lib/libgcc/Makefile Fri Mar 26 05:20:59 2010 (r205670) @@ -117,6 +117,10 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns .if ${TARGET_ARCH} == "mips" LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c +LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c +LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c +LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c +LIB2FUNCS_EXTRA+= fixdfdi.c .endif .if ${TARGET_ARCH} == "ia64" From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 06:03:21 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED940106564A; Fri, 26 Mar 2010 06:03:21 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DCD8B8FC08; Fri, 26 Mar 2010 06:03:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q63Lq2058012; Fri, 26 Mar 2010 06:03:21 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q63LHM058011; Fri, 26 Mar 2010 06:03:21 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260603.o2Q63LHM058011@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 06:03:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205673 - user/jmallett/octeon/contrib/gcc/config/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 06:03:22 -0000 Author: jmallett Date: Fri Mar 26 06:03:21 2010 New Revision: 205673 URL: http://svn.freebsd.org/changeset/base/205673 Log: Put libgcc and libc into a group so that references between them are resolved properly. For some reason this only seems to afflict n64 builds. Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h ============================================================================== --- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Fri Mar 26 05:35:25 2010 (r205672) +++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h Fri Mar 26 06:03:21 2010 (r205673) @@ -75,7 +75,10 @@ Boston, MA 02110-1301, USA. */ %{mabi=o64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \ %(fbsd_link_spec)" - +#undef LINK_GCC_C_SEQUENCE_SPEC +#define LINK_GCC_C_SEQUENCE_SPEC \ + "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}" + /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h but trashed by config/mips/elf.h. */ #undef STARTFILE_SPEC From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 06:06:20 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFA75106566B; Fri, 26 Mar 2010 06:06:20 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BF0898FC0A; Fri, 26 Mar 2010 06:06:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q66KQt058695; Fri, 26 Mar 2010 06:06:20 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q66K95058693; Fri, 26 Mar 2010 06:06:20 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260606.o2Q66K95058693@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 06:06:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205674 - user/jmallett/octeon/sys/mips/include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 06:06:20 -0000 Author: jmallett Date: Fri Mar 26 06:06:20 2010 New Revision: 205674 URL: http://svn.freebsd.org/changeset/base/205674 Log: Check _MIPS_SZLONG to set _LARGE_LONG appropriately. Modified: user/jmallett/octeon/sys/mips/include/_limits.h Modified: user/jmallett/octeon/sys/mips/include/_limits.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/_limits.h Fri Mar 26 06:03:21 2010 (r205673) +++ user/jmallett/octeon/sys/mips/include/_limits.h Fri Mar 26 06:06:20 2010 (r205674) @@ -34,6 +34,10 @@ #ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ +#if _MIPS_SZLONG == 64 +#define _LARGE_LONG +#endif + /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 07:51:09 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAE061065672; Fri, 26 Mar 2010 07:51:09 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA1E98FC16; Fri, 26 Mar 2010 07:51:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q7p9Vl081773; Fri, 26 Mar 2010 07:51:09 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q7p92Y081771; Fri, 26 Mar 2010 07:51:09 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260751.o2Q7p92Y081771@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 07:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205676 - user/jmallett/octeon/gnu/lib/libgcc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 07:51:09 -0000 Author: jmallett Date: Fri Mar 26 07:51:09 2010 New Revision: 205676 URL: http://svn.freebsd.org/changeset/base/205676 Log: Add fixunssfsi.c. Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/libgcc/Makefile Fri Mar 26 07:15:27 2010 (r205675) +++ user/jmallett/octeon/gnu/lib/libgcc/Makefile Fri Mar 26 07:51:09 2010 (r205676) @@ -120,7 +120,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c -LIB2FUNCS_EXTRA+= fixdfdi.c +LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c .endif .if ${TARGET_ARCH} == "ia64" From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 08:05:31 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45718106564A; Fri, 26 Mar 2010 08:05:31 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A1178FC0C; Fri, 26 Mar 2010 08:05:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q85Vji084971; Fri, 26 Mar 2010 08:05:31 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q85Uf7084968; Fri, 26 Mar 2010 08:05:30 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003260805.o2Q85Uf7084968@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 08:05:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205677 - in user/jmallett/octeon/gnu/lib: . libgomp X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 08:05:31 -0000 Author: jmallett Date: Fri Mar 26 08:05:30 2010 New Revision: 205677 URL: http://svn.freebsd.org/changeset/base/205677 Log: Now that we're setting the right defines, we can build libgomp for n64. Modified: user/jmallett/octeon/gnu/lib/Makefile user/jmallett/octeon/gnu/lib/libgomp/Makefile Modified: user/jmallett/octeon/gnu/lib/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/Makefile Fri Mar 26 07:51:09 2010 (r205676) +++ user/jmallett/octeon/gnu/lib/Makefile Fri Mar 26 08:05:30 2010 (r205677) @@ -2,16 +2,7 @@ .include -SUBDIR= csu libgcc libgcov libdialog libregex libreadline libssp - -# XXX/juli -# The values to substitute for libgomp are elusive for MIPS N64. Using the -# definitions used by other LP64 architectures does not seem to work. It seems -# that not building it is the best available choice for now. Will run the -# configure script and see what it comes up with on a running system. -.if ${MACHINE_ARCH} != "mips" || !defined(TARGET_ABI) || ${TARGET_ABI} != "n64" -SUBDIR+= libgomp -.endif +SUBDIR= csu libgcc libgcov libgomp libdialog libregex libreadline libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. Modified: user/jmallett/octeon/gnu/lib/libgomp/Makefile ============================================================================== --- user/jmallett/octeon/gnu/lib/libgomp/Makefile Fri Mar 26 07:51:09 2010 (r205676) +++ user/jmallett/octeon/gnu/lib/libgomp/Makefile Fri Mar 26 08:05:30 2010 (r205677) @@ -23,9 +23,9 @@ CFLAGS+= -I${.CURDIR} -I. -I${SRCDIR} -I VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration -# XXX/juli Need to handle different MIPS ABIs here properly. .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \ - ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc + ${MACHINE_ARCH} == powerpc || \ + (${MACHINE_ARCH} == mips && (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64")) OMP_LOCK_ALIGN = 4 OMP_LOCK_KIND= 4 OMP_LOCK_SIZE= 4 From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 22:04:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBAEA106566B; Fri, 26 Mar 2010 22:04:57 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBD768FC1B; Fri, 26 Mar 2010 22:04:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QM4vYM073644; Fri, 26 Mar 2010 22:04:57 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QM4vYW073642; Fri, 26 Mar 2010 22:04:57 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003262204.o2QM4vYW073642@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 22:04:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205715 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 22:04:57 -0000 Author: jmallett Date: Fri Mar 26 22:04:57 2010 New Revision: 205715 URL: http://svn.freebsd.org/changeset/base/205715 Log: Shift exception code to get offset into table of 64-bit pointers. Modified: user/jmallett/octeon/sys/mips/mips/exception.S Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Fri Mar 26 22:04:11 2010 (r205714) +++ user/jmallett/octeon/sys/mips/mips/exception.S Fri Mar 26 22:04:57 2010 (r205715) @@ -203,6 +203,9 @@ VECTOR(MipsException, unknown) sll k0, k0, 3 # shift user bit for cause index #endif and k1, k1, CR_EXC_CODE # Mask out the cause bits. +#if defined(__mips_n64) + sll k1, k1, 1 # shift code to get 8-byte offset +#endif or k1, k1, k0 # change index to user table 1: PTR_LA k0, _C_LABEL(machExceptionTable) # get base of the jump table From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 23:18:34 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7B40106566C; Fri, 26 Mar 2010 23:18:34 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B84E48FC12; Fri, 26 Mar 2010 23:18:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QNIYCW089814; Fri, 26 Mar 2010 23:18:34 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QNIYMo089812; Fri, 26 Mar 2010 23:18:34 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003262318.o2QNIYMo089812@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 23:18:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205716 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 23:18:34 -0000 Author: jmallett Date: Fri Mar 26 23:18:34 2010 New Revision: 205716 URL: http://svn.freebsd.org/changeset/base/205716 Log: Look for 64-bit stack modifications and stores as well. Modified: user/jmallett/octeon/sys/mips/mips/stack_machdep.c Modified: user/jmallett/octeon/sys/mips/mips/stack_machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/stack_machdep.c Fri Mar 26 22:04:57 2010 (r205715) +++ user/jmallett/octeon/sys/mips/mips/stack_machdep.c Fri Mar 26 23:18:34 2010 (r205716) @@ -66,12 +66,15 @@ stack_capture(struct stack *st, u_regist switch (insn.IType.op) { case OP_ADDI: case OP_ADDIU: + case OP_DADDI: + case OP_DADDIU: if (insn.IType.rs != SP || insn.IType.rt != SP) break; stacksize = -(short)insn.IType.imm; break; case OP_SW: + case OP_SD: if (insn.IType.rs != SP || insn.IType.rt != RA) break; ra_stack_pos = (short)insn.IType.imm; From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 23:26:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C0051065686; Fri, 26 Mar 2010 23:26:57 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CA878FC18; Fri, 26 Mar 2010 23:26:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QNQvlh091658; Fri, 26 Mar 2010 23:26:57 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QNQva7091656; Fri, 26 Mar 2010 23:26:57 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003262326.o2QNQva7091656@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 23:26:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205717 - user/jmallett/octeon/contrib/binutils/ld/emulparams X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 23:26:57 -0000 Author: jmallett Date: Fri Mar 26 23:26:57 2010 New Revision: 205717 URL: http://svn.freebsd.org/changeset/base/205717 Log: Temporarily make n64 use the n32 text address since we only have a 32-bit pmap. Modified: user/jmallett/octeon/contrib/binutils/ld/emulparams/elf64btsmip.sh Modified: user/jmallett/octeon/contrib/binutils/ld/emulparams/elf64btsmip.sh ============================================================================== --- user/jmallett/octeon/contrib/binutils/ld/emulparams/elf64btsmip.sh Fri Mar 26 23:18:34 2010 (r205716) +++ user/jmallett/octeon/contrib/binutils/ld/emulparams/elf64btsmip.sh Fri Mar 26 23:26:57 2010 (r205717) @@ -13,4 +13,6 @@ OTHER_SECTIONS=' .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } ' -TEXT_START_ADDR="0x120000000" +# XXX/juli +# We really only have 32-bit pmap on FreeBSD right now, so don't override the start addr. +#TEXT_START_ADDR="0x120000000" From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 23:27:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A5A21065670; Fri, 26 Mar 2010 23:27:30 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B2108FC12; Fri, 26 Mar 2010 23:27:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QNRTRJ091825; Fri, 26 Mar 2010 23:27:29 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QNRTXo091823; Fri, 26 Mar 2010 23:27:29 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003262327.o2QNRTXo091823@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 23:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205718 - user/jmallett/octeon/sys/mips/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 23:27:30 -0000 Author: jmallett Date: Fri Mar 26 23:27:29 2010 New Revision: 205718 URL: http://svn.freebsd.org/changeset/base/205718 Log: Turn on bootp for testing of n64 kernel+world. Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1 Fri Mar 26 23:26:57 2010 (r205717) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1 Fri Mar 26 23:27:29 2010 (r205718) @@ -56,10 +56,10 @@ options _KPOSIX_PRIORITY_SCHEDULING #Po #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING -#options BOOTP -#options BOOTP_NFSROOT -#options BOOTP_NFSV3 -#options BOOTP_COMPAT +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support From owner-svn-src-user@FreeBSD.ORG Fri Mar 26 23:44:52 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 225BF106566C; Fri, 26 Mar 2010 23:44:52 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0EB938FC1A; Fri, 26 Mar 2010 23:44:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QNiqUl095681; Fri, 26 Mar 2010 23:44:52 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QNip2Q095669; Fri, 26 Mar 2010 23:44:51 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003262344.o2QNip2Q095669@svn.freebsd.org> From: Juli Mallett Date: Fri, 26 Mar 2010 23:44:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205719 - in user/jmallett/octeon: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool contrib/cpio contrib/netcat crypto/openssl/crypto/camellia/asm etc/defaults gnu/... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 23:44:52 -0000 Author: jmallett Date: Fri Mar 26 23:44:51 2010 New Revision: 205719 URL: http://svn.freebsd.org/changeset/base/205719 Log: Merge from head. Deleted: user/jmallett/octeon/contrib/cpio/ user/jmallett/octeon/crypto/openssl/crypto/camellia/asm/ user/jmallett/octeon/gnu/usr.bin/cpio/ user/jmallett/octeon/tools/build/options/WITH_GNU_CPIO user/jmallett/octeon/tools/tools/nanobsd/pcengines/Pkg/ user/jmallett/octeon/usr.sbin/ntp/ntptrace/ Modified: user/jmallett/octeon/MAINTAINERS user/jmallett/octeon/Makefile.inc1 user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zpool/zpool.8 user/jmallett/octeon/contrib/netcat/FREEBSD-upgrade user/jmallett/octeon/contrib/netcat/FREEBSD-vendor user/jmallett/octeon/contrib/netcat/nc.1 user/jmallett/octeon/contrib/netcat/netcat.c user/jmallett/octeon/etc/defaults/periodic.conf user/jmallett/octeon/gnu/usr.bin/Makefile user/jmallett/octeon/gnu/usr.bin/gdb/Makefile user/jmallett/octeon/gnu/usr.bin/gdb/Makefile.inc user/jmallett/octeon/gnu/usr.bin/gdb/kgdb/trgt_ia64.c user/jmallett/octeon/include/dlfcn.h user/jmallett/octeon/lib/libc/gen/dlfcn.c user/jmallett/octeon/lib/libc/gen/dlopen.3 user/jmallett/octeon/lib/libc/sys/mmap.2 user/jmallett/octeon/lib/libpmc/pmc.xscale.3 user/jmallett/octeon/libexec/ftpd/popen.c user/jmallett/octeon/libexec/rtld-elf/rtld.c user/jmallett/octeon/sbin/ifconfig/ifieee80211.c user/jmallett/octeon/sbin/ipfw/ipfw2.c user/jmallett/octeon/sbin/setkey/setkey.8 user/jmallett/octeon/share/man/man3/pthread_affinity_np.3 user/jmallett/octeon/share/man/man5/src.conf.5 user/jmallett/octeon/share/misc/bsd-family-tree user/jmallett/octeon/share/mk/bsd.own.mk user/jmallett/octeon/sys/amd64/amd64/machdep.c user/jmallett/octeon/sys/amd64/ia32/ia32_signal.c user/jmallett/octeon/sys/amd64/linux32/linux32_sysvec.c user/jmallett/octeon/sys/arm/arm/machdep.c user/jmallett/octeon/sys/arm/xscale/ixp425/cambria_fled.c user/jmallett/octeon/sys/boot/i386/boot2/boot2.c user/jmallett/octeon/sys/boot/i386/gptboot/gptboot.c user/jmallett/octeon/sys/boot/i386/zfsboot/zfsboot.c user/jmallett/octeon/sys/compat/ia32/ia32_signal.h user/jmallett/octeon/sys/compat/linprocfs/linprocfs.c user/jmallett/octeon/sys/compat/linux/linux_ioctl.c user/jmallett/octeon/sys/compat/x86bios/x86bios.c user/jmallett/octeon/sys/conf/kern.post.mk user/jmallett/octeon/sys/conf/kmod.mk user/jmallett/octeon/sys/conf/options user/jmallett/octeon/sys/dev/ata/ata-raid.c user/jmallett/octeon/sys/dev/bge/if_bge.c user/jmallett/octeon/sys/dev/fb/vesa.c user/jmallett/octeon/sys/dev/fb/vga.c user/jmallett/octeon/sys/dev/hwpmc/hwpmc_logging.c user/jmallett/octeon/sys/dev/isp/isp.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.h user/jmallett/octeon/sys/dev/isp/isp_library.c user/jmallett/octeon/sys/dev/isp/ispvar.h user/jmallett/octeon/sys/dev/ppc/ppc_pci.c user/jmallett/octeon/sys/dev/syscons/scvgarndr.c user/jmallett/octeon/sys/dev/usb/quirk/usb_quirk.c user/jmallett/octeon/sys/dev/usb/usbdevs user/jmallett/octeon/sys/fs/nfs/nfs_commonport.c user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdport.c user/jmallett/octeon/sys/geom/geom_io.c user/jmallett/octeon/sys/i386/i386/machdep.c user/jmallett/octeon/sys/i386/i386/mca.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/i386/include/md_var.h user/jmallett/octeon/sys/i386/include/specialreg.h user/jmallett/octeon/sys/i386/linux/linux_sysvec.c user/jmallett/octeon/sys/ia64/ia32/ia32_signal.c user/jmallett/octeon/sys/ia64/ia64/autoconf.c user/jmallett/octeon/sys/ia64/ia64/clock.c user/jmallett/octeon/sys/ia64/ia64/interrupt.c user/jmallett/octeon/sys/ia64/ia64/machdep.c user/jmallett/octeon/sys/ia64/ia64/mp_machdep.c user/jmallett/octeon/sys/ia64/ia64/trap.c user/jmallett/octeon/sys/ia64/include/acpica_machdep.h user/jmallett/octeon/sys/ia64/include/cpufunc.h user/jmallett/octeon/sys/ia64/include/intr.h user/jmallett/octeon/sys/ia64/include/pcpu.h user/jmallett/octeon/sys/kern/imgact_elf.c user/jmallett/octeon/sys/kern/kern_exec.c user/jmallett/octeon/sys/kern/kern_rwlock.c user/jmallett/octeon/sys/kern/vfs_lookup.c user/jmallett/octeon/sys/mips/include/cpufunc.h user/jmallett/octeon/sys/mips/mips/pm_machdep.c user/jmallett/octeon/sys/mips/mips/support.S user/jmallett/octeon/sys/mips/mips/tick.c user/jmallett/octeon/sys/mips/sibyte/sb_asm.S user/jmallett/octeon/sys/mips/sibyte/sb_scd.c user/jmallett/octeon/sys/modules/dummynet/Makefile user/jmallett/octeon/sys/net/if_media.h user/jmallett/octeon/sys/net80211/ieee80211.c user/jmallett/octeon/sys/net80211/ieee80211_hostap.c user/jmallett/octeon/sys/net80211/ieee80211_ht.c user/jmallett/octeon/sys/net80211/ieee80211_var.h user/jmallett/octeon/sys/netgraph/netflow/ng_netflow.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c user/jmallett/octeon/sys/netinet/sctp_indata.c user/jmallett/octeon/sys/netinet/sctp_input.c user/jmallett/octeon/sys/netinet/sctp_output.c user/jmallett/octeon/sys/netinet/sctp_pcb.c user/jmallett/octeon/sys/netinet/sctp_pcb.h user/jmallett/octeon/sys/netinet/sctp_sysctl.c user/jmallett/octeon/sys/netinet/sctp_uio.h user/jmallett/octeon/sys/netinet/sctputil.c user/jmallett/octeon/sys/netinet/sctputil.h user/jmallett/octeon/sys/netinet6/nd6.c user/jmallett/octeon/sys/nfsserver/nfs_srvsubs.c user/jmallett/octeon/sys/pc98/pc98/machdep.c user/jmallett/octeon/sys/powerpc/aim/machdep.c user/jmallett/octeon/sys/powerpc/aim/nexus.c user/jmallett/octeon/sys/powerpc/booke/interrupt.c user/jmallett/octeon/sys/powerpc/booke/machdep.c user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.c user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.h user/jmallett/octeon/sys/powerpc/mpc85xx/pci_ocp.c user/jmallett/octeon/sys/powerpc/powermac/cuda.c user/jmallett/octeon/sys/powerpc/powermac/cudavar.h user/jmallett/octeon/sys/powerpc/powermac/pmu.c user/jmallett/octeon/sys/powerpc/powermac/smu.c user/jmallett/octeon/sys/powerpc/powerpc/cpu.c user/jmallett/octeon/sys/rpc/svc.c user/jmallett/octeon/sys/sparc64/sparc64/machdep.c user/jmallett/octeon/sys/sun4v/sun4v/machdep.c user/jmallett/octeon/sys/sys/imgact.h user/jmallett/octeon/sys/sys/sysent.h user/jmallett/octeon/sys/vm/vm_mmap.c user/jmallett/octeon/tools/build/mk/OptionalObsoleteFiles.inc user/jmallett/octeon/tools/tools/nanobsd/Files/root/updatep1 user/jmallett/octeon/tools/tools/nanobsd/Files/root/updatep2 user/jmallett/octeon/usr.bin/cpio/Makefile user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/Makefile user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c user/jmallett/octeon/usr.sbin/sysinstall/sysinstall.8 Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/netcat/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) Modified: user/jmallett/octeon/MAINTAINERS ============================================================================== --- user/jmallett/octeon/MAINTAINERS Fri Mar 26 23:27:29 2010 (r205718) +++ user/jmallett/octeon/MAINTAINERS Fri Mar 26 23:44:51 2010 (r205719) @@ -57,9 +57,9 @@ libfetch des Advance notification reques fetch des Advance notification requested. libpam des Pre-commit review requested. openssh des Pre-commit review requested. -pseudofs des Advance notification requested. -procfs des Advance notification requested. -linprocfs des Advance notification requested. +pseudofs des Pre-commit review requested. +procfs des Pre-commit review requested. +linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. Modified: user/jmallett/octeon/Makefile.inc1 ============================================================================== --- user/jmallett/octeon/Makefile.inc1 Fri Mar 26 23:27:29 2010 (r205718) +++ user/jmallett/octeon/Makefile.inc1 Fri Mar 26 23:44:51 2010 (r205719) @@ -283,6 +283,7 @@ LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTRE VERSION="${VERSION}" \ MACHINE=i386 \ MACHINE_ARCH=i386 \ + MACHINE_CPU="i686 mmx sse sse2" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ CC="${CC} ${LIB32FLAGS}" \ Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Fri Mar 26 23:27:29 2010 (r205718) +++ user/jmallett/octeon/ObsoleteFiles.inc Fri Mar 26 23:44:51 2010 (r205719) @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100326: gcpio removal +OLD_FILES+=usr/bin/gcpio +OLD_FILES+=usr/share/info/cpio.info.gz +OLD_FILES+=usr/share/man/man1/gcpio.1.gz + # 20100322: libz update OLD_LIBS+=lib/libz.so.5 .if ${TARGET_ARCH} == "amd64" Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Mar 26 23:27:29 2010 (r205718) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Mar 26 23:44:51 2010 (r205719) @@ -1,24 +1,9 @@ '\" te -.\" CDDL HEADER START -.\" -.\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). -.\" You may not use this file except in compliance with the License. -.\" -.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -.\" or http://www.opensolaris.org/os/licensing. -.\" See the License for the specific language governing permissions -.\" and limitations under the License. -.\" -.\" When distributing Covered Code, include this CDDL HEADER in each -.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE. -.\" If applicable, add the following below this CDDL HEADER, with the -.\" fields enclosed by brackets "[]" replaced with your own identifying -.\" information: Portions Copyright [yyyy] [name of copyright owner] -.\" -.\" CDDL HEADER END -.\" Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. -.TH zfs 1M "8 Apr 2008" "SunOS 5.11" "System Administration Commands" +.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved. +.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. +.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. +.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] +.TH zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands" .SH NAME zfs \- configures ZFS file systems .SH SYNOPSIS @@ -44,7 +29,8 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@snapname\fR|\fIvolume@snapname\fR +\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... + \fIfilesystem@snapname\fR|\fIvolume@snapname\fR .fi .LP @@ -54,7 +40,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBclone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR +\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR .fi .LP @@ -65,7 +51,7 @@ zfs \- configures ZFS file systems .LP .nf \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR - \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR + \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi .LP @@ -81,23 +67,23 @@ zfs \- configures ZFS file systems .LP .nf \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]] - [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ... + [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ... .fi .LP .nf -\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ... +\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|snapshot ... .fi .LP .nf \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...] - \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... + \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... .fi .LP .nf -\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ... +\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ... .fi .LP @@ -132,12 +118,12 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR +\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR .fi .LP .nf -\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR +\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR .fi .LP @@ -153,7 +139,7 @@ zfs \- configures ZFS file systems .LP .nf \fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI@setname\fR[,...] - \fIfilesystem\fR|\fIvolume\fR + \fIfilesystem\fR|\fIvolume\fR .fi .LP @@ -174,7 +160,7 @@ zfs \- configures ZFS file systems .LP .nf \fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]] - \fIfilesystem\fR|\fIvolume\fR + \fIfilesystem\fR|\fIvolume\fR .fi .LP @@ -192,20 +178,10 @@ zfs \- configures ZFS file systems \fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @setname [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR .fi -.LP -.nf -\fBzfs\fR \fBjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR -.fi -.LP -.nf -\fBzfs\fR \fBunjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR -.fi - .SH DESCRIPTION .sp .LP -The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A -dataset is identified by a unique path within the \fBZFS\fR namespace. For example: +The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example: .sp .in +2 .nf @@ -226,9 +202,9 @@ A dataset can be one of the following: .na \fB\fIfile system\fR\fR .ad -.RS 15n -.rt -A standard \fBPOSIX\fR file system. \fBZFS\fR file systems can be mounted within the standard file system namespace and behave like any other file system. +.sp .6 +.RS 4n +A \fBZFS\fR dataset of type "filesystem" that can be mounted within the standard system namespace and behaves like other file systems. While \fBZFS\fR file systems are designed to be \fBPOSIX\fR compliant, known issues exist that prevent compliance in some cases. Applications that depend on standards conformance might fail due to nonstandard behavior when checking file system free space. .RE .sp @@ -237,8 +213,8 @@ A standard \fBPOSIX\fR file system. \fBZ .na \fB\fIvolume\fR\fR .ad -.RS 15n -.rt +.sp .6 +.RS 4n A logical volume exported as a raw or block device. This type of dataset should only be used under special circumstances. File systems are typically used in most environments. Volumes cannot be used in a non-global zone. .RE @@ -248,8 +224,8 @@ A logical volume exported as a raw or bl .na \fB\fIsnapshot\fR\fR .ad -.RS 15n -.rt +.sp .6 +.RS 4n A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR. .RE @@ -272,20 +248,17 @@ A snapshot is a read-only copy of a file Snapshots can have arbitrary names. Snapshots of volumes can be cloned or rolled back, but cannot be accessed independently. .sp .LP -File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" -property. +File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property. .SS "Clones" .sp .LP A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space. .sp .LP -Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin" -property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist. +Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin" property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist. .sp .LP -The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone -was created from. +The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from. .SS "Mount Points" .sp .LP @@ -301,8 +274,7 @@ A file system can also have a mount poin A file system mountpoint property of "none" prevents the file system from being mounted. .sp .LP -If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage -the file system, and the administrator is responsible for mounting and unmounting the file system. +If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. .SS "Zones" .sp .LP @@ -312,8 +284,7 @@ A \fBZFS\fR file system can be added to The physical properties of an added file system are controlled by the global administrator. However, the zone administrator can create, modify, or destroy files within the added file system, depending on how the file system is mounted. .sp .LP -A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or -any of its children. However, the "quota" property is controlled by the global administrator. +A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or any of its children. However, the "quota" property is controlled by the global administrator. .sp .LP A \fBZFS\fR volume can be added as a device to a non-global zone by using zonecfg's "\fBadd device\fR" subcommand. However, its physical properties can only be modified by the global administrator. @@ -329,15 +300,13 @@ The global administrator can forcibly cl .SS "Native Properties" .sp .LP -Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, -but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section. +Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section. .sp .LP -Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Snapshot properties can not be edited; they always inherit their inheritable properties. Properties -that are not applicable to snapshots are not displayed. +Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Some properties only apply to certain types of datasets (file systems, volumes or snapshots). .sp .LP -The values of numeric properties can be specified using the following human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: +The values of numeric properties can be specified using human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications: .sp .in +2 .nf @@ -360,8 +329,7 @@ The following native properties consist .ad .sp .6 .RS 4n -The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets -within the pool. +The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets within the pool. .sp This property can also be referred to by its shortened column name, "avail". .RE @@ -418,8 +386,7 @@ For cloned file systems or volumes, the .ad .sp .6 .RS 4n -The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are -identical. +The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are identical. .sp This property can also be referred to by its shortened column name, "refer". .RE @@ -432,7 +399,7 @@ This property can also be referred to by .ad .sp .6 .RS 4n -The type of dataset: "filesystem", "volume", "snapshot", or "clone". +The type of dataset: "filesystem", "volume", or "snapshot". .RE .sp @@ -443,11 +410,9 @@ The type of dataset: "filesystem", "volu .ad .sp .6 .RS 4n -The amount of space consumed by this dataset and all its descendents. This is the value that is checked against this dataset's quota and reservation. The space used does not include this dataset's reservation, but does take into account the reservations of any descendent datasets. -The amount of space that a dataset consumes from its parent, as well as the amount of space that are freed if this dataset is recursively destroyed, is the greater of its space used and its reservation. +The amount of space consumed by this dataset and all its descendents. This is the value that is checked against this dataset's quota and reservation. The space used does not include this dataset's reservation, but does take into account the reservations of any descendent datasets. The amount of space that a dataset consumes from its parent, as well as the amount of space that are freed if this dataset is recursively destroyed, is the greater of its space used and its reservation. .sp -When snapshots (see the "Snapshots" section) are created, their space is initially shared between the snapshot and the file system, and possibly with previous snapshots. As the file system changes, space that was previously shared becomes unique to the snapshot, and counted in -the snapshot's space used. Additionally, deleting snapshots can increase the amount of space unique to (and used by) other snapshots. +When snapshots (see the "Snapshots" section) are created, their space is initially shared between the snapshot and the file system, and possibly with previous snapshots. As the file system changes, space that was previously shared becomes unique to the snapshot, and counted in the snapshot's space used. Additionally, deleting snapshots can increase the amount of space unique to (and used by) other snapshots. .sp The amount of space used, available, or referenced does not take into account pending changes. Pending changes are generally accounted for within a few seconds. Committing a change to a disk using \fBfsync\fR(3c) or \fBO_SYNC\fR does not necessarily guarantee that the space usage information is updated immediately. .RE @@ -456,12 +421,66 @@ The amount of space used, available, or .ne 2 .mk .na +\fBusedby*\fR +.ad +.sp .6 +.RS 4n +The \fBusedby*\fR snapshots decompose the "used" properties into the various reasons that space is used. Specifically, \fBused\fR = \fBusedbychildren\fR + \fBusedbydataset\fR + \fBusedbyrefreservation\fR +, \fBusedbysnapshots\fR. These properties are only available for datasets created on zpool "version 13" pools. +.RE + +.sp +.ne 2 +.mk +.na +\fBusedbychildren\fR +.ad +.sp .6 +.RS 4n +The amount of space used by children of this dataset, which would be freed if all the dataset's children were destroyed. +.RE + +.sp +.ne 2 +.mk +.na +\fBusedbydataset\fR +.ad +.sp .6 +.RS 4n +The amount of space used by this dataset itself, which would be freed if the dataset were destroyed (after first removing any \fBrefreservation\fR and destroying any necessary snapshots or descendents). +.RE + +.sp +.ne 2 +.mk +.na +\fBusedbyrefreservation\fR +.ad +.sp .6 +.RS 4n +The amount of space used by a \fBrefreservation\fR set on this dataset, which would be freed if the \fBrefreservation\fR was removed. +.RE + +.sp +.ne 2 +.mk +.na +\fBusedbysnapshots\fR +.ad +.sp .6 +.RS 4n +The amount of space consumed by snapshots of this dataset. In particular, it is the amount of space that would be freed if all of this dataset's snapshots were destroyed. Note that this is not simply the sum of the snapshots' "used" properties because space can be shared by multiple snapshots +.RE + +.sp +.ne 2 +.mk +.na \fBvolblocksize=\fIblocksize\fR\fR .ad .sp .6 .RS 4n -For volumes, specifies the block size of the volume. The \fBblocksize\fR cannot be changed once the volume has been written, so it should be set at volume creation time. The default \fBblocksize\fR for volumes is 8 Kbytes. Any power of 2 from 512 bytes -to 128 Kbytes is valid. +For volumes, specifies the block size of the volume. The \fBblocksize\fR cannot be changed once the volume has been written, so it should be set at volume creation time. The default \fBblocksize\fR for volumes is 8 Kbytes. Any power of 2 from 512 bytes to 128 Kbytes is valid. .sp This property can also be referred to by its shortened column name, "volblock". .RE @@ -473,15 +492,13 @@ The following native properties can be u .ne 2 .mk .na -\fBaclinherit=\fBdiscard\fR | \fBnoallow\fR | \fBrestricted\fR | \fBpassthrough\fR\fR +\fBaclinherit=\fBdiscard\fR | \fBnoallow\fR | \fBrestricted\fR | \fBpassthrough\fR | \fBpassthrough-x\fR\fR .ad .sp .6 .RS 4n -Controls how \fBACL\fR entries are inherited when files and directories are created. A file system with an "aclinherit" property of "\fBdiscard\fR" does not inherit any \fBACL\fR entries. A file system with an "aclinherit" -property value of "\fBnoallow\fR" only inherits inheritable \fBACL\fR entries that specify "deny" permissions. The property value "\fBrestricted\fR" (the default) removes the "\fBwrite_acl\fR" and "\fBwrite_owner\fR" permissions when the \fBACL\fR entry is inherited. A file system with an "aclinherit" property value of "\fBpassthrough\fR" inherits all inheritable \fBACL\fR entries without any modifications made to the \fBACL\fR entries when they are inherited. +Controls how \fBACL\fR entries are inherited when files and directories are created. A file system with an "aclinherit" property of "\fBdiscard\fR" does not inherit any \fBACL\fR entries. A file system with an "aclinherit" property value of "\fBnoallow\fR" only inherits inheritable \fBACL\fR entries that specify "deny" permissions. The property value "\fBrestricted\fR" (the default) removes the "\fBwrite_acl\fR" and "\fBwrite_owner\fR" permissions when the \fBACL\fR entry is inherited. A file system with an "aclinherit" property value of "\fBpassthrough\fR" inherits all inheritable \fBACL\fR entries without any modifications made to the \fBACL\fR entries when they are inherited. A file system with an "aclinherit" property value of "\fBpassthrough-x\fR" has the same meaning as "\fBpassthrough\fR", except that the \fBowner@\fR, \fBgroup@\fR, and \fBeveryone@\fR \fBACE\fRs inherit the execute permission only if the file creation mode also requests the execute bit. .sp -When the property value is set to "\fBpassthrough\fR," files are created with a mode determined by the inheritable \fBACE\fRs. If no inheritable \fBACE\fRs exist that affect the mode, then the mode is set in accordance to the requested mode -from the application. +When the property value is set to "\fBpassthrough\fR," files are created with a mode determined by the inheritable \fBACE\fRs. If no inheritable \fBACE\fRs exist that affect the mode, then the mode is set in accordance to the requested mode from the application. .RE .sp @@ -492,9 +509,7 @@ from the application. .ad .sp .6 .RS 4n -Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an "aclmode" property of "\fBdiscard\fR" -deletes all \fBACL\fR entries that do not represent the mode of the file. An "aclmode" property of "\fBgroupmask\fR" (the default) reduces user or group permissions. The permissions are reduced, such that they are no greater than the group permission -bits, unless it is a user entry that has the same \fBUID\fR as the owner of the file or directory. In this case, the \fBACL\fR permissions are reduced so that they are no greater than owner permission bits. A file system with an "aclmode" property of "\fBpassthrough\fR" indicates that no changes are made to the \fBACL\fR other than generating the necessary \fBACL\fR entries to represent the new mode of the file or directory. +Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an "aclmode" property of "\fBdiscard\fR" deletes all \fBACL\fR entries that do not represent the mode of the file. An "aclmode" property of "\fBgroupmask\fR" (the default) reduces user or group permissions. The permissions are reduced, such that they are no greater than the group permission bits, unless it is a user entry that has the same \fBUID\fR as the owner of the file or directory. In this case, the \fBACL\fR permissions are reduced so that they are no greater than owner permission bits. A file system with an "aclmode" property of "\fBpassthrough\fR" indicates that no changes are made to the \fBACL\fR other than generating the necessary \fBACL\fR entries to represent the new mode of the file or directory. .RE .sp @@ -505,8 +520,7 @@ bits, unless it is a user entry that has .ad .sp .6 .RS 4n -Controls whether the access time for files is updated when they are read. Turning this property off avoids producing write traffic when reading files and can result in significant performance gains, though it might confuse mailers and other similar utilities. The default value -is "on". +Controls whether the access time for files is updated when they are read. Turning this property off avoids producing write traffic when reading files and can result in significant performance gains, though it might confuse mailers and other similar utilities. The default value is "on". .RE .sp @@ -517,12 +531,9 @@ is "on". .ad .sp .6 .RS 4n -If this property is set to "\fBoff\fR", the file system cannot be mounted, and is ignored by "\fBzfs mount -a\fR". Setting this property to "\fBoff\fR" is similar to setting the "mountpoint" -property to "\fBnone\fR", except that the dataset still has a normal "mountpoint" property, which can be inherited. Setting this property to "\fBoff\fR" allows datasets to be used solely as a mechanism to inherit properties. One example -of setting canmount=\fBoff\fR is to have two datasets with the same mountpoint, so that the children of both datasets appear in the same directory, but might have different inherited characteristics. +If this property is set to "\fBoff\fR", the file system cannot be mounted, and is ignored by "\fBzfs mount -a\fR". Setting this property to "\fBoff\fR" is similar to setting the "mountpoint" property to "\fBnone\fR", except that the dataset still has a normal "mountpoint" property, which can be inherited. Setting this property to "\fBoff\fR" allows datasets to be used solely as a mechanism to inherit properties. One example of setting canmount=\fBoff\fR is to have two datasets with the same mountpoint, so that the children of both datasets appear in the same directory, but might have different inherited characteristics. .sp -When the "\fBnoauto\fR" option is set, a dataset can only be mounted and unmounted explicitly. The dataset is not mounted automatically when the dataset is created or imported, nor is it mounted by the "\fBzfs mount -a\fR" command or unmounted -by the "\fBzfs unmount -a\fR" command. +When the "\fBnoauto\fR" option is set, a dataset can only be mounted and unmounted explicitly. The dataset is not mounted automatically when the dataset is created or imported, nor is it mounted by the "\fBzfs mount -a\fR" command or unmounted by the "\fBzfs unmount -a\fR" command. .sp This property is not inherited. .RE @@ -535,8 +546,7 @@ This property is not inherited. .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity -checking on user data. Disabling checksums is NOT a recommended practice. +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE .sp @@ -547,9 +557,7 @@ checking on user data. Disabling checksu .ad .sp .6 .RS 4n -Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" -compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR" where \fIN\fR is -an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)). +Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR" where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)). .sp This property can also be referred to by its shortened column name "compress". .RE @@ -562,8 +570,7 @@ This property can also be referred to by .ad .sp .6 .RS 4n -Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated -file and dataset, changing the "used" property and counting against quotas and reservations. +Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated file and dataset, changing the "used" property and counting against quotas and reservations. .sp Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option. .RE @@ -600,8 +607,7 @@ Controls whether processes can be execut .RS 4n Controls the mount point used for this file system. See the "Mount Points" section for more information on how this property is used. .sp -When the mountpoint property is changed for a file system, the file system and any children that inherit the mount point are unmounted. If the new value is "legacy", then they remain unmounted. Otherwise, they are automatically remounted in the new location if the property was -previously "legacy" or "none", or if they were mounted before the property was changed. In addition, any shared file systems are unshared and shared in the new location. +When the mountpoint property is changed for a file system, the file system and any children that inherit the mount point are unmounted. If the new value is "legacy", then they remain unmounted. Otherwise, they are automatically remounted in the new location if the property was previously "legacy" or "none", or if they were mounted before the property was changed. In addition, any shared file systems are unshared and shared in the new location. .RE .sp @@ -612,7 +618,18 @@ previously "legacy" or "none", or if the .ad .sp .6 .RS 4n -Controls whether the file system should be mounted with "\fBnbmand\fR" (Non Blocking mandatory locks). This is used for \fBCIFS\fR clients. Changes to this property only take effect when the file system is umounted and remounted. See \fBmount\fR(1M) for more information on "\fBnbmand\fR" mounts. +Controls whether the file system should be mounted with "\fBnbmand\fR" (Non Blocking mandatory locks). This is used for \fBCIFS\fR clients. Changes to this property only take effect when the file system is umounted and remounted. See \fBmount\fR(1M) for more information on "\fBnbmand\fR" mounts. +.RE + +.sp +.ne 2 +.mk +.na +\fBprimarycache=\fIall\fR | \fInone\fR | \fImetadata\fR\fR +.ad +.sp .6 +.RS 4n +Controls what is cached in the primary cache (ARC). If this property is set to "all", then both user data and metadata is cached. If this property is set to "none", then neither user data nor metadata is cached. If this property is set to "metadata", then only metadata is cached. The default value is "all". .RE .sp @@ -623,8 +640,7 @@ Controls whether the file system should .ad .sp .6 .RS 4n -Limits the amount of space a dataset and its descendents can consume. This property enforces a hard limit on the amount of space used. This includes all space consumed by descendents, including file systems and snapshots. Setting a quota on a descendent of a dataset that already -has a quota does not override the ancestor's quota, but rather imposes an additional limit. +Limits the amount of space a dataset and its descendents can consume. This property enforces a hard limit on the amount of space used. This includes all space consumed by descendents, including file systems and snapshots. Setting a quota on a descendent of a dataset that already has a quota does not override the ancestor's quota, but rather imposes an additional limit. .sp Quotas cannot be set on volumes, as the "volsize" property acts as an implicit quota. .RE @@ -650,11 +666,9 @@ This property can also be referred to by .ad .sp .6 .RS 4n -Specifies a suggested block size for files in the file system. This property is designed solely for use with database workloads that access files in fixed-size records. \fBZFS\fR automatically tunes block sizes according to internal algorithms optimized for typical -access patterns. +Specifies a suggested block size for files in the file system. This property is designed solely for use with database workloads that access files in fixed-size records. \fBZFS\fR automatically tunes block sizes according to internal algorithms optimized for typical access patterns. .sp -For databases that create very large files but access them in small random chunks, these algorithms may be suboptimal. Specifying a "recordsize" greater than or equal to the record size of the database can result in significant performance gains. Use of this property for general -purpose file systems is strongly discouraged, and may adversely affect performance. +For databases that create very large files but access them in small random chunks, these algorithms may be suboptimal. Specifying a "recordsize" greater than or equal to the record size of the database can result in significant performance gains. Use of this property for general purpose file systems is strongly discouraged, and may adversely affect performance. .sp The size specified must be a power of two greater than or equal to 512 and less than or equal to 128 Kbytes. .sp @@ -682,8 +696,7 @@ Limits the amount of space a dataset can .ad .sp .6 .RS 4n -The minimum amount of space guaranteed to a dataset, not including its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by \fBrefreservation\fR. The \fBrefreservation\fR reservation -is accounted for in the parent datasets' space used, and counts against the parent datasets' quotas and reservations. +The minimum amount of space guaranteed to a dataset, not including its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by \fBrefreservation\fR. The \fBrefreservation\fR reservation is accounted for in the parent datasets' space used, and counts against the parent datasets' quotas and reservations. .sp If \fBrefreservation\fR is set, a snapshot is only allowed if there is enough free pool space outside of this reservation to accommodate the current number of "referenced" bytes in the dataset. .sp @@ -698,8 +711,7 @@ This property can also be referred to by .ad .sp .6 .RS 4n -The minimum amount of space guaranteed to a dataset and its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by its reservation. Reservations are accounted for in the parent datasets' space -used, and count against the parent datasets' quotas and reservations. +The minimum amount of space guaranteed to a dataset and its descendents. When the amount of space used is below this value, the dataset is treated as if it were taking up the amount of space specified by its reservation. Reservations are accounted for in the parent datasets' space used, and count against the parent datasets' quotas and reservations. .sp This property can also be referred to by its shortened column name, "reserv". .RE @@ -708,6 +720,17 @@ This property can also be referred to by .ne 2 .mk .na +\fBsecondarycache=\fIall\fR | \fInone\fR | \fImetadata\fR\fR +.ad +.sp .6 +.RS 4n +Controls what is cached in the secondary cache (L2ARC). If this property is set to "all", then both user data and metadata is cached. If this property is set to "none", then neither user data nor metadata is cached. If this property is set to "metadata", then only metadata is cached. The default value is "all". +.RE + +.sp +.ne 2 +.mk +.na \fBsetuid=\fIon\fR | \fIoff\fR\fR .ad .sp .6 @@ -723,8 +746,7 @@ Controls whether the set-\fBUID\fR bit i .ad .sp .6 .RS 4n -Like the "sharenfs" property, "shareiscsi" indicates whether a \fBZFS\fR volume is exported as an \fBiSCSI\fR target. The acceptable values for this property are "on", "off", and "type=disk". -The default value is "off". In the future, other target types might be supported. For example, "tape". +Like the "sharenfs" property, "shareiscsi" indicates whether a \fBZFS\fR volume is exported as an \fBiSCSI\fR target. The acceptable values for this property are "on", "off", and "type=disk". The default value is "off". In the future, other target types might be supported. For example, "tape". .sp You might want to set "shareiscsi=on" for a file system so that all \fBZFS\fR volumes within the file system are shared by default. Setting this property on a file system has no direct effect, however. .RE @@ -737,15 +759,13 @@ You might want to set "shareiscsi=on" fo .ad .sp .6 .RS 4n -Controls whether the file system is shared by using the Solaris \fBCIFS\fR service, and what options are to be used. A file system with the "\fBsharesmb\fR" property set to "off" is managed through traditional tools such as \fBsharemgr\fR(1M). Otherwise, the file system is automatically shared and unshared with the "zfs share" and "zfs unshare" commands. If the property is set to "on", -the \fBsharemgr\fR(1M) command is invoked with no options. Otherwise, the \fBsharemgr\fR(1M) command is invoked with options equivalent to the contents of this property. +Controls whether the file system is shared by using the Solaris \fBCIFS\fR service, and what options are to be used. A file system with the "\fBsharesmb\fR" property set to "off" is managed through traditional tools such as \fBsharemgr\fR(1M). Otherwise, the file system is automatically shared and unshared with the \fBzfs share\fR and \fBzfs unshare\fR commands. If the property is set to \fBon\fR, the \fBsharemgr\fR(1M) command is invoked with no options. Otherwise, the \fBsharemgr\fR(1M) command is invoked with options equivalent to the contents of this property. +.sp +Because \fBSMB\fR shares requires a resource name, a unique resource name is constructed from the dataset name. The constructed name is a copy of the dataset name except that the characters in the dataset name, which would be illegal in the resource name, are replaced with underscore (\fB_\fR) characters. A pseudo property "name" is also supported that allows you to replace the data set name with a specified name. The specified name is then used to replace the prefix dataset in the case of inheritance. For example, if the dataset \fBdata/home/john\fR is set to \fBname=john\fR, then \fBdata/home/john\fR has a resource name of \fBjohn\fR. If a child dataset of \fBdata/home/john/backups\fR, it has a resource name of \fBjohn_backups\fR. .sp -Because \fBSMB\fR shares requires a resource name, a unique resource name is constructed from the dataset name. The constructed name is a copy of the dataset name except that the characters in the dataset name, which would be illegal in the resource name, are replaced with underscore -(_) characters. A pseudo property "name" is also supported that allows you to replace the data set name with a specified name. The specified name is then used to replace the prefix dataset in the case of inheritance. For example, if the dataset "\fBdata/home/john\fR" -is set to "name=john", then "\fBdata/home/john\fR" has a resource name of "john". If a child dataset of "\fBdata/home/john/backups\fR", it has a resource name of "john_backups". +When SMB shares are created, the SMB share name appears as an entry in the \fB\&.zfs/shares\fR directory. You can use the \fBls\fR or \fBchmod\fR command to display the share-level ACLs on the entries in this directory. .sp -When the "sharesmb" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously set to "off", or if they were shared before the property was changed. If the new property -is set to "off", the file systems are unshared. +When the \fBsharesmb\fR property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously set to \fBoff\fR, or if they were shared before the property was changed. If the new property is set to \fBoff\fR, the file systems are unshared. .RE .sp @@ -756,11 +776,9 @@ is set to "off", the file systems are un .ad .sp .6 .RS 4n -Controls whether the file system is shared via \fBNFS\fR, and what options are used. A file system with a"\fBsharenfs\fR" property of "off" is managed through traditional tools such as \fBshare\fR(1M), \fBunshare\fR(1M), and \fBdfstab\fR(4). Otherwise, the file system is automatically shared and unshared with the "\fBzfs share\fR" and "\fBzfs unshare\fR" commands. If the property is set to "on", -the \fBshare\fR(1M) command is invoked with no options. Otherwise, the \fBshare\fR(1M) command is invoked with options equivalent to the contents of this property. +Controls whether the file system is shared via \fBNFS\fR, and what options are used. A file system with a"\fBsharenfs\fR" property of "off" is managed through traditional tools such as \fBshare\fR(1M), \fBunshare\fR(1M), and \fBdfstab\fR(4). Otherwise, the file system is automatically shared and unshared with the "\fBzfs share\fR" and "\fBzfs unshare\fR" commands. If the property is set to "on", the \fBshare\fR(1M) command is invoked with no options. Otherwise, the \fBshare\fR(1M) command is invoked with options equivalent to the contents of this property. .sp -When the "sharenfs" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously "off", or if they were shared before the property was changed. If the new property is "off", -the file systems are unshared. +When the "sharenfs" property is changed for a dataset, the dataset and any children inheriting the property are re-shared with the new options, only if the property was previously "off", or if they were shared before the property was changed. If the new property is "off", the file systems are unshared. .RE .sp @@ -793,14 +811,11 @@ The on-disk version of this file system, .ad .sp .6 .RS 4n -For volumes, specifies the logical size of the volume. By default, creating a volume establishes a reservation of equal size. For storage pools with a version number of 9 or higher, a \fBrefreservation\fR is set instead. Any changes to \fBvolsize\fR are -reflected in an equivalent change to the reservation (or \fBrefreservation\fR). The \fBvolsize\fR can only be set to a multiple of \fBvolblocksize\fR, and cannot be zero. +For volumes, specifies the logical size of the volume. By default, creating a volume establishes a reservation of equal size. For storage pools with a version number of 9 or higher, a \fBrefreservation\fR is set instead. Any changes to \fBvolsize\fR are reflected in an equivalent change to the reservation (or \fBrefreservation\fR). The \fBvolsize\fR can only be set to a multiple of \fBvolblocksize\fR, and cannot be zero. .sp -The reservation is kept equal to the volume's logical size to prevent unexpected behavior for consumers. Without the reservation, the volume could run out of space, resulting in undefined behavior or data corruption, depending on how the volume is used. These effects can also occur when -the volume size is changed while it is in use (particularly when shrinking the size). Extreme care should be used when adjusting the volume size. +The reservation is kept equal to the volume's logical size to prevent unexpected behavior for consumers. Without the reservation, the volume could run out of space, resulting in undefined behavior or data corruption, depending on how the volume is used. These effects can also occur when the volume size is changed while it is in use (particularly when shrinking the size). Extreme care should be used when adjusting the volume size. .sp -Though not recommended, a "sparse volume" (also known as "thin provisioning") can be created by specifying the \fB-s\fR option to the "\fBzfs create -V\fR" command, or by changing the reservation after the volume has been created. -A "sparse volume" is a volume where the reservation is less then the volume size. Consequently, writes to a sparse volume can fail with \fBENOSPC\fR when the pool is low on space. For a sparse volume, changes to \fBvolsize\fR are not reflected in the reservation. +Though not recommended, a "sparse volume" (also known as "thin provisioning") can be created by specifying the \fB-s\fR option to the "\fBzfs create -V\fR" command, or by changing the reservation after the volume has been created. A "sparse volume" is a volume where the reservation is less then the volume size. Consequently, writes to a sparse volume can fail with \fBENOSPC\fR when the pool is low on space. For a sparse volume, changes to \fBvolsize\fR are not reflected in the reservation. .RE .sp @@ -838,8 +853,7 @@ Controls whether the dataset is managed .sp .LP -The following three properties cannot be changed after the file system is created, and therefore, should be set when the file system is created. If the properties are not set with the "\fBzfs create\fR" command, these properties are inherited from the parent dataset. -If the parent dataset lacks these properties due to having been created prior to these features being supported, the new file system will have the default values for these properties. +The following three properties cannot be changed after the file system is created, and therefore, should be set when the file system is created. If the properties are not set with the "\fBzfs create\fR" or "\fBzpool create\fR" commands, these properties are inherited from the parent dataset. If the parent dataset lacks these properties due to having been created prior to these features being supported, the new file system will have the default values for these properties. .sp .ne 2 .mk @@ -848,11 +862,9 @@ If the parent dataset lacks these proper .ad .sp .6 .RS 4n -Indicates whether the file name matching algorithm used by the file system should be case-sensitive, case-insensitive, or allow a combination of both styles of matching. The default value for the "\fBcasesensitivity\fR" property is "\fBsensitive\fR." -Traditionally, UNIX and POSIX file systems have case-sensitive file names. +Indicates whether the file name matching algorithm used by the file system should be case-sensitive, case-insensitive, or allow a combination of both styles of matching. The default value for the "\fBcasesensitivity\fR" property is "\fBsensitive\fR." Traditionally, UNIX and POSIX file systems have case-sensitive file names. .sp -The "\fBmixed\fR" value for the "\fBcasesensitivity\fR" property indicates that the file system can support requests for both case-sensitive and case-insensitive matching behavior. Currently, case-insensitive matching behavior on a file system -that supports mixed behavior is limited to the Solaris CIFS server product. For more information about the "mixed" value behavior, see the \fIZFS Administration Guide\fR. +The "\fBmixed\fR" value for the "\fBcasesensitivity\fR" property indicates that the file system can support requests for both case-sensitive and case-insensitive matching behavior. Currently, case-insensitive matching behavior on a file system that supports mixed behavior is limited to the Solaris CIFS server product. For more information about the "mixed" value behavior, see the \fIZFS Administration Guide\fR. .RE .sp @@ -863,20 +875,7 @@ that supports mixed behavior is limited .ad .sp .6 .RS 4n -Indicates whether the file system should perform a \fBunicode\fR normalization of file names whenever two file names are compared, and which normalization algorithm should be used. File names are always stored unmodified, names are normalized as part of any comparison -process. If this property is set to a legal value other than "\fBnone\fR," and the "\fButf8only\fR" property was left unspecified, the "\fButf8only\fR" property is automatically set to "\fBon\fR." -The default value of the "\fBnormalization\fR" property is "\fBnone\fR." This property cannot be changed after the file system is created. -.RE - -.sp -.ne 2 -.mk -.na -\fBjailed =\fIon\fR | \fIoff\fR\fR -.ad -.sp .6 -.RS 4n -Controls whether the dataset is managed from within a jail. The default value is "off". +Indicates whether the file system should perform a \fBunicode\fR normalization of file names whenever two file names are compared, and which normalization algorithm should be used. File names are always stored unmodified, names are normalized as part of any comparison process. If this property is set to a legal value other than "\fBnone\fR," and the "\fButf8only\fR" property was left unspecified, the "\fButf8only\fR" property is automatically set to "\fBon\fR." The default value of the "\fBnormalization\fR" property is "\fBnone\fR." This property cannot be changed after the file system is created. .RE .sp @@ -887,63 +886,52 @@ Controls whether the dataset is managed .ad .sp .6 .RS 4n -Indicates whether the file system should reject file names that include characters that are not present in the \fBUTF-8\fR character code set. If this property is explicitly set to "\fBoff\fR," the normalization property must either not be -explicitly set or be set to "\fBnone\fR." The default value for the "\fButf8only\fR" property is "off." This property cannot be changed after the file system is created. +Indicates whether the file system should reject file names that include characters that are not present in the \fBUTF-8\fR character code set. If this property is explicitly set to "\fBoff\fR," the normalization property must either not be explicitly set or be set to "\fBnone\fR." The default value for the "\fButf8only\fR" property is "off." This property cannot be changed after the file system is created. .RE .sp .LP -The "\fBcasesensitivity\fR," "\fBnormalization\fR," and "\fButf8only\fR" properties are also new permissions that can be assigned to non-privileged users by using the \fBZFS\fR delegated administration -feature. +The "\fBcasesensitivity\fR," "\fBnormalization\fR," and "\fButf8only\fR" properties are also new permissions that can be assigned to non-privileged users by using the \fBZFS\fR delegated administration feature. .SS "Temporary Mount Point Properties" .sp .LP -When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, -its mount options are set according to its properties. The correlation between properties and mount options is as follows: +When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, its mount options are set according to its properties. The correlation between properties and mount options is as follows: .sp .in +2 .nf PROPERTY MOUNT OPTION - devices devices/nodevices - exec exec/noexec - readonly ro/rw - setuid setuid/nosetuid - xattr xattr/noxattr + devices devices/nodevices + exec exec/noexec + readonly ro/rw + setuid setuid/nosetuid + xattr xattr/noxattr .fi .in -2 .sp .sp .LP -In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". -These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings. +In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings. .SS "User Properties" .sp .LP -In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets. -.sp -.LP -User property names must contain a colon (":") character, to distinguish them from native properties. They might contain lowercase letters, numbers, and the following punctuation characters: colon (":"), dash ("-"), period ("."), and underscore -("_"). The expected convention is that the property name is divided into two portions such as "\fImodule\fR:\fIproperty\fR", but this namespace is not enforced by \fBZFS\fR. User property names can be at most 256 characters, -and cannot begin with a dash ("-"). +In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets (file systems, volumes, and snapshots). .sp .LP -When making programmatic use of user properties, it is strongly suggested to use a reversed \fBDNS\fR domain name for the \fImodule\fR component of property names to reduce the chance that two independently-developed packages use the same property name for -different purposes. Property names beginning with "com.sun." are reserved for use by Sun Microsystems. +User property names must contain a colon (":") character to distinguish them from native properties. They may contain lowercase letters, numbers, and the following punctuation characters: colon (":"), dash ("-"), period ("."), and underscore ("_"). The expected convention is that the property name is divided into two portions such as "\fImodule\fR:\fIproperty\fR", but this namespace is not enforced by \fBZFS\fR. User property names can be at most 256 characters, and cannot begin with a dash ("-"). .sp .LP -The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. -Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters. -.SS "Volumes as Swap or Dump Devices" +When making programmatic use of user properties, it is strongly suggested to use a reversed \fBDNS\fR domain name for the \fImodule\fR component of property names to reduce the chance that two independently-developed packages use the same property name for different purposes. Property names beginning with "com.sun." are reserved for use by Sun Microsystems. .sp .LP -To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section. +The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters. +.SS "ZFS Volumes as Swap or Dump Devices" .sp .LP -Do not swap to a file on a \fBZFS\fR file system. A \fBZFS\fR swap file configuration is not supported. +During an initial installation or a live upgrade from a \fBUFS\fR file system, a swap device and dump device are created on \fBZFS\fR volumes in the \fBZFS\fR root pool. By default, the swap area size is based on 1/2 the size of physical memory up to 2 Gbytes. The size of the dump device depends on the kernel's requirements at installation time. Separate \fBZFS\fR volumes must be used for the swap area and dump devices. Do not swap to a file on a \fBZFS\fR file system. A \fBZFS\fR swap file configuration is not supported. .sp .LP -Using a \fBZFS\fR volume as a dump device is not supported. +If you need to change your swap area or dump device after the system is installed or upgraded, use the \fBswap\fR(1M) and \fBdumpadm\fR(1M) commands. If you need to change the size of your swap area or dump device, see the \fISolaris ZFS Administration Guide\fR. .SH SUBCOMMANDS .sp .LP @@ -974,10 +962,9 @@ Creates a new \fBZFS\fR file system. The .na \fB\fB-p\fR\fR .ad -.RS 21n -.rt -Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If -the target filesystem already exists, the operation completes successfully. +.sp .6 +.RS 4n +Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If the target filesystem already exists, the operation completes successfully. .RE .sp @@ -986,10 +973,9 @@ the target filesystem already exists, th .na \fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR .ad -.RS 21n -.rt -Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An -error results if the same property is specified in multiple \fB-o\fR options. +.sp .6 +.RS 4n +Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An error results if the same property is specified in multiple \fB-o\fR options. .RE .RE @@ -1002,8 +988,7 @@ error results if the same property is sp .ad .sp .6 .RS 4n -Creates a volume of the given size. The volume is exported as a block device in \fB/dev/zvol/{dsk,rdsk}/\fIpath\fR\fR, where \fIpath\fR is the name of the volume in the \fBZFS\fR namespace. The size represents -the logical size as exported by the device. By default, a reservation of equal size is created. +Creates a volume of the given size. The volume is exported as a block device in \fB/dev/zvol/{dsk,rdsk}/\fIpath\fR\fR, where \fIpath\fR is the name of the volume in the \fBZFS\fR namespace. The size represents the logical size as exported by the device. By default, a reservation of equal size is created. .sp \fIsize\fR is automatically rounded up to the nearest 128 Kbytes to ensure that the volume has an integral number of blocks regardless of \fIblocksize\fR. .sp @@ -1012,10 +997,9 @@ the logical size as exported by the devi .na \fB\fB-p\fR\fR .ad -.RS 21n -.rt -Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If -the target filesystem already exists, the operation completes successfully. +.sp .6 +.RS 4n +Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. Any property specified on the command line using the \fB-o\fR option is ignored. If the target filesystem already exists, the operation completes successfully. .RE .sp @@ -1024,8 +1008,8 @@ the target filesystem already exists, th .na \fB\fB-s\fR\fR .ad -.RS 21n -.rt +.sp .6 +.RS 4n Creates a sparse volume with no reservation. See "volsize" in the Native Properties section for more information about sparse volumes. .RE @@ -1035,10 +1019,9 @@ Creates a sparse volume with no reservat .na \fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR .ad -.RS 21n -.rt -Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An -error results if the same property is specified in multiple \fB-o\fR options. +.sp .6 +.RS 4n +Sets the specified property as if "\fBzfs set property=value\fR" was invoked at the same time the dataset was created. Any editable \fBZFS\fR property can also be set at creation time. Multiple \fB-o\fR options can be specified. An error results if the same property is specified in multiple \fB-o\fR options. .RE .sp @@ -1047,10 +1030,9 @@ error results if the same property is sp .na \fB\fB-b\fR \fIblocksize\fR\fR .ad -.RS 21n -.rt -Equivalent to "\fB\fR\fB-o\fR \fBvolblocksize=\fIblocksize\fR\fR". If this option is specified in conjunction with "\fB\fR\fB-o\fR \fBvolblocksize\fR", the resulting -behavior is undefined. +.sp .6 +.RS 4n +Equivalent to "\fB\fR\fB-o\fR \fBvolblocksize=\fIblocksize\fR\fR". If this option is specified in conjunction with "\fB\fR\fB-o\fR \fBvolblocksize\fR", the resulting behavior is undefined. .RE .RE @@ -1070,8 +1052,8 @@ Destroys the given dataset. By default, .na \fB\fB-r\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Recursively destroy all children. If a snapshot is specified, destroy all snapshots with this name in descendent file systems. .RE @@ -1081,8 +1063,8 @@ Recursively destroy all children. If a s .na \fB\fB-R\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Recursively destroy all dependents, including cloned file systems outside the target hierarchy. If a snapshot is specified, destroy all snapshots with this name in descendent file systems. .RE @@ -1092,8 +1074,8 @@ Recursively destroy all dependents, incl .na \fB\fB-f\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Force an unmount of any file systems using the "\fBunmount -f\fR" command. This option has no effect on non-file systems or unmounted file systems. .RE @@ -1104,7 +1086,7 @@ Extreme care should be taken when applyi .ne 2 .mk .na -\fB\fBzfs snapshot\fR [\fB-r\fR] \fIfilesystem@snapname\fR|\fIvolume@snapname\fR\fR +\fB\fBzfs snapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIfilesystem@snapname\fR|\fIvolume@snapname\fR\fR .ad .sp .6 .RS 4n @@ -1115,11 +1097,22 @@ Creates a snapshot with the given name. .na \fB\fB-r\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Recursively create snapshots of all descendent datasets. Snapshots are taken atomically, so that all recursive snapshots correspond to the same moment in time. .RE +.sp +.ne 2 +.mk +.na +\fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR +.ad +.sp .6 +.RS 4n +Sets the specified property; see "\fBzfs create\fR" for details. +.RE + .RE .sp @@ -1130,16 +1123,15 @@ Recursively create snapshots of all desc .ad .sp .6 .RS 4n -Roll back the given dataset to a previous snapshot. When a dataset is rolled back, all data that has changed since the snapshot is discarded, and the dataset reverts to the state at the time of the snapshot. By default, the command refuses to roll back to a snapshot other than -the most recent one. In order to do so, all intermediate snapshots must be destroyed by specifying the \fB-r\fR option. +Roll back the given dataset to a previous snapshot. When a dataset is rolled back, all data that has changed since the snapshot is discarded, and the dataset reverts to the state at the time of the snapshot. By default, the command refuses to roll back to a snapshot other than the most recent one. In order to do so, all intermediate snapshots must be destroyed by specifying the \fB-r\fR option. .sp .ne 2 .mk .na \fB\fB-r\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Recursively destroy any snapshots more recent than the one specified. .RE @@ -1149,8 +1141,8 @@ Recursively destroy any snapshots more r .na \fB\fB-R\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Recursively destroy any more recent snapshots, as well as any clones of those snapshots. .RE @@ -1160,8 +1152,8 @@ Recursively destroy any more recent snap .na \fB\fB-f\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Used with the \fB-R\fR option to force an unmount of any clone file systems that are to be destroyed. .RE @@ -1171,7 +1163,7 @@ Used with the \fB-R\fR option to force a .ne 2 .mk .na -\fB\fBzfs clone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR\fR +\fB\fBzfs clone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR\fR .ad .sp .6 .RS 4n @@ -1182,11 +1174,22 @@ Creates a clone of the given snapshot. S .na \fB\fB-p\fR\fR .ad -.RS 6n -.rt +.sp .6 +.RS 4n Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the "mountpoint" property inherited from their parent. If the target filesystem or volume already exists, the operation completes successfully. .RE +.sp +.ne 2 +.mk +.na +\fB\fB-o\fR \fIproperty\fR=\fIvalue\fR\fR +.ad +.sp .6 +.RS 4n +Sets the specified property; see "\fBzfs create\fR" for details. +.RE + .RE .sp @@ -1197,11 +1200,9 @@ Creates all the non-existing parent data .ad .sp .6 .RS 4n -Promotes a clone file system to no longer be dependent on its "origin" snapshot. This makes it possible to destroy the file system that the clone was created from. The clone parent-child dependency relationship is reversed, so that the "origin" file system -becomes a clone of the specified file system. +Promotes a clone file system to no longer be dependent on its "origin" snapshot. This makes it possible to destroy the file system that the clone was created from. The clone parent-child dependency relationship is reversed, so that the "origin" file system becomes a clone of the specified file system. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 00:25:41 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 138AB106566B; Sat, 27 Mar 2010 00:25:41 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 047338FC16; Sat, 27 Mar 2010 00:25:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2R0Pepm004902; Sat, 27 Mar 2010 00:25:40 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2R0Peo6004900; Sat, 27 Mar 2010 00:25:40 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003270025.o2R0Peo6004900@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Mar 2010 00:25:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205721 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 00:25:41 -0000 Author: jmallett Date: Sat Mar 27 00:25:40 2010 New Revision: 205721 URL: http://svn.freebsd.org/changeset/base/205721 Log: Fix db_frame for N32 and N64 kernels. Modified: user/jmallett/octeon/sys/mips/mips/db_interface.c Modified: user/jmallett/octeon/sys/mips/mips/db_interface.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/db_interface.c Sat Mar 27 00:21:40 2010 (r205720) +++ user/jmallett/octeon/sys/mips/mips/db_interface.c Sat Mar 27 00:25:40 2010 (r205721) @@ -115,12 +115,12 @@ int (*do_db_log_stack_trace_cmd)(char *) static int db_frame(struct db_variable *vp, db_expr_t *valuep, int op) { - int *reg; + register_t *reg; if (kdb_frame == NULL) return (0); - reg = (int *)((uintptr_t)kdb_frame + (size_t)(intptr_t)vp->valuep); + reg = (register_t *)((uintptr_t)kdb_frame + (size_t)(intptr_t)vp->valuep); if (op == DB_VAR_GET) *valuep = *reg; else From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 02:42:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E5F41065672; Sat, 27 Mar 2010 02:42:35 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA708FC12; Sat, 27 Mar 2010 02:42:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2R2gZ1L034907; Sat, 27 Mar 2010 02:42:35 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2R2gZEa034905; Sat, 27 Mar 2010 02:42:35 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003270242.o2R2gZEa034905@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Mar 2010 02:42:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205722 - user/jmallett/octeon/sys/ddb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 02:42:35 -0000 Author: jmallett Date: Sat Mar 27 02:42:35 2010 New Revision: 205722 URL: http://svn.freebsd.org/changeset/base/205722 Log: Only use the hackish %llx format for N32 MIPS. Modified: user/jmallett/octeon/sys/ddb/db_print.c Modified: user/jmallett/octeon/sys/ddb/db_print.c ============================================================================== --- user/jmallett/octeon/sys/ddb/db_print.c Sat Mar 27 00:25:40 2010 (r205721) +++ user/jmallett/octeon/sys/ddb/db_print.c Sat Mar 27 02:42:35 2010 (r205722) @@ -56,8 +56,13 @@ db_show_regs(intptr_t _1, boolean_t _2, for (regp = db_regs; regp < db_eregs; regp++) { if (!db_read_variable(regp, &value)) continue; -#if 0 /* XXX n32 MIPS has 32-bit longs, 64-bit regs and GCC won't take %llr */ - db_printf("%-12s%#18llr", regp->name, (unsigned long long)value); + /* + * XXX + * n32 MIPS has 32-bit longs, 64-bit regs and GCC won't take + * %llr + */ +#if !defined(__mips_n32) + db_printf("%-12s%#18lr", regp->name, (unsigned long)value); #else db_printf("%-12s%#18llx", regp->name, (unsigned long long)value); #endif From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 04:39:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B78B91065674; Sat, 27 Mar 2010 04:39:59 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A423D8FC12; Sat, 27 Mar 2010 04:39:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2R4dx0p061052; Sat, 27 Mar 2010 04:39:59 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2R4dxvW061042; Sat, 27 Mar 2010 04:39:59 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003270439.o2R4dxvW061042@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Mar 2010 04:39:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205725 - in user/jmallett/octeon/sys: conf mips/conf mips/include mips/mips sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 04:39:59 -0000 Author: jmallett Date: Sat Mar 27 04:39:59 2010 New Revision: 205725 URL: http://svn.freebsd.org/changeset/base/205725 Log: Add not-quite-tested support for running N32 binaries on N64 kernels. N64 and N32 /sbin/init both blow up in pmap_remove_entry, which I've not yet tracked down, on N64 kernels. Remove unused elf64_machdep file. Added: user/jmallett/octeon/sys/mips/mips/freebsd32_machdep.c Deleted: user/jmallett/octeon/sys/mips/mips/elf64_machdep.c Modified: user/jmallett/octeon/sys/conf/files.mips user/jmallett/octeon/sys/conf/options.mips user/jmallett/octeon/sys/mips/conf/OCTEON1 user/jmallett/octeon/sys/mips/include/elf.h user/jmallett/octeon/sys/mips/include/reg.h user/jmallett/octeon/sys/mips/include/vmparam.h user/jmallett/octeon/sys/mips/mips/elf_machdep.c user/jmallett/octeon/sys/sys/sysctl.h Modified: user/jmallett/octeon/sys/conf/files.mips ============================================================================== --- user/jmallett/octeon/sys/conf/files.mips Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/conf/files.mips Sat Mar 27 04:39:59 2010 (r205725) @@ -104,3 +104,10 @@ dev/siba/siba_pcib.c optional siba pci dev/hwpmc/hwpmc_mips.c optional hwpmc dev/hwpmc/hwpmc_mips24k.c optional hwpmc + +compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32 +compat/freebsd32/freebsd32_misc.c optional compat_freebsd32 +compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32 +compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32 +mips/mips/freebsd32_machdep.c optional compat_freebsd32 +kern/imgact_elf32.c optional compat_freebsd32 Modified: user/jmallett/octeon/sys/conf/options.mips ============================================================================== --- user/jmallett/octeon/sys/conf/options.mips Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/conf/options.mips Sat Mar 27 04:39:59 2010 (r205725) @@ -57,6 +57,8 @@ TARGET_XLR_XLS opt_global.h TICK_USE_YAMON_FREQ opt_global.h TICK_USE_MALTA_RTC opt_global.h +COMPAT_FREEBSD32 opt_compat.h + # # The highest memory address that can be used by the kernel in units of KB. # Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1 Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1 Sat Mar 27 04:39:59 2010 (r205725) @@ -56,10 +56,12 @@ options _KPOSIX_PRIORITY_SCHEDULING #Po #options ROOTDEVNAME=\"ufs:ad0s1a\" # Original options NO_SWAPPING -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_COMPAT +options COMPAT_FREEBSD32 + +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_COMPAT options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support Modified: user/jmallett/octeon/sys/mips/include/elf.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/elf.h Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/mips/include/elf.h Sat Mar 27 04:39:59 2010 (r205725) @@ -38,6 +38,10 @@ #ifndef _MACHINE_ELF_H_ #define _MACHINE_ELF_H_ +#if defined(_KERNEL) && !defined(_STANDALONE) +#include "opt_compat.h" +#endif + /* Information taken from MIPS ABI supplemental */ #ifndef __ELF_WORD_SIZE @@ -52,6 +56,9 @@ #include #define ELF_ARCH EM_MIPS +#if defined(COMPAT_FREEBSD32) +#define ELF_ARCH32 ELF_ARCH +#endif #define ELF_MACHINE_OK(x) ((x) == EM_MIPS || (x) == EM_MIPS_RS4_BE) /* Architecture dependent Segment types - p_type */ Modified: user/jmallett/octeon/sys/mips/include/reg.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/reg.h Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/mips/include/reg.h Sat Mar 27 04:39:59 2010 (r205725) @@ -42,6 +42,10 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#if defined(_KERNEL) && !defined(_STANDALONE) +#include "opt_compat.h" +#endif + /* * Location of the users' stored registers relative to ZERO. * must be visible to assembly code. @@ -66,6 +70,20 @@ struct dbreg { unsigned long junk; }; +#if defined(COMPAT_FREEBSD32) +struct reg32 { + register_t r_regs[NUMSAVEREGS]; /* numbered as above */ +}; + +struct fpreg32 { + f_register_t r_regs[NUMFPREGS]; +}; + +struct dbreg32 { + unsigned long junk; +}; +#endif + #ifdef _KERNEL int fill_fpregs(struct thread *, struct fpreg *); int fill_regs(struct thread *, struct reg *); @@ -73,6 +91,15 @@ int set_fpregs(struct thread *, struct f int set_regs(struct thread *, struct reg *); int fill_dbregs(struct thread *, struct dbreg *); int set_dbregs(struct thread *, struct dbreg *); + +#ifdef COMPAT_FREEBSD32 +int fill_fpregs32(struct thread *, struct fpreg32 *); +int fill_regs32(struct thread *, struct reg32 *); +int set_fpregs32(struct thread *, struct fpreg32 *); +int set_regs32(struct thread *, struct reg32 *); +int fill_dbregs32(struct thread *, struct dbreg32 *); +int set_dbregs32(struct thread *, struct dbreg32 *); +#endif #endif #endif /* !_MACHINE_REG_H_ */ Modified: user/jmallett/octeon/sys/mips/include/vmparam.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/vmparam.h Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/mips/include/vmparam.h Sat Mar 27 04:39:59 2010 (r205725) @@ -43,6 +43,10 @@ #ifndef _MACHINE_VMPARAM_H_ #define _MACHINE_VMPARAM_H_ +#if defined(_KERNEL) && !defined(_STANDALONE) +#include "opt_compat.h" +#endif + /* * Machine dependent constants mips processors. */ @@ -57,6 +61,9 @@ * offset is calculated. */ #define USRSTACK 0x7ffff000 /* Start of user stack */ +#if defined(COMPAT_FREEBSD32) +#define FREEBSD32_USRSTACK USRSTACK +#endif /* * Virtual memory related constants, all in bytes Modified: user/jmallett/octeon/sys/mips/mips/elf_machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/elf_machdep.c Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/mips/mips/elf_machdep.c Sat Mar 27 04:39:59 2010 (r205725) @@ -80,7 +80,7 @@ struct sysentvec elf64_freebsd_sysvec = .sv_flags = SV_ABI_FREEBSD | SV_LP64 }; -static Elf64_Brandinfo freebsd_brand_info = { +static Elf64_Brandinfo freebsd64_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_MIPS, .compat_3_brand = "FreeBSD", @@ -93,7 +93,7 @@ static Elf64_Brandinfo freebsd_brand_inf SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, - &freebsd_brand_info); + &freebsd64_brand_info); void elf64_dump_thread(struct thread *td __unused, void *dst __unused, @@ -101,6 +101,10 @@ elf64_dump_thread(struct thread *td __un { } #else +/* + * XXX + * Add a mechanism to distinguish between n32 and o32. + */ struct sysentvec elf32_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = sysent, @@ -132,7 +136,7 @@ struct sysentvec elf32_freebsd_sysvec = .sv_flags = SV_ABI_FREEBSD | SV_ILP32 }; -static Elf32_Brandinfo freebsd_brand_info = { +static Elf32_Brandinfo freebsd32_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_MIPS, .compat_3_brand = "FreeBSD", @@ -145,7 +149,7 @@ static Elf32_Brandinfo freebsd_brand_inf SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t) elf32_insert_brand_entry, - &freebsd_brand_info); + &freebsd32_brand_info); void elf32_dump_thread(struct thread *td __unused, void *dst __unused, Added: user/jmallett/octeon/sys/mips/mips/freebsd32_machdep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/sys/mips/mips/freebsd32_machdep.c Sat Mar 27 04:39:59 2010 (r205725) @@ -0,0 +1,265 @@ +/*- + * Copyright 2010 Juli Mallett. + * Copyright 1996-1998 John D. Polstra. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * from: src/sys/i386/i386/elf_machdep.c,v 1.20 2004/08/11 02:35:05 marcel + */ + +#include +__FBSDID("$FreeBSD: user/jmallett/octeon/sys/mips/mips/elf_machdep.c 204031 2010-02-18 05:49:52Z neel $"); + +#define __ELF_WORD_SIZE 32 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/* + * XXX + * Add a mechanism to distinguish between n32 and o32. + */ +struct sysentvec elf32_freebsd_sysvec = { + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = FREEBSD32_USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_ILP32 +}; + +static Elf32_Brandinfo freebsd32_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_MIPS, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = 0 +}; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd32_brand_info); + +void +elf32_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + +int +fill_fpregs32(struct thread *td, struct fpreg32 *fpr32) +{ + struct fpreg fpr; + unsigned i; + int error; + + error = fill_fpregs(td, &fpr); + if (error != 0) + return (error); + + for (i = 0; i < NUMFPREGS; i++) { + fpr32->r_regs[i] = fpr.r_regs[i]; + } + + return (0); +} + +int +fill_regs32(struct thread *td, struct reg32 *r32) +{ + struct reg r; + unsigned i; + int error; + + error = fill_regs(td, &r); + if (error != 0) + return (error); + + for (i = 0; i < NUMSAVEREGS; i++) { + r32->r_regs[i] = r.r_regs[i]; + } + + return (0); +} + +int +set_fpregs32(struct thread *td, struct fpreg32 *fpr32) +{ + struct fpreg fpr; + unsigned i; + int error; + + for (i = 0; i < NUMFPREGS; i++) { + fpr.r_regs[i] = fpr32->r_regs[i]; + } + + error = set_fpregs(td, &fpr); + if (error != 0) + return (error); + return (0); +} + +int +set_regs32(struct thread *td, struct reg32 *r32) +{ + struct reg r; + unsigned i; + int error; + + for (i = 0; i < NUMSAVEREGS; i++) { + r.r_regs[i] = r32->r_regs[i]; + } + + error = set_regs(td, &r); + if (error != 0) + return (error); + return (0); +} + +int +fill_dbregs32(struct thread *td, struct dbreg32 *dbr32) +{ + return (ENOSYS); +} + +int +set_dbregs32(struct thread *td, struct dbreg32 *dbr32) +{ + return (ENOSYS); +} + +int +freebsd32_sigreturn(struct thread *td, struct freebsd32_sigreturn_args *uap) +{ + struct sigreturn_args sa; + int error; + + sa.sigcntxp = (void *)(intptr_t)(int32_t)(intptr_t)uap->sigcntxp; + + error = sigreturn(td, &sa); + if (error != 0) + return (error); + return (0); +} + +int +freebsd32_getcontext(struct thread *td, struct freebsd32_getcontext_args *uap) +{ + struct getcontext_args gca; + int error; + + gca.ucp = (void *)(intptr_t)(int32_t)(intptr_t)uap->ucp; + + error = getcontext(td, &gca); + if (error != 0) + return (error); + return (0); +} + +int +freebsd32_setcontext(struct thread *td, struct freebsd32_setcontext_args *uap) +{ + struct setcontext_args sca; + int error; + + sca.ucp = (void *)(intptr_t)(int32_t)(intptr_t)uap->ucp; + + error = setcontext(td, &sca); + if (error != 0) + return (error); + return (0); +} + +int +freebsd32_swapcontext(struct thread *td, struct freebsd32_swapcontext_args *uap) +{ + struct swapcontext_args sca; + int error; + + sca.ucp = (void *)(intptr_t)(int32_t)(intptr_t)uap->ucp; + + error = swapcontext(td, &sca); + if (error != 0) + return (error); + return (0); +} + +int +freebsd32_sysarch(struct thread *td, struct freebsd32_sysarch_args *uap) +{ + struct sysarch_args saa; + int error; + + saa.op = uap->op; + saa.parms = (void *)(intptr_t)(int32_t)(intptr_t)uap->parms; + + error = sysarch(td, &saa); + if (error != 0) + return (error); + return (0); +} Modified: user/jmallett/octeon/sys/sys/sysctl.h ============================================================================== --- user/jmallett/octeon/sys/sys/sysctl.h Sat Mar 27 03:17:39 2010 (r205724) +++ user/jmallett/octeon/sys/sys/sysctl.h Sat Mar 27 04:39:59 2010 (r205725) @@ -123,7 +123,7 @@ struct ctlname { #define REQ_WIRED 2 /* locked and wired */ /* definitions for sysctl_req 'flags' member */ -#if defined(__amd64__) || defined(__ia64__) +#if defined(__amd64__) || defined(__ia64__) || defined(__mips__) #define SCTL_MASK32 1 /* 32 bit emulation */ #endif From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 16:42:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 453EA1065677; Sat, 27 Mar 2010 16:42:54 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 348F18FC19; Sat, 27 Mar 2010 16:42:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RGgsIK040900; Sat, 27 Mar 2010 16:42:54 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RGgsaH040898; Sat, 27 Mar 2010 16:42:54 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201003271642.o2RGgsaH040898@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 27 Mar 2010 16:42:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205741 - user/des/svnsup/src/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 16:42:54 -0000 Author: des Date: Sat Mar 27 16:42:53 2010 New Revision: 205741 URL: http://svn.freebsd.org/changeset/base/205741 Log: base64 lookup table generator Added: user/des/svnsup/src/libsvnsup/b64.c (contents, props changed) Added: user/des/svnsup/src/libsvnsup/b64.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/src/libsvnsup/b64.c Sat Mar 27 16:42:53 2010 (r205741) @@ -0,0 +1,75 @@ +/*- + * Copyright (c) 2010 Dag-Erling Coïdan Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#include + +static const char b64enc[64] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789" + "+/"; + +static char b64dec[256]; + +int +main(void) +{ + int i, j; + + for (i = 0; i < 64; ++i) + b64dec[(int)b64enc[i]] = i + 1; + for (i = 0; i < 256; ++i) + --b64dec[i]; + + printf("static const char b64enc[64] = {\n"); + for (i = 0; i < 8; ++i) { + putchar('\t'); + for (j = 0; j < 8; ++j) { + if (j > 0) + putchar(' '); + printf("'%c',", b64enc[i * 8 + j]); + } + putchar('\n'); + } + printf("};\n"); + + printf("static const char b64dec[256] = {\n"); + for (i = 0; i < 16; ++i) { + putchar('\t'); + for (j = 0; j < 16; ++j) { + if (j > 0) + putchar(' '); + printf("%2d,", b64dec[i * 16 + j]); + } + putchar('\n'); + } + printf("};\n"); + + return (0); +} From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 16:44:52 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D05D8106566C; Sat, 27 Mar 2010 16:44:52 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BEA7A8FC0C; Sat, 27 Mar 2010 16:44:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RGiqM8041401; Sat, 27 Mar 2010 16:44:52 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RGiqVP041397; Sat, 27 Mar 2010 16:44:52 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201003271644.o2RGiqVP041397@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 27 Mar 2010 16:44:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205742 - user/des/svnsup/src/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 16:44:52 -0000 Author: des Date: Sat Mar 27 16:44:52 2010 New Revision: 205742 URL: http://svn.freebsd.org/changeset/base/205742 Log: Implement memory-to-memory base64 encoding and decoding. Use size_t instead of int for lengths. Modified: user/des/svnsup/src/libsvnsup/svnsup.h user/des/svnsup/src/libsvnsup/svnsup_base64.c user/des/svnsup/src/libsvnsup/svnsup_string.c Modified: user/des/svnsup/src/libsvnsup/svnsup.h ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 16:42:53 2010 (r205741) +++ user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 16:44:52 2010 (r205742) @@ -74,15 +74,18 @@ char *svnsup_string_encode(const char *) char *svnsup_buf_encode(const char *, size_t); #ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ -int svnsup_string_fencode(FILE *, const char *); -int svnsup_buf_fencode(FILE *, const char *, size_t); +size_t svnsup_string_fencode(FILE *, const char *); +size_t svnsup_buf_fencode(FILE *, const char *, size_t); #endif /* * svnsup_base64.c */ +size_t svnsup_base64_encode(char *, const unsigned char *, size_t); +size_t svnsup_base64_decode(unsigned char *, const char *, size_t); #ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ -int svnsup_base64_fencode(FILE *, const unsigned char *, size_t); +size_t svnsup_base64_fencode(FILE *, const unsigned char *, size_t); +/* no fdecode yet */ #endif #endif Modified: user/des/svnsup/src/libsvnsup/svnsup_base64.c ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup_base64.c Sat Mar 27 16:42:53 2010 (r205741) +++ user/des/svnsup/src/libsvnsup/svnsup_base64.c Sat Mar 27 16:44:52 2010 (r205742) @@ -33,32 +33,103 @@ #include +#include #include #include "svnsup.h" -static const char b64t[65] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789" - "+/" - "="; +static const char b64enc[64] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/', +}; + +static const char b64dec[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +}; + +/* + * Compute the amount of space required to base64-encode a specified + * amount of data. + */ +size_t +svnsup_base64_encode_length(size_t size) +{ + + return (((size + 2) / 3) * 4); +} -int -svnsup_base64_fencode(FILE *f, const unsigned char *buf, size_t size) +/* + * Encode a buffer into another. Assumes that str points to a buffer of + * sufficient length. + */ +size_t +svnsup_base64_encode(char *b64, const unsigned char *data, size_t size) { - int count = 0; + size_t count = 0; + + while (size > 3) { + *b64++ = b64enc[data[0] >> 2]; + *b64++ = b64enc[(data[0] << 4 | data[1] >> 4) & 0x3f]; + *b64++ = b64enc[(data[1] << 2 | data[2] >> 6) & 0x3f]; + *b64++ = b64enc[data[2] & 0x3f]; + count += 4; + data += 3; + size -= 3; + } + if (size > 0) { + *b64++ = b64enc[data[0] >> 2]; + if (size > 1) { + *b64++ = b64enc[(data[0] << 4 | data[1] >> 4) & 0x3f]; + *b64++ = b64enc[(data[1] << 2) & 0x3f]; + } else { + *b64++ = b64enc[(data[0] << 4) & 0x3f]; + *b64++ = '='; + } + *b64++ = '='; + count += 4; + } + return (count); +} + +/* + * Encode a buffer and write the result to a file + */ +size_t +svnsup_base64_fencode(FILE *f, const unsigned char *data, size_t size) +{ + size_t count = 0; #if 0 int width = 0; #endif while (size >= 3) { - putc(b64t[buf[0] >> 2], f); - putc(b64t[(buf[0] << 4 | buf[1] >> 4) & 0x3f], f); - putc(b64t[(buf[1] << 2 | buf[2] >> 6) & 0x3f], f); - putc(b64t[buf[2] & 0x3f], f); + putc(b64enc[data[0] >> 2], f); + putc(b64enc[(data[0] << 4 | data[1] >> 4) & 0x3f], f); + putc(b64enc[(data[1] << 2 | data[2] >> 6) & 0x3f], f); + putc(b64enc[data[2] & 0x3f], f); count += 4; - buf += 3; + data += 3; size -= 3; #if 0 if ((width += 3) == 64 && size > 0) { @@ -69,12 +140,12 @@ svnsup_base64_fencode(FILE *f, const uns #endif } if (size > 0) { - putc(b64t[buf[0] >> 2], f); + putc(b64enc[data[0] >> 2], f); if (size > 1) { - putc(b64t[(buf[0] << 4 | buf[1] >> 4) & 0x3f], f); - putc(b64t[(buf[1] << 2) & 0x3f], f); + putc(b64enc[(data[0] << 4 | data[1] >> 4) & 0x3f], f); + putc(b64enc[(data[1] << 2) & 0x3f], f); } else { - putc(b64t[(buf[0] << 4) & 0x3f], f); + putc(b64enc[(data[0] << 4) & 0x3f], f); putc('=', f); } putc('=', f); @@ -82,3 +153,46 @@ svnsup_base64_fencode(FILE *f, const uns } return (count); } + +/* + * Compute the amount of space required to decode a base64-encoded string + * of the specified length. Note that this number may be a little high + * due to padding. + */ +size_t +svnsup_base64_decode_length(size_t size) +{ + + return ((size + 3 / 4) * 3); +} + +/* + * Decode a bas64-encoded string into a buffer. + */ +size_t +svnsup_base64_decode(unsigned char *data, const char *b64, size_t len) +{ + size_t count = 0; + + assert(len % 4 == 0); + while (len > 0) { + assert(b64dec[(int)b64[0]] != -1); + assert(b64dec[(int)b64[1]] != -1); + assert(b64dec[(int)b64[2]] != -1 || b64[2] == '='); + assert(b64dec[(int)b64[3]] != -1 || b64[3] == '='); + + *data = b64dec[(int)b64[0]] << 2 | b64dec[(int)b64[1]] >> 4; + ++count, ++data; + if (b64[2] != '=') { + *data = b64dec[(int)b64[1]] << 4 | b64dec[(int)b64[2]] >> 2; + ++count, ++data; + } + if (b64[3] != '=') { + *data = b64dec[(int)b64[2]] << 6 | b64dec[(int)b64[3]]; + ++count, ++data; + } + b64 += 4; + len -= 4; + } + return (count); +} Modified: user/des/svnsup/src/libsvnsup/svnsup_string.c ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup_string.c Sat Mar 27 16:42:53 2010 (r205741) +++ user/des/svnsup/src/libsvnsup/svnsup_string.c Sat Mar 27 16:44:52 2010 (r205742) @@ -90,14 +90,14 @@ svnsup_buf_encode(const char *buf, size_ return (NULL); } -int +size_t svnsup_string_fencode(FILE *f, const char *str) { return (svnsup_buf_fencode(f, str, strlen(str))); } -int +size_t svnsup_buf_fencode(FILE *f, const char *buf, size_t size) { int len; From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 16:55:50 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC6B7106564A; Sat, 27 Mar 2010 16:55:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D590E8FC0A; Sat, 27 Mar 2010 16:55:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RGto7L043872; Sat, 27 Mar 2010 16:55:50 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RGtodn043844; Sat, 27 Mar 2010 16:55:50 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201003271655.o2RGtodn043844@svn.freebsd.org> From: Konstantin Belousov Date: Sat, 27 Mar 2010 16:55:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205743 - in user/kib/vm6: . bin/ed bin/kill bin/pkill bin/ps bin/setfacl bin/sh cddl cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/li... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 16:55:51 -0000 Author: kib Date: Sat Mar 27 16:55:48 2010 New Revision: 205743 URL: http://svn.freebsd.org/changeset/base/205743 Log: IFC Added: user/kib/vm6/contrib/dtc/ - copied from r205733, head/contrib/dtc/ user/kib/vm6/contrib/tzcode/ - copied from r205733, head/contrib/tzcode/ - copied from r205733, head/contrib/tzdata/ user/kib/vm6/crypto/openssh/PROTOCOL.certkeys - copied unchanged from r205733, head/crypto/openssh/PROTOCOL.certkeys user/kib/vm6/crypto/openssh/PROTOCOL.mux - copied unchanged from r205733, head/crypto/openssh/PROTOCOL.mux user/kib/vm6/crypto/openssh/openbsd-compat/pwcache.c - copied unchanged from r205733, head/crypto/openssh/openbsd-compat/pwcache.c user/kib/vm6/crypto/openssh/pkcs11.h - copied unchanged from r205733, head/crypto/openssh/pkcs11.h user/kib/vm6/crypto/openssh/roaming_client.c - copied unchanged from r205733, head/crypto/openssh/roaming_client.c user/kib/vm6/crypto/openssh/roaming_serv.c - copied unchanged from r205733, head/crypto/openssh/roaming_serv.c user/kib/vm6/crypto/openssh/ssh-pkcs11-client.c - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11-client.c user/kib/vm6/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11-helper.0 user/kib/vm6/crypto/openssh/ssh-pkcs11-helper.8 - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11-helper.8 user/kib/vm6/crypto/openssh/ssh-pkcs11-helper.c - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11-helper.c user/kib/vm6/crypto/openssh/ssh-pkcs11.c - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11.c user/kib/vm6/crypto/openssh/ssh-pkcs11.h - copied unchanged from r205733, head/crypto/openssh/ssh-pkcs11.h user/kib/vm6/crypto/openssl/engines/alpha.opt - copied unchanged from r205733, head/crypto/openssl/engines/alpha.opt user/kib/vm6/crypto/openssl/engines/ia64.opt - copied unchanged from r205733, head/crypto/openssl/engines/ia64.opt user/kib/vm6/crypto/openssl/ssl/t1_reneg.c - copied unchanged from r205733, head/crypto/openssl/ssl/t1_reneg.c user/kib/vm6/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh - copied unchanged from r205733, head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh user/kib/vm6/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh - copied unchanged from r205733, head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh user/kib/vm6/gnu/usr.bin/dtc/ - copied from r205733, head/gnu/usr.bin/dtc/ user/kib/vm6/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c - copied unchanged from r205733, head/gnu/usr.bin/gdb/gdbserver/fbsd-amd64-low.c user/kib/vm6/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c - copied unchanged from r205733, head/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c user/kib/vm6/lib/libalias/Makefile.inc - copied unchanged from r205733, head/lib/libalias/Makefile.inc user/kib/vm6/lib/libcompat/4.3/re_comp.c - copied unchanged from r205733, head/lib/libcompat/4.3/re_comp.c user/kib/vm6/lib/libpmc/pmc.mips.3 - copied unchanged from r205733, head/lib/libpmc/pmc.mips.3 user/kib/vm6/lib/libz/Symbol.map - copied unchanged from r205733, head/lib/libz/Symbol.map user/kib/vm6/lib/libz/Versions.def - copied unchanged from r205733, head/lib/libz/Versions.def user/kib/vm6/lib/libz/contrib/ - copied from r205733, head/lib/libz/contrib/ user/kib/vm6/lib/libz/doc/ - copied from r205733, head/lib/libz/doc/ user/kib/vm6/lib/libz/gzclose.c - copied unchanged from r205733, head/lib/libz/gzclose.c user/kib/vm6/lib/libz/gzguts.h - copied unchanged from r205733, head/lib/libz/gzguts.h user/kib/vm6/lib/libz/gzlib.c - copied unchanged from r205733, head/lib/libz/gzlib.c user/kib/vm6/lib/libz/gzread.c - copied unchanged from r205733, head/lib/libz/gzread.c user/kib/vm6/lib/libz/gzwrite.c - copied unchanged from r205733, head/lib/libz/gzwrite.c user/kib/vm6/secure/libexec/ssh-pkcs11-helper/ - copied from r205733, head/secure/libexec/ssh-pkcs11-helper/ user/kib/vm6/share/man/man4/man4.powerpc/smu.4 - copied unchanged from r205733, head/share/man/man4/man4.powerpc/smu.4 user/kib/vm6/sys/amd64/amd64/atpic_vector.S - copied unchanged from r205733, head/sys/amd64/amd64/atpic_vector.S user/kib/vm6/sys/arm/conf/LN2410SBC - copied unchanged from r205733, head/sys/arm/conf/LN2410SBC user/kib/vm6/sys/arm/s3c2xx0/ - copied from r205733, head/sys/arm/s3c2xx0/ user/kib/vm6/sys/contrib/dev/acpica/compiler/aslpredef.c - copied unchanged from r205733, head/sys/contrib/dev/acpica/compiler/aslpredef.c user/kib/vm6/sys/contrib/dev/acpica/executer/exdebug.c - copied unchanged from r205733, head/sys/contrib/dev/acpica/executer/exdebug.c user/kib/vm6/sys/contrib/libfdt/ - copied from r205733, head/sys/contrib/libfdt/ user/kib/vm6/sys/dev/hwpmc/hwpmc_mips.c - copied unchanged from r205733, head/sys/dev/hwpmc/hwpmc_mips.c user/kib/vm6/sys/dev/hwpmc/hwpmc_mips24k.c - copied unchanged from r205733, head/sys/dev/hwpmc/hwpmc_mips24k.c user/kib/vm6/sys/dev/hwpmc/hwpmc_mips24k.h - copied unchanged from r205733, head/sys/dev/hwpmc/hwpmc_mips24k.h user/kib/vm6/sys/dev/usb/controller/ohci_s3c24x0.c - copied unchanged from r205733, head/sys/dev/usb/controller/ohci_s3c24x0.c user/kib/vm6/sys/i386/i386/atpic_vector.s - copied unchanged from r205733, head/sys/i386/i386/atpic_vector.s user/kib/vm6/sys/kern/kern_gzio.c - copied unchanged from r205733, head/sys/kern/kern_gzio.c user/kib/vm6/sys/net/netisr_internal.h - copied unchanged from r205733, head/sys/net/netisr_internal.h user/kib/vm6/sys/net/zutil.h - copied unchanged from r205733, head/sys/net/zutil.h user/kib/vm6/sys/netinet/ipfw/dn_heap.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_heap.c user/kib/vm6/sys/netinet/ipfw/dn_heap.h - copied unchanged from r205733, head/sys/netinet/ipfw/dn_heap.h user/kib/vm6/sys/netinet/ipfw/dn_sched.h - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched.h user/kib/vm6/sys/netinet/ipfw/dn_sched_fifo.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched_fifo.c user/kib/vm6/sys/netinet/ipfw/dn_sched_prio.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched_prio.c user/kib/vm6/sys/netinet/ipfw/dn_sched_qfq.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched_qfq.c user/kib/vm6/sys/netinet/ipfw/dn_sched_rr.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched_rr.c user/kib/vm6/sys/netinet/ipfw/dn_sched_wf2q.c - copied unchanged from r205733, head/sys/netinet/ipfw/dn_sched_wf2q.c user/kib/vm6/sys/netinet/ipfw/dummynet.txt - copied unchanged from r205733, head/sys/netinet/ipfw/dummynet.txt user/kib/vm6/sys/netinet/ipfw/ip_dn_glue.c - copied unchanged from r205733, head/sys/netinet/ipfw/ip_dn_glue.c user/kib/vm6/sys/netinet/ipfw/ip_dn_io.c - copied unchanged from r205733, head/sys/netinet/ipfw/ip_dn_io.c user/kib/vm6/sys/netinet/ipfw/ip_dn_private.h - copied unchanged from r205733, head/sys/netinet/ipfw/ip_dn_private.h user/kib/vm6/sys/netinet/ipfw/test/ - copied from r205733, head/sys/netinet/ipfw/test/ user/kib/vm6/sys/x86/ - copied from r205733, head/sys/x86/ user/kib/vm6/tools/regression/bin/sh/builtins/command10.0 - copied unchanged from r205733, head/tools/regression/bin/sh/builtins/command10.0 user/kib/vm6/tools/regression/bin/sh/builtins/command11.0 - copied unchanged from r205733, head/tools/regression/bin/sh/builtins/command11.0 user/kib/vm6/tools/regression/bin/sh/builtins/command8.0 - copied unchanged from r205733, head/tools/regression/bin/sh/builtins/command8.0 user/kib/vm6/tools/regression/bin/sh/builtins/command9.0 - copied unchanged from r205733, head/tools/regression/bin/sh/builtins/command9.0 user/kib/vm6/tools/regression/bin/sh/builtins/var-assign2.0 - copied unchanged from r205733, head/tools/regression/bin/sh/builtins/var-assign2.0 user/kib/vm6/tools/regression/bin/sh/errors/assignment-error1.0 - copied unchanged from r205733, head/tools/regression/bin/sh/errors/assignment-error1.0 user/kib/vm6/tools/regression/bin/sh/errors/redirection-error3.0 - copied unchanged from r205733, head/tools/regression/bin/sh/errors/redirection-error3.0 user/kib/vm6/tools/regression/bin/sh/errors/redirection-error4.0 - copied unchanged from r205733, head/tools/regression/bin/sh/errors/redirection-error4.0 user/kib/vm6/tools/regression/bin/sh/errors/redirection-error5.0 - copied unchanged from r205733, head/tools/regression/bin/sh/errors/redirection-error5.0 user/kib/vm6/tools/regression/bin/sh/errors/redirection-error6.0 - copied unchanged from r205733, head/tools/regression/bin/sh/errors/redirection-error6.0 user/kib/vm6/tools/regression/bin/sh/expansion/assign1.0 - copied unchanged from r205733, head/tools/regression/bin/sh/expansion/assign1.0 user/kib/vm6/tools/regression/bin/sh/expansion/cmdsubst2.0 - copied unchanged from r205733, head/tools/regression/bin/sh/expansion/cmdsubst2.0 user/kib/vm6/tools/regression/bin/sh/expansion/plus-minus1.0 - copied unchanged from r205733, head/tools/regression/bin/sh/expansion/plus-minus1.0 user/kib/vm6/tools/regression/bin/sh/parser/heredoc1.0 - copied unchanged from r205733, head/tools/regression/bin/sh/parser/heredoc1.0 user/kib/vm6/tools/regression/usr.bin/apply/ - copied from r205733, head/tools/regression/usr.bin/apply/ user/kib/vm6/tools/regression/usr.bin/ncal/ - copied from r205733, head/tools/regression/usr.bin/ncal/ user/kib/vm6/tools/tools/mcgrab/ - copied from r205733, head/tools/tools/mcgrab/ user/kib/vm6/usr.bin/csup/README - copied unchanged from r205733, head/usr.bin/csup/README user/kib/vm6/usr.bin/csup/TODO - copied unchanged from r205733, head/usr.bin/csup/TODO user/kib/vm6/usr.bin/csup/attrstack.c - copied unchanged from r205733, head/usr.bin/csup/attrstack.c user/kib/vm6/usr.bin/csup/attrstack.h - copied unchanged from r205733, head/usr.bin/csup/attrstack.h user/kib/vm6/usr.bin/csup/auth.c - copied unchanged from r205733, head/usr.bin/csup/auth.c user/kib/vm6/usr.bin/csup/auth.h - copied unchanged from r205733, head/usr.bin/csup/auth.h user/kib/vm6/usr.bin/csup/config.c - copied unchanged from r205733, head/usr.bin/csup/config.c user/kib/vm6/usr.bin/csup/config.h - copied unchanged from r205733, head/usr.bin/csup/config.h user/kib/vm6/usr.bin/csup/cpasswd.1 - copied unchanged from r205733, head/usr.bin/csup/cpasswd.1 user/kib/vm6/usr.bin/csup/cpasswd.sh - copied unchanged from r205733, head/usr.bin/csup/cpasswd.sh user/kib/vm6/usr.bin/csup/csup.1 - copied unchanged from r205733, head/usr.bin/csup/csup.1 user/kib/vm6/usr.bin/csup/detailer.c - copied unchanged from r205733, head/usr.bin/csup/detailer.c user/kib/vm6/usr.bin/csup/detailer.h - copied unchanged from r205733, head/usr.bin/csup/detailer.h user/kib/vm6/usr.bin/csup/diff.c - copied unchanged from r205733, head/usr.bin/csup/diff.c user/kib/vm6/usr.bin/csup/diff.h - copied unchanged from r205733, head/usr.bin/csup/diff.h user/kib/vm6/usr.bin/csup/fattr.c - copied unchanged from r205733, head/usr.bin/csup/fattr.c user/kib/vm6/usr.bin/csup/fattr.h - copied unchanged from r205733, head/usr.bin/csup/fattr.h user/kib/vm6/usr.bin/csup/fattr_bsd.h - copied unchanged from r205733, head/usr.bin/csup/fattr_bsd.h user/kib/vm6/usr.bin/csup/fattr_posix.h - copied unchanged from r205733, head/usr.bin/csup/fattr_posix.h user/kib/vm6/usr.bin/csup/fixups.c - copied unchanged from r205733, head/usr.bin/csup/fixups.c user/kib/vm6/usr.bin/csup/fixups.h - copied unchanged from r205733, head/usr.bin/csup/fixups.h user/kib/vm6/usr.bin/csup/fnmatch.c - copied unchanged from r205733, head/usr.bin/csup/fnmatch.c user/kib/vm6/usr.bin/csup/fnmatch.h - copied unchanged from r205733, head/usr.bin/csup/fnmatch.h user/kib/vm6/usr.bin/csup/globtree.c - copied unchanged from r205733, head/usr.bin/csup/globtree.c user/kib/vm6/usr.bin/csup/globtree.h - copied unchanged from r205733, head/usr.bin/csup/globtree.h user/kib/vm6/usr.bin/csup/idcache.c - copied unchanged from r205733, head/usr.bin/csup/idcache.c user/kib/vm6/usr.bin/csup/idcache.h - copied unchanged from r205733, head/usr.bin/csup/idcache.h user/kib/vm6/usr.bin/csup/keyword.c - copied unchanged from r205733, head/usr.bin/csup/keyword.c user/kib/vm6/usr.bin/csup/keyword.h - copied unchanged from r205733, head/usr.bin/csup/keyword.h user/kib/vm6/usr.bin/csup/lex.rcs.c - copied unchanged from r205733, head/usr.bin/csup/lex.rcs.c user/kib/vm6/usr.bin/csup/lister.c - copied unchanged from r205733, head/usr.bin/csup/lister.c user/kib/vm6/usr.bin/csup/lister.h - copied unchanged from r205733, head/usr.bin/csup/lister.h user/kib/vm6/usr.bin/csup/main.c - copied unchanged from r205733, head/usr.bin/csup/main.c user/kib/vm6/usr.bin/csup/main.h - copied unchanged from r205733, head/usr.bin/csup/main.h user/kib/vm6/usr.bin/csup/misc.c - copied unchanged from r205733, head/usr.bin/csup/misc.c user/kib/vm6/usr.bin/csup/misc.h - copied unchanged from r205733, head/usr.bin/csup/misc.h user/kib/vm6/usr.bin/csup/mux.c - copied unchanged from r205733, head/usr.bin/csup/mux.c user/kib/vm6/usr.bin/csup/mux.h - copied unchanged from r205733, head/usr.bin/csup/mux.h user/kib/vm6/usr.bin/csup/parse.y - copied unchanged from r205733, head/usr.bin/csup/parse.y user/kib/vm6/usr.bin/csup/pathcomp.c - copied unchanged from r205733, head/usr.bin/csup/pathcomp.c user/kib/vm6/usr.bin/csup/pathcomp.h - copied unchanged from r205733, head/usr.bin/csup/pathcomp.h user/kib/vm6/usr.bin/csup/proto.c - copied unchanged from r205733, head/usr.bin/csup/proto.c user/kib/vm6/usr.bin/csup/proto.h - copied unchanged from r205733, head/usr.bin/csup/proto.h user/kib/vm6/usr.bin/csup/queue.h - copied unchanged from r205733, head/usr.bin/csup/queue.h user/kib/vm6/usr.bin/csup/rcsfile.c - copied unchanged from r205733, head/usr.bin/csup/rcsfile.c user/kib/vm6/usr.bin/csup/rcsfile.h - copied unchanged from r205733, head/usr.bin/csup/rcsfile.h user/kib/vm6/usr.bin/csup/rcsparse.c - copied unchanged from r205733, head/usr.bin/csup/rcsparse.c user/kib/vm6/usr.bin/csup/rcsparse.h - copied unchanged from r205733, head/usr.bin/csup/rcsparse.h user/kib/vm6/usr.bin/csup/rcstokenizer.h - copied unchanged from r205733, head/usr.bin/csup/rcstokenizer.h user/kib/vm6/usr.bin/csup/rcstokenizer.l - copied unchanged from r205733, head/usr.bin/csup/rcstokenizer.l user/kib/vm6/usr.bin/csup/rsyncfile.c - copied unchanged from r205733, head/usr.bin/csup/rsyncfile.c user/kib/vm6/usr.bin/csup/rsyncfile.h - copied unchanged from r205733, head/usr.bin/csup/rsyncfile.h user/kib/vm6/usr.bin/csup/status.c - copied unchanged from r205733, head/usr.bin/csup/status.c user/kib/vm6/usr.bin/csup/status.h - copied unchanged from r205733, head/usr.bin/csup/status.h user/kib/vm6/usr.bin/csup/stream.c - copied unchanged from r205733, head/usr.bin/csup/stream.c user/kib/vm6/usr.bin/csup/stream.h - copied unchanged from r205733, head/usr.bin/csup/stream.h user/kib/vm6/usr.bin/csup/threads.c - copied unchanged from r205733, head/usr.bin/csup/threads.c user/kib/vm6/usr.bin/csup/threads.h - copied unchanged from r205733, head/usr.bin/csup/threads.h user/kib/vm6/usr.bin/csup/token.h - copied unchanged from r205733, head/usr.bin/csup/token.h user/kib/vm6/usr.bin/csup/token.l - copied unchanged from r205733, head/usr.bin/csup/token.l user/kib/vm6/usr.bin/csup/updater.c - copied unchanged from r205733, head/usr.bin/csup/updater.c user/kib/vm6/usr.bin/csup/updater.h - copied unchanged from r205733, head/usr.bin/csup/updater.h user/kib/vm6/usr.bin/procstat/procstat_sigs.c - copied unchanged from r205733, head/usr.bin/procstat/procstat_sigs.c Directory Properties: user/kib/vm6/contrib/tzdata/ (props changed) Replaced: user/kib/vm6/usr.bin/csup/Makefile - copied unchanged from r205733, head/usr.bin/csup/Makefile Deleted: user/kib/vm6/contrib/cpio/ user/kib/vm6/contrib/csup/ user/kib/vm6/crypto/openssh/README.smartcard user/kib/vm6/crypto/openssh/scard-opensc.c user/kib/vm6/crypto/openssh/scard.c user/kib/vm6/crypto/openssh/scard.h user/kib/vm6/crypto/openssl/apps/genpkey.c user/kib/vm6/crypto/openssl/apps/pkey.c user/kib/vm6/crypto/openssl/apps/pkeyparam.c user/kib/vm6/crypto/openssl/apps/pkeyutl.c user/kib/vm6/crypto/openssl/apps/ts.c user/kib/vm6/crypto/openssl/apps/tsget user/kib/vm6/crypto/openssl/crypto/aes/aes_x86core.c user/kib/vm6/crypto/openssl/crypto/aes/asm/aes-armv4.pl user/kib/vm6/crypto/openssl/crypto/aes/asm/aes-ppc.pl user/kib/vm6/crypto/openssl/crypto/aes/asm/aes-s390x.pl user/kib/vm6/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl user/kib/vm6/crypto/openssl/crypto/asn1/ameth_lib.c user/kib/vm6/crypto/openssl/crypto/asn1/asn1_locl.h user/kib/vm6/crypto/openssl/crypto/asn1/bio_asn1.c user/kib/vm6/crypto/openssl/crypto/asn1/bio_ndef.c user/kib/vm6/crypto/openssl/crypto/asn1/x_nx509.c user/kib/vm6/crypto/openssl/crypto/bn/asm/alpha-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/armv4-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/mips3-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/ppc-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/ppc64-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/s390x-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/s390x.S user/kib/vm6/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/via-mont.pl user/kib/vm6/crypto/openssl/crypto/bn/asm/x86-mont.pl user/kib/vm6/crypto/openssl/crypto/camellia/asm/ user/kib/vm6/crypto/openssl/crypto/ppccpuid.pl user/kib/vm6/crypto/openssl/crypto/s390xcpuid.S user/kib/vm6/crypto/openssl/crypto/sparcv9cap.c user/kib/vm6/crypto/openssl/engines/axp.opt user/kib/vm6/gnu/usr.bin/cpio/ user/kib/vm6/include/regexp.h user/kib/vm6/include/utmp.h user/kib/vm6/lib/libc/stdtime/asctime.c user/kib/vm6/lib/libc/stdtime/ctime.3 user/kib/vm6/lib/libc/stdtime/difftime.c user/kib/vm6/lib/libc/stdtime/localtime.c user/kib/vm6/lib/libc/stdtime/private.h user/kib/vm6/lib/libc/stdtime/time2posix.3 user/kib/vm6/lib/libc/stdtime/tzfile.5 user/kib/vm6/lib/libc/stdtime/tzfile.h user/kib/vm6/lib/libcompat/4.3/regex.c user/kib/vm6/lib/libcompat/regexp/ user/kib/vm6/lib/libz/algorithm.txt user/kib/vm6/lib/libz/gzio.c user/kib/vm6/share/zoneinfo/africa user/kib/vm6/share/zoneinfo/antarctica user/kib/vm6/share/zoneinfo/asia user/kib/vm6/share/zoneinfo/australasia user/kib/vm6/share/zoneinfo/backward user/kib/vm6/share/zoneinfo/etcetera user/kib/vm6/share/zoneinfo/europe user/kib/vm6/share/zoneinfo/factory user/kib/vm6/share/zoneinfo/leapseconds user/kib/vm6/share/zoneinfo/northamerica user/kib/vm6/share/zoneinfo/pacificnew user/kib/vm6/share/zoneinfo/southamerica user/kib/vm6/share/zoneinfo/systemv user/kib/vm6/share/zoneinfo/yearistype.sh user/kib/vm6/share/zoneinfo/zone.tab user/kib/vm6/sys/amd64/isa/ user/kib/vm6/sys/dev/cxgb/common/cxgb_version.h user/kib/vm6/sys/dev/cxgb/cxgb_config.h user/kib/vm6/sys/i386/bios/smbios.c user/kib/vm6/sys/i386/bios/vpd.c user/kib/vm6/sys/i386/cpufreq/ user/kib/vm6/sys/i386/isa/atpic.c user/kib/vm6/sys/i386/isa/atpic_vector.s user/kib/vm6/sys/i386/isa/clock.c user/kib/vm6/sys/i386/isa/elcr.c user/kib/vm6/sys/i386/isa/icu.h user/kib/vm6/sys/i386/isa/isa.c user/kib/vm6/sys/i386/isa/isa.h user/kib/vm6/sys/i386/isa/isa_dma.c user/kib/vm6/sys/i386/isa/nmi.c user/kib/vm6/sys/ia64/include/nexusvar.h user/kib/vm6/sys/ia64/include/sapicreg.h user/kib/vm6/sys/ia64/include/sapicvar.h user/kib/vm6/sys/isa/atrtc.c user/kib/vm6/sys/isa/orm.c user/kib/vm6/tools/build/options/WITH_GNU_CPIO user/kib/vm6/tools/tools/mctest/mcgrab.1 user/kib/vm6/tools/tools/mctest/mcgrab.cc user/kib/vm6/tools/tools/nanobsd/pcengines/Pkg/ user/kib/vm6/usr.sbin/ntp/ntptrace/ user/kib/vm6/usr.sbin/zic/Theory user/kib/vm6/usr.sbin/zic/ialloc.c user/kib/vm6/usr.sbin/zic/private.h user/kib/vm6/usr.sbin/zic/scheck.c user/kib/vm6/usr.sbin/zic/zdump.8 user/kib/vm6/usr.sbin/zic/zdump.c user/kib/vm6/usr.sbin/zic/zic.8 user/kib/vm6/usr.sbin/zic/zic.c Modified: user/kib/vm6/MAINTAINERS user/kib/vm6/Makefile user/kib/vm6/Makefile.inc1 user/kib/vm6/ObsoleteFiles.inc user/kib/vm6/UPDATING user/kib/vm6/bin/ed/Makefile user/kib/vm6/bin/ed/main.c user/kib/vm6/bin/kill/kill.c user/kib/vm6/bin/pkill/pkill.1 user/kib/vm6/bin/pkill/pkill.c user/kib/vm6/bin/ps/extern.h user/kib/vm6/bin/ps/keyword.c user/kib/vm6/bin/ps/print.c user/kib/vm6/bin/ps/ps.1 user/kib/vm6/bin/setfacl/file.c user/kib/vm6/bin/setfacl/mask.c user/kib/vm6/bin/setfacl/merge.c user/kib/vm6/bin/setfacl/remove.c user/kib/vm6/bin/setfacl/setfacl.1 user/kib/vm6/bin/setfacl/setfacl.c user/kib/vm6/bin/setfacl/setfacl.h user/kib/vm6/bin/setfacl/util.c user/kib/vm6/bin/sh/eval.c user/kib/vm6/bin/sh/exec.c user/kib/vm6/bin/sh/exec.h user/kib/vm6/bin/sh/parser.c user/kib/vm6/bin/sh/sh.1 user/kib/vm6/cddl/Makefile.inc user/kib/vm6/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/kib/vm6/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c user/kib/vm6/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h user/kib/vm6/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/kib/vm6/cddl/contrib/opensolaris/cmd/zpool/zpool.8 user/kib/vm6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/kib/vm6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/kib/vm6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/kib/vm6/cddl/lib/drti/Makefile user/kib/vm6/cddl/lib/libavl/Makefile user/kib/vm6/cddl/lib/libctf/Makefile user/kib/vm6/cddl/lib/libdtrace/Makefile user/kib/vm6/cddl/lib/libnvpair/Makefile user/kib/vm6/cddl/lib/libumem/Makefile user/kib/vm6/cddl/lib/libuutil/Makefile user/kib/vm6/cddl/lib/libzfs/Makefile user/kib/vm6/cddl/lib/libzpool/Makefile user/kib/vm6/cddl/sbin/zfs/Makefile user/kib/vm6/cddl/sbin/zpool/Makefile user/kib/vm6/cddl/usr.bin/ctfconvert/Makefile user/kib/vm6/cddl/usr.bin/ctfdump/Makefile user/kib/vm6/cddl/usr.bin/ctfmerge/Makefile user/kib/vm6/cddl/usr.bin/sgsmsg/Makefile user/kib/vm6/cddl/usr.bin/zinject/Makefile user/kib/vm6/cddl/usr.bin/ztest/Makefile user/kib/vm6/cddl/usr.sbin/dtrace/Makefile user/kib/vm6/cddl/usr.sbin/lockstat/Makefile user/kib/vm6/cddl/usr.sbin/zdb/Makefile user/kib/vm6/contrib/bind9/CHANGES user/kib/vm6/contrib/bind9/COPYRIGHT user/kib/vm6/contrib/bind9/FAQ user/kib/vm6/contrib/bind9/FAQ.xml user/kib/vm6/contrib/bind9/NSEC3-NOTES user/kib/vm6/contrib/bind9/README user/kib/vm6/contrib/bind9/bin/check/named-checkconf.8 user/kib/vm6/contrib/bind9/bin/check/named-checkconf.html user/kib/vm6/contrib/bind9/bin/check/named-checkzone.8 user/kib/vm6/contrib/bind9/bin/check/named-checkzone.c user/kib/vm6/contrib/bind9/bin/check/named-checkzone.docbook user/kib/vm6/contrib/bind9/bin/check/named-checkzone.html user/kib/vm6/contrib/bind9/bin/dig/dig.1 user/kib/vm6/contrib/bind9/bin/dig/dig.html user/kib/vm6/contrib/bind9/bin/dig/dighost.c user/kib/vm6/contrib/bind9/bin/dig/host.1 user/kib/vm6/contrib/bind9/bin/dig/host.c user/kib/vm6/contrib/bind9/bin/dig/host.html user/kib/vm6/contrib/bind9/bin/dig/nslookup.1 user/kib/vm6/contrib/bind9/bin/dig/nslookup.c user/kib/vm6/contrib/bind9/bin/dig/nslookup.html user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keygen.8 user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keygen.c user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keygen.docbook user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-keygen.html user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-signzone.8 user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-signzone.c user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-signzone.docbook user/kib/vm6/contrib/bind9/bin/dnssec/dnssec-signzone.html user/kib/vm6/contrib/bind9/bin/dnssec/dnssectool.c user/kib/vm6/contrib/bind9/bin/dnssec/dnssectool.h user/kib/vm6/contrib/bind9/bin/named/control.c user/kib/vm6/contrib/bind9/bin/named/include/named/server.h user/kib/vm6/contrib/bind9/bin/named/lwresd.8 user/kib/vm6/contrib/bind9/bin/named/lwresd.html user/kib/vm6/contrib/bind9/bin/named/named.8 user/kib/vm6/contrib/bind9/bin/named/named.conf.5 user/kib/vm6/contrib/bind9/bin/named/named.conf.html user/kib/vm6/contrib/bind9/bin/named/named.docbook user/kib/vm6/contrib/bind9/bin/named/named.html user/kib/vm6/contrib/bind9/bin/named/query.c user/kib/vm6/contrib/bind9/bin/named/server.c user/kib/vm6/contrib/bind9/bin/named/statschannel.c user/kib/vm6/contrib/bind9/bin/named/update.c user/kib/vm6/contrib/bind9/bin/nsupdate/nsupdate.1 user/kib/vm6/contrib/bind9/bin/nsupdate/nsupdate.html user/kib/vm6/contrib/bind9/bin/rndc/rndc-confgen.8 user/kib/vm6/contrib/bind9/bin/rndc/rndc-confgen.html user/kib/vm6/contrib/bind9/bin/rndc/rndc.8 user/kib/vm6/contrib/bind9/bin/rndc/rndc.conf.5 user/kib/vm6/contrib/bind9/bin/rndc/rndc.conf.html user/kib/vm6/contrib/bind9/bin/rndc/rndc.html user/kib/vm6/contrib/bind9/config.h.in user/kib/vm6/contrib/bind9/configure.in user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM-book.xml user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch01.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch02.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch03.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch04.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch05.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch06.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch07.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch08.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch09.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.ch10.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.html user/kib/vm6/contrib/bind9/doc/arm/Bv9ARM.pdf user/kib/vm6/contrib/bind9/doc/arm/man.dig.html user/kib/vm6/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html user/kib/vm6/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html user/kib/vm6/contrib/bind9/doc/arm/man.dnssec-keygen.html user/kib/vm6/contrib/bind9/doc/arm/man.dnssec-signzone.html user/kib/vm6/contrib/bind9/doc/arm/man.host.html user/kib/vm6/contrib/bind9/doc/arm/man.named-checkconf.html user/kib/vm6/contrib/bind9/doc/arm/man.named-checkzone.html user/kib/vm6/contrib/bind9/doc/arm/man.named.html user/kib/vm6/contrib/bind9/doc/arm/man.nsupdate.html user/kib/vm6/contrib/bind9/doc/arm/man.rndc-confgen.html user/kib/vm6/contrib/bind9/doc/arm/man.rndc.conf.html user/kib/vm6/contrib/bind9/doc/arm/man.rndc.html user/kib/vm6/contrib/bind9/doc/misc/Makefile.in user/kib/vm6/contrib/bind9/lib/dns/api user/kib/vm6/contrib/bind9/lib/dns/db.c user/kib/vm6/contrib/bind9/lib/dns/dispatch.c user/kib/vm6/contrib/bind9/lib/dns/dnssec.c user/kib/vm6/contrib/bind9/lib/dns/dst_api.c user/kib/vm6/contrib/bind9/lib/dns/dst_internal.h user/kib/vm6/contrib/bind9/lib/dns/dst_parse.c user/kib/vm6/contrib/bind9/lib/dns/include/dns/db.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/dnssec.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/journal.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/keyvalues.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/name.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/ncache.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/nsec3.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/rbt.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/rdataset.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/resolver.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/result.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/types.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/validator.h user/kib/vm6/contrib/bind9/lib/dns/include/dns/zone.h user/kib/vm6/contrib/bind9/lib/dns/include/dst/dst.h user/kib/vm6/contrib/bind9/lib/dns/journal.c user/kib/vm6/contrib/bind9/lib/dns/masterdump.c user/kib/vm6/contrib/bind9/lib/dns/message.c user/kib/vm6/contrib/bind9/lib/dns/ncache.c user/kib/vm6/contrib/bind9/lib/dns/nsec3.c user/kib/vm6/contrib/bind9/lib/dns/opensslrsa_link.c user/kib/vm6/contrib/bind9/lib/dns/rbt.c user/kib/vm6/contrib/bind9/lib/dns/rbtdb.c user/kib/vm6/contrib/bind9/lib/dns/rcode.c user/kib/vm6/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c user/kib/vm6/contrib/bind9/lib/dns/rdatalist.c user/kib/vm6/contrib/bind9/lib/dns/rdataset.c user/kib/vm6/contrib/bind9/lib/dns/rdataslab.c user/kib/vm6/contrib/bind9/lib/dns/resolver.c user/kib/vm6/contrib/bind9/lib/dns/result.c user/kib/vm6/contrib/bind9/lib/dns/sdb.c user/kib/vm6/contrib/bind9/lib/dns/sdlz.c user/kib/vm6/contrib/bind9/lib/dns/spnego.c user/kib/vm6/contrib/bind9/lib/dns/validator.c user/kib/vm6/contrib/bind9/lib/dns/view.c user/kib/vm6/contrib/bind9/lib/dns/zone.c user/kib/vm6/contrib/bind9/lib/isc/api user/kib/vm6/contrib/bind9/lib/isc/base32.c user/kib/vm6/contrib/bind9/lib/isc/base64.c user/kib/vm6/contrib/bind9/lib/isc/heap.c user/kib/vm6/contrib/bind9/lib/isc/httpd.c user/kib/vm6/contrib/bind9/lib/isc/ia64/include/isc/atomic.h user/kib/vm6/contrib/bind9/lib/isc/include/isc/entropy.h user/kib/vm6/contrib/bind9/lib/isc/include/isc/netscope.h user/kib/vm6/contrib/bind9/lib/isc/include/isc/portset.h user/kib/vm6/contrib/bind9/lib/isc/include/isc/sha2.h user/kib/vm6/contrib/bind9/lib/isc/include/isc/util.h user/kib/vm6/contrib/bind9/lib/isc/inet_ntop.c user/kib/vm6/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h user/kib/vm6/contrib/bind9/lib/isc/random.c user/kib/vm6/contrib/bind9/lib/isc/sha2.c user/kib/vm6/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c user/kib/vm6/contrib/bind9/lib/isc/unix/socket.c user/kib/vm6/contrib/bind9/lib/isccc/api user/kib/vm6/contrib/bind9/lib/isccfg/aclconf.c user/kib/vm6/contrib/bind9/lib/isccfg/api user/kib/vm6/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h user/kib/vm6/contrib/bind9/lib/lwres/api user/kib/vm6/contrib/bind9/lib/lwres/context.c user/kib/vm6/contrib/bind9/lib/lwres/getipnode.c user/kib/vm6/contrib/bind9/lib/lwres/man/lwres.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_buffer.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_buffer.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_config.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_config.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_context.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_context.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gabn.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gabn.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gethostent.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gethostent.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getipnode.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getipnode.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gnba.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_gnba.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_hstrerror.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_hstrerror.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_inetntop.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_inetntop.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_noop.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_noop.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_packet.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_packet.html user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_resutil.3 user/kib/vm6/contrib/bind9/lib/lwres/man/lwres_resutil.html user/kib/vm6/contrib/bind9/version user/kib/vm6/contrib/bsnmp/gensnmpdef/gensnmpdef.c user/kib/vm6/contrib/bsnmp/gensnmptree/gensnmptree.1 user/kib/vm6/contrib/bsnmp/snmpd/config.c user/kib/vm6/contrib/bsnmp/snmpd/snmpmod.3 user/kib/vm6/contrib/gcc/config/mips/freebsd.h user/kib/vm6/contrib/ipfilter/ipsend/sbpf.c user/kib/vm6/contrib/netcat/FREEBSD-upgrade user/kib/vm6/contrib/netcat/FREEBSD-vendor user/kib/vm6/contrib/netcat/nc.1 user/kib/vm6/contrib/netcat/netcat.c user/kib/vm6/contrib/openpam/include/security/pam_appl.h user/kib/vm6/contrib/top/utils.c user/kib/vm6/crypto/openssh/ChangeLog user/kib/vm6/crypto/openssh/INSTALL user/kib/vm6/crypto/openssh/PROTOCOL user/kib/vm6/crypto/openssh/PROTOCOL.agent user/kib/vm6/crypto/openssh/README user/kib/vm6/crypto/openssh/addrmatch.c user/kib/vm6/crypto/openssh/auth-krb5.c user/kib/vm6/crypto/openssh/auth-options.c user/kib/vm6/crypto/openssh/auth-options.h user/kib/vm6/crypto/openssh/auth-rh-rsa.c user/kib/vm6/crypto/openssh/auth-rhosts.c user/kib/vm6/crypto/openssh/auth-rsa.c user/kib/vm6/crypto/openssh/auth.c user/kib/vm6/crypto/openssh/auth.h user/kib/vm6/crypto/openssh/auth2-hostbased.c user/kib/vm6/crypto/openssh/auth2-pubkey.c user/kib/vm6/crypto/openssh/authfd.c user/kib/vm6/crypto/openssh/authfd.h user/kib/vm6/crypto/openssh/authfile.c user/kib/vm6/crypto/openssh/authfile.h user/kib/vm6/crypto/openssh/bufaux.c user/kib/vm6/crypto/openssh/buffer.c user/kib/vm6/crypto/openssh/buffer.h user/kib/vm6/crypto/openssh/canohost.c user/kib/vm6/crypto/openssh/channels.c user/kib/vm6/crypto/openssh/channels.h user/kib/vm6/crypto/openssh/clientloop.c user/kib/vm6/crypto/openssh/clientloop.h user/kib/vm6/crypto/openssh/config.guess user/kib/vm6/crypto/openssh/config.h user/kib/vm6/crypto/openssh/config.h.in user/kib/vm6/crypto/openssh/defines.h user/kib/vm6/crypto/openssh/dh.c user/kib/vm6/crypto/openssh/dns.c user/kib/vm6/crypto/openssh/dns.h user/kib/vm6/crypto/openssh/hostfile.c user/kib/vm6/crypto/openssh/hostfile.h user/kib/vm6/crypto/openssh/kex.c user/kib/vm6/crypto/openssh/kex.h user/kib/vm6/crypto/openssh/kexdhs.c user/kib/vm6/crypto/openssh/kexgexs.c user/kib/vm6/crypto/openssh/key.c user/kib/vm6/crypto/openssh/key.h user/kib/vm6/crypto/openssh/loginrec.c user/kib/vm6/crypto/openssh/match.h user/kib/vm6/crypto/openssh/misc.c user/kib/vm6/crypto/openssh/misc.h user/kib/vm6/crypto/openssh/monitor.c user/kib/vm6/crypto/openssh/monitor_fdpass.c user/kib/vm6/crypto/openssh/monitor_wrap.c user/kib/vm6/crypto/openssh/mux.c user/kib/vm6/crypto/openssh/myproposal.h user/kib/vm6/crypto/openssh/nchan.c user/kib/vm6/crypto/openssh/openbsd-compat/bsd-cygwin_util.c user/kib/vm6/crypto/openssh/openbsd-compat/openbsd-compat.h user/kib/vm6/crypto/openssh/openbsd-compat/openssl-compat.c user/kib/vm6/crypto/openssh/openbsd-compat/port-aix.c user/kib/vm6/crypto/openssh/openbsd-compat/port-aix.h user/kib/vm6/crypto/openssh/openbsd-compat/port-linux.c user/kib/vm6/crypto/openssh/openbsd-compat/port-linux.h user/kib/vm6/crypto/openssh/openbsd-compat/readpassphrase.c user/kib/vm6/crypto/openssh/pathnames.h user/kib/vm6/crypto/openssh/platform.c user/kib/vm6/crypto/openssh/platform.h user/kib/vm6/crypto/openssh/readconf.c user/kib/vm6/crypto/openssh/readconf.h user/kib/vm6/crypto/openssh/roaming.h user/kib/vm6/crypto/openssh/roaming_common.c user/kib/vm6/crypto/openssh/scp.1 user/kib/vm6/crypto/openssh/scp.c user/kib/vm6/crypto/openssh/servconf.c user/kib/vm6/crypto/openssh/servconf.h user/kib/vm6/crypto/openssh/session.c user/kib/vm6/crypto/openssh/sftp-client.c user/kib/vm6/crypto/openssh/sftp-client.h user/kib/vm6/crypto/openssh/sftp-common.c user/kib/vm6/crypto/openssh/sftp-common.h user/kib/vm6/crypto/openssh/sftp-server.8 user/kib/vm6/crypto/openssh/sftp-server.c user/kib/vm6/crypto/openssh/sftp.1 user/kib/vm6/crypto/openssh/sftp.c user/kib/vm6/crypto/openssh/ssh-add.1 user/kib/vm6/crypto/openssh/ssh-add.c user/kib/vm6/crypto/openssh/ssh-agent.1 user/kib/vm6/crypto/openssh/ssh-agent.c user/kib/vm6/crypto/openssh/ssh-dss.c user/kib/vm6/crypto/openssh/ssh-keygen.1 user/kib/vm6/crypto/openssh/ssh-keygen.c user/kib/vm6/crypto/openssh/ssh-keyscan.1 user/kib/vm6/crypto/openssh/ssh-keyscan.c user/kib/vm6/crypto/openssh/ssh-keysign.c user/kib/vm6/crypto/openssh/ssh-rand-helper.c user/kib/vm6/crypto/openssh/ssh-rsa.c user/kib/vm6/crypto/openssh/ssh.1 user/kib/vm6/crypto/openssh/ssh.c user/kib/vm6/crypto/openssh/ssh2.h user/kib/vm6/crypto/openssh/ssh_config user/kib/vm6/crypto/openssh/ssh_config.5 user/kib/vm6/crypto/openssh/ssh_namespace.h user/kib/vm6/crypto/openssh/sshconnect.c user/kib/vm6/crypto/openssh/sshconnect2.c user/kib/vm6/crypto/openssh/sshd.8 user/kib/vm6/crypto/openssh/sshd.c user/kib/vm6/crypto/openssh/sshd_config user/kib/vm6/crypto/openssh/sshd_config.5 user/kib/vm6/crypto/openssh/sshpty.h user/kib/vm6/crypto/openssh/sshtty.c user/kib/vm6/crypto/openssh/version.h user/kib/vm6/crypto/openssl/CHANGES user/kib/vm6/crypto/openssl/Configure user/kib/vm6/crypto/openssl/FAQ user/kib/vm6/crypto/openssl/Makefile user/kib/vm6/crypto/openssl/Makefile.org user/kib/vm6/crypto/openssl/NEWS user/kib/vm6/crypto/openssl/README user/kib/vm6/crypto/openssl/apps/CA.sh user/kib/vm6/crypto/openssl/apps/Makefile user/kib/vm6/crypto/openssl/apps/apps.c user/kib/vm6/crypto/openssl/apps/ca.c user/kib/vm6/crypto/openssl/apps/dsa.c user/kib/vm6/crypto/openssl/apps/dsaparam.c user/kib/vm6/crypto/openssl/apps/enc.c user/kib/vm6/crypto/openssl/apps/gendsa.c user/kib/vm6/crypto/openssl/apps/genrsa.c user/kib/vm6/crypto/openssl/apps/openssl.c user/kib/vm6/crypto/openssl/apps/pkcs12.c user/kib/vm6/crypto/openssl/apps/req.c user/kib/vm6/crypto/openssl/apps/s_apps.h user/kib/vm6/crypto/openssl/apps/s_cb.c user/kib/vm6/crypto/openssl/apps/s_client.c user/kib/vm6/crypto/openssl/apps/s_server.c user/kib/vm6/crypto/openssl/apps/s_socket.c user/kib/vm6/crypto/openssl/apps/speed.c user/kib/vm6/crypto/openssl/apps/x509.c user/kib/vm6/crypto/openssl/config user/kib/vm6/crypto/openssl/crypto/aes/aes_cfb.c user/kib/vm6/crypto/openssl/crypto/aes/asm/aes-x86_64.pl user/kib/vm6/crypto/openssl/crypto/asn1/a_mbstr.c user/kib/vm6/crypto/openssl/crypto/asn1/a_object.c user/kib/vm6/crypto/openssl/crypto/asn1/asn1.h user/kib/vm6/crypto/openssl/crypto/asn1/asn1_err.c user/kib/vm6/crypto/openssl/crypto/asn1/asn1_gen.c user/kib/vm6/crypto/openssl/crypto/asn1/asn1_par.c user/kib/vm6/crypto/openssl/crypto/asn1/t_x509.c user/kib/vm6/crypto/openssl/crypto/bio/bio.h user/kib/vm6/crypto/openssl/crypto/bio/bss_dgram.c user/kib/vm6/crypto/openssl/crypto/bio/bss_file.c user/kib/vm6/crypto/openssl/crypto/bn/asm/x86_64-gcc.c user/kib/vm6/crypto/openssl/crypto/bn/bn_div.c user/kib/vm6/crypto/openssl/crypto/bn/bn_exp.c user/kib/vm6/crypto/openssl/crypto/bn/bn_gf2m.c user/kib/vm6/crypto/openssl/crypto/bn/bn_mul.c user/kib/vm6/crypto/openssl/crypto/bn/bntest.c user/kib/vm6/crypto/openssl/crypto/camellia/Makefile user/kib/vm6/crypto/openssl/crypto/cast/c_cfb64.c user/kib/vm6/crypto/openssl/crypto/cast/c_ecb.c user/kib/vm6/crypto/openssl/crypto/cast/c_enc.c user/kib/vm6/crypto/openssl/crypto/cast/c_ofb64.c user/kib/vm6/crypto/openssl/crypto/cast/cast.h user/kib/vm6/crypto/openssl/crypto/cms/cms_ess.c user/kib/vm6/crypto/openssl/crypto/cms/cms_lib.c user/kib/vm6/crypto/openssl/crypto/comp/c_zlib.c user/kib/vm6/crypto/openssl/crypto/cryptlib.c user/kib/vm6/crypto/openssl/crypto/dsa/Makefile user/kib/vm6/crypto/openssl/crypto/dsa/dsa_asn1.c user/kib/vm6/crypto/openssl/crypto/dsa/dsa_lib.c user/kib/vm6/crypto/openssl/crypto/dso/dso_dlfcn.c user/kib/vm6/crypto/openssl/crypto/ec/ec2_smpl.c user/kib/vm6/crypto/openssl/crypto/ecdsa/Makefile user/kib/vm6/crypto/openssl/crypto/ecdsa/ecs_ossl.c user/kib/vm6/crypto/openssl/crypto/ecdsa/ecs_sign.c user/kib/vm6/crypto/openssl/crypto/engine/Makefile user/kib/vm6/crypto/openssl/crypto/engine/eng_cnf.c user/kib/vm6/crypto/openssl/crypto/engine/eng_cryptodev.c user/kib/vm6/crypto/openssl/crypto/engine/eng_ctrl.c user/kib/vm6/crypto/openssl/crypto/engine/eng_err.c user/kib/vm6/crypto/openssl/crypto/engine/eng_table.c user/kib/vm6/crypto/openssl/crypto/engine/engine.h user/kib/vm6/crypto/openssl/crypto/err/Makefile user/kib/vm6/crypto/openssl/crypto/err/err_all.c user/kib/vm6/crypto/openssl/crypto/evp/c_allc.c user/kib/vm6/crypto/openssl/crypto/evp/c_alld.c user/kib/vm6/crypto/openssl/crypto/evp/digest.c user/kib/vm6/crypto/openssl/crypto/evp/evp_lib.c user/kib/vm6/crypto/openssl/crypto/evp/evp_locl.h user/kib/vm6/crypto/openssl/crypto/lhash/lhash.c user/kib/vm6/crypto/openssl/crypto/md5/asm/md5-x86_64.pl user/kib/vm6/crypto/openssl/crypto/o_init.c user/kib/vm6/crypto/openssl/crypto/o_str.c user/kib/vm6/crypto/openssl/crypto/objects/obj_dat.c user/kib/vm6/crypto/openssl/crypto/objects/obj_dat.h user/kib/vm6/crypto/openssl/crypto/objects/obj_mac.h user/kib/vm6/crypto/openssl/crypto/objects/obj_mac.num user/kib/vm6/crypto/openssl/crypto/objects/objects.txt user/kib/vm6/crypto/openssl/crypto/ocsp/ocsp_prn.c user/kib/vm6/crypto/openssl/crypto/opensslv.h user/kib/vm6/crypto/openssl/crypto/pem/pem_seal.c user/kib/vm6/crypto/openssl/crypto/perlasm/x86_64-xlate.pl user/kib/vm6/crypto/openssl/crypto/pkcs12/p12_attr.c user/kib/vm6/crypto/openssl/crypto/pkcs12/p12_key.c user/kib/vm6/crypto/openssl/crypto/pkcs12/p12_utl.c user/kib/vm6/crypto/openssl/crypto/pkcs12/pkcs12.h user/kib/vm6/crypto/openssl/crypto/pkcs7/pk7_mime.c user/kib/vm6/crypto/openssl/crypto/rand/rand_win.c user/kib/vm6/crypto/openssl/crypto/rand/randfile.c user/kib/vm6/crypto/openssl/crypto/rsa/rsa.h user/kib/vm6/crypto/openssl/crypto/rsa/rsa_eay.c user/kib/vm6/crypto/openssl/crypto/rsa/rsa_eng.c user/kib/vm6/crypto/openssl/crypto/rsa/rsa_oaep.c user/kib/vm6/crypto/openssl/crypto/rsa/rsa_pss.c user/kib/vm6/crypto/openssl/crypto/rsa/rsa_sign.c user/kib/vm6/crypto/openssl/crypto/sha/sha512.c user/kib/vm6/crypto/openssl/crypto/stack/safestack.h user/kib/vm6/crypto/openssl/crypto/symhacks.h user/kib/vm6/crypto/openssl/crypto/ui/ui_openssl.c user/kib/vm6/crypto/openssl/crypto/x509/by_dir.c user/kib/vm6/crypto/openssl/crypto/x509/x509.h user/kib/vm6/crypto/openssl/crypto/x509/x509_lu.c user/kib/vm6/crypto/openssl/crypto/x509/x509_vfy.c user/kib/vm6/crypto/openssl/crypto/x509/x509_vfy.h user/kib/vm6/crypto/openssl/crypto/x509/x509_vpm.c user/kib/vm6/crypto/openssl/crypto/x509v3/pcy_tree.c user/kib/vm6/crypto/openssl/crypto/x509v3/v3_alt.c user/kib/vm6/crypto/openssl/crypto/x509v3/v3_ocsp.c user/kib/vm6/crypto/openssl/demos/x509/mkcert.c user/kib/vm6/crypto/openssl/demos/x509/mkreq.c user/kib/vm6/crypto/openssl/doc/apps/enc.pod user/kib/vm6/crypto/openssl/doc/apps/verify.pod user/kib/vm6/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod user/kib/vm6/crypto/openssl/doc/crypto/EVP_DigestInit.pod user/kib/vm6/crypto/openssl/doc/crypto/PKCS12_parse.pod user/kib/vm6/crypto/openssl/doc/crypto/bn_internal.pod user/kib/vm6/crypto/openssl/doc/crypto/d2i_X509.pod user/kib/vm6/crypto/openssl/doc/crypto/d2i_X509_CRL.pod user/kib/vm6/crypto/openssl/doc/crypto/d2i_X509_REQ.pod user/kib/vm6/crypto/openssl/doc/crypto/hmac.pod user/kib/vm6/crypto/openssl/doc/crypto/pem.pod user/kib/vm6/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod user/kib/vm6/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod user/kib/vm6/crypto/openssl/engines/Makefile user/kib/vm6/crypto/openssl/engines/e_capi.c user/kib/vm6/crypto/openssl/engines/e_capi_err.c user/kib/vm6/crypto/openssl/engines/e_capi_err.h user/kib/vm6/crypto/openssl/engines/e_ubsec.c user/kib/vm6/crypto/openssl/fips/Makefile user/kib/vm6/crypto/openssl/fips/aes/fips_aesavs.c user/kib/vm6/crypto/openssl/fips/des/fips_desmovs.c user/kib/vm6/crypto/openssl/fips/dsa/fips_dsa_key.c user/kib/vm6/crypto/openssl/fips/dsa/fips_dsa_sign.c user/kib/vm6/crypto/openssl/fips/dsa/fips_dsatest.c user/kib/vm6/crypto/openssl/fips/dsa/fips_dssvs.c user/kib/vm6/crypto/openssl/fips/fips_locl.h user/kib/vm6/crypto/openssl/fips/fips_test_suite.c user/kib/vm6/crypto/openssl/fips/fips_utl.h user/kib/vm6/crypto/openssl/fips/fipsalgtest.pl user/kib/vm6/crypto/openssl/fips/fipsld user/kib/vm6/crypto/openssl/fips/hmac/fips_hmac.c user/kib/vm6/crypto/openssl/fips/hmac/fips_hmac_selftest.c user/kib/vm6/crypto/openssl/fips/rand/fips_rand.c user/kib/vm6/crypto/openssl/fips/rand/fips_rngvs.c user/kib/vm6/crypto/openssl/fips/rsa/fips_rsagtest.c user/kib/vm6/crypto/openssl/fips/rsa/fips_rsastest.c user/kib/vm6/crypto/openssl/fips/rsa/fips_rsavtest.c user/kib/vm6/crypto/openssl/fips/sha/Makefile user/kib/vm6/crypto/openssl/fips/sha/fips_sha1_selftest.c user/kib/vm6/crypto/openssl/openssl.spec user/kib/vm6/crypto/openssl/ssl/Makefile user/kib/vm6/crypto/openssl/ssl/d1_both.c user/kib/vm6/crypto/openssl/ssl/d1_clnt.c user/kib/vm6/crypto/openssl/ssl/d1_enc.c user/kib/vm6/crypto/openssl/ssl/d1_lib.c user/kib/vm6/crypto/openssl/ssl/d1_pkt.c user/kib/vm6/crypto/openssl/ssl/d1_srvr.c user/kib/vm6/crypto/openssl/ssl/dtls1.h user/kib/vm6/crypto/openssl/ssl/kssl.c user/kib/vm6/crypto/openssl/ssl/s23_clnt.c user/kib/vm6/crypto/openssl/ssl/s23_srvr.c user/kib/vm6/crypto/openssl/ssl/s2_srvr.c user/kib/vm6/crypto/openssl/ssl/s3_both.c user/kib/vm6/crypto/openssl/ssl/s3_clnt.c user/kib/vm6/crypto/openssl/ssl/s3_lib.c user/kib/vm6/crypto/openssl/ssl/s3_pkt.c user/kib/vm6/crypto/openssl/ssl/s3_srvr.c user/kib/vm6/crypto/openssl/ssl/ssl.h user/kib/vm6/crypto/openssl/ssl/ssl3.h user/kib/vm6/crypto/openssl/ssl/ssl_algs.c user/kib/vm6/crypto/openssl/ssl/ssl_asn1.c user/kib/vm6/crypto/openssl/ssl/ssl_cert.c user/kib/vm6/crypto/openssl/ssl/ssl_ciph.c user/kib/vm6/crypto/openssl/ssl/ssl_err.c user/kib/vm6/crypto/openssl/ssl/ssl_lib.c user/kib/vm6/crypto/openssl/ssl/ssl_locl.h user/kib/vm6/crypto/openssl/ssl/ssl_rsa.c user/kib/vm6/crypto/openssl/ssl/ssl_sess.c user/kib/vm6/crypto/openssl/ssl/ssl_stat.c user/kib/vm6/crypto/openssl/ssl/ssl_txt.c user/kib/vm6/crypto/openssl/ssl/t1_enc.c user/kib/vm6/crypto/openssl/ssl/t1_lib.c user/kib/vm6/crypto/openssl/ssl/tls1.h user/kib/vm6/crypto/openssl/test/Makefile user/kib/vm6/crypto/openssl/test/cms-test.pl user/kib/vm6/crypto/openssl/util/domd user/kib/vm6/crypto/openssl/util/libeay.num user/kib/vm6/crypto/openssl/util/mk1mf.pl user/kib/vm6/crypto/openssl/util/mkdef.pl user/kib/vm6/crypto/openssl/util/mkerr.pl user/kib/vm6/crypto/openssl/util/pl/Mingw32.pl user/kib/vm6/crypto/openssl/util/pl/VC-32.pl user/kib/vm6/crypto/openssl/util/pod2man.pl user/kib/vm6/crypto/openssl/util/shlib_wrap.sh user/kib/vm6/etc/Makefile user/kib/vm6/etc/defaults/periodic.conf user/kib/vm6/etc/defaults/rc.conf user/kib/vm6/etc/mtree/BSD.usr.dist user/kib/vm6/etc/rc.d/jail user/kib/vm6/etc/rc.d/rtsold user/kib/vm6/etc/rc.d/tmp user/kib/vm6/etc/termcap.small user/kib/vm6/games/fortune/datfiles/fortunes user/kib/vm6/games/pom/pom.6 user/kib/vm6/gnu/usr.bin/Makefile user/kib/vm6/gnu/usr.bin/binutils/ld/Makefile.mips user/kib/vm6/gnu/usr.bin/binutils/ld/genscripts.sh user/kib/vm6/gnu/usr.bin/cc/Makefile.inc user/kib/vm6/gnu/usr.bin/diff/Makefile user/kib/vm6/gnu/usr.bin/diff3/Makefile user/kib/vm6/gnu/usr.bin/gdb/Makefile user/kib/vm6/gnu/usr.bin/gdb/Makefile.inc user/kib/vm6/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h user/kib/vm6/gnu/usr.bin/gdb/gdbserver/Makefile user/kib/vm6/gnu/usr.bin/gdb/kgdb/trgt_ia64.c user/kib/vm6/gnu/usr.bin/sdiff/Makefile user/kib/vm6/include/Makefile user/kib/vm6/include/dlfcn.h user/kib/vm6/lib/Makefile user/kib/vm6/lib/bind/config.h user/kib/vm6/lib/csu/Makefile.inc user/kib/vm6/lib/csu/amd64/crt1.c user/kib/vm6/lib/csu/arm/Makefile user/kib/vm6/lib/csu/arm/crt1.c user/kib/vm6/lib/csu/i386-elf/Makefile user/kib/vm6/lib/csu/ia64/Makefile user/kib/vm6/lib/csu/mips/Makefile user/kib/vm6/lib/csu/mips/crt1.c user/kib/vm6/lib/csu/mips/crti.S user/kib/vm6/lib/csu/mips/crtn.S user/kib/vm6/lib/csu/powerpc/Makefile user/kib/vm6/lib/csu/powerpc/crt1.c user/kib/vm6/lib/csu/sparc64/crt1.c user/kib/vm6/lib/libalias/libalias/Makefile user/kib/vm6/lib/libarchive/test/Makefile user/kib/vm6/lib/libbsnmp/Makefile.inc user/kib/vm6/lib/libbsnmp/libbsnmp/Makefile user/kib/vm6/lib/libc/arm/gen/makecontext.c user/kib/vm6/lib/libc/arm/string/bzero.S user/kib/vm6/lib/libc/arm/string/memcpy_arm.S user/kib/vm6/lib/libc/arm/string/memmove.S user/kib/vm6/lib/libc/compat-43/sigpause.2 user/kib/vm6/lib/libc/gen/daemon.c user/kib/vm6/lib/libc/gen/dlfcn.c user/kib/vm6/lib/libc/gen/dlopen.3 user/kib/vm6/lib/libc/gen/fmtcheck.3 user/kib/vm6/lib/libc/gen/opendir.c user/kib/vm6/lib/libc/gen/pause.c user/kib/vm6/lib/libc/gen/stringlist.3 user/kib/vm6/lib/libc/gen/sysconf.c user/kib/vm6/lib/libc/include/reentrant.h user/kib/vm6/lib/libc/posix1e/acl_add_flag_np.3 user/kib/vm6/lib/libc/posix1e/acl_clear_flags_np.3 user/kib/vm6/lib/libc/posix1e/acl_delete_flag_np.3 user/kib/vm6/lib/libc/posix1e/acl_get_brand_np.3 user/kib/vm6/lib/libc/posix1e/acl_get_entry_type_np.3 user/kib/vm6/lib/libc/posix1e/acl_get_flag_np.3 user/kib/vm6/lib/libc/posix1e/acl_get_flagset_np.3 user/kib/vm6/lib/libc/posix1e/acl_set_entry_type_np.3 user/kib/vm6/lib/libc/posix1e/acl_set_flagset_np.3 user/kib/vm6/lib/libc/posix1e/acl_strip.c user/kib/vm6/lib/libc/powerpc/gen/fpgetmask.c user/kib/vm6/lib/libc/powerpc/gen/fpgetround.c user/kib/vm6/lib/libc/powerpc/gen/fpgetsticky.c user/kib/vm6/lib/libc/powerpc/gen/fpsetmask.c user/kib/vm6/lib/libc/powerpc/gen/fpsetround.c user/kib/vm6/lib/libc/rpc/Symbol.map user/kib/vm6/lib/libc/rpc/clnt_simple.c user/kib/vm6/lib/libc/rpc/getnetconfig.c user/kib/vm6/lib/libc/rpc/key_call.c user/kib/vm6/lib/libc/rpc/mt_misc.c user/kib/vm6/lib/libc/rpc/mt_misc.h user/kib/vm6/lib/libc/rpc/rpc_generic.c user/kib/vm6/lib/libc/rpc/rpc_soc.c user/kib/vm6/lib/libc/sparc64/fpu/fpu.c user/kib/vm6/lib/libc/sparc64/fpu/fpu_div.c user/kib/vm6/lib/libc/sparc64/fpu/fpu_emu.h user/kib/vm6/lib/libc/sparc64/fpu/fpu_explode.c user/kib/vm6/lib/libc/sparc64/fpu/fpu_extern.h user/kib/vm6/lib/libc/sparc64/fpu/fpu_implode.c user/kib/vm6/lib/libc/stdio/findfp.c user/kib/vm6/lib/libc/stdio/local.h user/kib/vm6/lib/libc/stdio/mktemp.c user/kib/vm6/lib/libc/stdio/snprintf.c user/kib/vm6/lib/libc/stdio/vasprintf.c user/kib/vm6/lib/libc/stdio/vdprintf.c user/kib/vm6/lib/libc/stdio/vfprintf.c user/kib/vm6/lib/libc/stdio/vsnprintf.c user/kib/vm6/lib/libc/stdio/vsprintf.c user/kib/vm6/lib/libc/stdio/vsscanf.c user/kib/vm6/lib/libc/stdio/vswprintf.c user/kib/vm6/lib/libc/stdio/vswscanf.c user/kib/vm6/lib/libc/stdio/xprintf.c user/kib/vm6/lib/libc/stdlib/malloc.c user/kib/vm6/lib/libc/stdlib/rb.h user/kib/vm6/lib/libc/stdlib/reallocf.c user/kib/vm6/lib/libc/stdtime/Makefile.inc user/kib/vm6/lib/libc/string/strlen.c user/kib/vm6/lib/libc/sys/mlockall.2 user/kib/vm6/lib/libc/sys/mmap.2 user/kib/vm6/lib/libc/sys/ntp_adjtime.2 user/kib/vm6/lib/libc/sys/open.2 user/kib/vm6/lib/libc/sys/utrace.2 user/kib/vm6/lib/libcompat/4.1/ascftime.c user/kib/vm6/lib/libcompat/4.1/cftime.c user/kib/vm6/lib/libcompat/4.1/ftime.c user/kib/vm6/lib/libcompat/4.1/getpw.c user/kib/vm6/lib/libcompat/4.3/cfree.c user/kib/vm6/lib/libcompat/4.3/re_comp.3 user/kib/vm6/lib/libcompat/Makefile user/kib/vm6/lib/libdwarf/Makefile user/kib/vm6/lib/libedit/editline.3 user/kib/vm6/lib/libedit/editrc.5 user/kib/vm6/lib/libedit/read.h user/kib/vm6/lib/libgssapi/gss_init_sec_context.3 user/kib/vm6/lib/libgssapi/gss_unwrap.3 user/kib/vm6/lib/libkvm/Makefile user/kib/vm6/lib/libkvm/kvm.c user/kib/vm6/lib/libkvm/kvm.h user/kib/vm6/lib/libkvm/kvm_getpcpu.3 user/kib/vm6/lib/libkvm/kvm_pcpu.c user/kib/vm6/lib/libkvm/kvm_private.h user/kib/vm6/lib/libkvm/kvm_vnet.c user/kib/vm6/lib/libpam/Makefile.inc user/kib/vm6/lib/libpam/modules/Makefile.inc user/kib/vm6/lib/libpam/modules/pam_krb5/Makefile user/kib/vm6/lib/libpam/modules/pam_ssh/pam_ssh.c user/kib/vm6/lib/libpmc/libpmc.c user/kib/vm6/lib/libpmc/pmc.xscale.3 user/kib/vm6/lib/libproc/Makefile user/kib/vm6/lib/librpcsec_gss/rpcsec_gss.3 user/kib/vm6/lib/librt/Makefile user/kib/vm6/lib/libsm/Makefile user/kib/vm6/lib/libstand/bzipfs.c user/kib/vm6/lib/libstand/gzipfs.c user/kib/vm6/lib/libusbhid/data.c user/kib/vm6/lib/libusbhid/descr.c user/kib/vm6/lib/libusbhid/parse.c user/kib/vm6/lib/libusbhid/usage.c user/kib/vm6/lib/libusbhid/usbhid.h user/kib/vm6/lib/libusbhid/usbvar.h user/kib/vm6/lib/libutil/humanize_number.3 user/kib/vm6/lib/libz/ChangeLog user/kib/vm6/lib/libz/FAQ user/kib/vm6/lib/libz/Makefile user/kib/vm6/lib/libz/README user/kib/vm6/lib/libz/adler32.c user/kib/vm6/lib/libz/compress.c user/kib/vm6/lib/libz/crc32.c user/kib/vm6/lib/libz/deflate.c user/kib/vm6/lib/libz/deflate.h user/kib/vm6/lib/libz/example.c user/kib/vm6/lib/libz/infback.c user/kib/vm6/lib/libz/inffast.c user/kib/vm6/lib/libz/inflate.c user/kib/vm6/lib/libz/inflate.h user/kib/vm6/lib/libz/inftrees.c user/kib/vm6/lib/libz/inftrees.h user/kib/vm6/lib/libz/minigzip.c (contents, props changed) user/kib/vm6/lib/libz/trees.c user/kib/vm6/lib/libz/uncompr.c user/kib/vm6/lib/libz/zconf.h user/kib/vm6/lib/libz/zlib.3 user/kib/vm6/lib/libz/zlib.h user/kib/vm6/lib/libz/zutil.c user/kib/vm6/lib/libz/zutil.h user/kib/vm6/lib/msun/man/cimag.3 user/kib/vm6/libexec/ftpd/popen.c user/kib/vm6/libexec/rpc.rstatd/Makefile user/kib/vm6/libexec/rtld-elf/mips/reloc.c user/kib/vm6/libexec/rtld-elf/mips/rtld_start.S user/kib/vm6/libexec/rtld-elf/rtld.c user/kib/vm6/libexec/tftpd/tftpd.8 user/kib/vm6/libexec/ulog-helper/Makefile user/kib/vm6/sbin/ddb/Makefile user/kib/vm6/sbin/geom/class/cache/gcache.8 user/kib/vm6/sbin/geom/class/mountver/gmountver.8 user/kib/vm6/sbin/geom/class/multipath/geom_multipath.c user/kib/vm6/sbin/geom/class/part/Makefile user/kib/vm6/sbin/gvinum/gvinum.c user/kib/vm6/sbin/hastctl/Makefile user/kib/vm6/sbin/hastd/Makefile user/kib/vm6/sbin/hastd/primary.c user/kib/vm6/sbin/ifconfig/Makefile user/kib/vm6/sbin/ifconfig/ifconfig.c user/kib/vm6/sbin/ifconfig/ifieee80211.c user/kib/vm6/sbin/ipf/ipftest/Makefile user/kib/vm6/sbin/ipfw/Makefile user/kib/vm6/sbin/ipfw/altq.c user/kib/vm6/sbin/ipfw/dummynet.c user/kib/vm6/sbin/ipfw/ipfw.8 user/kib/vm6/sbin/ipfw/ipfw2.c user/kib/vm6/sbin/ipfw/ipfw2.h user/kib/vm6/sbin/ipfw/main.c user/kib/vm6/sbin/mount/mount.c user/kib/vm6/sbin/mount_hpfs/Makefile user/kib/vm6/sbin/mount_hpfs/mount_hpfs.c user/kib/vm6/sbin/mount_ntfs/Makefile user/kib/vm6/sbin/mount_ntfs/mount_ntfs.c user/kib/vm6/sbin/newfs/Makefile user/kib/vm6/sbin/newfs/newfs.8 user/kib/vm6/sbin/newfs/newfs.c user/kib/vm6/sbin/nos-tun/Makefile user/kib/vm6/sbin/nos-tun/nos-tun.c user/kib/vm6/sbin/quotacheck/quotacheck.8 user/kib/vm6/sbin/route/Makefile user/kib/vm6/sbin/route/route.c user/kib/vm6/sbin/routed/Makefile user/kib/vm6/sbin/routed/if.c user/kib/vm6/sbin/routed/rtquery/Makefile user/kib/vm6/sbin/rtsol/Makefile user/kib/vm6/sbin/setkey/setkey.8 user/kib/vm6/sbin/sysctl/sysctl.c user/kib/vm6/secure/lib/libcrypto/Makefile.inc user/kib/vm6/secure/lib/libcrypto/Makefile.man user/kib/vm6/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 user/kib/vm6/secure/lib/libcrypto/man/ASN1_STRING_length.3 user/kib/vm6/secure/lib/libcrypto/man/ASN1_STRING_new.3 user/kib/vm6/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 user/kib/vm6/secure/lib/libcrypto/man/ASN1_generate_nconf.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_ctrl.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_base64.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_buffer.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_cipher.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_md.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_null.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_f_ssl.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_find_type.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_new.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_push.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_read.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_accept.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_bio.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_connect.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_fd.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_file.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_mem.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_null.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_s_socket.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_set_callback.3 user/kib/vm6/secure/lib/libcrypto/man/BIO_should_retry.3 user/kib/vm6/secure/lib/libcrypto/man/BN_BLINDING_new.3 user/kib/vm6/secure/lib/libcrypto/man/BN_CTX_new.3 user/kib/vm6/secure/lib/libcrypto/man/BN_CTX_start.3 user/kib/vm6/secure/lib/libcrypto/man/BN_add.3 user/kib/vm6/secure/lib/libcrypto/man/BN_add_word.3 user/kib/vm6/secure/lib/libcrypto/man/BN_bn2bin.3 user/kib/vm6/secure/lib/libcrypto/man/BN_cmp.3 user/kib/vm6/secure/lib/libcrypto/man/BN_copy.3 user/kib/vm6/secure/lib/libcrypto/man/BN_generate_prime.3 user/kib/vm6/secure/lib/libcrypto/man/BN_mod_inverse.3 user/kib/vm6/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 user/kib/vm6/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 user/kib/vm6/secure/lib/libcrypto/man/BN_new.3 user/kib/vm6/secure/lib/libcrypto/man/BN_num_bytes.3 user/kib/vm6/secure/lib/libcrypto/man/BN_rand.3 user/kib/vm6/secure/lib/libcrypto/man/BN_set_bit.3 user/kib/vm6/secure/lib/libcrypto/man/BN_swap.3 user/kib/vm6/secure/lib/libcrypto/man/BN_zero.3 user/kib/vm6/secure/lib/libcrypto/man/CONF_modules_free.3 user/kib/vm6/secure/lib/libcrypto/man/CONF_modules_load_file.3 user/kib/vm6/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 user/kib/vm6/secure/lib/libcrypto/man/DH_generate_key.3 user/kib/vm6/secure/lib/libcrypto/man/DH_generate_parameters.3 user/kib/vm6/secure/lib/libcrypto/man/DH_get_ex_new_index.3 user/kib/vm6/secure/lib/libcrypto/man/DH_new.3 user/kib/vm6/secure/lib/libcrypto/man/DH_set_method.3 user/kib/vm6/secure/lib/libcrypto/man/DH_size.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_SIG_new.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_do_sign.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_dup_DH.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_generate_key.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_generate_parameters.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_new.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_set_method.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_sign.3 user/kib/vm6/secure/lib/libcrypto/man/DSA_size.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_GET_LIB.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_clear_error.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_error_string.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_get_error.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_load_strings.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_print_errors.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_put_error.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_remove_state.3 user/kib/vm6/secure/lib/libcrypto/man/ERR_set_mark.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_BytesToKey.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_DigestInit.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_EncryptInit.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_OpenInit.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_PKEY_new.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_SealInit.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_SignInit.3 user/kib/vm6/secure/lib/libcrypto/man/EVP_VerifyInit.3 user/kib/vm6/secure/lib/libcrypto/man/OBJ_nid2obj.3 user/kib/vm6/secure/lib/libcrypto/man/OPENSSL_Applink.3 user/kib/vm6/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 user/kib/vm6/secure/lib/libcrypto/man/OPENSSL_config.3 user/kib/vm6/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 user/kib/vm6/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 user/kib/vm6/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS12_create.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS12_parse.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS7_decrypt.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS7_encrypt.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS7_sign.3 user/kib/vm6/secure/lib/libcrypto/man/PKCS7_verify.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_add.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_bytes.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_cleanup.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_egd.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_load_file.3 user/kib/vm6/secure/lib/libcrypto/man/RAND_set_rand_method.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_blinding_on.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_check_key.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_generate_key.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_new.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_print.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_private_encrypt.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_public_encrypt.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_set_method.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_sign.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 user/kib/vm6/secure/lib/libcrypto/man/RSA_size.3 user/kib/vm6/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 user/kib/vm6/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 user/kib/vm6/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 user/kib/vm6/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 user/kib/vm6/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 user/kib/vm6/secure/lib/libcrypto/man/X509_NAME_print_ex.3 user/kib/vm6/secure/lib/libcrypto/man/X509_new.3 user/kib/vm6/secure/lib/libcrypto/man/bio.3 user/kib/vm6/secure/lib/libcrypto/man/blowfish.3 user/kib/vm6/secure/lib/libcrypto/man/bn.3 user/kib/vm6/secure/lib/libcrypto/man/bn_internal.3 user/kib/vm6/secure/lib/libcrypto/man/buffer.3 user/kib/vm6/secure/lib/libcrypto/man/crypto.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_DHparams.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509_CRL.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509_NAME.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509_REQ.3 user/kib/vm6/secure/lib/libcrypto/man/d2i_X509_SIG.3 user/kib/vm6/secure/lib/libcrypto/man/des.3 user/kib/vm6/secure/lib/libcrypto/man/dh.3 user/kib/vm6/secure/lib/libcrypto/man/dsa.3 user/kib/vm6/secure/lib/libcrypto/man/ecdsa.3 user/kib/vm6/secure/lib/libcrypto/man/engine.3 user/kib/vm6/secure/lib/libcrypto/man/err.3 user/kib/vm6/secure/lib/libcrypto/man/evp.3 user/kib/vm6/secure/lib/libcrypto/man/hmac.3 user/kib/vm6/secure/lib/libcrypto/man/lh_stats.3 user/kib/vm6/secure/lib/libcrypto/man/lhash.3 user/kib/vm6/secure/lib/libcrypto/man/md5.3 user/kib/vm6/secure/lib/libcrypto/man/mdc2.3 user/kib/vm6/secure/lib/libcrypto/man/pem.3 user/kib/vm6/secure/lib/libcrypto/man/rand.3 user/kib/vm6/secure/lib/libcrypto/man/rc4.3 user/kib/vm6/secure/lib/libcrypto/man/ripemd.3 user/kib/vm6/secure/lib/libcrypto/man/rsa.3 user/kib/vm6/secure/lib/libcrypto/man/sha.3 user/kib/vm6/secure/lib/libcrypto/man/threads.3 user/kib/vm6/secure/lib/libcrypto/man/ui.3 user/kib/vm6/secure/lib/libcrypto/man/ui_compat.3 user/kib/vm6/secure/lib/libcrypto/man/x509.3 user/kib/vm6/secure/lib/libssh/Makefile user/kib/vm6/secure/lib/libssl/Makefile user/kib/vm6/secure/lib/libssl/Makefile.man user/kib/vm6/secure/lib/libssl/man/SSL_CIPHER_get_name.3 user/kib/vm6/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_add_session.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_ctrl.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_free.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_new.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_sess_number.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_sessions.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_mode.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_options.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_timeout.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_set_verify.3 user/kib/vm6/secure/lib/libssl/man/SSL_CTX_use_certificate.3 user/kib/vm6/secure/lib/libssl/man/SSL_SESSION_free.3 user/kib/vm6/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 user/kib/vm6/secure/lib/libssl/man/SSL_SESSION_get_time.3 user/kib/vm6/secure/lib/libssl/man/SSL_accept.3 user/kib/vm6/secure/lib/libssl/man/SSL_alert_type_string.3 user/kib/vm6/secure/lib/libssl/man/SSL_clear.3 user/kib/vm6/secure/lib/libssl/man/SSL_connect.3 user/kib/vm6/secure/lib/libssl/man/SSL_do_handshake.3 user/kib/vm6/secure/lib/libssl/man/SSL_free.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_SSL_CTX.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_ciphers.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_client_CA_list.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_current_cipher.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_default_timeout.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_error.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_ex_new_index.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_fd.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_peer_certificate.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_rbio.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_session.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_verify_result.3 user/kib/vm6/secure/lib/libssl/man/SSL_get_version.3 user/kib/vm6/secure/lib/libssl/man/SSL_library_init.3 user/kib/vm6/secure/lib/libssl/man/SSL_load_client_CA_file.3 user/kib/vm6/secure/lib/libssl/man/SSL_new.3 user/kib/vm6/secure/lib/libssl/man/SSL_pending.3 user/kib/vm6/secure/lib/libssl/man/SSL_read.3 user/kib/vm6/secure/lib/libssl/man/SSL_rstate_string.3 user/kib/vm6/secure/lib/libssl/man/SSL_session_reused.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_bio.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_connect_state.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_fd.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_session.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_shutdown.3 user/kib/vm6/secure/lib/libssl/man/SSL_set_verify_result.3 user/kib/vm6/secure/lib/libssl/man/SSL_shutdown.3 user/kib/vm6/secure/lib/libssl/man/SSL_state_string.3 user/kib/vm6/secure/lib/libssl/man/SSL_want.3 user/kib/vm6/secure/lib/libssl/man/SSL_write.3 user/kib/vm6/secure/lib/libssl/man/d2i_SSL_SESSION.3 user/kib/vm6/secure/lib/libssl/man/ssl.3 user/kib/vm6/secure/libexec/Makefile user/kib/vm6/secure/libexec/sftp-server/Makefile user/kib/vm6/secure/usr.bin/openssl/man/CA.pl.1 user/kib/vm6/secure/usr.bin/openssl/man/asn1parse.1 user/kib/vm6/secure/usr.bin/openssl/man/ca.1 user/kib/vm6/secure/usr.bin/openssl/man/ciphers.1 user/kib/vm6/secure/usr.bin/openssl/man/crl.1 user/kib/vm6/secure/usr.bin/openssl/man/crl2pkcs7.1 user/kib/vm6/secure/usr.bin/openssl/man/dgst.1 user/kib/vm6/secure/usr.bin/openssl/man/dhparam.1 user/kib/vm6/secure/usr.bin/openssl/man/dsa.1 user/kib/vm6/secure/usr.bin/openssl/man/dsaparam.1 user/kib/vm6/secure/usr.bin/openssl/man/ec.1 user/kib/vm6/secure/usr.bin/openssl/man/ecparam.1 user/kib/vm6/secure/usr.bin/openssl/man/enc.1 user/kib/vm6/secure/usr.bin/openssl/man/errstr.1 user/kib/vm6/secure/usr.bin/openssl/man/gendsa.1 user/kib/vm6/secure/usr.bin/openssl/man/genrsa.1 user/kib/vm6/secure/usr.bin/openssl/man/nseq.1 user/kib/vm6/secure/usr.bin/openssl/man/ocsp.1 user/kib/vm6/secure/usr.bin/openssl/man/openssl.1 user/kib/vm6/secure/usr.bin/openssl/man/passwd.1 user/kib/vm6/secure/usr.bin/openssl/man/pkcs12.1 user/kib/vm6/secure/usr.bin/openssl/man/pkcs7.1 user/kib/vm6/secure/usr.bin/openssl/man/pkcs8.1 user/kib/vm6/secure/usr.bin/openssl/man/rand.1 user/kib/vm6/secure/usr.bin/openssl/man/req.1 user/kib/vm6/secure/usr.bin/openssl/man/rsa.1 user/kib/vm6/secure/usr.bin/openssl/man/rsautl.1 user/kib/vm6/secure/usr.bin/openssl/man/s_client.1 user/kib/vm6/secure/usr.bin/openssl/man/s_server.1 user/kib/vm6/secure/usr.bin/openssl/man/s_time.1 user/kib/vm6/secure/usr.bin/openssl/man/sess_id.1 user/kib/vm6/secure/usr.bin/openssl/man/smime.1 user/kib/vm6/secure/usr.bin/openssl/man/speed.1 user/kib/vm6/secure/usr.bin/openssl/man/spkac.1 user/kib/vm6/secure/usr.bin/openssl/man/verify.1 user/kib/vm6/secure/usr.bin/openssl/man/version.1 user/kib/vm6/secure/usr.bin/openssl/man/x509.1 user/kib/vm6/secure/usr.bin/openssl/man/x509v3_config.1 user/kib/vm6/secure/usr.bin/ssh/Makefile user/kib/vm6/secure/usr.sbin/sshd/Makefile user/kib/vm6/share/dict/web2 user/kib/vm6/share/examples/autofs/driver/Makefile user/kib/vm6/share/man/man3/pthread_affinity_np.3 user/kib/vm6/share/man/man4/Makefile user/kib/vm6/share/man/man4/acpi.4 user/kib/vm6/share/man/man4/acpi_wmi.4 user/kib/vm6/share/man/man4/ada.4 user/kib/vm6/share/man/man4/ahci.4 user/kib/vm6/share/man/man4/altq.4 user/kib/vm6/share/man/man4/amdtemp.4 user/kib/vm6/share/man/man4/ata.4 user/kib/vm6/share/man/man4/ath.4 user/kib/vm6/share/man/man4/bwn.4 user/kib/vm6/share/man/man4/cd.4 user/kib/vm6/share/man/man4/ch.4 user/kib/vm6/share/man/man4/cxgb.4 user/kib/vm6/share/man/man4/da.4 user/kib/vm6/share/man/man4/ddb.4 user/kib/vm6/share/man/man4/ehci.4 user/kib/vm6/share/man/man4/gem.4 user/kib/vm6/share/man/man4/gre.4 user/kib/vm6/share/man/man4/hme.4 user/kib/vm6/share/man/man4/iscsi_initiator.4 user/kib/vm6/share/man/man4/man4.powerpc/Makefile user/kib/vm6/share/man/man4/man4.sparc64/sbus.4 user/kib/vm6/share/man/man4/msk.4 user/kib/vm6/share/man/man4/ndis.4 user/kib/vm6/share/man/man4/ng_ipfw.4 user/kib/vm6/share/man/man4/ohci.4 user/kib/vm6/share/man/man4/pass.4 user/kib/vm6/share/man/man4/pt.4 user/kib/vm6/share/man/man4/sa.4 user/kib/vm6/share/man/man4/scsi.4 user/kib/vm6/share/man/man4/siis.4 user/kib/vm6/share/man/man4/snd_uaudio.4 user/kib/vm6/share/man/man4/stge.4 user/kib/vm6/share/man/man4/sysmouse.4 user/kib/vm6/share/man/man4/textdump.4 user/kib/vm6/share/man/man4/uart.4 user/kib/vm6/share/man/man4/ubsa.4 user/kib/vm6/share/man/man4/ucom.4 user/kib/vm6/share/man/man4/udbp.4 user/kib/vm6/share/man/man4/ufm.4 user/kib/vm6/share/man/man4/uftdi.4 user/kib/vm6/share/man/man4/ugen.4 user/kib/vm6/share/man/man4/uhci.4 user/kib/vm6/share/man/man4/uhid.4 user/kib/vm6/share/man/man4/ukbd.4 user/kib/vm6/share/man/man4/ulpt.4 user/kib/vm6/share/man/man4/umass.4 user/kib/vm6/share/man/man4/umodem.4 user/kib/vm6/share/man/man4/ums.4 user/kib/vm6/share/man/man4/uplcom.4 user/kib/vm6/share/man/man4/urio.4 user/kib/vm6/share/man/man4/usb.4 user/kib/vm6/share/man/man4/uvisor.4 user/kib/vm6/share/man/man4/uvscom.4 user/kib/vm6/share/man/man5/core.5 user/kib/vm6/share/man/man5/rc.conf.5 user/kib/vm6/share/man/man5/src.conf.5 user/kib/vm6/share/man/man9/BUF_ISLOCKED.9 user/kib/vm6/share/man/man9/BUF_RECURSED.9 user/kib/vm6/share/man/man9/DEVICE_PROBE.9 user/kib/vm6/share/man/man9/VOP_LOCK.9 user/kib/vm6/share/man/man9/devfs_set_cdevpriv.9 user/kib/vm6/share/man/man9/driver.9 user/kib/vm6/share/man/man9/fail.9 user/kib/vm6/share/man/man9/kernacc.9 user/kib/vm6/share/man/man9/malloc.9 user/kib/vm6/share/man/man9/mi_switch.9 user/kib/vm6/share/man/man9/namei.9 user/kib/vm6/share/man/man9/physio.9 user/kib/vm6/share/man/man9/psignal.9 user/kib/vm6/share/man/man9/timeout.9 user/kib/vm6/share/man/man9/uio.9 user/kib/vm6/share/man/man9/vfs_mount.9 user/kib/vm6/share/man/man9/vm_page_alloc.9 user/kib/vm6/share/man/man9/vslock.9 user/kib/vm6/share/misc/bsd-family-tree user/kib/vm6/share/misc/pci_vendors user/kib/vm6/share/mk/bsd.cpu.mk user/kib/vm6/share/mk/bsd.libnames.mk user/kib/vm6/share/mk/bsd.own.mk user/kib/vm6/share/zoneinfo/Makefile user/kib/vm6/sys/amd64/acpica/acpi_machdep.c user/kib/vm6/sys/amd64/amd64/db_trace.c user/kib/vm6/sys/amd64/amd64/exception.S user/kib/vm6/sys/amd64/amd64/identcpu.c user/kib/vm6/sys/amd64/amd64/intr_machdep.c user/kib/vm6/sys/amd64/amd64/local_apic.c user/kib/vm6/sys/amd64/amd64/machdep.c user/kib/vm6/sys/amd64/amd64/mca.c user/kib/vm6/sys/amd64/amd64/nexus.c user/kib/vm6/sys/amd64/amd64/pmap.c user/kib/vm6/sys/amd64/amd64/vm_machdep.c user/kib/vm6/sys/amd64/conf/GENERIC user/kib/vm6/sys/amd64/conf/NOTES user/kib/vm6/sys/amd64/conf/XENHVM user/kib/vm6/sys/amd64/ia32/ia32_signal.c user/kib/vm6/sys/amd64/include/_inttypes.h user/kib/vm6/sys/amd64/include/apicvar.h user/kib/vm6/sys/amd64/include/elf.h user/kib/vm6/sys/amd64/include/mca.h user/kib/vm6/sys/amd64/include/md_var.h user/kib/vm6/sys/amd64/include/reg.h user/kib/vm6/sys/amd64/include/specialreg.h user/kib/vm6/sys/amd64/linux32/linux32_sysvec.c user/kib/vm6/sys/arm/arm/busdma_machdep.c user/kib/vm6/sys/arm/arm/identcpu.c user/kib/vm6/sys/arm/arm/machdep.c user/kib/vm6/sys/arm/arm/pmap.c user/kib/vm6/sys/arm/arm/vm_machdep.c user/kib/vm6/sys/arm/at91/if_ate.c user/kib/vm6/sys/arm/conf/BWCT user/kib/vm6/sys/arm/conf/BWCT.hints user/kib/vm6/sys/arm/conf/HL200 user/kib/vm6/sys/arm/conf/KB920X user/kib/vm6/sys/arm/mv/common.c user/kib/vm6/sys/arm/mv/kirkwood/kirkwood.c user/kib/vm6/sys/arm/mv/mv_machdep.c user/kib/vm6/sys/arm/xscale/ixp425/cambria_fled.c user/kib/vm6/sys/boot/arm/at91/boot2/bwct_board.c user/kib/vm6/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c user/kib/vm6/sys/boot/forth/loader.conf user/kib/vm6/sys/boot/i386/boot2/boot2.c user/kib/vm6/sys/boot/i386/gptboot/gptboot.c user/kib/vm6/sys/boot/i386/zfsboot/zfsboot.c user/kib/vm6/sys/boot/powerpc/uboot/Makefile user/kib/vm6/sys/boot/powerpc/uboot/conf.c user/kib/vm6/sys/boot/uboot/common/main.c user/kib/vm6/sys/boot/uboot/lib/disk.c user/kib/vm6/sys/boot/uboot/lib/time.c user/kib/vm6/sys/cam/ata/ata_xpt.c user/kib/vm6/sys/cam/cam_xpt.c user/kib/vm6/sys/cam/scsi/scsi_sg.c user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/kib/vm6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/kib/vm6/sys/compat/freebsd32/freebsd32.h user/kib/vm6/sys/compat/freebsd32/freebsd32_ipc.h user/kib/vm6/sys/compat/freebsd32/freebsd32_misc.c user/kib/vm6/sys/compat/freebsd32/freebsd32_proto.h user/kib/vm6/sys/compat/freebsd32/freebsd32_syscall.h user/kib/vm6/sys/compat/freebsd32/freebsd32_syscalls.c user/kib/vm6/sys/compat/freebsd32/freebsd32_sysent.c user/kib/vm6/sys/compat/freebsd32/freebsd32_util.h user/kib/vm6/sys/compat/freebsd32/syscalls.master user/kib/vm6/sys/compat/ia32/ia32_reg.h user/kib/vm6/sys/compat/ia32/ia32_signal.h user/kib/vm6/sys/compat/ia32/ia32_sysvec.c user/kib/vm6/sys/compat/linprocfs/linprocfs.c user/kib/vm6/sys/compat/linux/linux_file.c user/kib/vm6/sys/compat/linux/linux_getcwd.c user/kib/vm6/sys/compat/linux/linux_ioctl.c user/kib/vm6/sys/compat/linux/linux_time.c user/kib/vm6/sys/compat/x86bios/x86bios.c user/kib/vm6/sys/conf/NOTES user/kib/vm6/sys/conf/files user/kib/vm6/sys/conf/files.amd64 user/kib/vm6/sys/conf/files.i386 user/kib/vm6/sys/conf/files.ia64 user/kib/vm6/sys/conf/files.mips user/kib/vm6/sys/conf/files.pc98 user/kib/vm6/sys/conf/kern.post.mk user/kib/vm6/sys/conf/kmod.mk user/kib/vm6/sys/conf/ldscript.mips.octeon1.32 (contents, props changed) user/kib/vm6/sys/conf/ldscript.mips.octeon1.64 (contents, props changed) user/kib/vm6/sys/conf/ldscript.mips.octeon1.n32 (contents, props changed) user/kib/vm6/sys/conf/options user/kib/vm6/sys/conf/options.amd64 user/kib/vm6/sys/conf/options.i386 user/kib/vm6/sys/conf/options.ia64 user/kib/vm6/sys/conf/options.mips user/kib/vm6/sys/contrib/dev/acpica/changes.txt user/kib/vm6/sys/contrib/dev/acpica/common/dmextern.c user/kib/vm6/sys/contrib/dev/acpica/common/dmtable.c user/kib/vm6/sys/contrib/dev/acpica/common/dmtbdump.c user/kib/vm6/sys/contrib/dev/acpica/common/dmtbinfo.c user/kib/vm6/sys/contrib/dev/acpica/compiler/aslanalyze.c user/kib/vm6/sys/contrib/dev/acpica/compiler/aslcompiler.h user/kib/vm6/sys/contrib/dev/acpica/compiler/aslglobal.h user/kib/vm6/sys/contrib/dev/acpica/compiler/aslmain.c user/kib/vm6/sys/contrib/dev/acpica/compiler/aslmap.c user/kib/vm6/sys/contrib/dev/acpica/compiler/aslstubs.c user/kib/vm6/sys/contrib/dev/acpica/compiler/asltypes.h user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dsfield.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dsmethod.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dsmthdat.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dsobject.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dsopcode.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dswexec.c user/kib/vm6/sys/contrib/dev/acpica/dispatcher/dswstate.c user/kib/vm6/sys/contrib/dev/acpica/events/evevent.c user/kib/vm6/sys/contrib/dev/acpica/events/evgpe.c user/kib/vm6/sys/contrib/dev/acpica/events/evgpeblk.c user/kib/vm6/sys/contrib/dev/acpica/events/evmisc.c user/kib/vm6/sys/contrib/dev/acpica/events/evxface.c user/kib/vm6/sys/contrib/dev/acpica/executer/exconvrt.c user/kib/vm6/sys/contrib/dev/acpica/executer/excreate.c user/kib/vm6/sys/contrib/dev/acpica/executer/exfield.c user/kib/vm6/sys/contrib/dev/acpica/executer/exfldio.c user/kib/vm6/sys/contrib/dev/acpica/executer/exmisc.c user/kib/vm6/sys/contrib/dev/acpica/executer/exmutex.c user/kib/vm6/sys/contrib/dev/acpica/executer/exnames.c user/kib/vm6/sys/contrib/dev/acpica/executer/exoparg1.c user/kib/vm6/sys/contrib/dev/acpica/executer/exoparg2.c user/kib/vm6/sys/contrib/dev/acpica/executer/exoparg3.c user/kib/vm6/sys/contrib/dev/acpica/executer/exoparg6.c user/kib/vm6/sys/contrib/dev/acpica/executer/exprep.c user/kib/vm6/sys/contrib/dev/acpica/executer/exregion.c user/kib/vm6/sys/contrib/dev/acpica/executer/exresnte.c user/kib/vm6/sys/contrib/dev/acpica/executer/exresolv.c user/kib/vm6/sys/contrib/dev/acpica/executer/exresop.c user/kib/vm6/sys/contrib/dev/acpica/executer/exstore.c user/kib/vm6/sys/contrib/dev/acpica/executer/exsystem.c user/kib/vm6/sys/contrib/dev/acpica/hardware/hwregs.c user/kib/vm6/sys/contrib/dev/acpica/hardware/hwsleep.c user/kib/vm6/sys/contrib/dev/acpica/hardware/hwvalid.c user/kib/vm6/sys/contrib/dev/acpica/include/acdisasm.h user/kib/vm6/sys/contrib/dev/acpica/include/acglobal.h user/kib/vm6/sys/contrib/dev/acpica/include/acinterp.h user/kib/vm6/sys/contrib/dev/acpica/include/acoutput.h user/kib/vm6/sys/contrib/dev/acpica/include/acpixf.h user/kib/vm6/sys/contrib/dev/acpica/include/actbl2.h user/kib/vm6/sys/contrib/dev/acpica/namespace/nsaccess.c user/kib/vm6/sys/contrib/dev/acpica/namespace/nsdump.c user/kib/vm6/sys/contrib/dev/acpica/namespace/nsnames.c user/kib/vm6/sys/contrib/dev/acpica/namespace/nssearch.c user/kib/vm6/sys/contrib/dev/acpica/namespace/nsutils.c user/kib/vm6/sys/contrib/dev/acpica/parser/psargs.c user/kib/vm6/sys/contrib/dev/acpica/parser/psloop.c user/kib/vm6/sys/contrib/dev/acpica/resources/rscreate.c user/kib/vm6/sys/contrib/dev/acpica/resources/rslist.c user/kib/vm6/sys/contrib/dev/acpica/resources/rsmisc.c user/kib/vm6/sys/contrib/dev/acpica/tables/tbfadt.c user/kib/vm6/sys/contrib/dev/acpica/tables/tbutils.c user/kib/vm6/sys/contrib/dev/acpica/tables/tbxfroot.c user/kib/vm6/sys/contrib/dev/acpica/utilities/utalloc.c user/kib/vm6/sys/contrib/dev/acpica/utilities/utdelete.c user/kib/vm6/sys/contrib/dev/acpica/utilities/uteval.c user/kib/vm6/sys/contrib/dev/acpica/utilities/utmisc.c user/kib/vm6/sys/contrib/dev/acpica/utilities/utmutex.c user/kib/vm6/sys/contrib/dev/acpica/utilities/utobject.c user/kib/vm6/sys/contrib/dev/acpica/utilities/uttrack.c user/kib/vm6/sys/contrib/x86emu/x86emu.c user/kib/vm6/sys/dev/aac/aac.c user/kib/vm6/sys/dev/aac/aac_cam.c user/kib/vm6/sys/dev/acpica/acpi.c user/kib/vm6/sys/dev/acpica/acpi_video.c user/kib/vm6/sys/dev/age/if_age.c user/kib/vm6/sys/dev/agp/agp_i810.c user/kib/vm6/sys/dev/ahci/ahci.c user/kib/vm6/sys/dev/alc/if_alc.c user/kib/vm6/sys/dev/ale/if_ale.c user/kib/vm6/sys/dev/ata/ata-all.c user/kib/vm6/sys/dev/ata/ata-pci.h user/kib/vm6/sys/dev/ata/ata-raid.c user/kib/vm6/sys/dev/ata/chipsets/ata-acerlabs.c user/kib/vm6/sys/dev/ath/ath_hal/ah_debug.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_decode.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_devid.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_eeprom.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_eeprom_v1.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_eeprom_v1.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_eeprom_v3.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ah_internal.h user/kib/vm6/sys/dev/ath/ath_hal/ah_soc.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210_power.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210desc.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210phy.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5210reg.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211_power.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211desc.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211phy.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/ar5211reg.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5211/boss.ini (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212.h user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212.ini (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212desc.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5212phy.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5212/ar5311reg.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312_power.c (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312phy.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5312/ar5312reg.h (contents, props changed) user/kib/vm6/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/kib/vm6/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c user/kib/vm6/sys/dev/bce/if_bce.c user/kib/vm6/sys/dev/bce/if_bcefw.h user/kib/vm6/sys/dev/bce/if_bcereg.h user/kib/vm6/sys/dev/bge/if_bge.c user/kib/vm6/sys/dev/bwn/if_bwn.c user/kib/vm6/sys/dev/bwn/if_bwnvar.h user/kib/vm6/sys/dev/ciss/ciss.c user/kib/vm6/sys/dev/ciss/cissvar.h user/kib/vm6/sys/dev/cm/if_cm_isa.c user/kib/vm6/sys/dev/cm/smc90cx6.c user/kib/vm6/sys/dev/cm/smc90cx6reg.h user/kib/vm6/sys/dev/cm/smc90cx6var.h user/kib/vm6/sys/dev/cxgb/common/cxgb_ael1002.c user/kib/vm6/sys/dev/cxgb/common/cxgb_common.h user/kib/vm6/sys/dev/cxgb/common/cxgb_t3_hw.c user/kib/vm6/sys/dev/cxgb/cxgb_adapter.h user/kib/vm6/sys/dev/cxgb/cxgb_main.c user/kib/vm6/sys/dev/cxgb/cxgb_offload.h user/kib/vm6/sys/dev/cxgb/cxgb_osdep.h user/kib/vm6/sys/dev/cxgb/cxgb_sge.c user/kib/vm6/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/kib/vm6/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c user/kib/vm6/sys/dev/drm/drm_pciids.h user/kib/vm6/sys/dev/drm/i915_drv.h user/kib/vm6/sys/dev/drm/i915_reg.h user/kib/vm6/sys/dev/fb/fb.c user/kib/vm6/sys/dev/fb/vesa.c user/kib/vm6/sys/dev/fb/vga.c user/kib/vm6/sys/dev/gem/if_gem.c user/kib/vm6/sys/dev/hme/if_hme_sbus.c user/kib/vm6/sys/dev/hme/if_hmereg.h user/kib/vm6/sys/dev/hme/if_hmevar.h user/kib/vm6/sys/dev/hwpmc/hwpmc_logging.c user/kib/vm6/sys/dev/hwpmc/pmc_events.h user/kib/vm6/sys/dev/isp/isp.c user/kib/vm6/sys/dev/isp/isp_freebsd.c user/kib/vm6/sys/dev/isp/isp_freebsd.h user/kib/vm6/sys/dev/isp/isp_library.c user/kib/vm6/sys/dev/isp/isp_library.h user/kib/vm6/sys/dev/isp/isp_pci.c user/kib/vm6/sys/dev/isp/isp_sbus.c user/kib/vm6/sys/dev/isp/isp_target.c user/kib/vm6/sys/dev/isp/ispmbox.h user/kib/vm6/sys/dev/isp/ispreg.h user/kib/vm6/sys/dev/isp/ispvar.h user/kib/vm6/sys/dev/ispfw/ispfw.c user/kib/vm6/sys/dev/ixgbe/LICENSE user/kib/vm6/sys/dev/ixgbe/ixgbe.c user/kib/vm6/sys/dev/ixgbe/ixgbe.h user/kib/vm6/sys/dev/ixgbe/ixgbe_82598.c user/kib/vm6/sys/dev/ixgbe/ixgbe_82599.c user/kib/vm6/sys/dev/ixgbe/ixgbe_api.c user/kib/vm6/sys/dev/ixgbe/ixgbe_api.h user/kib/vm6/sys/dev/ixgbe/ixgbe_common.c user/kib/vm6/sys/dev/ixgbe/ixgbe_phy.c user/kib/vm6/sys/dev/ixgbe/ixgbe_phy.h user/kib/vm6/sys/dev/ixgbe/ixgbe_type.h user/kib/vm6/sys/dev/jme/if_jme.c user/kib/vm6/sys/dev/le/am79900var.h user/kib/vm6/sys/dev/le/am7990var.h user/kib/vm6/sys/dev/le/if_le_ledma.c user/kib/vm6/sys/dev/le/lancevar.h user/kib/vm6/sys/dev/md/md.c user/kib/vm6/sys/dev/mfi/mfi_cam.c user/kib/vm6/sys/dev/mfi/mfi_pci.c user/kib/vm6/sys/dev/mii/bmtphyreg.h user/kib/vm6/sys/dev/mii/brgphy.c user/kib/vm6/sys/dev/mii/brgphyreg.h user/kib/vm6/sys/dev/mii/e1000phy.c user/kib/vm6/sys/dev/mii/icsphyreg.h user/kib/vm6/sys/dev/mii/lxtphyreg.h user/kib/vm6/sys/dev/mii/mii.c user/kib/vm6/sys/dev/mii/mii_physubr.c user/kib/vm6/sys/dev/mii/miidevs user/kib/vm6/sys/dev/mii/miivar.h user/kib/vm6/sys/dev/mii/nsphyreg.h user/kib/vm6/sys/dev/mii/nsphyterreg.h user/kib/vm6/sys/dev/mii/qsphyreg.h user/kib/vm6/sys/dev/mii/ukphy_subr.c user/kib/vm6/sys/dev/mpt/mpt_raid.c user/kib/vm6/sys/dev/msk/if_msk.c user/kib/vm6/sys/dev/msk/if_mskreg.h user/kib/vm6/sys/dev/mxge/if_mxge.c user/kib/vm6/sys/dev/ofw/ofw_pci.h user/kib/vm6/sys/dev/ofw/ofw_standard.c user/kib/vm6/sys/dev/pci/vga_pci.c user/kib/vm6/sys/dev/ppc/ppc_pci.c user/kib/vm6/sys/dev/siba/siba.c user/kib/vm6/sys/dev/siba/siba_bwn.c user/kib/vm6/sys/dev/siba/siba_cc.c user/kib/vm6/sys/dev/siba/siba_core.c user/kib/vm6/sys/dev/siba/siba_pcib.c user/kib/vm6/sys/dev/siba/sibavar.h user/kib/vm6/sys/dev/siis/siis.c user/kib/vm6/sys/dev/sound/pci/es137x.h user/kib/vm6/sys/dev/sound/pci/hda/hdac.c user/kib/vm6/sys/dev/sound/pcm/dsp.c user/kib/vm6/sys/dev/stge/if_stge.c user/kib/vm6/sys/dev/stge/if_stgereg.h user/kib/vm6/sys/dev/syscons/scvgarndr.c user/kib/vm6/sys/dev/syscons/scvidctl.c user/kib/vm6/sys/dev/syscons/snake/snake_saver.c user/kib/vm6/sys/dev/syscons/syscons.c user/kib/vm6/sys/dev/syscons/syscons.h user/kib/vm6/sys/dev/uart/uart_bus_pci.c user/kib/vm6/sys/dev/usb/controller/ehci.h user/kib/vm6/sys/dev/usb/controller/ehci_pci.c user/kib/vm6/sys/dev/usb/controller/ehcireg.h user/kib/vm6/sys/dev/usb/controller/ohci.h user/kib/vm6/sys/dev/usb/controller/ohci_pci.c user/kib/vm6/sys/dev/usb/controller/ohcireg.h user/kib/vm6/sys/dev/usb/controller/uhci.h user/kib/vm6/sys/dev/usb/controller/uhci_pci.c user/kib/vm6/sys/dev/usb/controller/uhcireg.h user/kib/vm6/sys/dev/usb/controller/usb_controller.c user/kib/vm6/sys/dev/usb/controller/uss820dci.c user/kib/vm6/sys/dev/usb/input/uhid.c user/kib/vm6/sys/dev/usb/input/ukbd.c user/kib/vm6/sys/dev/usb/input/ums.c user/kib/vm6/sys/dev/usb/quirk/usb_quirk.c user/kib/vm6/sys/dev/usb/serial/uftdi.c user/kib/vm6/sys/dev/usb/serial/ugensa.c user/kib/vm6/sys/dev/usb/serial/uipaq.c user/kib/vm6/sys/dev/usb/serial/ulpt.c user/kib/vm6/sys/dev/usb/serial/uvisor.c user/kib/vm6/sys/dev/usb/template/usb_template.c user/kib/vm6/sys/dev/usb/template/usb_template.h user/kib/vm6/sys/dev/usb/template/usb_template_mtp.c user/kib/vm6/sys/dev/usb/usb_cdc.h user/kib/vm6/sys/dev/usb/usb_device.c user/kib/vm6/sys/dev/usb/usb_device.h user/kib/vm6/sys/dev/usb/usb_generic.c user/kib/vm6/sys/dev/usb/usb_hid.c user/kib/vm6/sys/dev/usb/usb_transfer.c user/kib/vm6/sys/dev/usb/usbdevs user/kib/vm6/sys/dev/usb/wlan/if_run.c user/kib/vm6/sys/dev/usb/wlan/if_runreg.h user/kib/vm6/sys/dev/usb/wlan/if_runvar.h user/kib/vm6/sys/dev/xen/netback/netback.c user/kib/vm6/sys/fs/fdescfs/fdesc_vnops.c user/kib/vm6/sys/fs/msdosfs/msdosfs_denode.c user/kib/vm6/sys/fs/msdosfs/msdosfs_fat.c user/kib/vm6/sys/fs/msdosfs/msdosfs_fileno.c user/kib/vm6/sys/fs/msdosfs/msdosfs_lookup.c user/kib/vm6/sys/fs/msdosfs/msdosfs_vfsops.c user/kib/vm6/sys/fs/msdosfs/msdosfs_vnops.c user/kib/vm6/sys/fs/msdosfs/msdosfsmount.h user/kib/vm6/sys/fs/nfs/nfs_commonport.c user/kib/vm6/sys/fs/nfsserver/nfs_nfsdport.c user/kib/vm6/sys/fs/procfs/procfs_dbregs.c user/kib/vm6/sys/fs/procfs/procfs_fpregs.c user/kib/vm6/sys/fs/procfs/procfs_ioctl.c user/kib/vm6/sys/fs/procfs/procfs_map.c user/kib/vm6/sys/fs/procfs/procfs_regs.c user/kib/vm6/sys/geom/gate/g_gate.c user/kib/vm6/sys/geom/geom_dump.c user/kib/vm6/sys/geom/geom_io.c user/kib/vm6/sys/geom/multipath/g_multipath.c user/kib/vm6/sys/geom/vinum/geom_vinum.c user/kib/vm6/sys/i386/acpica/acpi_machdep.c user/kib/vm6/sys/i386/conf/GENERIC user/kib/vm6/sys/i386/conf/NOTES user/kib/vm6/sys/i386/conf/XEN user/kib/vm6/sys/i386/i386/exception.s user/kib/vm6/sys/i386/i386/identcpu.c user/kib/vm6/sys/i386/i386/local_apic.c user/kib/vm6/sys/i386/i386/machdep.c user/kib/vm6/sys/i386/i386/mca.c user/kib/vm6/sys/i386/i386/mp_machdep.c user/kib/vm6/sys/i386/i386/nexus.c user/kib/vm6/sys/i386/i386/pmap.c user/kib/vm6/sys/i386/i386/trap.c user/kib/vm6/sys/i386/i386/vm_machdep.c user/kib/vm6/sys/i386/include/_inttypes.h user/kib/vm6/sys/i386/include/apicvar.h user/kib/vm6/sys/i386/include/mca.h user/kib/vm6/sys/i386/include/md_var.h user/kib/vm6/sys/i386/include/specialreg.h user/kib/vm6/sys/i386/linux/linux_sysvec.c user/kib/vm6/sys/i386/xen/clock.c user/kib/vm6/sys/i386/xen/mp_machdep.c user/kib/vm6/sys/ia64/conf/GENERIC user/kib/vm6/sys/ia64/conf/NOTES user/kib/vm6/sys/ia64/ia32/ia32_signal.c user/kib/vm6/sys/ia64/ia64/autoconf.c user/kib/vm6/sys/ia64/ia64/clock.c user/kib/vm6/sys/ia64/ia64/db_machdep.c user/kib/vm6/sys/ia64/ia64/exception.S user/kib/vm6/sys/ia64/ia64/genassym.c user/kib/vm6/sys/ia64/ia64/highfp.c user/kib/vm6/sys/ia64/ia64/interrupt.c user/kib/vm6/sys/ia64/ia64/locore.S user/kib/vm6/sys/ia64/ia64/machdep.c user/kib/vm6/sys/ia64/ia64/mp_machdep.c user/kib/vm6/sys/ia64/ia64/nexus.c user/kib/vm6/sys/ia64/ia64/pmap.c user/kib/vm6/sys/ia64/ia64/sal.c user/kib/vm6/sys/ia64/ia64/sapic.c user/kib/vm6/sys/ia64/ia64/trap.c user/kib/vm6/sys/ia64/ia64/vm_machdep.c user/kib/vm6/sys/ia64/include/_inttypes.h user/kib/vm6/sys/ia64/include/acpica_machdep.h user/kib/vm6/sys/ia64/include/clock.h user/kib/vm6/sys/ia64/include/cpufunc.h user/kib/vm6/sys/ia64/include/elf.h user/kib/vm6/sys/ia64/include/frame.h user/kib/vm6/sys/ia64/include/intr.h user/kib/vm6/sys/ia64/include/intrcnt.h user/kib/vm6/sys/ia64/include/pcb.h user/kib/vm6/sys/ia64/include/pcpu.h user/kib/vm6/sys/ia64/include/reg.h user/kib/vm6/sys/ia64/include/smp.h user/kib/vm6/sys/ia64/pci/pci_cfgreg.c user/kib/vm6/sys/kern/imgact_elf.c user/kib/vm6/sys/kern/kern_conf.c user/kib/vm6/sys/kern/kern_exec.c user/kib/vm6/sys/kern/kern_jail.c user/kib/vm6/sys/kern/kern_ktr.c user/kib/vm6/sys/kern/kern_module.c user/kib/vm6/sys/kern/kern_proc.c user/kib/vm6/sys/kern/kern_resource.c user/kib/vm6/sys/kern/kern_rwlock.c user/kib/vm6/sys/kern/kern_sig.c user/kib/vm6/sys/kern/kern_syscalls.c user/kib/vm6/sys/kern/kern_thr.c user/kib/vm6/sys/kern/kern_umtx.c user/kib/vm6/sys/kern/ksched.c user/kib/vm6/sys/kern/subr_eventhandler.c user/kib/vm6/sys/kern/subr_firmware.c user/kib/vm6/sys/kern/subr_param.c user/kib/vm6/sys/kern/sys_generic.c user/kib/vm6/sys/kern/sys_process.c user/kib/vm6/sys/kern/sysv_ipc.c user/kib/vm6/sys/kern/sysv_msg.c user/kib/vm6/sys/kern/sysv_sem.c user/kib/vm6/sys/kern/sysv_shm.c user/kib/vm6/sys/kern/uipc_mqueue.c user/kib/vm6/sys/kern/uipc_sem.c user/kib/vm6/sys/kern/uipc_socket.c user/kib/vm6/sys/kern/uipc_syscalls.c user/kib/vm6/sys/kern/vfs_aio.c user/kib/vm6/sys/kern/vfs_lookup.c user/kib/vm6/sys/kern/vfs_syscalls.c user/kib/vm6/sys/kern/vfs_vnops.c user/kib/vm6/sys/mips/cavium/dev/rgmii/octeon_rgmx.c user/kib/vm6/sys/mips/cavium/octeon_ebt3000_cf.c user/kib/vm6/sys/mips/cavium/octeon_machdep.c user/kib/vm6/sys/mips/cavium/octeon_pcmap_regs.h user/kib/vm6/sys/mips/conf/AR71XX user/kib/vm6/sys/mips/conf/OCTEON1 user/kib/vm6/sys/mips/conf/OCTEON1-32 user/kib/vm6/sys/mips/include/_inttypes.h user/kib/vm6/sys/mips/include/asm.h user/kib/vm6/sys/mips/include/bus.h user/kib/vm6/sys/mips/include/cdefs.h user/kib/vm6/sys/mips/include/clock.h user/kib/vm6/sys/mips/include/cpu.h user/kib/vm6/sys/mips/include/cpufunc.h user/kib/vm6/sys/mips/include/cpuinfo.h user/kib/vm6/sys/mips/include/cpuregs.h user/kib/vm6/sys/mips/include/db_machdep.h user/kib/vm6/sys/mips/include/kdb.h user/kib/vm6/sys/mips/include/param.h user/kib/vm6/sys/mips/include/pmap.h user/kib/vm6/sys/mips/include/pmc_mdep.h user/kib/vm6/sys/mips/include/smp.h user/kib/vm6/sys/mips/include/trap.h user/kib/vm6/sys/mips/include/ucontext.h user/kib/vm6/sys/mips/malta/gtreg.h user/kib/vm6/sys/mips/mips/busdma_machdep.c user/kib/vm6/sys/mips/mips/cpu.c user/kib/vm6/sys/mips/mips/db_trace.c user/kib/vm6/sys/mips/mips/exception.S user/kib/vm6/sys/mips/mips/locore.S user/kib/vm6/sys/mips/mips/mp_machdep.c user/kib/vm6/sys/mips/mips/mpboot.S user/kib/vm6/sys/mips/mips/nexus.c user/kib/vm6/sys/mips/mips/pm_machdep.c user/kib/vm6/sys/mips/mips/pmap.c user/kib/vm6/sys/mips/mips/support.S user/kib/vm6/sys/mips/mips/swtch.S user/kib/vm6/sys/mips/mips/tick.c user/kib/vm6/sys/mips/mips/trap.c user/kib/vm6/sys/mips/mips/vm_machdep.c user/kib/vm6/sys/mips/rmi/ehcireg.h user/kib/vm6/sys/mips/rmi/ehcivar.h user/kib/vm6/sys/mips/rmi/files.xlr user/kib/vm6/sys/mips/rmi/iodi.c user/kib/vm6/sys/mips/rmi/xlr_pci.c user/kib/vm6/sys/mips/rmi/xls_ehci.c user/kib/vm6/sys/mips/sibyte/sb_asm.S user/kib/vm6/sys/mips/sibyte/sb_machdep.c user/kib/vm6/sys/mips/sibyte/sb_scd.c user/kib/vm6/sys/mips/sibyte/sb_scd.h user/kib/vm6/sys/modules/Makefile user/kib/vm6/sys/modules/acpi/acpi/Makefile user/kib/vm6/sys/modules/ath/Makefile user/kib/vm6/sys/modules/bios/smbios/Makefile user/kib/vm6/sys/modules/bios/vpd/Makefile user/kib/vm6/sys/modules/cpufreq/Makefile user/kib/vm6/sys/modules/cxgb/cxgb/Makefile user/kib/vm6/sys/modules/dummynet/Makefile user/kib/vm6/sys/modules/ixgbe/Makefile user/kib/vm6/sys/modules/linux/Makefile user/kib/vm6/sys/modules/procfs/Makefile user/kib/vm6/sys/modules/zfs/Makefile user/kib/vm6/sys/net/bpf.c user/kib/vm6/sys/net/flowtable.c user/kib/vm6/sys/net/flowtable.h user/kib/vm6/sys/net/if.c user/kib/vm6/sys/net/if.h user/kib/vm6/sys/net/if_bridge.c user/kib/vm6/sys/net/if_epair.c user/kib/vm6/sys/net/if_ethersubr.c user/kib/vm6/sys/net/if_gre.c user/kib/vm6/sys/net/if_gre.h user/kib/vm6/sys/net/if_lagg.c user/kib/vm6/sys/net/if_llatbl.c user/kib/vm6/sys/net/if_llatbl.h user/kib/vm6/sys/net/if_media.h user/kib/vm6/sys/net/if_tap.c user/kib/vm6/sys/net/if_tun.c user/kib/vm6/sys/net/if_var.h user/kib/vm6/sys/net/if_vlan.c user/kib/vm6/sys/net/netisr.c user/kib/vm6/sys/net/netisr.h user/kib/vm6/sys/net/radix.c user/kib/vm6/sys/net/radix.h user/kib/vm6/sys/net/radix_mpath.c user/kib/vm6/sys/net/route.c user/kib/vm6/sys/net/route.h user/kib/vm6/sys/net/vnet.c user/kib/vm6/sys/net/vnet.h user/kib/vm6/sys/net/zlib.h user/kib/vm6/sys/net80211/ieee80211.c user/kib/vm6/sys/net80211/ieee80211_adhoc.c user/kib/vm6/sys/net80211/ieee80211_hostap.c user/kib/vm6/sys/net80211/ieee80211_ht.c user/kib/vm6/sys/net80211/ieee80211_mesh.c user/kib/vm6/sys/net80211/ieee80211_proto.c user/kib/vm6/sys/net80211/ieee80211_sta.c user/kib/vm6/sys/net80211/ieee80211_tdma.c user/kib/vm6/sys/net80211/ieee80211_var.h user/kib/vm6/sys/netgraph/netflow/ng_netflow.c user/kib/vm6/sys/netgraph/ng_socket.c user/kib/vm6/sys/netgraph/ng_socketvar.h user/kib/vm6/sys/netinet/in.c user/kib/vm6/sys/netinet/in_pcb.c user/kib/vm6/sys/netinet/in_pcb.h user/kib/vm6/sys/netinet/ip_divert.c user/kib/vm6/sys/netinet/ip_dummynet.h user/kib/vm6/sys/netinet/ip_fw.h user/kib/vm6/sys/netinet/ip_gre.c user/kib/vm6/sys/netinet/ip_gre.h user/kib/vm6/sys/netinet/ip_input.c user/kib/vm6/sys/netinet/ip_ipsec.c user/kib/vm6/sys/netinet/ip_output.c user/kib/vm6/sys/netinet/ipfw/ip_dummynet.c user/kib/vm6/sys/netinet/ipfw/ip_fw2.c user/kib/vm6/sys/netinet/ipfw/ip_fw_dynamic.c user/kib/vm6/sys/netinet/ipfw/ip_fw_log.c user/kib/vm6/sys/netinet/ipfw/ip_fw_pfil.c user/kib/vm6/sys/netinet/ipfw/ip_fw_private.h user/kib/vm6/sys/netinet/ipfw/ip_fw_sockopt.c user/kib/vm6/sys/netinet/ipfw/ip_fw_table.c user/kib/vm6/sys/netinet/raw_ip.c user/kib/vm6/sys/netinet/sctp_crc32.c user/kib/vm6/sys/netinet/sctp_crc32.h user/kib/vm6/sys/netinet/sctp_indata.c user/kib/vm6/sys/netinet/sctp_input.c user/kib/vm6/sys/netinet/sctp_output.c user/kib/vm6/sys/netinet/sctp_pcb.c user/kib/vm6/sys/netinet/sctp_pcb.h user/kib/vm6/sys/netinet/sctp_sysctl.c user/kib/vm6/sys/netinet/sctp_uio.h user/kib/vm6/sys/netinet/sctputil.c user/kib/vm6/sys/netinet/sctputil.h user/kib/vm6/sys/netinet/tcp_input.c user/kib/vm6/sys/netinet/tcp_reass.c user/kib/vm6/sys/netinet/tcp_subr.c user/kib/vm6/sys/netinet/tcp_timer.c user/kib/vm6/sys/netinet/tcp_timewait.c user/kib/vm6/sys/netinet/tcp_usrreq.c user/kib/vm6/sys/netinet/tcp_var.h user/kib/vm6/sys/netinet/udp_usrreq.c user/kib/vm6/sys/netinet6/ip6_output.c user/kib/vm6/sys/netinet6/nd6.c user/kib/vm6/sys/nfsserver/nfs_srvsubs.c user/kib/vm6/sys/pc98/cbus/clock.c user/kib/vm6/sys/pc98/conf/GENERIC user/kib/vm6/sys/pc98/pc98/machdep.c user/kib/vm6/sys/powerpc/aim/interrupt.c user/kib/vm6/sys/powerpc/aim/machdep.c user/kib/vm6/sys/powerpc/aim/mmu_oea64.c user/kib/vm6/sys/powerpc/aim/nexus.c user/kib/vm6/sys/powerpc/aim/ofw_machdep.c user/kib/vm6/sys/powerpc/aim/ofwmagic.S user/kib/vm6/sys/powerpc/booke/interrupt.c user/kib/vm6/sys/powerpc/booke/machdep.c user/kib/vm6/sys/powerpc/booke/trap_subr.S user/kib/vm6/sys/powerpc/conf/GENERIC user/kib/vm6/sys/powerpc/fpu/fpu_extern.h user/kib/vm6/sys/powerpc/include/_inttypes.h user/kib/vm6/sys/powerpc/include/intr.h user/kib/vm6/sys/powerpc/include/pte.h user/kib/vm6/sys/powerpc/include/spr.h user/kib/vm6/sys/powerpc/mpc85xx/ocpbus.c user/kib/vm6/sys/powerpc/mpc85xx/ocpbus.h user/kib/vm6/sys/powerpc/mpc85xx/pci_ocp.c user/kib/vm6/sys/powerpc/ofw/ofw_real.c user/kib/vm6/sys/powerpc/powermac/cuda.c user/kib/vm6/sys/powerpc/powermac/cudavar.h user/kib/vm6/sys/powerpc/powermac/pmu.c user/kib/vm6/sys/powerpc/powermac/smu.c user/kib/vm6/sys/powerpc/powermac/uninorth.c user/kib/vm6/sys/powerpc/powerpc/cpu.c user/kib/vm6/sys/powerpc/powerpc/mem.c user/kib/vm6/sys/rpc/svc.c user/kib/vm6/sys/security/mac_biba/mac_biba.c user/kib/vm6/sys/security/mac_lomac/mac_lomac.c user/kib/vm6/sys/security/mac_mls/mac_mls.c user/kib/vm6/sys/sparc64/conf/GENERIC user/kib/vm6/sys/sparc64/include/_inttypes.h user/kib/vm6/sys/sparc64/include/dcr.h user/kib/vm6/sys/sparc64/include/tlb.h user/kib/vm6/sys/sparc64/include/tte.h user/kib/vm6/sys/sparc64/include/ver.h user/kib/vm6/sys/sparc64/include/wstate.h user/kib/vm6/sys/sparc64/pci/schizo.c user/kib/vm6/sys/sparc64/pci/schizovar.h user/kib/vm6/sys/sparc64/sbus/lsi64854reg.h user/kib/vm6/sys/sparc64/sbus/lsi64854var.h user/kib/vm6/sys/sparc64/sbus/ofw_sbus.h user/kib/vm6/sys/sparc64/sparc64/cheetah.c user/kib/vm6/sys/sparc64/sparc64/exception.S user/kib/vm6/sys/sparc64/sparc64/genassym.c user/kib/vm6/sys/sparc64/sparc64/locore.S user/kib/vm6/sys/sparc64/sparc64/machdep.c user/kib/vm6/sys/sparc64/sparc64/pmap.c user/kib/vm6/sys/sparc64/sparc64/support.S user/kib/vm6/sys/sparc64/sparc64/swtch.S user/kib/vm6/sys/sun4v/conf/GENERIC user/kib/vm6/sys/sun4v/include/_inttypes.h user/kib/vm6/sys/sun4v/sun4v/machdep.c user/kib/vm6/sys/sys/ata.h user/kib/vm6/sys/sys/clock.h user/kib/vm6/sys/sys/eventhandler.h user/kib/vm6/sys/sys/fbio.h user/kib/vm6/sys/sys/imgact.h user/kib/vm6/sys/sys/imgact_aout.h user/kib/vm6/sys/sys/imgact_elf.h user/kib/vm6/sys/sys/param.h user/kib/vm6/sys/sys/pcpu.h user/kib/vm6/sys/sys/pioctl.h user/kib/vm6/sys/sys/pmc.h user/kib/vm6/sys/sys/ptrace.h user/kib/vm6/sys/sys/sysent.h user/kib/vm6/sys/sys/systm.h user/kib/vm6/sys/sys/timeb.h user/kib/vm6/sys/vm/uma_int.h user/kib/vm6/sys/vm/vm_mmap.c user/kib/vm6/sys/vm/vm_page.c user/kib/vm6/tools/build/mk/OptionalObsoleteFiles.inc user/kib/vm6/tools/regression/aio/aiotest/aiotest.c user/kib/vm6/tools/regression/file/closefrom/Makefile user/kib/vm6/tools/regression/file/flock/Makefile user/kib/vm6/tools/regression/gaithrstress/Makefile user/kib/vm6/tools/regression/kgssapi/Makefile user/kib/vm6/tools/regression/kqueue/Makefile user/kib/vm6/tools/regression/lib/libc/resolv/resolv.c user/kib/vm6/tools/regression/mqueue/mqtest1/Makefile user/kib/vm6/tools/regression/mqueue/mqtest1/mqtest1.c user/kib/vm6/tools/regression/mqueue/mqtest2/Makefile user/kib/vm6/tools/regression/mqueue/mqtest2/mqtest2.c user/kib/vm6/tools/regression/mqueue/mqtest3/Makefile user/kib/vm6/tools/regression/mqueue/mqtest3/mqtest3.c user/kib/vm6/tools/regression/mqueue/mqtest4/Makefile user/kib/vm6/tools/regression/mqueue/mqtest4/mqtest4.c user/kib/vm6/tools/regression/mqueue/mqtest5/Makefile user/kib/vm6/tools/regression/mqueue/mqtest5/mqtest5.c user/kib/vm6/tools/regression/netipx/ipxdgramloopback/Makefile user/kib/vm6/tools/regression/netipx/spxabort/Makefile user/kib/vm6/tools/regression/netipx/spxloopback/Makefile user/kib/vm6/tools/regression/posixsem/posixsem.c user/kib/vm6/tools/regression/posixsem2/semtest.c user/kib/vm6/tools/regression/priv/Makefile user/kib/vm6/tools/regression/pthread/cv_cancel1/Makefile user/kib/vm6/tools/regression/pthread/mutex_isowned_np/Makefile user/kib/vm6/tools/regression/rpcsec_gss/Makefile user/kib/vm6/tools/regression/sigqueue/sigqtest1/Makefile user/kib/vm6/tools/regression/sigqueue/sigqtest2/Makefile user/kib/vm6/tools/regression/sockets/sendfile/Makefile user/kib/vm6/tools/regression/sockets/sendfile/sendfile.c user/kib/vm6/tools/regression/sockets/unix_gc/Makefile user/kib/vm6/tools/regression/sockets/unix_sorflush/Makefile user/kib/vm6/tools/regression/sysvmsg/msgtest.c user/kib/vm6/tools/regression/sysvsem/semtest.c user/kib/vm6/tools/regression/sysvshm/shmtest.c user/kib/vm6/tools/regression/tls/libxx/Makefile user/kib/vm6/tools/regression/tls/libyy/Makefile user/kib/vm6/tools/regression/tls/ttls1/Makefile user/kib/vm6/tools/regression/tls/ttls2/Makefile user/kib/vm6/tools/regression/tls/ttls4/Makefile user/kib/vm6/tools/regression/tmpfs/Makefile user/kib/vm6/tools/regression/tmpfs/h_funcs.subr user/kib/vm6/tools/regression/tmpfs/h_tools.c user/kib/vm6/tools/regression/tmpfs/t_create user/kib/vm6/tools/regression/tmpfs/t_dots user/kib/vm6/tools/regression/tmpfs/t_exec user/kib/vm6/tools/regression/tmpfs/t_link user/kib/vm6/tools/regression/tmpfs/t_mkdir user/kib/vm6/tools/regression/tmpfs/t_mount user/kib/vm6/tools/regression/tmpfs/t_pipes user/kib/vm6/tools/regression/tmpfs/t_read_write user/kib/vm6/tools/regression/tmpfs/t_readdir user/kib/vm6/tools/regression/tmpfs/t_remove user/kib/vm6/tools/regression/tmpfs/t_rename user/kib/vm6/tools/regression/tmpfs/t_rmdir user/kib/vm6/tools/regression/tmpfs/t_setattr user/kib/vm6/tools/regression/tmpfs/t_sizes user/kib/vm6/tools/regression/tmpfs/t_sockets user/kib/vm6/tools/regression/tmpfs/t_statvfs user/kib/vm6/tools/regression/tmpfs/t_symlink user/kib/vm6/tools/regression/tmpfs/t_times user/kib/vm6/tools/regression/tmpfs/t_trail_slash user/kib/vm6/tools/regression/tmpfs/t_truncate user/kib/vm6/tools/regression/tmpfs/t_vnd user/kib/vm6/tools/regression/tmpfs/t_vnode_leak user/kib/vm6/tools/regression/usr.bin/Makefile user/kib/vm6/tools/tools/ether_reflect/Makefile user/kib/vm6/tools/tools/mctest/Makefile user/kib/vm6/tools/tools/mctest/mctest.1 user/kib/vm6/tools/tools/nanobsd/Files/root/updatep1 user/kib/vm6/tools/tools/nanobsd/Files/root/updatep2 user/kib/vm6/tools/tools/net80211/stumbler/Makefile user/kib/vm6/tools/tools/net80211/w00t/Makefile.inc user/kib/vm6/tools/tools/netrate/http/Makefile user/kib/vm6/tools/tools/netrate/httpd/Makefile user/kib/vm6/tools/tools/netrate/juggle/Makefile user/kib/vm6/tools/tools/netrate/tcpconnect/Makefile user/kib/vm6/tools/tools/netrate/tcpp/Makefile user/kib/vm6/tools/tools/netrate/tcpreceive/Makefile user/kib/vm6/tools/tools/umastat/Makefile user/kib/vm6/usr.bin/apply/Makefile user/kib/vm6/usr.bin/apply/apply.c user/kib/vm6/usr.bin/biff/biff.1 user/kib/vm6/usr.bin/chpass/Makefile user/kib/vm6/usr.bin/comm/comm.c user/kib/vm6/usr.bin/cpio/Makefile user/kib/vm6/usr.bin/fetch/Makefile user/kib/vm6/usr.bin/find/find.1 user/kib/vm6/usr.bin/gcore/Makefile user/kib/vm6/usr.bin/locale/Makefile user/kib/vm6/usr.bin/minigzip/Makefile user/kib/vm6/usr.bin/ncal/Makefile user/kib/vm6/usr.bin/ncal/ncal.1 user/kib/vm6/usr.bin/ncal/ncal.c user/kib/vm6/usr.bin/netstat/main.c user/kib/vm6/usr.bin/netstat/netgraph.c user/kib/vm6/usr.bin/netstat/netisr.c user/kib/vm6/usr.bin/netstat/netstat.h user/kib/vm6/usr.bin/perror/perror.1 user/kib/vm6/usr.bin/pr/Makefile user/kib/vm6/usr.bin/pr/egetopt.c user/kib/vm6/usr.bin/pr/pr.c user/kib/vm6/usr.bin/procstat/Makefile user/kib/vm6/usr.bin/procstat/procstat.1 user/kib/vm6/usr.bin/procstat/procstat.c user/kib/vm6/usr.bin/procstat/procstat.h user/kib/vm6/usr.bin/script/script.c user/kib/vm6/usr.bin/systat/Makefile user/kib/vm6/usr.bin/tar/Makefile user/kib/vm6/usr.bin/tar/bsdtar.1 user/kib/vm6/usr.bin/truncate/Makefile user/kib/vm6/usr.bin/truncate/truncate.c user/kib/vm6/usr.bin/truss/amd64-fbsd.c user/kib/vm6/usr.bin/truss/amd64-fbsd32.c user/kib/vm6/usr.bin/truss/amd64-linux32.c user/kib/vm6/usr.bin/truss/extern.h user/kib/vm6/usr.bin/truss/i386-fbsd.c user/kib/vm6/usr.bin/truss/i386-linux.c user/kib/vm6/usr.bin/truss/ia64-fbsd.c user/kib/vm6/usr.bin/truss/main.c user/kib/vm6/usr.bin/truss/mips-fbsd.c user/kib/vm6/usr.bin/truss/powerpc-fbsd.c user/kib/vm6/usr.bin/truss/setup.c user/kib/vm6/usr.bin/truss/sparc64-fbsd.c user/kib/vm6/usr.bin/truss/syscalls.c user/kib/vm6/usr.bin/truss/truss.h user/kib/vm6/usr.bin/unifdef/unifdef.1 user/kib/vm6/usr.bin/unifdef/unifdef.c user/kib/vm6/usr.bin/unifdef/unifdefall.sh user/kib/vm6/usr.bin/uniq/uniq.c user/kib/vm6/usr.bin/unzip/Makefile user/kib/vm6/usr.bin/xlint/lint1/scan.l user/kib/vm6/usr.sbin/Makefile user/kib/vm6/usr.sbin/acpi/acpidb/Makefile user/kib/vm6/usr.sbin/acpi/iasl/Makefile user/kib/vm6/usr.sbin/auditd/Makefile user/kib/vm6/usr.sbin/bluetooth/bthidd/Makefile user/kib/vm6/usr.sbin/boot0cfg/Makefile user/kib/vm6/usr.sbin/bsnmpd/modules/Makefile.inc user/kib/vm6/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt user/kib/vm6/usr.sbin/bsnmpd/modules/snmp_pf/Makefile user/kib/vm6/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c user/kib/vm6/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def user/kib/vm6/usr.sbin/cxgbtool/cxgbtool.c user/kib/vm6/usr.sbin/cxgbtool/reg_defs.c user/kib/vm6/usr.sbin/cxgbtool/reg_defs_t3.c user/kib/vm6/usr.sbin/cxgbtool/reg_defs_t3b.c user/kib/vm6/usr.sbin/cxgbtool/reg_defs_t3c.c user/kib/vm6/usr.sbin/freebsd-update/freebsd-update.8 user/kib/vm6/usr.sbin/fwcontrol/Makefile user/kib/vm6/usr.sbin/jail/jail.8 user/kib/vm6/usr.sbin/jls/jls.c user/kib/vm6/usr.sbin/lastlogin/lastlogin.c user/kib/vm6/usr.sbin/mergemaster/mergemaster.8 user/kib/vm6/usr.sbin/mergemaster/mergemaster.sh user/kib/vm6/usr.sbin/mfiutil/Makefile user/kib/vm6/usr.sbin/mount_nwfs/Makefile user/kib/vm6/usr.sbin/mount_nwfs/mount_nwfs.c user/kib/vm6/usr.sbin/mptutil/Makefile user/kib/vm6/usr.sbin/pkg_install/updating/pkg_updating.1 user/kib/vm6/usr.sbin/pmcannotate/pmcannotate.8 user/kib/vm6/usr.sbin/pmcstat/Makefile user/kib/vm6/usr.sbin/pmcstat/pmcpl_callgraph.c user/kib/vm6/usr.sbin/pmcstat/pmcpl_calltree.c user/kib/vm6/usr.sbin/pmcstat/pmcstat.c user/kib/vm6/usr.sbin/pmcstat/pmcstat_log.c user/kib/vm6/usr.sbin/powerd/powerd.8 user/kib/vm6/usr.sbin/ppp/arp.c user/kib/vm6/usr.sbin/rtsold/Makefile user/kib/vm6/usr.sbin/rtsold/dump.c user/kib/vm6/usr.sbin/rtsold/if.c user/kib/vm6/usr.sbin/rtsold/rtsock.c user/kib/vm6/usr.sbin/rtsold/rtsol.c user/kib/vm6/usr.sbin/rtsold/rtsold.c user/kib/vm6/usr.sbin/rtsold/rtsold.h user/kib/vm6/usr.sbin/sysinstall/devices.c user/kib/vm6/usr.sbin/sysinstall/sysinstall.8 user/kib/vm6/usr.sbin/uhsoctl/Makefile user/kib/vm6/usr.sbin/uhsoctl/uhsoctl.1 user/kib/vm6/usr.sbin/zic/Makefile user/kib/vm6/usr.sbin/zic/zdump/Makefile user/kib/vm6/usr.sbin/zic/zic/Makefile Directory Properties: user/kib/vm6/ (props changed) user/kib/vm6/contrib/bind9/ (props changed) user/kib/vm6/contrib/netcat/ (props changed) user/kib/vm6/contrib/openpam/ (props changed) user/kib/vm6/contrib/tzcode/stdtime/ (props changed) user/kib/vm6/contrib/tzcode/zic/ (props changed) user/kib/vm6/crypto/openssh/ (props changed) user/kib/vm6/crypto/openssl/ (props changed) user/kib/vm6/lib/libz/ (props changed) user/kib/vm6/sys/contrib/dev/acpica/ (props changed) user/kib/vm6/sys/contrib/x86emu/ (props changed) Modified: user/kib/vm6/MAINTAINERS ============================================================================== --- user/kib/vm6/MAINTAINERS Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/MAINTAINERS Sat Mar 27 16:55:48 2010 (r205743) @@ -36,8 +36,6 @@ pci bus imp,jhb Pre-commit review reque cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -twe aradford@amcc.com Pre-commit review requested -twa aradford@amcc.com Pre-commit review requested CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. @@ -59,15 +57,12 @@ libfetch des Advance notification reques fetch des Advance notification requested. libpam des Pre-commit review requested. openssh des Pre-commit review requested. -pseudofs des Advance notification requested. -procfs des Advance notification requested. -linprocfs des Advance notification requested. +pseudofs des Pre-commit review requested. +procfs des Pre-commit review requested. +linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. -pkill gad Heads-up appreciated. -ps gad I am working on a number of changes to this. Would - like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. @@ -76,9 +71,6 @@ share/mk ru This is a vital component of offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm rnoland Just keep me informed of changes, try not to break it. -libufs jmallett Willing to handle problems, help with work. -fdc(4) joerg Just keep me informed of changes, try not to break it. -sppp(4) joerg Just keep me informed of changes, try not to break it. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -144,4 +136,3 @@ $ cd /usr/src; find */* -type f|xargs eg sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org -usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org Modified: user/kib/vm6/Makefile ============================================================================== --- user/kib/vm6/Makefile Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/Makefile Sat Mar 27 16:55:48 2010 (r205743) @@ -15,6 +15,7 @@ # reinstallkernel - Reinstall the kernel and the kernel-modules. # reinstallkernel.debug # kernel - buildkernel + installkernel. +# kernel-toolchain - Builds the subset of world necessary to build a kernel # doxygen - Build API documentation of the kernel, needs doxygen. # update - Convenient way to update your source tree (cvs). # check-old - List obsolete directories/files/libraries. @@ -310,6 +311,7 @@ universe_${target}: "check _.${target}.buildworld for details" | ${MAKEFAIL})) @echo ">> ${target} buildworld completed on `LC_ALL=C date`" .endif +.if !defined(MAKE_JUST_WORLDS) .if exists(${.CURDIR}/sys/${target}/conf/NOTES) @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ @@ -318,6 +320,7 @@ universe_${target}: .endif @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels +.endif @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs Modified: user/kib/vm6/Makefile.inc1 ============================================================================== --- user/kib/vm6/Makefile.inc1 Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/Makefile.inc1 Sat Mar 27 16:55:48 2010 (r205743) @@ -283,6 +283,7 @@ LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTRE VERSION="${VERSION}" \ MACHINE=i386 \ MACHINE_ARCH=i386 \ + MACHINE_CPU="i686 mmx sse sse2" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ CC="${CC} ${LIB32FLAGS}" \ @@ -1259,7 +1260,7 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @for file in ${OLD_FILES}; do \ + @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}"; \ @@ -1279,7 +1280,7 @@ delete-old-files: check-old-files: @echo ">>> Checking for old files" - @for file in ${OLD_FILES}; do \ + @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ Modified: user/kib/vm6/ObsoleteFiles.inc ============================================================================== --- user/kib/vm6/ObsoleteFiles.inc Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/ObsoleteFiles.inc Sat Mar 27 16:55:48 2010 (r205743) @@ -14,6 +14,40 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100326: [ia64] removed +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/machine/nexusvar.h +.endif +# 20100326: gcpio removal +OLD_FILES+=usr/bin/gcpio +OLD_FILES+=usr/share/info/cpio.info.gz +OLD_FILES+=usr/share/man/man1/gcpio.1.gz +# 20100322: libz update +OLD_LIBS+=lib/libz.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libz.so.5 +.endif +# 20100314: removal of regexp.h +OLD_FILES+=usr/include/regexp.h +OLD_FILES+=usr/share/man/man3/regexp.3.gz +OLD_FILES+=usr/share/man/man3/regsub.3.gz +# 20100303: actual removal of utmp.h +OLD_FILES+=usr/include/utmp.h +# 20100227: [ia64] removed and +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/machine/sapicreg.h +OLD_FILES+=usr/include/machine/sapicvar.h +.endif +# 20100208: man pages moved +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz +OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz +OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz +OLD_FILES+=usr/share/man/man4/i386/scd.4.gz +OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz +.endif # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd OLD_FILES+=usr/share/doc/papers/bc.ascii.gz OLD_FILES+=usr/share/doc/papers/dc.ascii.gz @@ -2275,7 +2309,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" +.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign Modified: user/kib/vm6/UPDATING ============================================================================== --- user/kib/vm6/UPDATING Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/UPDATING Sat Mar 27 16:55:48 2010 (r205743) @@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100311: + The kernel option COMPAT_IA32 has been replaced with COMPAT_FREEBSD32 + to allow 32-bit compatibility on non-x86 platforms. All kernel + configurations on amd64 and ia64 platforms using these options must + be modified accordingly. + 20100113: The utmp user accounting database has been replaced with utmpx, the user accounting interface standardized by POSIX. @@ -497,7 +503,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20090313: The k8temp(4) driver has been renamed to amdtemp(4) since - support for K10 and K11 CPU families was added. + support for Family 10 and Family 11 CPU families was added. 20090309: IGMPv3 and Source-Specific Multicast (SSM) have been merged @@ -983,7 +989,7 @@ COMMON ITEMS: mergemaster -p [5] make installworld make delete-old - mergemaster [4] + mergemaster -i [4] @@ -1054,7 +1060,8 @@ COMMON ITEMS: system. Attempting to do it by hand is not recommended and those that pursue this avenue should read this file carefully, as well as the archives of freebsd-current and freebsd-hackers mailing lists - for potential gotchas. + for potential gotchas. The -U option is also useful to consider. + See mergemaster(8) for more information. [5] Usually this step is a noop. However, from time to time you may need to do this if you get unknown user in the following Modified: user/kib/vm6/bin/ed/Makefile ============================================================================== --- user/kib/vm6/bin/ed/Makefile Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ed/Makefile Sat Mar 27 16:55:48 2010 (r205743) @@ -4,7 +4,6 @@ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c -WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 Modified: user/kib/vm6/bin/ed/main.c ============================================================================== --- user/kib/vm6/bin/ed/main.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ed/main.c Sat Mar 27 16:55:48 2010 (r205743) @@ -103,15 +103,10 @@ const char usage[] = "usage: %s [-] [-sx /* ed: line editor */ int -main(int argc, char *argv[]) +main(volatile int argc, char ** volatile argv) { int c, n; long status = 0; -#if __GNUC__ - /* Avoid longjmp clobbering */ - (void) &argc; - (void) &argv; -#endif (void)setlocale(LC_ALL, ""); Modified: user/kib/vm6/bin/kill/kill.c ============================================================================== --- user/kib/vm6/bin/kill/kill.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/kill/kill.c Sat Mar 27 16:55:48 2010 (r205743) @@ -108,7 +108,7 @@ main(int argc, char *argv[]) numsig = strtol(*argv, &ep, 10); if (!**argv || *ep) errx(1, "illegal signal number: %s", *argv); - if (numsig < 0 || numsig >= sys_nsig) + if (numsig < 0) nosig(*argv); } else nosig(*argv); Modified: user/kib/vm6/bin/pkill/pkill.1 ============================================================================== --- user/kib/vm6/bin/pkill/pkill.1 Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/pkill/pkill.1 Sat Mar 27 16:55:48 2010 (r205743) @@ -16,13 +16,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/kib/vm6/bin/pkill/pkill.c ============================================================================== --- user/kib/vm6/bin/pkill/pkill.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/pkill/pkill.c Sat Mar 27 16:55:48 2010 (r205743) @@ -16,13 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/kib/vm6/bin/ps/extern.h ============================================================================== --- user/kib/vm6/bin/ps/extern.h Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ps/extern.h Sat Mar 27 16:55:48 2010 (r205743) @@ -48,6 +48,7 @@ void command(KINFO *, VARENT *); void cputime(KINFO *, VARENT *); int donlist(void); void elapsed(KINFO *, VARENT *); +void elapseds(KINFO *, VARENT *); void emulname(KINFO *, VARENT *); VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, size_t); Modified: user/kib/vm6/bin/ps/keyword.c ============================================================================== --- user/kib/vm6/bin/ps/keyword.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ps/keyword.c Sat Mar 27 16:55:48 2010 (r205743) @@ -89,6 +89,7 @@ static VAR var[] = { {"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR, NULL, 0}, {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, + {"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, Modified: user/kib/vm6/bin/ps/print.c ============================================================================== --- user/kib/vm6/bin/ps/print.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ps/print.c Sat Mar 27 16:55:48 2010 (r205743) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -618,6 +619,21 @@ elapsed(KINFO *k, VARENT *ve) (void)printf("%*s", v->width, obuff); } +void +elapseds(KINFO *k, VARENT *ve) +{ + VAR *v; + time_t val; + + v = ve->var; + if (!k->ki_valid) { + (void)printf("%-*s", v->width, "-"); + return; + } + val = now - k->ki_p->ki_start.tv_sec; + (void)printf("%*jd", v->width, (intmax_t)val); +} + double getpcpu(const KINFO *k) { Modified: user/kib/vm6/bin/ps/ps.1 ============================================================================== --- user/kib/vm6/bin/ps/ps.1 Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/ps/ps.1 Sat Mar 27 16:55:48 2010 (r205743) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 9, 2009 +.Dd March 17, 2010 .Dt PS 1 .Os .Sh NAME @@ -284,11 +284,10 @@ The percentage of real memory used by th The flags associated with the process as in the include file .In sys/proc.h : -.Bl -column P_STOPPED_SINGLE 0x4000000 +.Bl -column P_SINGLE_BOUNDARY 0x40000000 .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" .It Dv "P_KTHREAD" Ta No "0x00004 Kernel thread" -.It Dv "P_NOLOAD" Ta No "0x00008 Ignore during load avg calculations" .It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit" .It Dv "P_PROFIL" Ta No "0x00020 Has started profiling" .It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof" @@ -305,8 +304,14 @@ the include file .It Dv "P_STOPPED_SINGLE" Ta No "0x80000 Only one thread can continue" .It Dv "P_PROTECTED" Ta No "0x100000 Do not kill on memory overcommit" .It Dv "P_SIGEVENT" Ta No "0x200000 Process pending signals changed" +.It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000 Threads should suspend at user boundary" +.It Dv "P_HWPMC" Ta No "0x800000 Process is using HWPMCs" .It Dv "P_JAILED" Ta No "0x1000000 Process is in jail" .It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()" +.It Dv "P_STATCHILD" Ta No "0x8000000 Child process stopped or exited" +.It Dv "P_INMEM" Ta No "0x10000000 Loaded into memory" +.It Dv "P_SWAPPINGOUT" Ta No "0x20000000 Process is being swapped out" +.It Dv "P_SWAPPINGIN" Ta No "0x40000000 Process is being swapped in" .El .It Cm label The MAC label of the process. @@ -474,7 +479,12 @@ command and arguments .It Cm cpu short-term CPU usage factor (for scheduling) .It Cm etime -elapsed running time +elapsed running time, format +.Op days- Ns +.Op hours: Ns +minutes:seconds. +.It Cm etimes +elapsed running time, in decimal integer seconds .It Cm flags the process flags, in hexadecimal (alias .Cm f ) @@ -615,6 +625,13 @@ wait channel (as a symbolic name) .It Cm xstat exit or stop status (valid only for stopped or zombie process) .El +.Pp +Note that the +.Cm pending +column displays bitmask of signals pending in the process queue when +.Fl H +option is not specified, otherwise the per-thread queue of pending signals +is shown. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : Modified: user/kib/vm6/bin/setfacl/file.c ============================================================================== --- user/kib/vm6/bin/setfacl/file.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/file.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/setfacl/mask.c ============================================================================== --- user/kib/vm6/bin/setfacl/mask.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/mask.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/setfacl/merge.c ============================================================================== --- user/kib/vm6/bin/setfacl/merge.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/merge.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/setfacl/remove.c ============================================================================== --- user/kib/vm6/bin/setfacl/remove.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/remove.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/setfacl/setfacl.1 ============================================================================== --- user/kib/vm6/bin/setfacl/setfacl.1 Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/setfacl.1 Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE -.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\" Modified: user/kib/vm6/bin/setfacl/setfacl.c ============================================================================== --- user/kib/vm6/bin/setfacl/setfacl.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/setfacl.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/setfacl/setfacl.h ============================================================================== --- user/kib/vm6/bin/setfacl/setfacl.h Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/setfacl.h Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * $FreeBSD$ */ Modified: user/kib/vm6/bin/setfacl/util.c ============================================================================== --- user/kib/vm6/bin/setfacl/util.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/setfacl/util.c Sat Mar 27 16:55:48 2010 (r205743) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include Modified: user/kib/vm6/bin/sh/eval.c ============================================================================== --- user/kib/vm6/bin/sh/eval.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/sh/eval.c Sat Mar 27 16:55:48 2010 (r205743) @@ -91,6 +91,7 @@ STATIC void evalloop(union node *, int); STATIC void evalfor(union node *, int); STATIC void evalcase(union node *, int); STATIC void evalsubshell(union node *, int); +STATIC void evalredir(union node *, int); STATIC void expredir(union node *); STATIC void evalpipe(union node *); STATIC void evalcommand(union node *, int, struct backcmd *); @@ -221,10 +222,7 @@ evaltree(union node *n, int flags) evaltree(n->nbinary.ch2, flags); break; case NREDIR: - expredir(n->nredir.redirect); - redirect(n->nredir.redirect, REDIR_PUSH); - evaltree(n->nredir.n, flags); - popredir(); + evalredir(n, flags); break; case NSUBSHELL: evalsubshell(n, flags); @@ -415,6 +413,46 @@ evalsubshell(union node *n, int flags) } +/* + * Evaluate a redirected compound command. + */ + +STATIC void +evalredir(union node *n, int flags) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + volatile int in_redirect = 1; + + expredir(n->nredir.redirect); + savehandler = handler; + if (setjmp(jmploc.loc)) { + int e; + + handler = savehandler; + e = exception; + if (e == EXERROR || e == EXEXEC) { + popredir(); + if (in_redirect) { + exitstatus = 2; + return; + } + } + longjmp(handler->loc, 1); + } else { + INTOFF; + handler = &jmploc; + redirect(n->nredir.redirect, REDIR_PUSH); + in_redirect = 0; + INTON; + evaltree(n->nredir.n, flags); + } + INTOFF; + handler = savehandler; + popredir(); + INTON; +} + /* * Compute the names of the files in a redirection list. @@ -597,6 +635,7 @@ evalcommand(union node *cmd, int flags, char *lastarg; int realstatus; int do_clearcmdentry; + char *path = pathval(); /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); @@ -679,10 +718,10 @@ evalcommand(union node *cmd, int flags, /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; - cmdentry.special = 1; + cmdentry.special = 0; } else { static const char PATH[] = "PATH="; - char *path = pathval(); + int cmd_flags = 0, bltinonly = 0; /* * Modify the command lookup path, if a PATH= assignment @@ -713,24 +752,68 @@ evalcommand(union node *cmd, int flags, do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 0, path); - /* implement the bltin builtin here */ - if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { - for (;;) { - argv++; - if (--argc == 0) - break; - if ((cmdentry.u.index = find_builtin(*argv, - &cmdentry.special)) < 0) { + for (;;) { + if (bltinonly) { + cmdentry.u.index = find_builtin(*argv, &cmdentry.special); + if (cmdentry.u.index < 0) { cmdentry.u.index = BLTINCMD; argv--; argc++; break; } - if (cmdentry.u.index != BLTINCMD) + } else + find_command(argv[0], &cmdentry, cmd_flags, path); + /* implement the bltin and command builtins here */ + if (cmdentry.cmdtype != CMDBUILTIN) + break; + if (cmdentry.u.index == BLTINCMD) { + if (argc == 1) break; - } + argv++; + argc--; + bltinonly = 1; + } else if (cmdentry.u.index == COMMANDCMD) { + if (argc == 1) + break; + if (!strcmp(argv[1], "-p")) { + if (argc == 2) + break; + if (argv[2][0] == '-') { + if (strcmp(argv[2], "--")) + break; + if (argc == 3) + break; + argv += 3; + argc -= 3; + } else { + argv += 2; + argc -= 2; + } + path = _PATH_STDPATH; + clearcmdentry(0); + do_clearcmdentry = 1; + } else if (!strcmp(argv[1], "--")) { + if (argc == 2) + break; + argv += 2; + argc -= 2; + } else if (argv[1][0] == '-') + break; + else { + argv++; + argc--; + } + cmd_flags |= DO_NOFUNC; + bltinonly = 0; + } else + break; } + /* + * Special builtins lose their special properties when + * called via 'command'. + */ + if (cmd_flags & DO_NOFUNC) + cmdentry.special = 0; } /* Fork off a child process if necessary. */ @@ -741,9 +824,7 @@ evalcommand(union node *cmd, int flags, && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD)) - || (cmdentry.cmdtype == CMDBUILTIN && - cmdentry.u.index == COMMANDCMD)) { + || cmdentry.u.index == EVALCMD))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -770,7 +851,6 @@ evalcommand(union node *cmd, int flags, #ifdef DEBUG trputs("Shell function: "); trargs(argv); #endif - redirect(cmd->ncmd.redirect, REDIR_PUSH); saveparam = shellparam; shellparam.malloc = 0; shellparam.reset = 1; @@ -788,6 +868,8 @@ evalcommand(union node *cmd, int flags, else { freeparam(&shellparam); shellparam = saveparam; + if (exception == EXERROR || exception == EXEXEC) + popredir(); } unreffunc(cmdentry.u.func); poplocalvars(); @@ -798,6 +880,7 @@ evalcommand(union node *cmd, int flags, } handler = &jmploc; funcnest++; + redirect(cmd->ncmd.redirect, REDIR_PUSH); INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); @@ -846,6 +929,12 @@ evalcommand(union node *cmd, int flags, } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + /* + * If there is no command word, redirection errors should + * not be fatal but assignment errors should. + */ + if (argc == 0 && !(flags & EV_BACKCMD)) + cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); commandname = argv[0]; @@ -871,6 +960,9 @@ cmddone: backcmd->nleft = memout.nextc - memout.buf; memout.buf = NULL; } + if (cmdentry.u.index != EXECCMD && + (e == -1 || e == EXERROR || e == EXEXEC)) + popredir(); if (e != -1) { if ((e != EXERROR && e != EXEXEC) || cmdentry.special) @@ -879,8 +971,6 @@ cmddone: if (flags != EV_BACKCMD) FORCEINTON; } - if (cmdentry.u.index != EXECCMD) - popredir(); } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); @@ -889,7 +979,7 @@ cmddone: for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); envp = environment(); - shellexec(argv, envp, pathval(), cmdentry.u.index); + shellexec(argv, envp, path, cmdentry.u.index); /*NOTREACHED*/ } goto out; @@ -996,15 +1086,11 @@ int commandcmd(int argc, char **argv) { static char stdpath[] = _PATH_STDPATH; - struct jmploc loc, *old; - struct strlist *sp; char *path; int ch; int cmd = -1; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(sp->text, VEXPORT|VSTACK); - path = pathval(); + path = bltinlookup("PATH", 1); optind = optreset = 1; opterr = 0; @@ -1032,22 +1118,14 @@ commandcmd(int argc, char **argv) error("wrong number of arguments"); return typecmd_impl(2, argv - 1, cmd, path); } - if (argc != 0) { - old = handler; - handler = &loc; - if (setjmp(handler->loc) == 0) - shellexec(argv, environment(), path, 0); - handler = old; - if (exception == EXEXEC) - exit(exerrno); - exraise(exception); - } + if (argc != 0) + error("commandcmd() called while it should not be"); /* * Do nothing successfully if no command was specified; * ksh also does this. */ - exit(0); + return 0; } Modified: user/kib/vm6/bin/sh/exec.c ============================================================================== --- user/kib/vm6/bin/sh/exec.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/sh/exec.c Sat Mar 27 16:55:48 2010 (r205743) @@ -248,7 +248,7 @@ hashcmd(int argc __unused, char **argv _ && (cmdp->cmdtype == CMDNORMAL || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) delete_cmd_entry(); - find_command(name, &entry, 1, pathval()); + find_command(name, &entry, DO_ERR, pathval()); if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); @@ -310,10 +310,10 @@ printentry(struct tblentry *cmdp, int ve */ void -find_command(const char *name, struct cmdentry *entry, int printerr, +find_command(const char *name, struct cmdentry *entry, int act, const char *path) { - struct tblentry *cmdp; + struct tblentry *cmdp, loc_cmd; int idx; int prev; char *fullname; @@ -330,13 +330,19 @@ find_command(const char *name, struct cm } /* If name is in the table, and not invalidated by cd, we're done */ - if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) - goto success; + if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) { + if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) + cmdp = NULL; + else + goto success; + } /* If %builtin not in path, check for builtin next */ if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -365,6 +371,8 @@ loop: goto loop; INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -414,6 +422,8 @@ loop: TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; cmdp->param.index = idx; INTON; @@ -421,9 +431,9 @@ loop: } /* We failed. If there was an entry for this command, delete it */ - if (cmdp) + if (cmdp && cmdp->cmdtype != CMDFUNCTION) delete_cmd_entry(); - if (printerr) { + if (act & DO_ERR) { if (e == ENOENT || e == ENOTDIR) outfmt(out2, "%s: not found\n", name); else Modified: user/kib/vm6/bin/sh/exec.h ============================================================================== --- user/kib/vm6/bin/sh/exec.h Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/sh/exec.h Sat Mar 27 16:55:48 2010 (r205743) @@ -57,6 +57,10 @@ struct cmdentry { }; +/* action to find_command() */ +#define DO_ERR 0x01 /* prints errors */ +#define DO_NOFUNC 0x02 /* don't return shell functions, for command */ + extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ Modified: user/kib/vm6/bin/sh/parser.c ============================================================================== --- user/kib/vm6/bin/sh/parser.c Sat Mar 27 16:44:52 2010 (r205742) +++ user/kib/vm6/bin/sh/parser.c Sat Mar 27 16:55:48 2010 (r205743) @@ -863,6 +863,164 @@ breakloop: } +/* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 18:40:09 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCCFE1065670; Sat, 27 Mar 2010 18:40:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CAF298FC1C; Sat, 27 Mar 2010 18:40:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RIe8vn068787; Sat, 27 Mar 2010 18:40:08 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RIe8Qg068782; Sat, 27 Mar 2010 18:40:08 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201003271840.o2RIe8Qg068782@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 27 Mar 2010 18:40:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205774 - in user/des/svnsup/src: distill libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 18:40:09 -0000 Author: des Date: Sat Mar 27 18:40:08 2010 New Revision: 205774 URL: http://svn.freebsd.org/changeset/base/205774 Log: Canonicalize the session URL. Split it into root + subdir and use that information to rewrite file and directory paths from absolute to relative to the session URL. Modified: user/des/svnsup/src/distill/distill.c user/des/svnsup/src/distill/distill.h user/des/svnsup/src/libsvnsup/svnsup.h user/des/svnsup/src/libsvnsup/svnsup_delta.c Modified: user/des/svnsup/src/distill/distill.c ============================================================================== --- user/des/svnsup/src/distill/distill.c Sat Mar 27 18:24:27 2010 (r205773) +++ user/des/svnsup/src/distill/distill.c Sat Mar 27 18:40:08 2010 (r205774) @@ -31,6 +31,7 @@ #include "config.h" #endif +#include #include #include #include @@ -49,6 +50,7 @@ distill(const char *url, unsigned long r svn_auth_provider_object_t *auth_provider; apr_array_header_t *auth_providers; svn_ra_session_t *ra_session; + const char *root, *subdir, *uuid; svn_error_t *error; svnsup_delta_t sd; svnsup_err_t err; @@ -57,6 +59,9 @@ distill(const char *url, unsigned long r status = apr_pool_create(&pool, NULL); SVNSUP_APR_ERROR(status, "apr_pool_create()"); + /* canonicalize URL */ + url = svn_path_canonicalize(url, pool); + /* set up our authentication system */ /* XXX check for errors */ auth_providers = apr_array_make(pool, 1, sizeof auth_provider); @@ -72,9 +77,30 @@ distill(const char *url, unsigned long r NULL, config, pool); SVNSUP_SVN_ERROR(error, "svn_ra_open3()"); + /* get repo uuid */ + error = svn_ra_get_uuid2(ra_session, &uuid, pool); + SVNSUP_SVN_ERROR(error, "svn_ra_get_uuid2()"); + + /* get repo root */ + error = svn_ra_get_repos_root2(ra_session, &root, pool); + SVNSUP_SVN_ERROR(error, "svn_ra_get_repos_root2()"); + + /* get subdirectory; libsvn guarantees root is a prefix of url */ + assert(strstr(url, root) == url); + subdir = url + strlen(root); + assert(*subdir == '/' || *subdir == '\0'); + if (*subdir == '/') + ++subdir; + /* XXX create delta */ err = svnsup_create_delta(&sd); SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_create()"); + err = svnsup_delta_root(sd, root); + SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_root()"); + err = svnsup_delta_uuid(sd, uuid); + SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_uuid()"); + err = svnsup_delta_path(sd, subdir); + SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_path()"); /* get revision metadata */ error = svn_ra_get_log2(ra_session, NULL, revision, revision, 0, Modified: user/des/svnsup/src/distill/distill.h ============================================================================== --- user/des/svnsup/src/distill/distill.h Sat Mar 27 18:24:27 2010 (r205773) +++ user/des/svnsup/src/distill/distill.h Sat Mar 27 18:40:08 2010 (r205774) @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "svnsup.h" Modified: user/des/svnsup/src/libsvnsup/svnsup.h ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 18:24:27 2010 (r205773) +++ user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 18:40:08 2010 (r205774) @@ -46,6 +46,9 @@ typedef struct svnsup_delta_file *svnsup int svnsup_create_delta(svnsup_delta_t *); int svnsup_close_delta(svnsup_delta_t); +int svnsup_delta_root(svnsup_delta_t, const char *); +int svnsup_delta_uuid(svnsup_delta_t, const char *); +int svnsup_delta_path(svnsup_delta_t, const char *); int svnsup_delta_comment(svnsup_delta_t, const char *, ...); int svnsup_delta_meta(svnsup_delta_t, const char *, const char *, ...); int svnsup_delta_create_directory(svnsup_delta_t, const char *); Modified: user/des/svnsup/src/libsvnsup/svnsup_delta.c ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup_delta.c Sat Mar 27 18:24:27 2010 (r205773) +++ user/des/svnsup/src/libsvnsup/svnsup_delta.c Sat Mar 27 18:40:08 2010 (r205774) @@ -45,6 +45,9 @@ struct svnsup_delta { FILE *f; + const char *root; + const char *uuid; + const char *path; struct svnsup_delta_file *sdf; unsigned int ntxt; }; @@ -72,7 +75,7 @@ svnsup_delta_file_alloc(svnsup_delta_t s return (sdf); } -void +static void svnsup_delta_file_free(svnsup_delta_file_t sdf) { @@ -81,6 +84,18 @@ svnsup_delta_file_free(svnsup_delta_file free(sdf); } +static const char * +svnsup_delta_shorten_path(svnsup_delta_t sd, const char *pn) +{ + + assert(strstr(pn, sd->path) == pn); + pn += strlen(sd->path); + assert(*pn == '/' || *pn == '\0'); + if (*pn == '/') + ++pn; + return (pn); +} + /* * Create an svnsup delta. */ @@ -144,10 +159,71 @@ svnsup_delta_comment(svnsup_delta_t sd, int svnsup_delta_meta(svnsup_delta_t sd, const char *key, const char *fmt, ...) { + va_list ap; + char *value; + + assert(sd != NULL); + assert(key != NULL); + assert(fmt != NULL); + va_start(ap, fmt); + vasprintf(&value, fmt, ap); + va_end(ap); + fprintf(sd->f, "@meta "); + svnsup_string_fencode(sd->f, key); + fprintf(sd->f, " "); + svnsup_string_fencode(sd->f, value); + fprintf(sd->f, "\n"); + return (SVNSUP_ERR_NONE); +} + +/* + * Repository root + */ +int +svnsup_delta_root(svnsup_delta_t sd, const char *root) +{ - (void)sd; - (void)key; - (void)fmt; + assert(sd->root == NULL); + sd->root = strdup(root); + if (sd->root == NULL) + return (SVNSUP_ERR_MEMORY); + fprintf(sd->f, "@root "); + svnsup_string_fencode(sd->f, sd->root); + fprintf(sd->f, "\n"); + return (SVNSUP_ERR_NONE); +} + +/* + * Repository UUID + */ +int +svnsup_delta_uuid(svnsup_delta_t sd, const char *uuid) +{ + + assert(sd->uuid == NULL); + sd->uuid = strdup(uuid); + if (sd->uuid == NULL) + return (SVNSUP_ERR_MEMORY); + fprintf(sd->f, "@uuid "); + svnsup_string_fencode(sd->f, sd->uuid); + fprintf(sd->f, "\n"); + return (SVNSUP_ERR_NONE); +} + +/* + * Repository path (branch / subdir) + */ +int +svnsup_delta_path(svnsup_delta_t sd, const char *path) +{ + + assert(sd->path == NULL); + sd->path = strdup(path); + if (sd->path == NULL) + return (SVNSUP_ERR_MEMORY); + fprintf(sd->f, "@path "); + svnsup_string_fencode(sd->f, sd->path); + fprintf(sd->f, "\n"); return (SVNSUP_ERR_NONE); } @@ -161,6 +237,7 @@ svnsup_delta_create_directory(svnsup_del assert(sd != NULL); assert(dn != NULL && *dn != '\0'); assert(sd->sdf == NULL); + dn = svnsup_delta_shorten_path(sd, dn); fprintf(sd->f, "@mkdir "); svnsup_string_fencode(sd->f, dn); fprintf(sd->f, "\n"); @@ -177,6 +254,7 @@ svnsup_delta_remove(svnsup_delta_t sd, c assert(sd != NULL); assert(fn != NULL && *fn != '\0'); assert(sd->sdf == NULL); + fn = svnsup_delta_shorten_path(sd, fn); fprintf(sd->f, "@remove "); svnsup_string_fencode(sd->f, fn); fprintf(sd->f, "\n"); @@ -215,6 +293,7 @@ svnsup_delta_create_file(svnsup_delta_t assert(sd->sdf == NULL); assert(sdfp != NULL); assert(fn != NULL && *fn != '\0'); + fn = svnsup_delta_shorten_path(sd, fn); if ((sdf = svnsup_delta_file_alloc(sd, fn)) == NULL) return (SVNSUP_ERR_MEMORY); sdf->create = 1; @@ -238,6 +317,7 @@ svnsup_delta_open_file(svnsup_delta_t sd assert(sd->sdf == NULL); assert(sdfp != NULL); assert(fn != NULL && *fn != '\0'); + fn = svnsup_delta_shorten_path(sd, fn); if ((sdf = svnsup_delta_file_alloc(sd, fn)) == NULL) return (SVNSUP_ERR_MEMORY); *sdfp = sdf; From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 19:05:14 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 999081065689; Sat, 27 Mar 2010 19:05:14 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E1998FC14; Sat, 27 Mar 2010 19:05:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RJ5ELk074431; Sat, 27 Mar 2010 19:05:14 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RJ5EOK074428; Sat, 27 Mar 2010 19:05:14 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201003271905.o2RJ5EOK074428@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 27 Mar 2010 19:05:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205776 - user/des/svnsup/src/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 19:05:14 -0000 Author: des Date: Sat Mar 27 19:05:13 2010 New Revision: 205776 URL: http://svn.freebsd.org/changeset/base/205776 Log: Use unsigned char * for buffers. Modified: user/des/svnsup/src/libsvnsup/svnsup.h user/des/svnsup/src/libsvnsup/svnsup_delta.c user/des/svnsup/src/libsvnsup/svnsup_string.c Modified: user/des/svnsup/src/libsvnsup/svnsup.h ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 18:45:53 2010 (r205775) +++ user/des/svnsup/src/libsvnsup/svnsup.h Sat Mar 27 19:05:13 2010 (r205776) @@ -72,13 +72,13 @@ int svnsup_delta_close_file(svnsup_delta * svnsup_string.c */ int svnsup_string_is_safe(const char *); -int svnsup_buf_is_safe(const char *, size_t); +int svnsup_buf_is_safe(const unsigned char *, size_t); char *svnsup_string_encode(const char *); -char *svnsup_buf_encode(const char *, size_t); +char *svnsup_buf_encode(const unsigned char *, size_t); #ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ size_t svnsup_string_fencode(FILE *, const char *); -size_t svnsup_buf_fencode(FILE *, const char *, size_t); +size_t svnsup_buf_fencode(FILE *, const unsigned char *, size_t); #endif /* Modified: user/des/svnsup/src/libsvnsup/svnsup_delta.c ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup_delta.c Sat Mar 27 18:45:53 2010 (r205775) +++ user/des/svnsup/src/libsvnsup/svnsup_delta.c Sat Mar 27 19:05:13 2010 (r205776) @@ -275,7 +275,7 @@ svnsup_delta_text(svnsup_delta_t sd, con assert(txtid != NULL); *txtid = sd->ntxt++; fprintf(sd->f, "@text %u ", *txtid); - svnsup_buf_fencode(sd->f, src, len); + svnsup_buf_fencode(sd->f, (const unsigned char *)src, len); fprintf(sd->f, "\n"); return (SVNSUP_ERR_NONE); } Modified: user/des/svnsup/src/libsvnsup/svnsup_string.c ============================================================================== --- user/des/svnsup/src/libsvnsup/svnsup_string.c Sat Mar 27 18:45:53 2010 (r205775) +++ user/des/svnsup/src/libsvnsup/svnsup_string.c Sat Mar 27 19:05:13 2010 (r205776) @@ -59,7 +59,7 @@ svnsup_string_is_safe(const char *str) * Safe to send as is */ int -svnsup_buf_is_safe(const char *buf, size_t size) +svnsup_buf_is_safe(const unsigned char *buf, size_t size) { while (size > 0) { @@ -81,7 +81,7 @@ svnsup_string_encode(const char *str) } char * -svnsup_buf_encode(const char *buf, size_t size) +svnsup_buf_encode(const unsigned char *buf, size_t size) { assert(0); @@ -94,11 +94,11 @@ size_t svnsup_string_fencode(FILE *f, const char *str) { - return (svnsup_buf_fencode(f, str, strlen(str))); + return (svnsup_buf_fencode(f, (const unsigned char *)str, strlen(str))); } size_t -svnsup_buf_fencode(FILE *f, const char *buf, size_t size) +svnsup_buf_fencode(FILE *f, const unsigned char *buf, size_t size) { int len; From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 23:57:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 481CE1065670; Sat, 27 Mar 2010 23:57:39 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 367248FC08; Sat, 27 Mar 2010 23:57:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RNvdYk038701; Sat, 27 Mar 2010 23:57:39 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RNvdhm038699; Sat, 27 Mar 2010 23:57:39 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003272357.o2RNvdhm038699@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Mar 2010 23:57:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205779 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 23:57:39 -0000 Author: jmallett Date: Sat Mar 27 23:57:38 2010 New Revision: 205779 URL: http://svn.freebsd.org/changeset/base/205779 Log: Don't truncate some pointers and sizes that are mixed with pointers. Modified: user/jmallett/octeon/sys/mips/mips/support.S Modified: user/jmallett/octeon/sys/mips/mips/support.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/support.S Sat Mar 27 23:53:47 2010 (r205778) +++ user/jmallett/octeon/sys/mips/mips/support.S Sat Mar 27 23:57:38 2010 (r205779) @@ -887,26 +887,26 @@ LEAF(bzero) ALEAF(blkclr) .set noreorder blt a1, 12, smallclr # small amount to clear? - subu a3, zero, a0 # compute # bytes to word align address + PTR_SUBU a3, zero, a0 # compute # bytes to word align address and a3, a3, 3 beq a3, zero, 1f # skip if word aligned - subu a1, a1, a3 # subtract from remaining count + PTR_SUBU a1, a1, a3 # subtract from remaining count SWHI zero, 0(a0) # clear 1, 2, or 3 bytes to align - addu a0, a0, a3 + PTR_ADDU a0, a0, a3 1: and v0, a1, 3 # compute number of words left - subu a3, a1, v0 + PTR_SUBU a3, a1, v0 move a1, v0 - addu a3, a3, a0 # compute ending address + PTR_ADDU a3, a3, a0 # compute ending address 2: - addu a0, a0, 4 # clear words + PTR_ADDU a0, a0, 4 # clear words bne a0, a3, 2b # unrolling loop does not help sw zero, -4(a0) # since we are limited by memory speed smallclr: ble a1, zero, 2f - addu a3, a1, a0 # compute ending address + PTR_ADDU a3, a1, a0 # compute ending address 1: - addu a0, a0, 1 # clear bytes + PTR_ADDU a0, a0, 1 # clear bytes bne a0, a3, 1b sb zero, -1(a0) 2: @@ -923,66 +923,66 @@ LEAF(bcmp) blt a2, 16, smallcmp # is it worth any trouble? xor v0, a0, a1 # compare low two bits of addresses and v0, v0, 3 - subu a3, zero, a1 # compute # bytes to word align address + PTR_SUBU a3, zero, a1 # compute # bytes to word align address bne v0, zero, unalignedcmp # not possible to align addresses and a3, a3, 3 beq a3, zero, 1f - subu a2, a2, a3 # subtract from remaining count + PTR_SUBU a2, a2, a3 # subtract from remaining count move v0, v1 # init v0,v1 so unmodified bytes match LWHI v0, 0(a0) # read 1, 2, or 3 bytes LWHI v1, 0(a1) - addu a1, a1, a3 + PTR_ADDU a1, a1, a3 bne v0, v1, nomatch - addu a0, a0, a3 + PTR_ADDU a0, a0, a3 1: and a3, a2, ~3 # compute number of whole words left - subu a2, a2, a3 # which has to be >= (16-3) & ~3 - addu a3, a3, a0 # compute ending address + PTR_SUBU a2, a2, a3 # which has to be >= (16-3) & ~3 + PTR_ADDU a3, a3, a0 # compute ending address 2: lw v0, 0(a0) # compare words lw v1, 0(a1) - addu a0, a0, 4 + PTR_ADDU a0, a0, 4 bne v0, v1, nomatch - addu a1, a1, 4 + PTR_ADDU a1, a1, 4 bne a0, a3, 2b nop b smallcmp # finish remainder nop unalignedcmp: beq a3, zero, 2f - subu a2, a2, a3 # subtract from remaining count - addu a3, a3, a0 # compute ending address + PTR_SUBU a2, a2, a3 # subtract from remaining count + PTR_ADDU a3, a3, a0 # compute ending address 1: lbu v0, 0(a0) # compare bytes until a1 word aligned lbu v1, 0(a1) - addu a0, a0, 1 + PTR_ADDU a0, a0, 1 bne v0, v1, nomatch - addu a1, a1, 1 + PTR_ADDU a1, a1, 1 bne a0, a3, 1b nop 2: and a3, a2, ~3 # compute number of whole words left - subu a2, a2, a3 # which has to be >= (16-3) & ~3 - addu a3, a3, a0 # compute ending address + PTR_SUBU a2, a2, a3 # which has to be >= (16-3) & ~3 + PTR_ADDU a3, a3, a0 # compute ending address 3: LWHI v0, 0(a0) # compare words a0 unaligned, a1 aligned LWLO v0, 3(a0) lw v1, 0(a1) - addu a0, a0, 4 + PTR_ADDU a0, a0, 4 bne v0, v1, nomatch - addu a1, a1, 4 + PTR_ADDU a1, a1, 4 bne a0, a3, 3b nop smallcmp: ble a2, zero, match - addu a3, a2, a0 # compute ending address + PTR_ADDU a3, a2, a0 # compute ending address 1: lbu v0, 0(a0) lbu v1, 0(a1) - addu a0, a0, 1 + PTR_ADDU a0, a0, 1 bne v0, v1, nomatch - addu a1, a1, 1 + PTR_ADDU a1, a1, 1 bne a0, a3, 1b nop match: From owner-svn-src-user@FreeBSD.ORG Sat Mar 27 23:58:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68845106566C; Sat, 27 Mar 2010 23:58:54 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 229728FC0A; Sat, 27 Mar 2010 23:58:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RNwsX4039002; Sat, 27 Mar 2010 23:58:54 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RNwsgS039000; Sat, 27 Mar 2010 23:58:54 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003272358.o2RNwsgS039000@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Mar 2010 23:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205780 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 23:58:54 -0000 Author: jmallett Date: Sat Mar 27 23:58:53 2010 New Revision: 205780 URL: http://svn.freebsd.org/changeset/base/205780 Log: Use the direct map in pmap_map where possible. Modified: user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Sat Mar 27 23:57:38 2010 (r205779) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Sat Mar 27 23:58:53 2010 (r205780) @@ -751,8 +751,15 @@ pmap_kremove(vm_offset_t va) vm_offset_t pmap_map(vm_offset_t *virt, vm_offset_t start, vm_offset_t end, int prot) { +#if defined(__mips_n64) + return (MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_CCA_CNC, start)); +#else vm_offset_t va, sva; + if (end <= MIPS_KSEG0_LARGEST_PHYS) { + return (MIPS_PHYS_TO_KSEG0(start)); + } + va = sva = *virt; while (start < end) { pmap_kenter(va, start); @@ -761,6 +768,7 @@ pmap_map(vm_offset_t *virt, vm_offset_t } *virt = va; return (sva); +#endif } /*