From owner-p4-projects@FreeBSD.ORG Wed Jan 11 21:10:35 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44B38106567A; Wed, 11 Jan 2012 21:10:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00532106564A for ; Wed, 11 Jan 2012 21:10:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E02B28FC17 for ; Wed, 11 Jan 2012 21:10:34 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0BLAY0u065517 for ; Wed, 11 Jan 2012 21:10:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0BLAYwW065505 for perforce@freebsd.org; Wed, 11 Jan 2012 21:10:34 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 11 Jan 2012 21:10:34 GMT Message-Id: <201201112110.q0BLAYwW065505@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2012 21:10:35 -0000 http://p4web.freebsd.org/@@204418?ac=10 Change 204418 by rene@rene_acer on 2012/01/11 21:10:12 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#120 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/euro/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/geom-class/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#45 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#122 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#67 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#37 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#11 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/installation.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/index.sgml#14 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#46 integrate .. //depot/projects/docproj_nl/www/en/security/security.sgml#21 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#12 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#41 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 (text+ko) ==== @@ -23,13 +23,12 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.8 2008/10/11 10:43:29 brueffer Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.9 2012/01/11 01:21:32 eadler Exp $ &tm-attrib.freebsd; &tm-attrib.cvsup; &tm-attrib.intel; - &tm-attrib.xfree86; &tm-attrib.general; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#120 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -97,12 +96,15 @@ The X Window system, which handles graphical display. The X Window system used in most versions of BSD is maintained - by one of two separate projects, either the - &xfree86; project or the + by the X.Org project. - This is the same code as Linux uses. BSD does not normally - specify a graphical desktop such as GNOME or KDE, - though these are available. + &os; allows the user to choose from a variety of desktop + environments, such as Gnome, + KDE, or Xfce; + and lightweight window managers like + Openbox, + Fluxbox, or + Awesome. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fonts/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -860,14 +860,6 @@ currently developing a useful set of FreeType tools: - - The freetype module is included with XFree86 4.x. For - more information please see the FreeBSD - Handbook or the XFree86 4.0.2 - Fonts page. - The xfsft font server for X11 can ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/geom-class/article.sgml#2 (text+ko) ==== @@ -22,13 +22,12 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/geom-class/article.sgml,v 1.8 2007/05/04 12:45:05 ceri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/geom-class/article.sgml,v 1.9 2012/01/11 02:13:00 eadler Exp $ &tm-attrib.freebsd; &tm-attrib.cvsup; &tm-attrib.intel; - &tm-attrib.xfree86; &tm-attrib.general; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#45 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.87 2012/01/07 00:15:52 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.89 2012/01/07 16:19:04 linimon Exp $ 2003 @@ -2460,7 +2460,8 @@ - Edit /var/portbuild/scripts/buildenv. + (Only necessary for old codebase): + Edit /var/portbuild/scripts/buildenv. @@ -2510,7 +2511,8 @@ - Only after the first time a + (Only necessary for old codebase): + Only after the first time a dopackages has been run for the arch: add the arch to /var/portbuild/scripts/dopackagestats. @@ -2601,9 +2603,7 @@ # mkdir -p /a/portbuild # cd /a/portbuild # -# chmod 775 . - -ln -s ../arch/archive/errorlogs arch-errorlogs +# chmod 775 . ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pxe/install.cfg#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $Wintelcom: src/freebsd/pxe/doc/install.cfg,v 1.1 2000/07/14 12:42:05 bright Exp $ -# $FreeBSD: doc/en_US.ISO8859-1/articles/pxe/install.cfg,v 1.2 2003/11/23 18:50:32 ceri Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/pxe/install.cfg,v 1.3 2012/01/11 01:21:58 eadler Exp $ # This is the installation configuration file for our rackmounted FreeBSD # cluster machines @@ -66,13 +66,7 @@ # OK, everything is set. Do it! installCommit -package=XFree86-3.3.6 -packageAdd - -#package=XFree86-aoutlibs-3.3.3 -#packageAdd - -package=XFree86-contrib-3.3.6 +package=xorg-server-1.10.4_1,1 packageAdd package=arpwatch-2.1.a4 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#9 (text+ko) ==== @@ -37,13 +37,12 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.87 2011/07/24 21:27:50 gjb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.88 2012/01/11 00:41:43 eadler Exp $ &tm-attrib.freebsd; &tm-attrib.cvsup; &tm-attrib.intel; - &tm-attrib.xfree86; &tm-attrib.general; @@ -716,33 +715,6 @@ For more information about the release build infrastructure, please see &man.release.7;. - - - - Building <application>&xfree86;</application> - - &xfree86; is an important component for many desktop users. - Prior to &os; 4.6-RELEASE, releases used &xfree86; - 3.X by default. - The easiest way to build these versions is to use the - src/release/scripts/X11/build_x.sh script. - This script requires that &xfree86; and Tcl/Tk already be - installed on the build host. After compiling the necessary X - servers, the script will package all of the files into tarballs - that &man.sysinstall.8; expects to find in the - XF86336 directory of the installation - media. - - Beginning with &os; 4.6-RELEASE, &man.sysinstall.8; - installs &xfree86; 4.X by default, as a - set of normal packages. These can either be the - packages generated by the package-building cluster or packages - built from an appropriately tagged ports tree. - - Beginning with &os; 5.3-RELEASE, &man.sysinstall.8; - installs &xorg; packages instead of &xfree86; packages by - default. - It is important to remove any site-specific settings from /etc/make.conf. For example, it would be unwise to distribute binaries that were built on a system @@ -795,8 +767,7 @@ make release. The only changes that should be made to the disc1 directory are the addition of - a tools directory, &xfree86;, and as many popular + a tools directory, and as many popular third party software packages as will fit on the disc. The tools directory contains software that allow users to create installation floppies from other operating systems. This disc @@ -814,13 +785,6 @@ src/usr.sbin/sysinstall. Optionally, you may choose to update sysinstall.8. - If an alternate version of &xfree86; is to be provided, then - &man.sysinstall.8; must be updated to reflect the new location - and installation instructions. The relevant code is contained - in src/usr.sbin/sysinstall. - Specifically, the files dist.c, - menus.c, and - config.c will need to be updated. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 (text+ko) ==== @@ -28,7 +28,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml,v 1.6 2007/02/22 19:01:42 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml,v 1.7 2012/01/11 01:21:58 eadler Exp $ &tm-attrib.freebsd; @@ -36,7 +36,6 @@ &tm-attrib.intel; &tm-attrib.microsoft; &tm-attrib.symantec; - &tm-attrib.xfree86; &tm-attrib.general; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#4 (text+ko) ==== @@ -3,20 +3,20 @@ Copyright (c) 2002 Sergey Lyubka All rights reserved -$FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml,v 1.28 2009/11/28 11:14:28 danger Exp $ +$FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml,v 1.32 2012/01/10 02:50:25 wblock Exp $ --> - Sergey + Sergey Lyubka Contributed by - Bootstrapping and kernel initialization + Bootstrapping and Kernel Initialization Synopsis @@ -62,41 +62,34 @@ using the table that follows. Please note that the actual data may differ from machine to machine: - + - - - may vary - + + + Output (may vary) BIOS (firmware) messages - + - - -F1 FreeBSD + + F1 FreeBSD F2 BSD -F5 Disk 2 - - +F5 Disk 2 boot0 - + - - ->>FreeBSD/i386 BOOT + + >>FreeBSD/i386 BOOT Default: 1:ad(1,a)/boot/loader -boot: - - +boot: boot2This - prompt will appear if the user presses a key just after - selecting an OS to boot at the boot0 - stage. - + prompt will appear if the user presses a key just + after selecting an OS to boot at the + boot0 + stage. + - - -BTX loader 1.0 BTX version is 1.01 + + BTX loader 1.0 BTX version is 1.01 BIOS drive A: is disk0 BIOS drive C: is disk1 BIOS 639kB/64512kB available memory @@ -105,24 +98,20 @@ (jkh@bento.freebsd.org, Mon Nov 20 11:41:23 GMT 2000) /kernel text=0x1234 data=0x2345 syms=[0x4+0x3456] Hit [Enter] to boot immediately, or any other key for command prompt -Booting [kernel] in 9 seconds..._ - +Booting [kernel] in 9 seconds..._ + loader + - loader - - - - - Copyright (c) 1992-2002 The FreeBSD Project. + + Copyright (c) 1992-2002 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD 4.6-RC #0: Sat May 4 22:49:02 GMT 2002 devnull@kukas:/usr/obj/usr/src/sys/DEVNULL Timecounter "i8254" frequency 1193182 Hz - - kernel - - + kernel + + @@ -136,9 +125,9 @@ after a power on is well defined: it is a 32-bit value of 0xfffffff0. The instruction pointer register points to code to be executed by the processor. One of the registers is the - cr1 32-bit control register, and its value - just after the reboot is 0. One of the cr1's bits, the bit PE - (Protected Enabled) indicates whether the processor is running + cr0 32-bit control register, and its value + just after the reboot is 0. One of the cr0's bits, the bit PE + (Protection Enabled) indicates whether the processor is running in protected or real mode. Since at boot time this bit is cleared, the processor boots in real mode. Real mode means, among other things, that linear and physical addresses are @@ -150,8 +139,8 @@ so that it points to a BIOS memory block. BIOS stands for Basic Input Output - System, and it is a chip on the motherboard that has - a relatively small amount of read-only memory (ROM). This + System, and it is a chip on the motherboard that + has a relatively small amount of read-only memory (ROM). This memory contains various low-level routines that are specific to the hardware supplied with the motherboard. So, the processor will first jump to the address 0xfffffff0, which really resides @@ -167,7 +156,7 @@ CD-ROM, harddisk etc. The very last thing in the POST is the INT - 0x19 instruction. That instruction reads 512 bytes + 0x19 instruction. That instruction reads 512 bytes from the first sector of boot device into the memory at address 0x7c00. The term first sector originates from harddrive architecture, where the magnetic plate is divided @@ -178,19 +167,20 @@ from 0, but sectors - starting from 1), has a special meaning. It is also called Master Boot Record, or MBR. The remaining sectors on the first track are never used Some - utilities such as &man.disklabel.8; may store the information in - this area, mostly in the second - sector.. + utilities such as &man.disklabel.8; may store the + information in this area, mostly in the second + sector.. - <literal>boot0</literal> stage + <literal>boot0</literal> Stage MBR Take a look at the file /boot/boot0. This is a small 512-byte file, and it is exactly what FreeBSD's installation procedure wrote to your harddisk's MBR if you chose - the bootmanager option at installation time. + the bootmanager option at installation + time. As mentioned previously, the INT 0x19 instruction loads an MBR, i.e. the boot0 @@ -214,19 +204,19 @@ - the 1-byte filesystem type + the 1-byte filesystem type - the 1-byte bootable flag + the 1-byte bootable flag - the 6 byte descriptor in CHS format + the 6 byte descriptor in CHS format - the 8 byte descriptor in LBA format + the 8 byte descriptor in LBA format @@ -269,7 +259,7 @@ - <literal>boot2</literal> stage + <literal>boot2</literal> Stage You might wonder, why boot2 comes after boot0, and not boot1. Actually, there is a @@ -316,7 +306,7 @@ The boot2 binary is created in special way: - sys/boot/i386/boot2/Makefile + sys/boot/i386/boot2/Makefile: boot2: boot2.ldr boot2.bin ${BTX}/btx/btx btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \ -o boot2.ld -P 1 boot2.bin @@ -346,30 +336,36 @@ virtual v86 mode - virtual v86 mode. That means, the BTX is a v86 - monitor. Real mode instructions like pushf, popf, cli, sti, if - called by the client, will work. + + virtual v86 mode. That means, the BTX is a v86 monitor. + Real mode instructions like pushf, popf, cli, sti, if called + by the client, will work. + - Interrupt Descriptor Table (IDT) is set up so - all hardware interrupts are routed to the default BIOS's - handlers, and interrupt 0x30 is set up to be the syscall - gate. + + Interrupt Descriptor Table (IDT) is set up so all + hardware interrupts are routed to the default BIOS's + handlers, and interrupt 0x30 is set up to be the syscall + gate. + - Two system calls: exec and - exit, are defined: + + Two system calls: exec and + exit, are defined: - sys/boot/i386/btx/lib/btxsys.s: + sys/boot/i386/btx/lib/btxsys.s: .set INT_SYS,0x30 # Interrupt number # # System call: exit # -__exit: xorl %eax,%eax # BTX system +__exit: xorl %eax,%eax # BTX system int $INT_SYS # call 0x0 # # System call: exec # -__exec: movl $0x1,%eax # BTX system - int $INT_SYS # call 0x1 +__exec: movl $0x1,%eax # BTX system + int $INT_SYS # call 0x1 + BTX creates a Global Descriptor Table (GDT): @@ -392,8 +388,8 @@ segment pointed to by the SEL_SCODE (supervisor code) selector, as shown from the code that creates an IDT: - mov $SEL_SCODE,%dh # Segment selector -init.2: shr %bx # Handle this int? + mov $SEL_SCODE,%dh # Segment selector +init.2: shr %bx # Handle this int? jnc init.3 # No mov %ax,(%di) # Set handler offset mov %dh,0x2(%di) # and selector @@ -415,7 +411,7 @@ boot device, physical memory available, envp pointer etc. The definition for it is: - /usr/include/machine/bootinfo.h + /usr/include/machine/bootinfo.h: struct bootinfo { u_int32_t bi_version; u_int32_t bi_kernelname; /* represents a char * */ @@ -438,28 +434,29 @@ u_int32_t bi_modulep; /* preloaded modules */ }; - boot2 enters into an infinite loop waiting - for user input, then calls load(). If the - user does not press anything, the loop breaks by a timeout, so - load() will load the default file - (/boot/loader). Functions ino_t - lookup(char *filename) and int xfsread(ino_t - inode, void *buf, size_t nbyte) are used to read the - content of a file into memory. /boot/loader - is an ELF binary, but where the ELF header is prepended with - a.out's struct exec structure. - load() scans the loader's ELF header, loading - the content of /boot/loader into memory, and - passing the execution to the loader's entry: + boot2 enters into an infinite loop + waiting for user input, then calls load(). + If the user does not press anything, the loop breaks by a + timeout, so load() will load the default + file (/boot/loader). Functions + ino_t lookup(char *filename) and + int xfsread(ino_t inode, void *buf, size_t + nbyte) are used to read the content of a file into + memory. /boot/loader is an ELF binary, but + where the ELF header is prepended with a.out's struct + exec structure. load() scans the + loader's ELF header, loading the content of + /boot/loader into memory, and passing the + execution to the loader's entry: - sys/boot/i386/boot2/boot2.c: + sys/boot/i386/boot2/boot2.c: __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.slice, dsk.unit, dsk.part), 0, 0, 0, VTOP(&bootinfo)); - <application>loader</application> stage + <application>loader</application> Stage loader is a BTX client as well. I will not describe it here in detail, there is a comprehensive @@ -470,18 +467,18 @@ the kernel is loaded into memory, it is being called by the loader: - sys/boot/common/boot.c: + sys/boot/common/boot.c: /* Call the exec handler from the loader matching the kernel */ module_formats[km->m_loader]->l_exec(km); - Kernel initialization + Kernel Initialization - Let us take a look at the command that links the kernel. This - will help us identify the exact location where the loader passes - execution to the kernel. This location is the kernel's actual entry - point. + Let us take a look at the command that links the kernel. + This will help identify the exact location where the loader + passes execution to the kernel. This location is the kernel's + actual entry point. sys/conf/Makefile.i386: ld -elf -Bdynamic -T /usr/src/sys/conf/ldscript.i386 -export-dynamic \ @@ -489,8 +486,8 @@ <lots of kernel .o files> ELF - A few interesting things can be seen in this line. First, - the kernel is an ELF dynamically linked binary, but the dynamic + A few interesting things can be seen here. First, the + kernel is an ELF dynamically linked binary, but the dynamic linker for kernel is /red/herring, which is definitely a bogus file. Second, taking a look at the file sys/conf/ldscript.i386 gives an idea about @@ -498,13 +495,13 @@ compiling a kernel. Reading through the first few lines, the string - sys/conf/ldscript.i386: + sys/conf/ldscript.i386: ENTRY(btext) says that a kernel's entry point is the symbol `btext'. This symbol is defined in locore.s: - sys/i386/i386/locore.s: + sys/i386/i386/locore.s: .text /********************************************************************** * @@ -513,11 +510,11 @@ */ NON_GPROF_ENTRY(btext) - First what is done is the register EFLAGS is set to a - predefined value of 0x00000002, and then all the segment - registers are initialized: + First, the register EFLAGS is set to a predefined value of + 0x00000002. Then all the segment registers are + initialized: - sys/i386/i386/locore.s + sys/i386/i386/locore.s: /* Don't trust what the BIOS gives for eflags. */ pushl $PSL_KERNEL popfl @@ -539,34 +536,31 @@ - - - recover_bootinfo + + + recover_bootinfo + This routine parses the parameters to the kernel + passed from the bootstrap. The kernel may have been + booted in 3 ways: by the loader, described above, by the + old disk boot blocks, or by the old diskless boot + procedure. This function determines the booting method, + and stores the struct bootinfo + structure into the kernel memory. + - This routine parses the parameters to the kernel - passed from the bootstrap. The kernel may have been - booted in 3 ways: by the loader, described above, by the - old disk boot blocks, and by the old diskless boot - procedure. This function determines the booting method, - and stores the struct bootinfo - structure into the kernel memory. - + + identify_cpu + This functions tries to find out what CPU it is + running on, storing the value found in a variable + _cpu. + - - identify_cpu - - This functions tries to find out what CPU it is - running on, storing the value found in a variable - _cpu. - - - - create_pagetables - - This function allocates and fills out a Page Table - Directory at the top of the kernel memory area. - - + + create_pagetables + This function allocates and fills out a Page Table + Directory at the top of the kernel memory area. + + @@ -580,6 +574,7 @@ movl %eax, %cr4 Then, enabling paging: + /* Now enable paging */ movl R(_IdlePTD), %eax movl %eax,%cr3 /* load ptd addr into mmu */ @@ -597,7 +592,7 @@ /* now running relocated at KERNBASE where the system is linked to run */ begin: - The function init386() is called, with + The function init386() is called with a pointer to the first free physical page, after that mi_startup(). init386 is an architecture dependent initialization function, and @@ -617,57 +612,56 @@ <function>init386()</function> init386() is defined in - sys/i386/i386/machdep.c and performs - low-level initialization, specific to the i386 chip. The - switch to protected mode was performed by the loader. The - loader has created the very first task, in which the kernel - continues to operate. Before running straight away to the - code, I will enumerate the tasks the processor must complete - to initialize protected mode execution: + sys/i386/i386/machdep.c and performs + low-level initialization specific to the i386 chip. The + switch to protected mode was performed by the loader. The + loader has created the very first task, in which the kernel + continues to operate. Before looking at the code, consider + the tasks the processor must complete to initialize protected + mode execution: - + Initialize the kernel tunable parameters, passed from the bootstrapping program. - + - + Prepare the GDT. - + Prepare the IDT. - + Initialize the system console. - + Initialize the DDB, if it is compiled into kernel. - + Initialize the TSS. - + Prepare the LDT. - + Set up proc0's pcb. - parameters - What init386() first does is - initialize the tunable parameters passed from bootstrap. This - is done by setting the environment pointer (envp) and calling - init_param1(). The envp pointer has been - passed from loader in the bootinfo - structure: + parameters + init386() initializes the tunable + parameters passed from bootstrap by setting the environment + pointer (envp) and calling init_param1(). + The envp pointer has been passed from loader in the + bootinfo structure: sys/i386/i386/machdep.c: kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE; @@ -676,45 +670,45 @@ init_param1(); init_param1() is defined in - sys/kern/subr_param.c. That file has a - number of sysctls, and two functions, - init_param1() and - init_param2(), that are called from - init386(): + sys/kern/subr_param.c. That file has a + number of sysctls, and two functions, + init_param1() and + init_param2(), that are called from + init386(): - sys/kern/subr_param.c + sys/kern/subr_param.c: hz = HZ; TUNABLE_INT_FETCH("kern.hz", &hz); TUNABLE_<typename>_FETCH is used to fetch the value - from the environment: + from the environment: - /usr/src/sys/sys/kernel.h + /usr/src/sys/sys/kernel.h: #define TUNABLE_INT_FETCH(path, var) getenv_int((path), (var)) - Sysctl kern.hz is the system clock tick. Along with - this, the following sysctls are set by - init_param1(): kern.maxswzone, - kern.maxbcache, kern.maxtsiz, kern.dfldsiz, kern.maxdsiz, kern.dflssiz, - kern.maxssiz, kern.sgrowsiz. + Sysctl kern.hz is the system clock + tick. Additionally, these sysctls are set by + init_param1(): kern.maxswzone, + kern.maxbcache, kern.maxtsiz, kern.dfldsiz, kern.maxdsiz, + kern.dflssiz, kern.maxssiz, kern.sgrowsiz. - Global Descriptors Table (GDT) + Global Descriptors Table + (GDT) Then init386() prepares the Global - Descriptors Table (GDT). Every task on an x86 is running in - its own virtual address space, and this space is addressed by - a segment:offset pair. Say, for instance, the current - instruction to be executed by the processor lies at CS:EIP, - then the linear virtual address for that instruction would be - the virtual address of code segment CS + EIP. For - convenience, segments begin at virtual address 0 and end at a - 4Gb boundary. Therefore, the instruction's linear virtual - address for this example would just be the value of EIP. - Segment registers such as CS, DS etc are the selectors, - i.e. indexes, into GDT (to be more precise, an index is not a - selector itself, but the INDEX field of a selector). - FreeBSD's GDT holds descriptors for 15 selectors per - CPU: + Descriptors Table (GDT). Every task on an x86 is running in + its own virtual address space, and this space is addressed by + a segment:offset pair. Say, for instance, the current + instruction to be executed by the processor lies at CS:EIP, + then the linear virtual address for that instruction would be + the virtual address of code segment CS + EIP. + For convenience, segments begin at virtual address 0 and end + at a 4Gb boundary. Therefore, the instruction's linear + virtual address for this example would just be the value of + EIP. Segment registers such as CS, DS etc are the selectors, + i.e. indexes, into GDT (to be more precise, an index is not a + selector itself, but the INDEX field of a selector). FreeBSD's + GDT holds descriptors for 15 selectors per CPU: sys/i386/i386/machdep.c: union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ @@ -740,22 +734,23 @@ #define GBIOSARGS_SEL 14 /* BIOS interface (Arguments) */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 12 09:41:54 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5089D106566C; Thu, 12 Jan 2012 09:41:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B0431065673 for ; Thu, 12 Jan 2012 09:41:54 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E7D708FC12 for ; Thu, 12 Jan 2012 09:41:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0C9frjT019111 for ; Thu, 12 Jan 2012 09:41:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0C9frnw019108 for perforce@freebsd.org; Thu, 12 Jan 2012 09:41:53 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 12 Jan 2012 09:41:53 GMT Message-Id: <201201120941.q0C9frnw019108@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 09:41:54 -0000 http://p4web.freebsd.org/@@204450?ac=10 Change 204450 by rene@rene_acer on 2012/01/12 09:41:16 Add Barbara for numerous PRs over the years. No email address per request. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#121 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#121 (text+ko) ==== @@ -1123,6 +1123,11 @@ + Barbara + + + + Barry Bierbauch pivrnec@vszbr.cz From owner-p4-projects@FreeBSD.ORG Thu Jan 12 11:38:49 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 242641065676; Thu, 12 Jan 2012 11:38:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C267F106566C for ; Thu, 12 Jan 2012 11:38:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A931C8FC08 for ; Thu, 12 Jan 2012 11:38:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CBcmNw042744 for ; Thu, 12 Jan 2012 11:38:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0CBcmrq042741 for perforce@freebsd.org; Thu, 12 Jan 2012 11:38:48 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 12 Jan 2012 11:38:48 GMT Message-Id: <201201121138.q0CBcmrq042741@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 11:38:49 -0000 http://p4web.freebsd.org/@@204453?ac=10 Change 204453 by rene@rene_acer on 2012/01/12 11:38:35 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#34 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#38 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#31 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#26 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/errata.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/9.0R/installation.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/relnotes-detailed.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/9.0R/relnotes.sgml#1 branch Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#34 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4444,7 +4444,7 @@ filename "FreeBSD/install/boot/pxeboot" ; # pxeboot boot loader will try to NFS mount this directory for root FS - option root-path "192.168.0.1:/b/tftpboot/FreeBSD/intall/" ; + option root-path "192.168.0.1:/b/tftpboot/FreeBSD/install/" ; } ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#38 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.529 2012/01/11 18:37:40 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.530 2012/01/11 23:45:35 hrs Exp $ --> @@ -894,6 +894,7 @@ + @@ -3448,6 +3449,7 @@ + @@ -3827,6 +3829,7 @@ + @@ -4634,6 +4637,7 @@ + @@ -5040,6 +5044,7 @@ + @@ -5062,6 +5067,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#31 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.129 2011/11/18 15:07:02 jkois Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.130 2012/01/11 20:54:37 thompsa Exp $ @@ -1187,6 +1187,11 @@ cvsup.nz.FreeBSD.org + + ftp.nz.FreeBSD.org + ftp://ftp.nz.FreeBSD.org/pub/FreeBSD/ + + ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#26 (text+ko) ==== @@ -33,7 +33,7 @@ # BSDI Id: bsdi-man,v 1.2 1995/01/11 02:30:01 polk Exp # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # -# $FreeBSD: www/en/cgi/man.cgi,v 1.267 2011/11/06 16:45:23 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.268 2012/01/11 21:02:55 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -200,9 +200,11 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 8.2-RELEASE'; +$manPathDefault = 'FreeBSD 9.0-RELEASE'; %manPath = ( + 'FreeBSD 9.0-RELEASE and Ports', +"$manLocalDir/FreeBSD-9.0-RELEASE/man:$manLocalDir/FreeBSD-9.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.2-RELEASE", 'FreeBSD 8.2-RELEASE and Ports', "$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.2-RELEASE", 'FreeBSD 8.1-RELEASE and Ports', @@ -220,6 +222,8 @@ 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 9.0-RELEASE', +"$manLocalDir/FreeBSD-9.0-RELEASE/man:$manLocalDir/FreeBSD-9.0-RELEASE/openssl/man", 'FreeBSD 8.2-stable', "$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", 'FreeBSD 8.2-RELEASE', @@ -578,8 +582,8 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 8.2-RELEASE', - 'freebsd-release', 'FreeBSD 8.2-RELEASE', + 'freebsd', 'FreeBSD 9.0-RELEASE', + 'freebsd-release', 'FreeBSD 9.0-RELEASE', 'freebsd-stable', 'FreeBSD 8.2-stable', 'freebsd-stable8', 'FreeBSD 8.2-stable', @@ -587,7 +591,7 @@ 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 9-current', - 'freebsd-release-ports', 'FreeBSD 8.2-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 9.0-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', @@ -1578,7 +1582,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.267 2011/11/06 16:45:23 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.268 2012/01/11 21:02:55 wosch Exp $'; return qq{\
 Copyright (c) 1996-2011 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releases/9.0R/Makefile,v 1.3 2012/01/11 20:06:45 hrs Exp $
+# $FreeBSD: www/en/releases/9.0R/Makefile,v 1.5 2012/01/12 05:14:26 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -7,11 +7,14 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	schedule.sgml
+DOCS=	schedule.sgml \
+	relnotes.sgml
 
 DATA=	docbook.css \
 	hardware.html \
 	readme.html \
-	installation.html
+	installation.html \
+	errata.html \
+	relnotes-detailed.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/releases/9.0R/installation.html#2 (text+ko) ====

@@ -22,8 +22,8 @@
 
 
 

$FreeBSD: -stable/9/release/doc/en_US.ISO8859-1/installation/article.sgml 229979 2012-01-11 -20:04:52Z hrs $
+stable/9/release/doc/en_US.ISO8859-1/installation/article.sgml 230001 2012-01-12 +03:52:53Z hrs $

@@ -71,7 +71,7 @@

2 Upgrading FreeBSD

If you are upgrading from a previous release of FreeBSD, please read upgrading section in the Release Notes for notable incompatibilities carefully.

From owner-p4-projects@FreeBSD.ORG Thu Jan 12 17:43:13 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB3C61065676; Thu, 12 Jan 2012 17:43:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A06D106564A for ; Thu, 12 Jan 2012 17:43:13 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 553208FC14 for ; Thu, 12 Jan 2012 17:43:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CHhD4e016123 for ; Thu, 12 Jan 2012 17:43:13 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0CHgsWQ016116 for perforce@freebsd.org; Thu, 12 Jan 2012 17:42:54 GMT (envelope-from peter@wemm.org) Date: Thu, 12 Jan 2012 17:42:54 GMT Message-Id: <201201121742.q0CHgsWQ016116@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 17:43:14 -0000 http://p4web.freebsd.org/@@204468?ac=10 Change 204468 by peter@peter_overcee on 2012/01/12 17:42:29 IFC Affected files ... .. //depot/projects/hammer/COPYRIGHT#11 integrate .. //depot/projects/hammer/MAINTAINERS#59 integrate .. //depot/projects/hammer/Makefile#64 integrate .. //depot/projects/hammer/Makefile.inc1#161 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#85 integrate .. //depot/projects/hammer/UPDATING#151 integrate .. //depot/projects/hammer/bin/cat/cat.c#8 integrate .. //depot/projects/hammer/bin/chio/chio.c#6 integrate .. //depot/projects/hammer/bin/df/df.1#15 integrate .. //depot/projects/hammer/bin/df/df.c#28 integrate .. //depot/projects/hammer/bin/ed/io.c#3 integrate .. //depot/projects/hammer/bin/ed/main.c#8 integrate .. //depot/projects/hammer/bin/ln/ln.c#12 integrate .. //depot/projects/hammer/bin/ls/ls.1#30 integrate .. //depot/projects/hammer/bin/ls/ls.c#22 integrate .. //depot/projects/hammer/bin/ls/ls.h#9 integrate .. //depot/projects/hammer/bin/ls/print.c#21 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#9 integrate .. //depot/projects/hammer/bin/mv/mv.c#14 integrate .. //depot/projects/hammer/bin/ps/extern.h#17 integrate .. //depot/projects/hammer/bin/ps/keyword.c#26 integrate .. //depot/projects/hammer/bin/ps/print.c#29 integrate .. //depot/projects/hammer/bin/ps/ps.1#34 integrate .. //depot/projects/hammer/bin/ps/ps.c#29 integrate .. //depot/projects/hammer/bin/ps/ps.h#11 integrate .. //depot/projects/hammer/bin/rm/rm.c#18 integrate .. //depot/projects/hammer/bin/sh/arith_yacc.c#5 integrate .. //depot/projects/hammer/bin/sh/eval.c#34 integrate .. //depot/projects/hammer/bin/sh/exec.c#20 integrate .. //depot/projects/hammer/bin/sh/exec.h#11 integrate .. //depot/projects/hammer/bin/sh/expand.c#27 integrate .. //depot/projects/hammer/bin/sh/expand.h#7 integrate .. //depot/projects/hammer/bin/sh/histedit.c#14 integrate .. //depot/projects/hammer/bin/sh/input.c#11 integrate .. //depot/projects/hammer/bin/sh/input.h#6 integrate .. //depot/projects/hammer/bin/sh/main.c#17 integrate .. //depot/projects/hammer/bin/sh/main.h#5 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#12 integrate .. //depot/projects/hammer/bin/sh/myhistedit.h#6 integrate .. //depot/projects/hammer/bin/sh/mystring.c#4 integrate .. //depot/projects/hammer/bin/sh/mystring.h#3 integrate .. //depot/projects/hammer/bin/sh/options.c#15 integrate .. //depot/projects/hammer/bin/sh/sh.1#43 integrate .. //depot/projects/hammer/bin/stty/modes.c#4 integrate .. //depot/projects/hammer/bin/test/test.c#8 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.8#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.c#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#8 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#9 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool.8#6 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#8 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/ztest/ztest.c#8 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/head/thread.h#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#9 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#10 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#4 delete .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#6 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#6 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#6 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 integrate .. //depot/projects/hammer/cddl/lib/drti/Makefile#4 integrate .. //depot/projects/hammer/cddl/lib/libzfs/Makefile#7 integrate .. //depot/projects/hammer/cddl/sbin/zfs/Makefile#7 integrate .. //depot/projects/hammer/cddl/sbin/zpool/Makefile#8 integrate .. //depot/projects/hammer/cddl/usr.bin/zinject/Makefile#3 integrate .. //depot/projects/hammer/cddl/usr.bin/zstreamdump/Makefile#2 integrate .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#9 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#9 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#26 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#14 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#14 integrate .. //depot/projects/hammer/contrib/bind9/version#26 integrate .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#16 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.h#8 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2recover.c#6 integrate .. //depot/projects/hammer/contrib/compiler-rt/LICENSE.TXT#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/README.txt#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/abi.h#2 delete .. //depot/projects/hammer/contrib/compiler-rt/lib/absvdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/absvsi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/absvti2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/adddf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/addsf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/addvdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/addvsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/addvti3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/apple_versioning.c#3 delete .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/adddf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/addsf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/divdf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/divsf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/eqdf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/eqsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/extendsfdf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/fixdfsivfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/fixsfsivfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/fixunsdfsivfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/fixunssfsivfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/floatsidfvfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/floatsisfvfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/floatunssidfvfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/floatunssisfvfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/gedf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/gesf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/gtdf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/gtsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/ledf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/lesf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/ltdf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/ltsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/muldf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/mulsf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/nedf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/negdf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/negsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/nesf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/subdf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/subsf3vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/truncdfsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/unorddf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/arm/unordsf2vfp.S#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ashldi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ashrdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/assembly.h#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/clear_cache.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/clzdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/clzsi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/cmpdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ctzdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ctzsi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divdc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divdf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divmoddi4.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divmodsi4.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divsc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divsf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/divxc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/enable_execute_stack.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/endianness.h#3 delete .. //depot/projects/hammer/contrib/compiler-rt/lib/eprintf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/extendsfdf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ffsdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixdfdi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixdfsi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixsfdi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixsfsi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixunsdfdi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixunsdfsi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixunssfdi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fixunssfsi.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatdidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatdisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatsidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatsisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floattidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floattisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floattixf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatundidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatundisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatunsidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatunsisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatuntidf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatuntisf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/floatuntixf.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/fp_lib.h#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/gcc_personality_v0.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/int_endianness.h#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/int_lib.h#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/int_math.h#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/int_types.h#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/int_util.c#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/int_util.h#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/lshrdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/moddi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/modsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/muldc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/muldf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/muldi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulodi4.c#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/mulosi4.c#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/muloti4.c#1 branch .. //depot/projects/hammer/contrib/compiler-rt/lib/mulsc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulsf3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulvdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulvsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulvti3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/mulxc3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/negdf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/negsf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/negvdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/negvsi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/negvti2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/paritydi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/paritysi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/popcountdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/popcountsi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/powidf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/powisf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/DD.h#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/divtc3.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/fixtfdi.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/fixunstfdi.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/floatditf.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/floatunditf.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ppc/multc3.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/subdf3.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/subsf3.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/subvdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/subvsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/subvti3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/trampoline_setup.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/truncdfsf2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/ucmpdi2.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/udivdi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/udivmoddi4.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/udivmodsi4.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/udivmodti4.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/udivsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/umoddi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/umodsi3.c#3 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/x86_64/floatdidf.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/x86_64/floatdisf.c#2 integrate .. //depot/projects/hammer/contrib/compiler-rt/lib/x86_64/floatdixf.c#2 integrate .. //depot/projects/hammer/contrib/ee/ee.c#5 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#11 integrate .. //depot/projects/hammer/contrib/gcc/BASE-VER#4 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.gcc43#2 integrate .. //depot/projects/hammer/contrib/gcc/DEV-PHASE#3 integrate .. //depot/projects/hammer/contrib/gcc/builtins.c#10 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.c#10 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd.h#7 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/pmm_malloc.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#8 integrate .. //depot/projects/hammer/contrib/gcclibs/libcpp/include/cpplib.h#2 integrate .. //depot/projects/hammer/contrib/gcclibs/libcpp/init.c#2 integrate .. //depot/projects/hammer/contrib/gcclibs/libcpp/internal.h#2 integrate .. //depot/projects/hammer/contrib/gcclibs/libcpp/macro.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#13 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#9 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodg.c#7 integrate .. //depot/projects/hammer/contrib/gdtoa/strtof.c#7 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorQ.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/strtord.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorx.c#5 integrate .. //depot/projects/hammer/contrib/gperf/AUTHORS#2 integrate .. //depot/projects/hammer/contrib/gperf/COPYING#2 integrate .. //depot/projects/hammer/contrib/gperf/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/gperf/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/gperf/INSTALL#2 integrate .. //depot/projects/hammer/contrib/gperf/Makefile.devel#2 integrate .. //depot/projects/hammer/contrib/gperf/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/gperf/NEWS#2 integrate .. //depot/projects/hammer/contrib/gperf/README#2 integrate .. //depot/projects/hammer/contrib/gperf/acconfig.h#2 delete .. //depot/projects/hammer/contrib/gperf/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/gperf/configure#2 integrate .. //depot/projects/hammer/contrib/gperf/configure.ac#1 branch .. //depot/projects/hammer/contrib/gperf/configure.in#2 delete .. //depot/projects/hammer/contrib/gperf/doc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/gperf/doc/configure#2 integrate .. //depot/projects/hammer/contrib/gperf/doc/configure.ac#1 branch .. //depot/projects/hammer/contrib/gperf/doc/configure.in#2 delete .. //depot/projects/hammer/contrib/gperf/doc/gperf.1#2 integrate .. //depot/projects/hammer/contrib/gperf/doc/help2man#2 integrate .. //depot/projects/hammer/contrib/gperf/doc/texinfo.tex#2 delete .. //depot/projects/hammer/contrib/gperf/lib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/gperf/lib/configure#2 integrate .. //depot/projects/hammer/contrib/gperf/lib/configure.ac#1 branch .. //depot/projects/hammer/contrib/gperf/lib/configure.in#2 delete .. //depot/projects/hammer/contrib/gperf/lib/getline.cc#1 branch .. //depot/projects/hammer/contrib/gperf/lib/getline.h#1 branch .. //depot/projects/hammer/contrib/gperf/lib/hash.cc#2 integrate .. //depot/projects/hammer/contrib/gperf/lib/hash.h#2 integrate .. //depot/projects/hammer/contrib/gperf/src/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/gperf/src/bool-array.cc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/bool-array.h#2 integrate .. //depot/projects/hammer/contrib/gperf/src/bool-array.icc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/config.h.in#2 integrate .. //depot/projects/hammer/contrib/gperf/src/config.h_vms#1 branch .. //depot/projects/hammer/contrib/gperf/src/configure#2 integrate .. //depot/projects/hammer/contrib/gperf/src/configure.ac#1 branch .. //depot/projects/hammer/contrib/gperf/src/configure.in#2 delete .. //depot/projects/hammer/contrib/gperf/src/gen-perf.cc#4 delete .. //depot/projects/hammer/contrib/gperf/src/gen-perf.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/hash-table.cc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/hash-table.h#2 integrate .. //depot/projects/hammer/contrib/gperf/src/input.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/input.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/iterator.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/iterator.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/key-list.cc#4 delete .. //depot/projects/hammer/contrib/gperf/src/key-list.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/keyword-list.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/keyword-list.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/keyword-list.icc#1 branch .. //depot/projects/hammer/contrib/gperf/src/keyword.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/keyword.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/keyword.icc#1 branch .. //depot/projects/hammer/contrib/gperf/src/list-node.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/list-node.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/main.cc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/new.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/options.cc#3 integrate .. //depot/projects/hammer/contrib/gperf/src/options.h#2 integrate .. //depot/projects/hammer/contrib/gperf/src/options.icc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/output.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/output.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/positions.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/positions.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/positions.icc#1 branch .. //depot/projects/hammer/contrib/gperf/src/read-line.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/read-line.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/read-line.icc#2 delete .. //depot/projects/hammer/contrib/gperf/src/search.cc#1 branch .. //depot/projects/hammer/contrib/gperf/src/search.h#1 branch .. //depot/projects/hammer/contrib/gperf/src/trace.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/trace.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/vectors.cc#2 delete .. //depot/projects/hammer/contrib/gperf/src/vectors.h#2 delete .. //depot/projects/hammer/contrib/gperf/src/version.cc#2 integrate .. //depot/projects/hammer/contrib/gperf/src/version.h#2 integrate .. //depot/projects/hammer/contrib/gperf/tests/Makefile.in#2 delete .. //depot/projects/hammer/contrib/gperf/tests/ada-pred.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/ada-res.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/ada.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/adadefs.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/c++.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/c-parse.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/c.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/c.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/configure#2 delete .. //depot/projects/hammer/contrib/gperf/tests/configure.in#2 delete .. //depot/projects/hammer/contrib/gperf/tests/gpc.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/gplus.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/irc.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/jscript.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/jstest1.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/jstest2.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/jstest3.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/makeinfo.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/modula.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/modula2.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/modula3.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/pascal.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/pascal.gperf#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-1.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-2.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-3.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-4.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-5.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-6.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test-7.exp#2 delete .. //depot/projects/hammer/contrib/gperf/tests/test.c#2 delete .. //depot/projects/hammer/contrib/gperf/tests/validate#2 delete .. //depot/projects/hammer/contrib/groff/tmac/doc-common#19 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#14 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#15 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#16 integrate .. //depot/projects/hammer/contrib/less/command.c#11 integrate .. //depot/projects/hammer/contrib/less/prompt.c#8 integrate .. //depot/projects/hammer/contrib/libarchive/COPYING#1 branch .. //depot/projects/hammer/contrib/libarchive/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/libarchive/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/libarchive/NEWS#1 branch .. //depot/projects/hammer/contrib/libarchive/README#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/bsdcpio.1#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/cmdline.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/cpio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/cpio.h#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/cpio_platform.h#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/main.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test.h#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_0.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_basic.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_cmdline.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_format_newc.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.bin.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.crc.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.newc.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_B_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_C_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_J_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_L_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_Z_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_a.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_c.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_d.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_f.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_f.cpio.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_help.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_l.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_lzma.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_m.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_m.cpio.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_t.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_t.cpio.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_t.stdout.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_tv.stdout.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_u.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_version.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_y.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_option_z.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_owner_parse.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_passthrough_dotdot.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_passthrough_reverse.c#1 branch .. //depot/projects/hammer/contrib/libarchive/cpio/test/test_pathmatch.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_check_magic.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_crc32.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_endian.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_hash.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_platform.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_data_into_fd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_disk.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_disk.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_extract.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_open_fd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_open_file.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_open_filename.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_open_memory.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_all.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_compress.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_none.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_rpm.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_compression_xz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_all.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_cpio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_raw.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_tar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_xar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_string.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_string.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_string_sprintf.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_util.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_util.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_virtual.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_disk.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_disk.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_disk_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_open_fd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_open_file.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_open_filename.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_open_memory.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_private.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_gzip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_none.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_compression_xz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_by_name.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_cpio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_pax.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_shar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_ustar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/cpio.5#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/filter_fork.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/filter_fork.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/libarchive-formats.5#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/libarchive.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/libarchive_internals.3#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/tar.5#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/README#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/main.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_archive_api_feature.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_bad_fd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_xz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_compat_zip_2.zip.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_entry.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_extattr_freebsd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_link_resolver.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_open_failure.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_open_fd.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_open_file.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_open_filename.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_data_large.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_disk.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_extract.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_2.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_raw.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tbz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tgz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_txz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_tz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_xar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_zip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_large.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_position.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_truncated.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_ustar_filenames.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress_gzip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress_lzma.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_compress_xz.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_failures.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_perms.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_secure.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_sparse.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_mtree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_tar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive/test/test_write_open_memory.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/err.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/err.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/lafe_platform.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/line_reader.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/line_reader.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/matching.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/matching.h#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/pathmatch.c#1 branch .. //depot/projects/hammer/contrib/libarchive/libarchive_fe/pathmatch.h#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/bsdtar.1#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/bsdtar.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/bsdtar.h#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/bsdtar_platform.h#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/cmdline.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/getdate.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/read.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/subst.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/main.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test.h#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_0.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_basic.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_copy.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_empty_mtree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_getdate.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_help.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_option_T_upper.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_option_q.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_option_r.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_option_s.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_patterns.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_patterns_2.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_patterns_3.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_patterns_4.tar.uu#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_stdio.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_strip_components.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_symlink_dir.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/test/test_version.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/tree.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/tree.h#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/util.c#1 branch .. //depot/projects/hammer/contrib/libarchive/tar/write.c#1 branch .. //depot/projects/hammer/contrib/libc++/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/libc++/include/__bit_reference#1 branch .. //depot/projects/hammer/contrib/libc++/include/__config#1 branch .. //depot/projects/hammer/contrib/libc++/include/__debug#1 branch .. //depot/projects/hammer/contrib/libc++/include/__functional_03#1 branch .. //depot/projects/hammer/contrib/libc++/include/__functional_base#1 branch .. //depot/projects/hammer/contrib/libc++/include/__functional_base_03#1 branch .. //depot/projects/hammer/contrib/libc++/include/__hash_table#1 branch .. //depot/projects/hammer/contrib/libc++/include/__locale#1 branch .. //depot/projects/hammer/contrib/libc++/include/__mutex_base#1 branch .. //depot/projects/hammer/contrib/libc++/include/__split_buffer#1 branch .. //depot/projects/hammer/contrib/libc++/include/__sso_allocator#1 branch .. //depot/projects/hammer/contrib/libc++/include/__std_stream#1 branch .. //depot/projects/hammer/contrib/libc++/include/__tree#1 branch .. //depot/projects/hammer/contrib/libc++/include/__tuple#1 branch .. //depot/projects/hammer/contrib/libc++/include/__tuple_03#1 branch .. //depot/projects/hammer/contrib/libc++/include/algorithm#1 branch .. //depot/projects/hammer/contrib/libc++/include/array#1 branch .. //depot/projects/hammer/contrib/libc++/include/atomic#1 branch .. //depot/projects/hammer/contrib/libc++/include/bitset#1 branch .. //depot/projects/hammer/contrib/libc++/include/cassert#1 branch .. //depot/projects/hammer/contrib/libc++/include/ccomplex#1 branch .. //depot/projects/hammer/contrib/libc++/include/cctype#1 branch .. //depot/projects/hammer/contrib/libc++/include/cerrno#1 branch .. //depot/projects/hammer/contrib/libc++/include/cfenv#1 branch .. //depot/projects/hammer/contrib/libc++/include/cfloat#1 branch .. //depot/projects/hammer/contrib/libc++/include/chrono#1 branch .. //depot/projects/hammer/contrib/libc++/include/cinttypes#1 branch .. //depot/projects/hammer/contrib/libc++/include/ciso646#1 branch .. //depot/projects/hammer/contrib/libc++/include/climits#1 branch .. //depot/projects/hammer/contrib/libc++/include/clocale#1 branch .. //depot/projects/hammer/contrib/libc++/include/cmath#1 branch .. //depot/projects/hammer/contrib/libc++/include/codecvt#1 branch .. //depot/projects/hammer/contrib/libc++/include/complex#1 branch .. //depot/projects/hammer/contrib/libc++/include/complex.h#1 branch .. //depot/projects/hammer/contrib/libc++/include/condition_variable#1 branch .. //depot/projects/hammer/contrib/libc++/include/csetjmp#1 branch .. //depot/projects/hammer/contrib/libc++/include/csignal#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstdarg#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstdbool#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstddef#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstdint#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstdio#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstdlib#1 branch .. //depot/projects/hammer/contrib/libc++/include/cstring#1 branch .. //depot/projects/hammer/contrib/libc++/include/ctgmath#1 branch .. //depot/projects/hammer/contrib/libc++/include/ctime#1 branch .. //depot/projects/hammer/contrib/libc++/include/cwchar#1 branch .. //depot/projects/hammer/contrib/libc++/include/cwctype#1 branch .. //depot/projects/hammer/contrib/libc++/include/deque#1 branch .. //depot/projects/hammer/contrib/libc++/include/exception#1 branch .. //depot/projects/hammer/contrib/libc++/include/ext/__hash#1 branch .. //depot/projects/hammer/contrib/libc++/include/ext/hash_map#1 branch .. //depot/projects/hammer/contrib/libc++/include/ext/hash_set#1 branch .. //depot/projects/hammer/contrib/libc++/include/forward_list#1 branch .. //depot/projects/hammer/contrib/libc++/include/fstream#1 branch .. //depot/projects/hammer/contrib/libc++/include/functional#1 branch .. //depot/projects/hammer/contrib/libc++/include/future#1 branch .. //depot/projects/hammer/contrib/libc++/include/initializer_list#1 branch .. //depot/projects/hammer/contrib/libc++/include/iomanip#1 branch .. //depot/projects/hammer/contrib/libc++/include/ios#1 branch .. //depot/projects/hammer/contrib/libc++/include/iosfwd#1 branch .. //depot/projects/hammer/contrib/libc++/include/iostream#1 branch .. //depot/projects/hammer/contrib/libc++/include/istream#1 branch .. //depot/projects/hammer/contrib/libc++/include/iterator#1 branch .. //depot/projects/hammer/contrib/libc++/include/limits#1 branch .. //depot/projects/hammer/contrib/libc++/include/list#1 branch .. //depot/projects/hammer/contrib/libc++/include/locale#1 branch .. //depot/projects/hammer/contrib/libc++/include/map#1 branch .. //depot/projects/hammer/contrib/libc++/include/memory#1 branch .. //depot/projects/hammer/contrib/libc++/include/mutex#1 branch .. //depot/projects/hammer/contrib/libc++/include/new#1 branch .. //depot/projects/hammer/contrib/libc++/include/numeric#1 branch .. //depot/projects/hammer/contrib/libc++/include/ostream#1 branch .. //depot/projects/hammer/contrib/libc++/include/queue#1 branch .. //depot/projects/hammer/contrib/libc++/include/random#1 branch .. //depot/projects/hammer/contrib/libc++/include/ratio#1 branch .. //depot/projects/hammer/contrib/libc++/include/regex#1 branch .. //depot/projects/hammer/contrib/libc++/include/scoped_allocator#1 branch .. //depot/projects/hammer/contrib/libc++/include/set#1 branch .. //depot/projects/hammer/contrib/libc++/include/sstream#1 branch .. //depot/projects/hammer/contrib/libc++/include/stack#1 branch .. //depot/projects/hammer/contrib/libc++/include/stdexcept#1 branch .. //depot/projects/hammer/contrib/libc++/include/streambuf#1 branch .. //depot/projects/hammer/contrib/libc++/include/string#1 branch .. //depot/projects/hammer/contrib/libc++/include/strstream#1 branch .. //depot/projects/hammer/contrib/libc++/include/system_error#1 branch .. //depot/projects/hammer/contrib/libc++/include/tgmath.h#1 branch .. //depot/projects/hammer/contrib/libc++/include/thread#1 branch .. //depot/projects/hammer/contrib/libc++/include/tuple#1 branch .. //depot/projects/hammer/contrib/libc++/include/type_traits#1 branch .. //depot/projects/hammer/contrib/libc++/include/typeindex#1 branch .. //depot/projects/hammer/contrib/libc++/include/typeinfo#1 branch .. //depot/projects/hammer/contrib/libc++/include/unordered_map#1 branch .. //depot/projects/hammer/contrib/libc++/include/unordered_set#1 branch .. //depot/projects/hammer/contrib/libc++/include/utility#1 branch .. //depot/projects/hammer/contrib/libc++/include/valarray#1 branch .. //depot/projects/hammer/contrib/libc++/include/vector#1 branch .. //depot/projects/hammer/contrib/libc++/src/algorithm.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/bind.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/chrono.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/condition_variable.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/debug.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/exception.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/future.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/hash.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/ios.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/iostream.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/locale.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/memory.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/mutex.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/new.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/random.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/regex.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/stdexcept.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/string.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/strstream.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/support/win32/locale_win32.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/support/win32/support.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/system_error.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/thread.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/typeinfo.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/utility.cpp#1 branch .. //depot/projects/hammer/contrib/libc++/src/valarray.cpp#1 branch .. //depot/projects/hammer/contrib/libcxxrt/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/libcxxrt/LICENSE#1 branch .. //depot/projects/hammer/contrib/libcxxrt/abi_namespace.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/auxhelper.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/cxxabi.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/dwarf_eh.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/dynamic_cast.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/exception.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/guard.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/libelftc_dem_gnu3.c#1 branch .. //depot/projects/hammer/contrib/libcxxrt/memory.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/stdexcept.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/stdexcept.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/terminate.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/typeinfo#1 branch .. //depot/projects/hammer/contrib/libcxxrt/typeinfo.cc#1 branch .. //depot/projects/hammer/contrib/libcxxrt/typeinfo.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/unwind-arm.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/unwind-itanium.h#1 branch .. //depot/projects/hammer/contrib/libcxxrt/unwind.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#15 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/os_defines.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/allocator.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_string.h#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/fstream.tcc#9 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.tcc#12 integrate .. //depot/projects/hammer/contrib/libstdc++/include/debug/map.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/debug/multimap.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/atomicity.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/codecvt_specializations.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/concurrence.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/vstring.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/tr1/boost_shared_ptr.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/tr1/random#3 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/eh_personality.cc#6 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/typeinfo#6 integrate .. //depot/projects/hammer/contrib/libstdc++/src/valarray-inst.cc#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Core.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Disassembler.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Object.h#2 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Target.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/IPO.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/Scalar.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APInt.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ArrayRef.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseMap.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseMapInfo.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseSet.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableMap.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableSet.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/IntervalMap.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PointerUnion.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SCCIterator.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/STLExtras.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallVector.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Statistic.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringExtras.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/TinyPtrVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Triple.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Twine.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BlockFrequency.h#2 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h#2 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/CodeMetrics.h#2 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ConstantFolding.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DIBuilder.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DebugInfo.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/IVUsers.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/InlineCost.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopInfo.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopPass.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/RegionPass.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Argument.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Attributes.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/AutoUpgrade.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/BasicBlock.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Analysis.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/FastISel.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LexicalScopes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequency.h#2 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineLocation.h#3 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Passes.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Action.h#3 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/AutoGenerated.h#2 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#3 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Common.td#4 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#4 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Error.h#3 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Main.h#2 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Main.inc#3 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Tool.h#4 delete .. //depot/projects/hammer/contrib/llvm/include/llvm/Constant.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Constants.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/DebugInfo/DIContext.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/DerivedTypes.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Function.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalAlias.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalValue.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalVariable.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/InitializePasses.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/InlineAsm.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/InstrTypes.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Instruction.def#2 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Instruction.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Instructions.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicInst.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.td#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsXCore.td#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/LinkAllPasses.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/Linker.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/EDInstInfo.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmBackend.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfo.h#6 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h#2 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAssembler.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAtom.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCCodeGenInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCContext.h#5 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCDirectives.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCDisassembler.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCDwarf.h#4 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInst.h#3 integrate .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInstPrinter.h#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 12 17:45:23 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE67106566B; Thu, 12 Jan 2012 17:45:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B31CC106567D for ; Thu, 12 Jan 2012 17:45:22 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8078FC0A for ; Thu, 12 Jan 2012 17:45:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CHjMUG016230 for ; Thu, 12 Jan 2012 17:45:22 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0CHjMVr016227 for perforce@freebsd.org; Thu, 12 Jan 2012 17:45:22 GMT (envelope-from peter@wemm.org) Date: Thu, 12 Jan 2012 17:45:22 GMT Message-Id: <201201121745.q0CHjMVr016227@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 17:45:23 -0000 http://p4web.freebsd.org/@@204469?ac=10 Change 204469 by peter@peter_overcee on 2012/01/12 17:45:09 IFC @204468 Affected files ... .. //depot/projects/hammer/contrib/compiler-rt/lib/int_lib.h#4 integrate .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/FARSI%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GREEK%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/INUIT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/THAI%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25FARSI.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GREEK.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25INUIT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25THAI.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP037%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP038%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10000%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10006%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10007%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10029%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1006%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10079%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10081%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1026%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1046%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1124%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1125%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1129%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1131%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1133%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1161%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1162%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1163%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1250%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1251%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1252%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1253%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1254%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1255%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1256%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1257%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1258%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP273%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP274%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP275%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP277%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP278%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP280%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP281%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP284%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP285%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP290%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP297%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP420%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP423%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP424%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP437%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP500%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP737%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP775%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP850%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP851%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP852%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP853%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP855%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP856%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP857%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP858%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP860%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP861%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP862%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP863%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP864%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP865%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP866%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP868%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP869%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP870%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP871%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP874%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP875%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP880%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP891%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP903%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP904%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP905%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP918%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP922%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP932UDA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP936EXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP942EXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP949EXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP950%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP037.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP038.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10000.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10006.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10007.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10029.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1006.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10079.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10081.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1026.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1046.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1124.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1125.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1129.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1131.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1133.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1161.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1162.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1163.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1250.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1251.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1252.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1253.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1254.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1255.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1256.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1257.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1258.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP273.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP274.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP275.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP277.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP278.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP280.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP281.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP284.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP285.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP290.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP297.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP420.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP423.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP424.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP437.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP500.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP737.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP775.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP850.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP851.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP852.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP853.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP855.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP856.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP857.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP858.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP860.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP861.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP862.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP863.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP864.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP865.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP866.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP868.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP869.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP870.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP871.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP874.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP875.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP880.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP891.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP903.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP904.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP905.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP918.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP922.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP932UDA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP936EXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP942EXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP949EXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP950.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB12345%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKEXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKUDA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB12345.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKEXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKUDA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI7%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI7.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/JOHAB%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25JOHAB.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/ATARIST%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/DECMCS%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/TDS565%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25ATARIST.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25DECMCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25TDS565.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25VISCII.src#7 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/VISCII%25UCS.src#7 branch .. //depot/projects/hammer/sys/dev/e1000/if_em.c#22 integrate Differences ... ==== //depot/projects/hammer/contrib/compiler-rt/lib/int_lib.h#4 (text+ko) ==== @@ -43,4 +43,24 @@ /* Include internal utility function declarations. */ #include "int_util.h" +/* + * Workaround for LLVM bug 11663. Prevent endless recursion in + * __c?zdi2(), where calls to __builtin_c?z() are expanded to + * __c?zdi2() instead of __c?zsi2(). + * + * Instead of placing this workaround in c?zdi2.c, put it in this + * global header to prevent other C files from making the detour + * through __c?zdi2() as well. + * + * This problem has only been observed on FreeBSD for sparc64 and + * mips64 with GCC 4.2.1. + */ +#if defined(__FreeBSD__) && (defined(__sparc64__) || \ + defined(__mips_n64) || defined(__mips_o64)) +si_int __clzsi2(si_int); +si_int __ctzsi2(si_int); +#define __builtin_clz __clzsi2 +#define __builtin_ctz __ctzsi2 +#endif + #endif /* INT_LIB_H */ ==== //depot/projects/hammer/sys/dev/e1000/if_em.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.83 2012/01/10 19:57:23 luigi Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.85 2012/01/12 17:30:44 luigi Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -4019,6 +4019,10 @@ struct em_buffer *rxbuf; bus_dma_segment_t seg[1]; int rsize, nsegs, error; +#ifdef DEV_NETMAP + struct netmap_adapter *na = NA(adapter->ifp); + struct netmap_slot *slot; +#endif /* Clear the ring contents */ @@ -4026,6 +4030,9 @@ rsize = roundup2(adapter->num_rx_desc * sizeof(struct e1000_rx_desc), EM_DBA_ALIGN); bzero((void *)rxr->rx_base, rsize); +#ifdef DEV_NETMAP + slot = netmap_reset(na, NR_RX, 0, 0); +#endif /* ** Free current RX buffer structs and their mbufs @@ -4037,12 +4044,29 @@ BUS_DMASYNC_POSTREAD); bus_dmamap_unload(rxr->rxtag, rxbuf->map); m_freem(rxbuf->m_head); + rxbuf->m_head = NULL; /* mark as freed */ } } /* Now replenish the mbufs */ for (int j = 0; j != adapter->num_rx_desc; ++j) { rxbuf = &rxr->rx_buffers[j]; +#ifdef DEV_NETMAP + if (slot) { + /* slot si is mapped to the j-th NIC-ring entry */ + int si = j + na->rx_rings[0].nkr_hwofs; + uint64_t paddr; + void *addr; + + if (si > na->num_rx_desc) + si -= na->num_rx_desc; + addr = PNMB(slot + si, &paddr); + netmap_load_map(rxr->rxtag, rxbuf->map, addr); + /* Update descriptor */ + rxr->rx_base[j].buffer_addr = htole64(paddr); + continue; + } +#endif /* DEV_NETMAP */ rxbuf->m_head = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, adapter->rx_mbuf_sz); if (rxbuf->m_head == NULL) { @@ -4073,63 +4097,6 @@ bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -#ifdef DEV_NETMAP - { - /* - * This driver is slightly different from the standard: - * it refills the rings in blocks of 8, so the while() - * above completes any leftover work. Also, after if_init() - * the ring starts at rxr->next_to_check instead of 0. - * - * Currently: we leave the mbufs allocated even in netmap - * mode, and simply make the NIC ring point to the - * correct buffer (netmap_buf or mbuf) depending on - * the mode. To avoid mbuf leaks, when in netmap mode we - * must make sure that next_to_refresh == next_to_check - 1 - * so that the above while() loop is never run on init. - * - * A better way would be to free the mbufs when entering - * netmap mode, and set next_to_refresh/check in - * a way that the mbufs are completely reallocated - * when going back to standard mode. - */ - struct netmap_adapter *na = NA(adapter->ifp); - struct netmap_slot *slot = netmap_reset(na, - NR_RX, rxr->me, rxr->next_to_check); - int sj = slot ? na->rx_rings[rxr->me].nkr_hwofs : 0; - - /* slot sj corresponds to entry j in the NIC ring */ - if (sj < 0) - sj += adapter->num_rx_desc; - - for (int j = 0; j != adapter->num_rx_desc; j++, sj++) { - rxbuf = &rxr->rx_buffers[j]; - /* no mbuf and regular mode -> skip this entry */ - if (rxbuf->m_head == NULL && !slot) - continue; - /* Handle wrap. Cannot use "na" here, could be NULL */ - if (sj >= adapter->num_rx_desc) - sj -= adapter->num_rx_desc; - /* see comment, set slot addr and map */ - if (slot) { - uint64_t paddr; - void *addr = PNMB(slot + sj, &paddr); - netmap_load_map(rxr->rxtag, rxbuf->map, addr); - /* Update descriptor */ - rxr->rx_base[j].buffer_addr = htole64(paddr); - } else { - /* Get the memory mapping */ - bus_dmamap_load_mbuf_sg(rxr->rxtag, - rxbuf->map, rxbuf->m_head, seg, - &nsegs, BUS_DMA_NOWAIT); - /* Update descriptor */ - rxr->rx_base[j].buffer_addr = htole64(seg[0].ds_addr); - } - bus_dmamap_sync(rxr->rxtag, rxbuf->map, BUS_DMASYNC_PREREAD); - } - } -#endif /* DEV_NETMAP */ - fail: EM_RX_UNLOCK(rxr); return (error); @@ -4313,21 +4280,18 @@ E1000_WRITE_REG(hw, E1000_RDBAL(i), (u32)bus_addr); /* Setup the Head and Tail Descriptor Pointers */ E1000_WRITE_REG(hw, E1000_RDH(i), 0); - E1000_WRITE_REG(hw, E1000_RDT(i), adapter->num_rx_desc - 1); #ifdef DEV_NETMAP /* * an init() while a netmap client is active must * preserve the rx buffers passed to userspace. * In this driver it means we adjust RDT to - * something different from next_to_refresh. + * something different from na->num_rx_desc - 1. */ if (ifp->if_capenable & IFCAP_NETMAP) { struct netmap_adapter *na = NA(adapter->ifp); struct netmap_kring *kring = &na->rx_rings[i]; - int t = rxr->next_to_refresh - kring->nr_hwavail; + int t = na->num_rx_desc - 1 - kring->nr_hwavail; - if (t < 0) - t += na->num_rx_desc; E1000_WRITE_REG(hw, E1000_RDT(i), t); } else #endif /* DEV_NETMAP */ From owner-p4-projects@FreeBSD.ORG Thu Jan 12 17:49:44 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445F71065673; Thu, 12 Jan 2012 17:49:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0660F1065672 for ; Thu, 12 Jan 2012 17:49:44 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E60068FC13 for ; Thu, 12 Jan 2012 17:49:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CHnhPt016387 for ; Thu, 12 Jan 2012 17:49:43 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0CHnhx4016384 for perforce@freebsd.org; Thu, 12 Jan 2012 17:49:43 GMT (envelope-from peter@wemm.org) Date: Thu, 12 Jan 2012 17:49:43 GMT Message-Id: <201201121749.q0CHnhx4016384@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 17:49:44 -0000 http://p4web.freebsd.org/@@204470?ac=10 Change 204470 by peter@peter_overcee on 2012/01/12 17:49:20 IFC @204468 Affected files ... .. //depot/projects/hammer/contrib/gperf/doc/gperf.texi#2 integrate .. //depot/projects/hammer/contrib/gperf/doc/gpl.texinfo#2 integrate .. //depot/projects/hammer/contrib/llvm/LICENSE.TXT#3 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/COPYRIGHT.regex#3 branch .. //depot/projects/hammer/contrib/llvm/tools/clang/LICENSE.TXT#3 branch .. //depot/projects/hammer/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Checker.cpp#3 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PROFILE#2 integrate Differences ... ==== //depot/projects/hammer/contrib/gperf/doc/gperf.texi#2 (text+ko) ==== @@ -7,9 +7,9 @@ @c some day we should @include version.texi instead of defining @c these values at hand. -@set UPDATED 26 September 2000 -@set EDITION 2.7.2 -@set VERSION 2.7.2 +@set UPDATED 31 March 2007 +@set EDITION 3.0.3 +@set VERSION 3.0.3 @c --------------------- @c remove the black boxes generated in the GPL appendix. @@ -28,7 +28,7 @@ This file documents the features of the GNU Perfect Hash Function Generator @value{VERSION}. -Copyright @copyright{} 1989-2000 Free Software Foundation, Inc. +Copyright @copyright{} 1989-2006 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -62,10 +62,11 @@ @subtitle The GNU Perfect Hash Function Generator @subtitle Edition @value{EDITION}, @value{UPDATED} @author Douglas C. Schmidt +@author Bruno Haible @page @vskip 0pt plus 1filll -Copyright @copyright{} 1989-2000 Free Software Foundation, Inc. +Copyright @copyright{} 1989-2007 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -98,13 +99,12 @@ * Copying:: GNU @code{gperf} General Public License says how you can copy and share @code{gperf}. * Contributors:: People who have contributed to @code{gperf}. -* Motivation:: Static search structures and GNU GPERF. +* Motivation:: The purpose of @code{gperf}. * Search Structures:: Static search structures and GNU @code{gperf} * Description:: High-level discussion of how GPERF functions. * Options:: A description of options to the program. * Bugs:: Known bugs and limitations with GPERF. * Projects:: Things still left to do. -* Implementation:: Implementation Details for GNU GPERF. * Bibliography:: Material Referenced in this Report. * Concept Index:: @@ -115,14 +115,21 @@ * Input Format:: Input Format to @code{gperf} * Output Format:: Output Format for Generated C Code with @code{gperf} -* Binary Strings:: Use of NUL characters +* Binary Strings:: Use of NUL bytes Input Format to @code{gperf} -* Declarations:: @code{struct} Declarations and C Code Inclusion. +* Declarations:: Declarations. * Keywords:: Format for Keyword Entries. * Functions:: Including Additional C Functions. +* Controls for GNU indent:: Where to place directives for GNU @code{indent}. +Declarations + +* User-supplied Struct:: Specifying keywords with attributes. +* Gperf Declarations:: Embedding command line options in the input. +* C Code Inclusion:: Including C declarations and definitions. + Invoking @code{gperf} * Input Details:: Options that affect Interpretation of the Input File @@ -147,15 +154,13 @@ @item @cindex Bugs The GNU @code{gperf} perfect hash function generator utility was -originally written in GNU C++ by Douglas C. Schmidt. It is now also -available in a highly-portable ``old-style'' C version. The general +written in GNU C++ by Douglas C. Schmidt. The general idea for the perfect hash function generator was inspired by Keith Bostic's algorithm written in C, and distributed to net.sources around 1984. The current program is a heavily modified, enhanced, and extended implementation of Keith's basic idea, created at the University of California, Irvine. Bugs, patches, and suggestions should be reported -to both @code{} and -@code{}. +to @code{}. @item Special thanks is extended to Michael Tiemann and Doug Lea, for @@ -166,8 +171,9 @@ that greatly helped improve the quality and functionality of @code{gperf}. @item -A testsuite was added by Bruno Haible. He also rewrote the output -routines for better reliability. +Bruno Haible enhanced and optimized the search algorithm. He also rewrote +the input routines and the output routines for better reliability, and +added a testsuite. @end itemize @node Motivation, Search Structures, Contributors, Top @@ -176,8 +182,8 @@ @code{gperf} is a perfect hash function generator written in C++. It transforms an @var{n} element user-specified keyword set @var{W} into a perfect hash function @var{F}. @var{F} uniquely maps keywords in -@var{W} onto the range 0..@var{k}, where @var{k} >= @var{n}. If @var{k} -= @var{n} then @var{F} is a @emph{minimal} perfect hash function. +@var{W} onto the range 0..@var{k}, where @var{k} >= @var{n-1}. If @var{k} += @var{n-1} then @var{F} is a @emph{minimal} perfect hash function. @code{gperf} generates a 0..@var{k} element static lookup table and a pair of C functions. These functions determine whether a given character string @var{s} occurs in @var{W}, using at most one probe into @@ -185,11 +191,12 @@ @code{gperf} currently generates the reserved keyword recognizer for lexical analyzers in several production and research compilers and -language processing tools, including GNU C, GNU C++, GNU Pascal, GNU -Modula 3, and GNU indent. Complete C++ source code for @code{gperf} is -available via anonymous ftp from @code{ftp://ftp.gnu.org/pub/gnu/gperf/}. +language processing tools, including GNU C, GNU C++, GNU Java, GNU Pascal, +GNU Modula 3, and GNU indent. Complete C++ source code for @code{gperf} is +available from @code{http://ftp.gnu.org/pub/gnu/gperf/}. A paper describing @code{gperf}'s design and implementation in greater -detail is available in the Second USENIX C++ Conference proceedings. +detail is available in the Second USENIX C++ Conference proceedings +or from @code{http://www.cs.wustl.edu/~schmidt/resume.html}. @node Search Structures, Description, Motivation, Top @chapter Static search structures and GNU @code{gperf} @@ -198,7 +205,7 @@ A @dfn{static search structure} is an Abstract Data Type with certain fundamental operations, e.g., @emph{initialize}, @emph{insert}, and @emph{retrieve}. Conceptually, all insertions occur before any -retrievals. In practice, @code{gperf} generates a @code{static} array +retrievals. In practice, @code{gperf} generates a @emph{static} array containing search set keywords and any associated attributes specified by the user. Thus, there is essentially no execution-time cost for the insertions. It is a useful data structure for representing @emph{static @@ -254,8 +261,8 @@ search structures by hand. It has proven a useful and practical tool for serious programming projects. Output from @code{gperf} is currently used in several production and research compilers, including GNU C, GNU -C++, GNU Pascal, and GNU Modula 3. The latter two compilers are not yet -part of the official GNU distribution. Each compiler utilizes +C++, GNU Java, GNU Pascal, and GNU Modula 3. The latter two compilers are +not yet part of the official GNU distribution. Each compiler utilizes @code{gperf} to automatically generate static search structures that efficiently identify their respective reserved keywords. @@ -265,11 +272,11 @@ @menu * Input Format:: Input Format to @code{gperf} * Output Format:: Output Format for Generated C Code with @code{gperf} -* Binary Strings:: Use of NUL characters +* Binary Strings:: Use of NUL bytes @end menu The perfect hash function generator @code{gperf} reads a set of -``keywords'' from a @dfn{keyfile} (or from the standard input by +``keywords'' from an input file (or from the standard input by default). It attempts to derive a perfect hashing function that recognizes a member of the @dfn{static keyword set} with at most a single probe into the lookup table. If @code{gperf} succeeds in @@ -288,7 +295,7 @@ using a C @code{switch} may actually speed up the keyword retrieval time somewhat. Actual results depend on your C compiler, of course. -In general, @code{gperf} assigns values to the characters it is using +In general, @code{gperf} assigns values to the bytes it is using for hashing until some set of values gives each keyword a unique value. A helpful heuristic is that the larger the hash value range, the easier it is for @code{gperf} to find and generate a perfect hash function. @@ -300,7 +307,7 @@ @cindex Declaration section @cindex Keywords section @cindex Functions section -You can control the input keyfile format by varying certain command-line +You can control the input file format by varying certain command-line arguments, in particular the @samp{-t} option. The input's appearance is similar to GNU utilities @code{flex} and @code{bison} (or UNIX utilities @code{lex} and @code{yacc}). Here's an outline of the general @@ -316,34 +323,64 @@ @end group @end example -@emph{Unlike} @code{flex} or @code{bison}, all sections of -@code{gperf}'s input are optional. The following sections describe the +@emph{Unlike} @code{flex} or @code{bison}, the declarations section and +the functions section are optional. The following sections describe the input format for each section. @menu -* Declarations:: @code{struct} Declarations and C Code Inclusion. +* Declarations:: Declarations. * Keywords:: Format for Keyword Entries. * Functions:: Including Additional C Functions. +* Controls for GNU indent:: Where to place directives for GNU @code{indent}. @end menu +It is possible to omit the declaration section entirely, if the @samp{-t} +option is not given. In this case the input file begins directly with the +first keyword line, e.g.: + +@example +@group +january +february +march +april +... +@end group +@end example + @node Declarations, Keywords, Input Format, Input Format -@subsection @code{struct} Declarations and C Code Inclusion +@subsection Declarations The keyword input file optionally contains a section for including -arbitrary C declarations and definitions, as well as provisions for -providing a user-supplied @code{struct}. If the @samp{-t} option +arbitrary C declarations and definitions, @code{gperf} declarations that +act like command-line options, as well as for providing a user-supplied +@code{struct}. + +@menu +* User-supplied Struct:: Specifying keywords with attributes. +* Gperf Declarations:: Embedding command line options in the input. +* C Code Inclusion:: Including C declarations and definitions. +@end menu + +@node User-supplied Struct, Gperf Declarations, Declarations, Declarations +@subsubsection User-supplied @code{struct} + +If the @samp{-t} option (or, equivalently, the @samp{%struct-type} declaration) @emph{is} enabled, you @emph{must} provide a C @code{struct} as the last -component in the declaration section from the keyfile file. The first -field in this struct must be a @code{char *} or @code{const char *} -identifier called @samp{name}, although it is possible to modify this -field's name with the @samp{-K} option described below. +component in the declaration section from the input file. The first +field in this struct must be of type @code{char *} or @code{const char *} +if the @samp{-P} option is not given, or of type @code{int} if the option +@samp{-P} (or, equivalently, the @samp{%pic} declaration) is enabled. +This first field must be called @samp{name}, although it is possible to modify +its name with the @samp{-K} option (or, equivalently, the +@samp{%define slot-name} declaration) described below. Here is a simple example, using months of the year and their attributes as input: @example @group -struct months @{ char *name; int number; int days; int leap_days; @}; +struct month @{ char *name; int number; int days; int leap_days; @}; %% january, 1, 31, 31 february, 2, 28, 29 @@ -366,6 +403,236 @@ appearing left justified in the first column, as in the UNIX utility @code{lex}. +If the @code{struct} has already been declared in an include file, it can +be mentioned in an abbreviated form, like this: + +@example +@group +struct month; +%% +january, 1, 31, 31 +... +@end group +@end example + +@node Gperf Declarations, C Code Inclusion, User-supplied Struct, Declarations +@subsubsection Gperf Declarations + +The declaration section can contain @code{gperf} declarations. They +influence the way @code{gperf} works, like command line options do. +In fact, every such declaration is equivalent to a command line option. +There are three forms of declarations: + +@enumerate +@item +Declarations without argument, like @samp{%compare-lengths}. + +@item +Declarations with an argument, like @samp{%switch=@var{count}}. + +@item +Declarations of names of entities in the output file, like +@samp{%define lookup-function-name @var{name}}. +@end enumerate + +When a declaration is given both in the input file and as a command line +option, the command-line option's value prevails. + +The following @code{gperf} declarations are available. + +@table @samp +@item %delimiters=@var{delimiter-list} +@cindex @samp{%delimiters} +Allows you to provide a string containing delimiters used to +separate keywords from their attributes. The default is ",". This +option is essential if you want to use keywords that have embedded +commas or newlines. + +@item %struct-type +@cindex @samp{%struct-type} +Allows you to include a @code{struct} type declaration for generated +code; see above for an example. + +@item %ignore-case +@cindex @samp{%ignore-case} +Consider upper and lower case ASCII characters as equivalent. The string +comparison will use a case insignificant character comparison. Note that +locale dependent case mappings are ignored. + +@item %language=@var{language-name} +@cindex @samp{%language} +Instructs @code{gperf} to generate code in the language specified by the +option's argument. Languages handled are currently: + +@table @samp +@item KR-C +Old-style K&R C. This language is understood by old-style C compilers and +ANSI C compilers, but ANSI C compilers may flag warnings (or even errors) +because of lacking @samp{const}. + +@item C +Common C. This language is understood by ANSI C compilers, and also by +old-style C compilers, provided that you @code{#define const} to empty +for compilers which don't know about this keyword. + +@item ANSI-C +ANSI C. This language is understood by ANSI C compilers and C++ compilers. + +@item C++ +C++. This language is understood by C++ compilers. +@end table + +The default is C. + +@item %define slot-name @var{name} +@cindex @samp{%define slot-name} +This declaration is only useful when option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) has been given. +By default, the program assumes the structure component identifier for +the keyword is @samp{name}. This option allows an arbitrary choice of +identifier for this component, although it still must occur as the first +field in your supplied @code{struct}. + +@item %define initializer-suffix @var{initializers} +@cindex @samp{%define initializer-suffix} +This declaration is only useful when option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) has been given. +It permits to specify initializers for the structure members following +@var{slot-name} in empty hash table entries. The list of initializers +should start with a comma. By default, the emitted code will +zero-initialize structure members following @var{slot-name}. + +@item %define hash-function-name @var{name} +@cindex @samp{%define hash-function-name} +Allows you to specify the name for the generated hash function. Default +name is @samp{hash}. This option permits the use of two hash tables in +the same file. + +@item %define lookup-function-name @var{name} +@cindex @samp{%define lookup-function-name} +Allows you to specify the name for the generated lookup function. +Default name is @samp{in_word_set}. This option permits multiple +generated hash functions to be used in the same application. + +@item %define class-name @var{name} +@cindex @samp{%define class-name} +This option is only useful when option @samp{-L C++} (or, equivalently, +the @samp{%language=C++} declaration) has been given. It +allows you to specify the name of generated C++ class. Default name is +@code{Perfect_Hash}. + +@item %7bit +@cindex @samp{%7bit} +This option specifies that all strings that will be passed as arguments +to the generated hash function and the generated lookup function will +solely consist of 7-bit ASCII characters (bytes in the range 0..127). +(Note that the ANSI C functions @code{isalnum} and @code{isgraph} do +@emph{not} guarantee that a byte is in this range. Only an explicit +test like @samp{c >= 'A' && c <= 'Z'} guarantees this.) + +@item %compare-lengths +@cindex @samp{%compare-lengths} +Compare keyword lengths before trying a string comparison. This option +is mandatory for binary comparisons (@pxref{Binary Strings}). It also might +cut down on the number of string comparisons made during the lookup, since +keywords with different lengths are never compared via @code{strcmp}. +However, using @samp{%compare-lengths} might greatly increase the size of the +generated C code if the lookup table range is large (which implies that +the switch option @samp{-S} or @samp{%switch} is not enabled), since the length +table contains as many elements as there are entries in the lookup table. + +@item %compare-strncmp +@cindex @samp{%compare-strncmp} +Generates C code that uses the @code{strncmp} function to perform +string comparisons. The default action is to use @code{strcmp}. + +@item %readonly-tables +@cindex @samp{%readonly-tables} +Makes the contents of all generated lookup tables constant, i.e., +``readonly''. Many compilers can generate more efficient code for this +by putting the tables in readonly memory. + +@item %enum +@cindex @samp{%enum} +Define constant values using an enum local to the lookup function rather +than with #defines. This also means that different lookup functions can +reside in the same file. Thanks to James Clark @code{}. + +@item %includes +@cindex @samp{%includes} +Include the necessary system include file, @code{}, at the +beginning of the code. By default, this is not done; the user must +include this header file himself to allow compilation of the code. + +@item %global-table +@cindex @samp{%global-table} +Generate the static table of keywords as a static global variable, +rather than hiding it inside of the lookup function (which is the +default behavior). + +@item %pic +@cindex @samp{%pic} +Optimize the generated table for inclusion in shared libraries. This +reduces the startup time of programs using a shared library containing +the generated code. If the @samp{%struct-type} declaration (or, +equivalently, the option @samp{-t}) is also given, the first field of the +user-defined struct must be of type @samp{int}, not @samp{char *}, because +it will contain offsets into the string pool instead of actual strings. +To convert such an offset to a string, you can use the expression +@samp{stringpool + @var{o}}, where @var{o} is the offset. The string pool +name can be changed through the @samp{%define string-pool-name} declaration. + +@item %define string-pool-name @var{name} +@cindex @samp{%define string-pool-name} +Allows you to specify the name of the generated string pool created by +the declaration @samp{%pic} (or, equivalently, the option @samp{-P}). +The default name is @samp{stringpool}. This declaration permits the use of +two hash tables in the same file, with @samp{%pic} and even when the +@samp{%global-table} declaration (or, equivalently, the option @samp{-G}) +is given. + +@item %null-strings +@cindex @samp{%null-strings} +Use NULL strings instead of empty strings for empty keyword table entries. +This reduces the startup time of programs using a shared library containing +the generated code (but not as much as the declaration @samp{%pic}), at the +expense of one more test-and-branch instruction at run time. + +@item %define word-array-name @var{name} +@cindex @samp{%define word-array-name} +Allows you to specify the name for the generated array containing the +hash table. Default name is @samp{wordlist}. This option permits the +use of two hash tables in the same file, even when the option @samp{-G} +(or, equivalently, the @samp{%global-table} declaration) is given. + +@item %define length-table-name @var{name} +@cindex @samp{%define length-table-name} +Allows you to specify the name for the generated array containing the +length table. Default name is @samp{lengthtable}. This option permits the +use of two length tables in the same file, even when the option @samp{-G} +(or, equivalently, the @samp{%global-table} declaration) is given. + +@item %switch=@var{count} +@cindex @samp{%switch} +Causes the generated C code to use a @code{switch} statement scheme, +rather than an array lookup table. This can lead to a reduction in both +time and space requirements for some input files. The argument to this +option determines how many @code{switch} statements are generated. A +value of 1 generates 1 @code{switch} containing all the elements, a +value of 2 generates 2 tables with 1/2 the elements in each +@code{switch}, etc. This is useful since many C compilers cannot +correctly generate code for large @code{switch} statements. This option +was inspired in part by Keith Bostic's original C program. + +@item %omit-struct-type +@cindex @samp{%omit-struct-type} +Prevents the transfer of the type declaration to the output file. Use +this option if the type is already defined elsewhere. +@end table + +@node C Code Inclusion, , Gperf Declarations, Declarations +@subsubsection C Code Inclusion + @cindex @samp{%@{} @cindex @samp{%@}} Using a syntax similar to GNU utilities @code{flex} and @code{bison}, it @@ -380,9 +647,9 @@ %@{ #include /* This section of code is inserted directly into the output. */ -int return_month_days (struct months *months, int is_leap_year); +int return_month_days (struct month *months, int is_leap_year); %@} -struct months @{ char *name; int number; int days; int leap_days; @}; +struct month @{ char *name; int number; int days; int leap_days; @}; %% january, 1, 31, 31 february, 2, 28, 29 @@ -391,32 +658,21 @@ @end group @end example -It is possible to omit the declaration section entirely. In this case -the keyfile begins directly with the first keyword line, e.g.: - -@example -@group -january, 1, 31, 31 -february, 2, 28, 29 -march, 3, 31, 31 -april, 4, 30, 30 -... -@end group -@end example - @node Keywords, Functions, Declarations, Input Format @subsection Format for Keyword Entries -The second keyfile format section contains lines of keywords and any +The second input file format section contains lines of keywords and any associated attributes you might supply. A line beginning with @samp{#} in the first column is considered a comment. Everything following the -@samp{#} is ignored, up to and including the following newline. +@samp{#} is ignored, up to and including the following newline. A line +beginning with @samp{%} in the first column is an option declaration and +must not occur within the keywords section. -The first field of each non-comment line is always the key itself. It +The first field of each non-comment line is always the keyword itself. It can be given in two ways: as a simple name, i.e., without surrounding string quotation marks, or as a string enclosed in double-quotes, in C syntax, possibly with backslash escapes like @code{\"} or @code{\234} -or @code{\xa8}. In either case, it must start right at the beginning +or @code{\xa8}. In either case, it must start right at the beginning of the line, without leading whitespace. In this context, a ``field'' is considered to extend up to, but not include, the first blank, comma, or newline. Here is a simple @@ -445,11 +701,12 @@ should be separated by commas, and terminate at the end of line. What these fields mean is entirely up to you; they are used to initialize the elements of the user-defined @code{struct} provided by you in the -declaration section. If the @samp{-t} option is @emph{not} enabled +declaration section. If the @samp{-t} option (or, equivalently, the +@samp{%struct-type} declaration) is @emph{not} enabled these fields are simply ignored. All previous examples except the last one contain keyword attributes. -@node Functions, , Keywords, Input Format +@node Functions, Controls for GNU indent, Keywords, Input Format @subsection Including Additional C Functions The optional third section also corresponds closely with conventions @@ -459,12 +716,58 @@ it is your responsibility to ensure that the code contained in this section is valid C. +@node Controls for GNU indent, , Functions, Input Format +@subsection Where to place directives for GNU @code{indent}. + +If you want to invoke GNU @code{indent} on a @code{gperf} input file, +you will see that GNU @code{indent} doesn't understand the @samp{%%}, +@samp{%@{} and @samp{%@}} directives that control @code{gperf}'s +interpretation of the input file. Therefore you have to insert some +directives for GNU @code{indent}. More precisely, assuming the most +general input file structure + +@example +@group +declarations part 1 +%@{ +verbatim code +%@} +declarations part 2 +%% +keywords +%% +functions +@end group +@end example + +@noindent +you would insert @samp{*INDENT-OFF*} and @samp{*INDENT-ON*} comments +as follows: + +@example +@group +/* *INDENT-OFF* */ +declarations part 1 +%@{ +/* *INDENT-ON* */ +verbatim code +/* *INDENT-OFF* */ +%@} +declarations part 2 +%% +keywords +%% +/* *INDENT-ON* */ +functions +@end group +@end example + @node Output Format, Binary Strings, Input Format, Description @section Output Format for Generated C Code with @code{gperf} @cindex hash table Several options control how the generated C code appears on the standard -output. Two C function are generated. They are called @code{hash} and +output. Two C functions are generated. They are called @code{hash} and @code{in_word_set}, although you may modify their names with a command-line option. Both functions require two arguments, a string, @code{char *} @var{str}, and a length parameter, @code{int} @var{len}. Their default @@ -472,26 +775,28 @@ @deftypefun {unsigned int} hash (const char * @var{str}, unsigned int @var{len}) By default, the generated @code{hash} function returns an integer value -created by adding @var{len} to several user-specified @var{str} key +created by adding @var{len} to several user-specified @var{str} byte positions indexed into an @dfn{associated values} table stored in a local static array. The associated values table is constructed internally by @code{gperf} and later output as a static local C array -called @samp{hash_table}; its meaning and properties are described below -(@pxref{Implementation}). The relevant key positions are specified via -the @samp{-k} option when running @code{gperf}, as detailed in the -@emph{Options} section below(@pxref{Options}). +called @samp{hash_table}. The relevant selected positions (i.e. indices +into @var{str}) are specified via the @samp{-k} option when running +@code{gperf}, as detailed in the @emph{Options} section below (@pxref{Options}). @end deftypefun @deftypefun {} in_word_set (const char * @var{str}, unsigned int @var{len}) If @var{str} is in the keyword set, returns a pointer to that -keyword. More exactly, if the option @samp{-t} was given, it returns -a pointer to the matching keyword's structure. Otherwise it returns +keyword. More exactly, if the option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) was given, it returns +a pointer to the matching keyword's structure. Otherwise it returns @code{NULL}. @end deftypefun -If the option @samp{-c} is not used, @var{str} must be a NUL terminated -string of exactly length @var{len}. If @samp{-c} is used, @var{str} must -simply be an array of @var{len} characters and does not need to be NUL +If the option @samp{-c} (or, equivalently, the @samp{%compare-strncmp} +declaration) is not used, @var{str} must be a NUL terminated +string of exactly length @var{len}. If @samp{-c} (or, equivalently, the +@samp{%compare-strncmp} declaration) is used, @var{str} must +simply be an array of @var{len} bytes and does not need to be NUL terminated. The code generated for these two functions is affected by the following @@ -512,44 +817,50 @@ code. @end table -If the @samp{-t} and @samp{-S} options are omitted, the default action -is to generate a @code{char *} array containing the keys, together with -additional null strings used for padding the array. By experimenting +If the @samp{-t} and @samp{-S} options (or, equivalently, the +@samp{%struct-type} and @samp{%switch} declarations) are omitted, the default +action +is to generate a @code{char *} array containing the keywords, together with +additional empty strings used for padding the array. By experimenting with the various input and output options, and timing the resulting C code, you can determine the best option choices for different keyword set characteristics. @node Binary Strings, , Output Format, Description -@section Use of NUL characters +@section Use of NUL bytes @cindex NUL By default, the code generated by @code{gperf} operates on zero -terminated strings, the usual representation of strings in C. This means -that the keywords in the input file must not contain NUL characters, +terminated strings, the usual representation of strings in C. This means +that the keywords in the input file must not contain NUL bytes, and the @var{str} argument passed to @code{hash} or @code{in_word_set} must be NUL terminated and have exactly length @var{len}. -If option @samp{-c} is used, then the @var{str} argument does not need -to be NUL terminated. The code generated by @code{gperf} will only +If option @samp{-c} (or, equivalently, the @samp{%compare-strncmp} +declaration) is used, then the @var{str} argument does not need +to be NUL terminated. The code generated by @code{gperf} will only access the first @var{len}, not @var{len+1}, bytes starting at @var{str}. However, the keywords in the input file still must not contain NUL -characters. +bytes. -If option @samp{-l} is used, then the hash table performs binary -comparison. The keywords in the input file may contain NUL characters, +If option @samp{-l} (or, equivalently, the @samp{%compare-lengths} +declaration) is used, then the hash table performs binary +comparison. The keywords in the input file may contain NUL bytes, written in string syntax as @code{\000} or @code{\x00}, and the code -generated by @code{gperf} will treat NUL like any other character. -Also, in this case the @samp{-c} option is ignored. +generated by @code{gperf} will treat NUL like any other byte. +Also, in this case the @samp{-c} option (or, equivalently, the +@samp{%compare-strncmp} declaration) is ignored. @node Options, Bugs, Description, Top @chapter Invoking @code{gperf} There are @emph{many} options to @code{gperf}. They were added to make the program more convenient for use with real applications. ``On-line'' -help is readily available via the @samp{-h} option. Here is the +help is readily available via the @samp{--help} option. Here is the complete list of options. @menu +* Output File:: Specifying the Location of the Output File * Input Details:: Options that affect Interpretation of the Input File * Output Language:: Specifying the Language for the Output Code * Output Details:: Fine tuning Details in the Output Code @@ -557,15 +868,29 @@ * Verbosity:: Informative Output @end menu -@node Input Details, Output Language, Options, Options +@node Output File, Input Details, Options, Options +@section Specifying the Location of the Output File + +@table @samp +@item --output-file=@var{file} +Allows you to specify the name of the file to which the output is written to. +@end table + +The results are written to standard output if no output file is specified +or if it is @samp{-}. + +@node Input Details, Output Language, Output File, Options @section Options that affect Interpretation of the Input File +These options are also available as declarations in the input file +(@pxref{Gperf Declarations}). + @table @samp @item -e @var{keyword-delimiter-list} @itemx --delimiters=@var{keyword-delimiter-list} @cindex Delimiters -Allows the user to provide a string containing delimiters used to -separate keywords from their attributes. The default is ",\n". This +Allows you to provide a string containing delimiters used to +separate keywords from their attributes. The default is ",". This option is essential if you want to use keywords that have embedded commas or newlines. One useful trick is to use -e'TAB', where TAB is the literal tab character. @@ -578,11 +903,25 @@ this, one group of fields per line. A set of examples for generating perfect hash tables and functions for Ada, C, C++, Pascal, Modula 2, Modula 3 and JavaScript reserved words are distributed with this release. + +@item --ignore-case +Consider upper and lower case ASCII characters as equivalent. The string +comparison will use a case insignificant character comparison. Note that +locale dependent case mappings are ignored. This option is therefore not +suitable if a properly internationalized or locale aware case mapping +should be used. (For example, in a Turkish locale, the upper case equivalent +of the lowercase ASCII letter @samp{i} is the non-ASCII character +@samp{capital i with dot above}.) For this case, it is better to apply +an uppercase or lowercase conversion on the string before passing it to +the @code{gperf} generated function. @end table @node Output Language, Output Details, Input Details, Options @section Options to specify the Language for the Output Code +These options are also available as declarations in the input file +(@pxref{Gperf Declarations}). + @table @samp @item -L @var{generated-language-name} @itemx --language=@var{generated-language-name} @@ -591,41 +930,45 @@ @table @samp @item KR-C -Old-style K&R C. This language is understood by old-style C compilers and +Old-style K&R C. This language is understood by old-style C compilers and ANSI C compilers, but ANSI C compilers may flag warnings (or even errors) because of lacking @samp{const}. @item C -Common C. This language is understood by ANSI C compilers, and also by +Common C. This language is understood by ANSI C compilers, and also by old-style C compilers, provided that you @code{#define const} to empty for compilers which don't know about this keyword. @item ANSI-C -ANSI C. This language is understood by ANSI C compilers and C++ compilers. +ANSI C. This language is understood by ANSI C compilers and C++ compilers. @item C++ -C++. This language is understood by C++ compilers. +C++. This language is understood by C++ compilers. @end table The default is C. @item -a This option is supported for compatibility with previous releases of -@code{gperf}. It does not do anything. +@code{gperf}. It does not do anything. @item -g This option is supported for compatibility with previous releases of -@code{gperf}. It does not do anything. +@code{gperf}. It does not do anything. @end table @node Output Details, Algorithmic Details, Output Language, Options @section Options for fine tuning Details in the Output Code +Most of these options are also available as declarations in the input file +(@pxref{Gperf Declarations}). + @table @samp -@item -K @var{key-name} -@itemx --slot-name=@var{key-name} +@item -K @var{slot-name} +@itemx --slot-name=@var{slot-name} @cindex Slot name -This option is only useful when option @samp{-t} has been given. +This option is only useful when option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) has been given. By default, the program assumes the structure component identifier for the keyword is @samp{name}. This option allows an arbitrary choice of identifier for this component, although it still must occur as the first @@ -634,29 +977,30 @@ @item -F @var{initializers} @itemx --initializer-suffix=@var{initializers} @cindex Initializers -This option is only useful when option @samp{-t} has been given. +This option is only useful when option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) has been given. It permits to specify initializers for the structure members following -@var{key name} in empty hash table entries. The list of initializers +@var{slot-name} in empty hash table entries. The list of initializers should start with a comma. By default, the emitted code will -zero-initialize structure members following @var{key name}. +zero-initialize structure members following @var{slot-name}. @item -H @var{hash-function-name} -@itemx --hash-fn-name=@var{hash-function-name} +@itemx --hash-function-name=@var{hash-function-name} Allows you to specify the name for the generated hash function. Default name is @samp{hash}. This option permits the use of two hash tables in the same file. @item -N @var{lookup-function-name} -@itemx --lookup-fn-name=@var{lookup-function-name} +@itemx --lookup-function-name=@var{lookup-function-name} Allows you to specify the name for the generated lookup function. -Default name is @samp{in_word_set}. This option permits completely -automatic generation of perfect hash functions, especially when multiple -generated hash functions are used in the same application. +Default name is @samp{in_word_set}. This option permits multiple +generated hash functions to be used in the same application. @item -Z @var{class-name} @itemx --class-name=@var{class-name} @cindex Class name -This option is only useful when option @samp{-L C++} has been given. It +This option is only useful when option @samp{-L C++} (or, equivalently, +the @samp{%language=C++} declaration) has been given. It allows you to specify the name of generated C++ class. Default name is @code{Perfect_Hash}. @@ -664,12 +1008,23 @@ @itemx --seven-bit This option specifies that all strings that will be passed as arguments to the generated hash function and the generated lookup function will -solely consist of 7-bit ASCII characters (characters in the range 0..127). +solely consist of 7-bit ASCII characters (bytes in the range 0..127). (Note that the ANSI C functions @code{isalnum} and @code{isgraph} do -@emph{not} guarantee that a character is in this range. Only an explicit +@emph{not} guarantee that a byte is in this range. Only an explicit test like @samp{c >= 'A' && c <= 'Z'} guarantees this.) This was the default in versions of @code{gperf} earlier than 2.7; now the default is -to assume 8-bit characters. +to support 8-bit and multibyte characters. + +@item -l +@itemx --compare-lengths +Compare keyword lengths before trying a string comparison. This option +is mandatory for binary comparisons (@pxref{Binary Strings}). It also might +cut down on the number of string comparisons made during the lookup, since +keywords with different lengths are never compared via @code{strcmp}. +However, using @samp{-l} might greatly increase the size of the +generated C code if the lookup table range is large (which implies that +the switch option @samp{-S} or @samp{%switch} is not enabled), since the length +table contains as many elements as there are entries in the lookup table. @item -c @itemx --compare-strncmp @@ -695,30 +1050,63 @@ include this header file himself to allow compilation of the code. @item -G -@itemx --global +@itemx --global-table Generate the static table of keywords as a static global variable, rather than hiding it inside of the lookup function (which is the default behavior). +@item -P +@itemx --pic +Optimize the generated table for inclusion in shared libraries. This +reduces the startup time of programs using a shared library containing +the generated code. If the option @samp{-t} (or, equivalently, the +@samp{%struct-type} declaration) is also given, the first field of the +user-defined struct must be of type @samp{int}, not @samp{char *}, because +it will contain offsets into the string pool instead of actual strings. +To convert such an offset to a string, you can use the expression +@samp{stringpool + @var{o}}, where @var{o} is the offset. The string pool +name can be changed through the option @samp{--string-pool-name}. + +@item -Q @var{string-pool-name} +@itemx --string-pool-name=@var{string-pool-name} +Allows you to specify the name of the generated string pool created by +option @samp{-P}. The default name is @samp{stringpool}. This option +permits the use of two hash tables in the same file, with @samp{-P} and +even when the option @samp{-G} (or, equivalently, the @samp{%global-table} +declaration) is given. + +@item --null-strings +Use NULL strings instead of empty strings for empty keyword table entries. +This reduces the startup time of programs using a shared library containing +the generated code (but not as much as option @samp{-P}), at the expense +of one more test-and-branch instruction at run time. + @item -W @var{hash-table-array-name} @itemx --word-array-name=@var{hash-table-array-name} @cindex Array name Allows you to specify the name for the generated array containing the hash table. Default name is @samp{wordlist}. This option permits the use of two hash tables in the same file, even when the option @samp{-G} -is given. +(or, equivalently, the @samp{%global-table} declaration) is given. + +@itemx --length-table-name=@var{length-table-array-name} +@cindex Array name +Allows you to specify the name for the generated array containing the +length table. Default name is @samp{lengthtable}. This option permits the +use of two length tables in the same file, even when the option @samp{-G} +(or, equivalently, the @samp{%global-table} declaration) is given. @item -S @var{total-switch-statements} @itemx --switch=@var{total-switch-statements} @cindex @code{switch} Causes the generated C code to use a @code{switch} statement scheme, rather than an array lookup table. This can lead to a reduction in both -time and space requirements for some keyfiles. The argument to this -option determines how many @code{switch} statements are generated. A +time and space requirements for some input files. The argument to this +option determines how many @code{switch} statements are generated. A value of 1 generates 1 @code{switch} containing all the elements, a value of 2 generates 2 tables with 1/2 the elements in each @code{switch}, etc. This is useful since many C compilers cannot -correctly generate code for large @code{switch} statements. This option +correctly generate code for large @code{switch} statements. This option was inspired in part by Keith Bostic's original C program. @item -T @@ -728,93 +1116,73 @@ @item -p This option is supported for compatibility with previous releases of -@code{gperf}. It does not do anything. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 12 21:53:00 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794BB1065672; Thu, 12 Jan 2012 21:53:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BA6E106566C for ; Thu, 12 Jan 2012 21:53:00 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 275A38FC1A for ; Thu, 12 Jan 2012 21:53:00 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CLr0fx095673 for ; Thu, 12 Jan 2012 21:53:00 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0CLqxkU095670 for perforce@freebsd.org; Thu, 12 Jan 2012 21:52:59 GMT (envelope-from peter@wemm.org) Date: Thu, 12 Jan 2012 21:52:59 GMT Message-Id: <201201122152.q0CLqxkU095670@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 21:53:00 -0000 http://p4web.freebsd.org/@@204497?ac=10 Change 204497 by peter@peter_daintree on 2012/01/12 21:52:25 Regenerate Affected files ... .. //depot/projects/hammer/sys/kern/init_sysent.c#85 edit .. //depot/projects/hammer/sys/kern/syscalls.c#82 edit .. //depot/projects/hammer/sys/kern/systrace_args.c#27 edit .. //depot/projects/hammer/sys/sys/sysproto.h#83 edit Differences ... ==== //depot/projects/hammer/sys/kern/init_sysent.c#85 (text+ko) ==== @@ -26,6 +26,12 @@ #define compat4(n, name) 0, (sy_call_t *)nosys #endif +#ifdef COMPAT_FREEBSD6 +#define compat6(n, name) n, (sy_call_t *)__CONCAT(freebsd6_,name) +#else +#define compat6(n, name) 0, (sy_call_t *)nosys +#endif + #ifdef COMPAT_FREEBSD7 #define compat7(n, name) n, (sy_call_t *)__CONCAT(freebsd7_,name) #else @@ -207,8 +213,8 @@ { AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 170 = msgsys */ { AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 171 = shmsys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 172 = nosys */ - { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 173 = freebsd6_pread */ - { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 174 = freebsd6_pwrite */ + { compat6(AS(freebsd6_pread_args),pread), AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 173 = freebsd6 pread */ + { compat6(AS(freebsd6_pwrite_args),pwrite), AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 174 = freebsd6 pwrite */ { AS(setfib_args), (sy_call_t *)sys_setfib, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 175 = setfib */ { AS(ntp_adjtime_args), (sy_call_t *)sys_ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 177 = sfork */ @@ -231,11 +237,11 @@ { AS(__getrlimit_args), (sy_call_t *)sys_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 194 = getrlimit */ { AS(__setrlimit_args), (sy_call_t *)sys_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 195 = setrlimit */ { AS(getdirentries_args), (sy_call_t *)sys_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 196 = getdirentries */ - { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 197 = freebsd6_mmap */ + { compat6(AS(freebsd6_mmap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 197 = freebsd6 mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 198 = __syscall */ - { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6_lseek */ - { AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 200 = freebsd6_truncate */ - { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 201 = freebsd6_ftruncate */ + { compat6(AS(freebsd6_lseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6 lseek */ + { compat6(AS(freebsd6_truncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 200 = freebsd6 truncate */ + { compat6(AS(freebsd6_ftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 201 = freebsd6 ftruncate */ { AS(sysctl_args), (sy_call_t *)sys___sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 202 = __sysctl */ { AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 203 = mlock */ { AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 204 = munlock */ @@ -452,9 +458,9 @@ { AS(__mac_execve_args), (sy_call_t *)sys___mac_execve, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 415 = __mac_execve */ { AS(sigaction_args), (sy_call_t *)sys_sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 416 = sigaction */ { AS(sigreturn_args), (sy_call_t *)sys_sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 417 = sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 420 = __xlstat */ + { AS(__xstat_args), (sy_call_t *)sys___xstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 418 = __xstat */ + { AS(__xfstat_args), (sy_call_t *)sys___xfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 419 = __xfstat */ + { AS(__xlstat_args), (sy_call_t *)sys___xlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 420 = __xlstat */ { AS(getcontext_args), (sy_call_t *)sys_getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 421 = getcontext */ { AS(setcontext_args), (sy_call_t *)sys_setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 422 = setcontext */ { AS(swapcontext_args), (sy_call_t *)sys_swapcontext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 423 = swapcontext */ ==== //depot/projects/hammer/sys/kern/syscalls.c#82 (text+ko) ==== @@ -180,8 +180,8 @@ "msgsys", /* 170 = msgsys */ "shmsys", /* 171 = shmsys */ "#172", /* 172 = nosys */ - "compat6.pread", /* 173 = old pread */ - "compat6.pwrite", /* 174 = old pwrite */ + "compat6.pread", /* 173 = freebsd6 pread */ + "compat6.pwrite", /* 174 = freebsd6 pwrite */ "setfib", /* 175 = setfib */ "ntp_adjtime", /* 176 = ntp_adjtime */ "#177", /* 177 = sfork */ @@ -204,11 +204,11 @@ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ "getdirentries", /* 196 = getdirentries */ - "compat6.mmap", /* 197 = old mmap */ + "compat6.mmap", /* 197 = freebsd6 mmap */ "__syscall", /* 198 = __syscall */ - "compat6.lseek", /* 199 = old lseek */ - "compat6.truncate", /* 200 = old truncate */ - "compat6.ftruncate", /* 201 = old ftruncate */ + "compat6.lseek", /* 199 = freebsd6 lseek */ + "compat6.truncate", /* 200 = freebsd6 truncate */ + "compat6.ftruncate", /* 201 = freebsd6 ftruncate */ "__sysctl", /* 202 = __sysctl */ "mlock", /* 203 = mlock */ "munlock", /* 204 = munlock */ ==== //depot/projects/hammer/sys/kern/systrace_args.c#27 (text+ko) ==== @@ -4702,50 +4702,6 @@ break; }; break; - /* freebsd6_pread */ - case 173: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "void *"; - break; - case 2: - p = "size_t"; - break; - case 3: - p = "int"; - break; - case 4: - p = "off_t"; - break; - default: - break; - }; - break; - /* freebsd6_pwrite */ - case 174: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "const void *"; - break; - case 2: - p = "size_t"; - break; - case 3: - p = "int"; - break; - case 4: - p = "off_t"; - break; - default: - break; - }; - break; /* setfib */ case 175: switch(ndx) { @@ -4906,88 +4862,9 @@ break; }; break; - /* freebsd6_mmap */ - case 197: - switch(ndx) { - case 0: - p = "caddr_t"; - break; - case 1: - p = "size_t"; - break; - case 2: - p = "int"; - break; - case 3: - p = "int"; - break; - case 4: - p = "int"; - break; - case 5: - p = "int"; - break; - case 6: - p = "off_t"; - break; - default: - break; - }; - break; /* nosys */ case 198: break; - /* freebsd6_lseek */ - case 199: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "int"; - break; - case 2: - p = "off_t"; - break; - case 3: - p = "int"; - break; - default: - break; - }; - break; - /* freebsd6_truncate */ - case 200: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "int"; - break; - case 2: - p = "off_t"; - break; - default: - break; - }; - break; - /* freebsd6_ftruncate */ - case 201: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "int"; - break; - case 2: - p = "off_t"; - break; - default: - break; - }; - break; /* __sysctl */ case 202: switch(ndx) { @@ -7034,6 +6911,54 @@ break; }; break; + /* __xstat */ + case 418: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "struct _new_stat *"; + break; + default: + break; + }; + break; + /* __xfstat */ + case 419: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "struct _new_stat *"; + break; + default: + break; + }; + break; + /* __xlstat */ + case 420: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "struct _new_stat *"; + break; + default: + break; + }; + break; /* getcontext */ case 421: switch(ndx) { @@ -9176,16 +9101,6 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd6_pread */ - case 173: - if (ndx == 0 || ndx == 1) - p = "ssize_t"; - break; - /* freebsd6_pwrite */ - case 174: - if (ndx == 0 || ndx == 1) - p = "ssize_t"; - break; /* setfib */ case 175: if (ndx == 0 || ndx == 1) @@ -9251,28 +9166,8 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd6_mmap */ - case 197: - if (ndx == 0 || ndx == 1) - p = "caddr_t"; - break; /* nosys */ case 198: - /* freebsd6_lseek */ - case 199: - if (ndx == 0 || ndx == 1) - p = "off_t"; - break; - /* freebsd6_truncate */ - case 200: - if (ndx == 0 || ndx == 1) - p = "int"; - break; - /* freebsd6_ftruncate */ - case 201: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* __sysctl */ case 202: if (ndx == 0 || ndx == 1) @@ -10008,6 +9903,21 @@ if (ndx == 0 || ndx == 1) p = "int"; break; + /* __xstat */ + case 418: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* __xfstat */ + case 419: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* __xlstat */ + case 420: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* getcontext */ case 421: if (ndx == 0 || ndx == 1) ==== //depot/projects/hammer/sys/sys/sysproto.h#83 (text+ko) ==== @@ -531,20 +531,6 @@ char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; }; -struct freebsd6_pread_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; -}; -struct freebsd6_pwrite_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; -}; struct setfib_args { char fibnum_l_[PADL_(int)]; int fibnum; char fibnum_r_[PADR_(int)]; }; @@ -594,31 +580,6 @@ char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; char basep_l_[PADL_(long *)]; long * basep; char basep_r_[PADR_(long *)]; }; -struct freebsd6_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)]; -}; -struct freebsd6_lseek_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; - char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; -}; -struct freebsd6_truncate_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; -}; -struct freebsd6_ftruncate_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; -}; struct sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; @@ -1244,6 +1205,21 @@ struct sigreturn_args { char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)]; }; +struct __xstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct _new_stat *)]; struct _new_stat * ub; char ub_r_[PADR_(struct _new_stat *)]; +}; +struct __xfstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char sb_l_[PADL_(struct _new_stat *)]; struct _new_stat * sb; char sb_r_[PADR_(struct _new_stat *)]; +}; +struct __xlstat_args { + char ver_l_[PADL_(int)]; int ver; char ver_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct _new_stat *)]; struct _new_stat * ub; char ub_r_[PADR_(struct _new_stat *)]; +}; struct getcontext_args { char ucp_l_[PADL_(struct __ucontext *)]; struct __ucontext * ucp; char ucp_r_[PADR_(struct __ucontext *)]; }; @@ -1861,8 +1837,6 @@ int sys_semsys(struct thread *, struct semsys_args *); int sys_msgsys(struct thread *, struct msgsys_args *); int sys_shmsys(struct thread *, struct shmsys_args *); -int freebsd6_pread(struct thread *, struct freebsd6_pread_args *); -int freebsd6_pwrite(struct thread *, struct freebsd6_pwrite_args *); int sys_setfib(struct thread *, struct setfib_args *); int sys_ntp_adjtime(struct thread *, struct ntp_adjtime_args *); int sys_setgid(struct thread *, struct setgid_args *); @@ -1876,10 +1850,6 @@ int sys_getrlimit(struct thread *, struct __getrlimit_args *); int sys_setrlimit(struct thread *, struct __setrlimit_args *); int sys_getdirentries(struct thread *, struct getdirentries_args *); -int freebsd6_mmap(struct thread *, struct freebsd6_mmap_args *); -int freebsd6_lseek(struct thread *, struct freebsd6_lseek_args *); -int freebsd6_truncate(struct thread *, struct freebsd6_truncate_args *); -int freebsd6_ftruncate(struct thread *, struct freebsd6_ftruncate_args *); int sys___sysctl(struct thread *, struct sysctl_args *); int sys_mlock(struct thread *, struct mlock_args *); int sys_munlock(struct thread *, struct munlock_args *); @@ -2024,6 +1994,9 @@ int sys___mac_execve(struct thread *, struct __mac_execve_args *); int sys_sigaction(struct thread *, struct sigaction_args *); int sys_sigreturn(struct thread *, struct sigreturn_args *); +int sys___xstat(struct thread *, struct __xstat_args *); +int sys___xfstat(struct thread *, struct __xfstat_args *); +int sys___xlstat(struct thread *, struct __xlstat_args *); int sys_getcontext(struct thread *, struct getcontext_args *); int sys_setcontext(struct thread *, struct setcontext_args *); int sys_swapcontext(struct thread *, struct swapcontext_args *); @@ -2365,6 +2338,51 @@ #ifdef COMPAT_FREEBSD6 +struct freebsd6_pread_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; +}; +struct freebsd6_pwrite_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; +}; +struct freebsd6_mmap_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)]; +}; +struct freebsd6_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct freebsd6_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; +}; +struct freebsd6_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; +}; +int freebsd6_pread(struct thread *, struct freebsd6_pread_args *); +int freebsd6_pwrite(struct thread *, struct freebsd6_pwrite_args *); +int freebsd6_mmap(struct thread *, struct freebsd6_mmap_args *); +int freebsd6_lseek(struct thread *, struct freebsd6_lseek_args *); +int freebsd6_truncate(struct thread *, struct freebsd6_truncate_args *); +int freebsd6_ftruncate(struct thread *, struct freebsd6_ftruncate_args *); #endif /* COMPAT_FREEBSD6 */ @@ -2718,6 +2736,9 @@ #define SYS_AUE___mac_execve AUE_NULL #define SYS_AUE_sigaction AUE_SIGACTION #define SYS_AUE_sigreturn AUE_SIGRETURN +#define SYS_AUE___xstat AUE_STAT +#define SYS_AUE___xfstat AUE_FSTAT +#define SYS_AUE___xlstat AUE_LSTAT #define SYS_AUE_getcontext AUE_NULL #define SYS_AUE_setcontext AUE_NULL #define SYS_AUE_swapcontext AUE_NULL From owner-p4-projects@FreeBSD.ORG Fri Jan 13 18:36:29 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979BD1065670; Fri, 13 Jan 2012 18:36:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A3431065677 for ; Fri, 13 Jan 2012 18:36:29 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 28D5A8FC16 for ; Fri, 13 Jan 2012 18:36:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0DIaTYW053491 for ; Fri, 13 Jan 2012 18:36:29 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0DIaTlo053488 for perforce@freebsd.org; Fri, 13 Jan 2012 18:36:29 GMT (envelope-from peter@wemm.org) Date: Fri, 13 Jan 2012 18:36:29 GMT Message-Id: <201201131836.q0DIaTlo053488@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 204545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2012 18:36:30 -0000 http://p4web.freebsd.org/@@204545?ac=10 Change 204545 by peter@peter_daintree on 2012/01/13 18:35:28 vfork() is not deprecated and isn't going anywhere. Revert the misguided part 4 of change 16117 back from 1996. At work we see 1000x improvements in certain pathological workloads. Affected files ... .. //depot/projects/hammer/lib/libc/stdlib/system.c#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/stdlib/system.c#4 (text+ko) ==== @@ -56,39 +56,39 @@ if (!command) /* just checking... */ return(1); - /* - * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save - * existing signal dispositions. - */ - ign.sa_handler = SIG_IGN; - (void)sigemptyset(&ign.sa_mask); - ign.sa_flags = 0; - (void)_sigaction(SIGINT, &ign, &intact); - (void)_sigaction(SIGQUIT, &ign, &quitact); (void)sigemptyset(&newsigblock); (void)sigaddset(&newsigblock, SIGCHLD); (void)_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); - switch(pid = fork()) { + switch(pid = vfork()) { case -1: /* error */ break; case 0: /* child */ /* * Restore original signal dispositions and exec the command. */ - (void)_sigaction(SIGINT, &intact, NULL); - (void)_sigaction(SIGQUIT, &quitact, NULL); (void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL); execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); _exit(127); default: /* parent */ + /* + * If we are running means that the child has either completed + * its execve, or has failed. + * Block SIGINT/QUIT because sh -c handles it and wait for + * it to clean up. + */ + ign.sa_handler = SIG_IGN; + (void)sigemptyset(&ign.sa_mask); + ign.sa_flags = 0; + (void)_sigaction(SIGINT, &ign, &intact); + (void)_sigaction(SIGQUIT, &ign, &quitact); savedpid = pid; do { pid = _wait4(savedpid, &pstat, 0, (struct rusage *)0); } while (pid == -1 && errno == EINTR); + (void)_sigaction(SIGINT, &intact, NULL); + (void)_sigaction(SIGQUIT, &quitact, NULL); break; } - (void)_sigaction(SIGINT, &intact, NULL); - (void)_sigaction(SIGQUIT, &quitact, NULL); (void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL); return(pid == -1 ? -1 : pstat); }