From owner-p4-projects@FreeBSD.ORG Sun Aug 31 15:47:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 388CB16A4C1; Sun, 31 Aug 2003 15:47:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D387F16A4BF for ; Sun, 31 Aug 2003 15:47:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ECFF43F75 for ; Sun, 31 Aug 2003 15:47:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7VMlf0U086859 for ; Sun, 31 Aug 2003 15:47:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7VMlfUp086856 for perforce@freebsd.org; Sun, 31 Aug 2003 15:47:41 -0700 (PDT) Date: Sun, 31 Aug 2003 15:47:41 -0700 (PDT) Message-Id: <200308312247.h7VMlfUp086856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2003 22:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=37284 Change 37284 by marcel@marcel_nfs on 2003/08/31 15:47:21 Properly deal with the fact that the registers on the ultra2 are not consecutive. This is considered a bug. The address lines are probably not wired correctly. We deal with this by adding a register shift variable to the puc(4) device information. It is exposed to subordinate devices as an IVAR. Since we already had support for shifting register numbers in uart(4), we only have to make sure we use it. Of course we also need to set the regshft for the low-level console. This too is trivial enough. Redefine the z8530 register offsets to be 0 for the control register and 1 for the data register as intended. Administrative note: There's a change in uart_dev_z8530.h that belongs to the next commit. Affected files ... .. //depot/projects/uart/dev/puc/puc.c#8 edit .. //depot/projects/uart/dev/puc/puc_sbus.c#3 edit .. //depot/projects/uart/dev/puc/pucvar.h#6 edit .. //depot/projects/uart/dev/uart/uart_bus_puc.c#5 edit .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#8 edit .. //depot/projects/uart/dev/uart/uart_dev_z8530.h#5 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#8 (text+ko) ==== @@ -105,8 +105,9 @@ struct puc_device { struct resource_list resources; - u_int serialfreq; - u_int subtype; + u_int serialfreq; + u_int subtype; + int regshft; }; static void puc_intr(void *arg); @@ -333,6 +334,7 @@ pdev->serialfreq = sc->sc_desc.ports[i].serialfreq; pdev->subtype = sc->sc_desc.ports[i].type & PUC_PORT_SUBTYPE_MASK; + pdev->regshft = sc->sc_desc.ports[i].regshft; childunit = puc_find_free_unit(typestr); if (childunit < 0 && strcmp(typestr, "uart") != 0) { @@ -599,6 +601,9 @@ case PUC_IVAR_SUBTYPE: *result = pdev->subtype; break; + case PUC_IVAR_REGSHFT: + *result = pdev->regshft; + break; default: return (ENOENT); } ==== //depot/projects/uart/dev/puc/puc_sbus.c#3 (text+ko) ==== @@ -71,6 +71,7 @@ dd.ports[i].offset = 4 * i; dd.ports[i].serialfreq = 0; dd.ports[i].flags = PUC_FLAGS_MEMORY; + dd.ports[i].regshft = 1; } return (puc_attach(dev, &dd)); } ==== //depot/projects/uart/dev/puc/pucvar.h#6 (text+ko) ==== @@ -79,6 +79,7 @@ int offset; u_int serialfreq; u_int flags; + int regshft; } ports[PUC_MAX_PORTS]; uint32_t ilr_type; uint32_t ilr_offset[2]; @@ -114,7 +115,8 @@ enum puc_device_ivars { PUC_IVAR_FREQ, - PUC_IVAR_SUBTYPE + PUC_IVAR_SUBTYPE, + PUC_IVAR_REGSHFT }; #ifdef PUC_ENTRAILS ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ { device_t parent; struct uart_softc *sc; - uintptr_t rclk, type; + uintptr_t rclk, regshft, type; parent = device_get_parent(dev); sc = device_get_softc(dev); @@ -86,7 +86,9 @@ if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk)) rclk = 0; - return (uart_bus_probe(dev, 0, rclk, 0)); + if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, ®shft)) + regshft = 0; + return (uart_bus_probe(dev, regshft, rclk, 0)); } DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0); ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#8 (text+ko) ==== @@ -100,6 +100,7 @@ di->ops = uart_ns8250_ops; else if (!strcmp(buffer, "zs")) { di->ops = uart_z8530_ops; + di->bas.regshft = 1; di->bas.bsh += 4; } else return (ENXIO); ==== //depot/projects/uart/dev/uart/uart_dev_z8530.h#5 (text+ko) ==== @@ -31,12 +31,14 @@ /* * Channel B control: 0 - * Channel B data: 2 - * Channel A control: 4 - * Channel A data: 6 + * Channel B data: 1 + * Channel A control: 2 + * Channel A data: 3 + * + * We expect a seperate subregion for each channel. */ #define REG_CTRL 0 -#define REG_DATA 2 +#define REG_DATA 1 /* Write registers. */ #define WR_CR 0 /* Command Register. */ @@ -241,7 +243,7 @@ #define TPC_TB6 0x40 /* 6 databits. */ #define TPC_TB7 0x20 /* 7 databits. */ #define TPC_TB5 0x00 /* 5 or fewer databits. */ -#define TPC_SB 0x10 /* Send break. */ +#define TPC_BRK 0x10 /* Send break. */ #define TPC_TXE 0x08 /* Transmitter Enable. */ #define TPC_CRC16 0x04 /* CRC16. */ #define TPC_RTS 0x02 /* RTS. */ From owner-p4-projects@FreeBSD.ORG Sun Aug 31 15:52:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C35416A4C1; Sun, 31 Aug 2003 15:52:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C396C16A4BF for ; Sun, 31 Aug 2003 15:52:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 366A843FD7 for ; Sun, 31 Aug 2003 15:52:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7VMqm0U087050 for ; Sun, 31 Aug 2003 15:52:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7VMqmSx087047 for perforce@freebsd.org; Sun, 31 Aug 2003 15:52:48 -0700 (PDT) Date: Sun, 31 Aug 2003 15:52:48 -0700 (PDT) Message-Id: <200308312252.h7VMqmSx087047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2003 22:52:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=37285 Change 37285 by marcel@marcel_nfs on 2003/08/31 15:52:17 Implement UART_GETSIG and UART_SETSIG. This was not so trivial, because we cannot set/clear DTR or RTS without knowing what the correct value of WR5 (=TPC) is. So, we keep an image of that register in the softc. For system devices we luckily have all the line settings to reconstruct the image. Pheeuw, Unfortunately, getty(8) doesn't give me a prompt yet. Maybe some signals need to be inverted... Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#8 (text+ko) ==== @@ -89,14 +89,14 @@ static int z8530_param(struct uart_bas *bas, int baudrate, int databits, int stopbits, - int parity, int tpc) + int parity, uint8_t *tpcp) { int divisor; - uint8_t rpc, mpm; + uint8_t mpm, rpc, tpc; rpc = RPC_RXE; mpm = MPM_CM16; - tpc = TPC_TXE | (tpc & (TPC_DTR | TPC_RTS)); + tpc = TPC_TXE | (*tpcp & (TPC_DTR | TPC_RTS)); if (databits >= 8) { rpc |= RPC_RB8; @@ -136,9 +136,36 @@ uart_barrier(bas); uart_setmreg(bas, WR_TPC, tpc); uart_barrier(bas); + *tpcp = tpc; return (0); } +static int +z8530_setup(struct uart_bas *bas, int baudrate, int databits, int stopbits, + int parity) +{ + uint8_t tpc; + + if (bas->rclk == 0) + bas->rclk = DEFAULT_RCLK; + + /* Assume we don't need to perform a full hardware reset. */ + uart_setmreg(bas, WR_MIC, ((IS_CHANNEL_A(bas)) ? MIC_CRA : MIC_CRB) | + MIC_MIE | MIC_NV); + uart_barrier(bas); + /* Set clock sources and enable BRG. */ + uart_setmreg(bas, WR_CMC, CMC_RC_BRG | CMC_TC_BRG); + uart_setmreg(bas, WR_MCB2, MCB2_PCLK | MCB2_BRGE); + uart_barrier(bas); + /* Set data encoding. */ + uart_setmreg(bas, WR_MCB1, MCB1_NRZ); + uart_barrier(bas); + + tpc = TPC_DTR | TPC_RTS; + z8530_param(bas, baudrate, databits, stopbits, parity, &tpc); + return (int)tpc; +} + /* * Low-level UART interface. */ @@ -170,23 +197,7 @@ int parity) { - if (bas->rclk == 0) - bas->rclk = DEFAULT_RCLK; - - /* Assume we don't need to perform a full hardware reset. */ - uart_setmreg(bas, WR_MIC, ((IS_CHANNEL_A(bas)) ? MIC_CRA : MIC_CRB) | - MIC_MIE | MIC_NV); - uart_barrier(bas); - /* Set clock sources and enable BRG. */ - uart_setmreg(bas, WR_CMC, CMC_RC_BRG | CMC_TC_BRG); - uart_setmreg(bas, WR_MCB2, MCB2_PCLK | MCB2_BRGE); - uart_barrier(bas); - /* Set data encoding. */ - uart_setmreg(bas, WR_MCB1, MCB1_NRZ); - uart_barrier(bas); - - z8530_param(bas, baudrate, databits, stopbits, parity, - TPC_DTR | TPC_RTS); + z8530_setup(bas, baudrate, databits, stopbits, parity); } static void @@ -227,6 +238,7 @@ */ struct z8530_softc { struct uart_softc base; + uint8_t tpc; }; static int z8530_bus_attach(struct uart_softc *); @@ -272,19 +284,32 @@ static int z8530_bus_attach(struct uart_softc *sc) { + struct z8530_softc *z8530 = (struct z8530_softc*)sc; struct uart_bas *bas; + struct uart_devinfo *di; bas = &sc->sc_bas; - if (sc->sc_sysdev == NULL) - z8530_init(bas, 9600, 8, 1, UART_PARITY_NONE); + if (sc->sc_sysdev != NULL) { + di = sc->sc_sysdev; + z8530->tpc = TPC_DTR|TPC_RTS; + z8530_param(bas, di->baudrate, di->databits, di->stopbits, + di->parity, &z8530->tpc); + } else { + z8530->tpc = z8530_setup(bas, 9600, 8, 1, UART_PARITY_NONE); + z8530->tpc &= ~(TPC_DTR|TPC_RTS); + } sc->sc_rxfifosz = 1; sc->sc_txfifosz = 1; uart_setmreg(bas, WR_IC, IC_BRK | IC_CTS | IC_DCD); + uart_barrier(bas); uart_setmreg(bas, WR_IDT, IDT_TIE | IDT_RIA); + uart_barrier(bas); uart_setmreg(bas, WR_IV, 0); uart_barrier(bas); + uart_setmreg(bas, WR_TPC, z8530->tpc); + uart_barrier(bas); return (0); } @@ -305,8 +330,15 @@ static int z8530_bus_getsig(struct uart_softc *sc) { + int sig; + uint8_t bes; - return (0); + sig = sc->sc_hwsig; + bes = uart_getmreg(&sc->sc_bas, RR_BES); + SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + sc->sc_hwsig = sig & ~UART_SIGMASK_DELTA; + return (sig); } static int @@ -347,10 +379,12 @@ z8530_bus_param(struct uart_softc *sc, int baudrate, int databits, int stopbits, int parity) { - struct uart_bas *bas; + struct z8530_softc *z8530 = (struct z8530_softc*)sc; + int error; - bas = &sc->sc_bas; - return (z8530_param(bas, baudrate, databits, stopbits, parity, 0)); + error = z8530_param(&sc->sc_bas, baudrate, databits, stopbits, parity, + &z8530->tpc); + return (error); } static int @@ -382,7 +416,34 @@ static int z8530_bus_setsig(struct uart_softc *sc, int sig) { + struct z8530_softc *z8530 = (struct z8530_softc*)sc; + struct uart_bas *bas; + bas = &sc->sc_bas; + if (sig & UART_SIG_DDTR) { + SIGCHG(sig & UART_SIG_DTR, sc->sc_hwsig, UART_SIG_DTR, + UART_SIG_DDTR); + } + if (sig & UART_SIG_DRTS) { + SIGCHG(sig & UART_SIG_RTS, sc->sc_hwsig, UART_SIG_RTS, + UART_SIG_DRTS); + } + if (sc->sc_hwsig & UART_SIG_DTR) + z8530->tpc |= TPC_DTR; + else + z8530->tpc &= ~TPC_DTR; + if (sc->sc_hwsig & UART_SIG_RTS) + z8530->tpc |= TPC_RTS; + else + z8530->tpc &= ~TPC_RTS; + if (sig & UART_SIG_DBREAK) { + if (sig & UART_SIG_BREAK) + z8530->tpc |= TPC_BRK; + else + z8530->tpc &= ~TPC_BRK; + } + uart_setmreg(bas, WR_TPC, z8530->tpc); + uart_barrier(bas); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 1 13:48:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5816C16A4C1; Mon, 1 Sep 2003 13:48:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03CB816A4BF for ; Mon, 1 Sep 2003 13:48:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57FA443FE1 for ; Mon, 1 Sep 2003 13:48:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81Kmc0U093547 for ; Mon, 1 Sep 2003 13:48:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81KmbRN093544 for perforce@freebsd.org; Mon, 1 Sep 2003 13:48:37 -0700 (PDT) Date: Mon, 1 Sep 2003 13:48:37 -0700 (PDT) Message-Id: <200309012048.h81KmbRN093544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 20:48:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37337 Change 37337 by marcel@marcel_nfs on 2003/09/01 13:47:41 Implement UART_RECEIVE() and change the size of the Rx FIFO from 1 to 3. This latter is not really crucial, because we read characters from the chip until there are no more. But, it's documented to be at least 3 characters. We now have a working console in single-user mode. For some reason getty(8) still waits for DCD. I don't think this is a problem that relates to the z8530 though. Even if we get the signals wrong, the console is forced to be CLOCAL so we don't care if we have DCD or not. At least, that's the idea. Get the signal state in UART_ATTACH() to have a good begin situation though. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#9 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#9 (text+ko) ==== @@ -299,9 +299,11 @@ z8530->tpc &= ~(TPC_DTR|TPC_RTS); } - sc->sc_rxfifosz = 1; + sc->sc_rxfifosz = 3; sc->sc_txfifosz = 1; + (void)z8530_bus_getsig(sc); + uart_setmreg(bas, WR_IC, IC_BRK | IC_CTS | IC_DCD); uart_barrier(bas); uart_setmreg(bas, WR_IDT, IDT_TIE | IDT_RIA); @@ -409,7 +411,24 @@ static int z8530_bus_receive(struct uart_softc *sc) { - + struct uart_bas *bas; + int xc; + uint8_t bes, src; + + bas = &sc->sc_bas; + bes = uart_getmreg(bas, RR_BES); + while ((bes & BES_RXA) && !uart_rx_full(sc)) { + src = uart_getmreg(bas, RR_SRC); + xc = uart_getreg(bas, REG_DATA); + if (src & SRC_FE) + xc |= UART_STAT_FRAMERR; + if (src & SRC_PE) + xc |= UART_STAT_PARERR; + uart_rx_put(sc, xc); + if (src & (SRC_FE | SRC_PE)) + uart_setreg(bas, REG_CTRL, CR_RSTERR); + bes = uart_getmreg(bas, RR_BES); + } return (0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 1 14:01:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A32516A4C1; Mon, 1 Sep 2003 14:01:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47C3116A4BF for ; Mon, 1 Sep 2003 14:01:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C874944003 for ; Mon, 1 Sep 2003 14:01:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81L1t0U094095 for ; Mon, 1 Sep 2003 14:01:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81L1tHn094091 for perforce@freebsd.org; Mon, 1 Sep 2003 14:01:55 -0700 (PDT) Date: Mon, 1 Sep 2003 14:01:55 -0700 (PDT) Message-Id: <200309012101.h81L1tHn094091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 21:01:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37339 Change 37339 by marcel@marcel_nfs on 2003/09/01 14:01:35 s/uart_close/uart_tty_close/g s/uart_ioctl/uart_tty_ioctl/g s/uart_open/uart_tty_open/g Now that the TTY interface is not the only interface (well, by design at least :-), avoid a naming scheme that implies otherwise. Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.c#9 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_tty.c#9 (text+ko) ==== @@ -62,16 +62,16 @@ CONS_DRIVER(uart, uart_cnprobe, uart_cninit, uart_cnterm, uart_cngetc, uart_cncheckc, uart_cnputc, NULL); -static d_open_t uart_open; -static d_close_t uart_close; -static d_ioctl_t uart_ioctl; +static d_open_t uart_tty_open; +static d_close_t uart_tty_close; +static d_ioctl_t uart_tty_ioctl; static struct cdevsw uart_cdevsw = { - .d_open = uart_open, - .d_close = uart_close, + .d_open = uart_tty_open, + .d_close = uart_tty_close, .d_read = ttyread, .d_write = ttywrite, - .d_ioctl = uart_ioctl, + .d_ioctl = uart_tty_ioctl, .d_poll = ttypoll, .d_name = uart_driver_name, .d_maj = MAJOR_AUTO, @@ -335,7 +335,7 @@ } static int -uart_open(dev_t dev, int flags, int mode, struct thread *td) +uart_tty_open(dev_t dev, int flags, int mode, struct thread *td) { struct uart_softc *sc; struct tty *tp; @@ -424,7 +424,7 @@ } static int -uart_close(dev_t dev, int flags, int mode, struct thread *td) +uart_tty_close(dev_t dev, int flags, int mode, struct thread *td) { struct uart_softc *sc; struct tty *tp; @@ -452,7 +452,8 @@ } static int -uart_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td) +uart_tty_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, + struct thread *td) { struct uart_softc *sc; struct tty *tp; From owner-p4-projects@FreeBSD.ORG Mon Sep 1 15:01:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D05116A4C1; Mon, 1 Sep 2003 15:01:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 399A316A4BF for ; Mon, 1 Sep 2003 15:01:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBAC243FCB for ; Mon, 1 Sep 2003 15:01:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81M170U097086 for ; Mon, 1 Sep 2003 15:01:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81M17p9097083 for perforce@freebsd.org; Mon, 1 Sep 2003 15:01:07 -0700 (PDT) Date: Mon, 1 Sep 2003 15:01:07 -0700 (PDT) Message-Id: <200309012201.h81M17p9097083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 22:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=37340 Change 37340 by marcel@marcel_nfs on 2003/09/01 15:00:27 Got it: we were setting CLOCAL and ~HUPCL in the wrong structure. It was never properly set for the tty. I think I must always have had DCD wired to DSR with my null-modem cables. Ok, so now that I can login (yay!) I still need to figure out if a have the DCD and CTS signals with the right polarity, because apparently DCD is not set according to the z8530 driver. If I look at zs(4), I think this is right, but I have no visual way to confirm this. It's trivial to fix, so I'm not going to worry about it until I get some definite reports. Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.c#10 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_tty.c#10 (text+ko) ==== @@ -191,9 +191,12 @@ return (ENODEV); if (t->c_ispeed != t->c_ospeed && t->c_ospeed != 0) return (EINVAL); - /* Hardwire the speed of system devices. */ - if (sc->sc_sysdev != NULL) + /* Fixate certain parameters for system devices. */ + if (sc->sc_sysdev != NULL) { t->c_ispeed = t->c_ospeed = sc->sc_sysdev->baudrate; + t->c_cflag |= CLOCAL; + t->c_cflag &= ~HUPCL; + } if (t->c_ospeed == 0) { UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); return (0); @@ -215,10 +218,6 @@ if ((t->c_cflag & CRTS_IFLOW) == 0) UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS); ttsetwater(tp); - if (sc->sc_sysdev != NULL) { - tp->t_cflag |= CLOCAL; - tp->t_cflag &= ~HUPCL; - } return (0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 1 16:49:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 470B516A4DF; Mon, 1 Sep 2003 16:49:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2BB016A4DF for ; Mon, 1 Sep 2003 16:49:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ED144400D for ; Mon, 1 Sep 2003 16:49:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81NnK0U008283 for ; Mon, 1 Sep 2003 16:49:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81NnJtr008280 for perforce@freebsd.org; Mon, 1 Sep 2003 16:49:19 -0700 (PDT) Date: Mon, 1 Sep 2003 16:49:19 -0700 (PDT) Message-Id: <200309012349.h81NnJtr008280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 23:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=37343 Change 37343 by marcel@marcel_nfs on 2003/09/01 16:48:34 Icing on the cake: Check the device parameters for the channel number. It's now save to move the console from ttya to ttyb, provided you have a getty(8) on the UART or boot single-user of course :-) Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#9 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#9 (text+ko) ==== @@ -42,14 +42,30 @@ static struct bus_space_tag bst_store[3]; +static int +uart_cpu_channel(char *dev) +{ + char alias[64]; + phandle_t aliases; + int len; + + strcpy(alias, dev); + if ((aliases = OF_finddevice("/aliases")) != -1) + OF_getprop(aliases, dev, alias, sizeof(alias)); + len = strlen(alias); + if (len < 2 || alias[len - 2] != ':' || alias[len - 1] < 'a' || + alias[len - 1] > 'b') + return (0); + return (alias[len - 1] - 'a'); +} + int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - char buffer[64]; - phandle_t chosen, consin, consout, options; - ihandle_t stdin, stdout; + char buf[32], dev[32]; + phandle_t input, options, output; bus_addr_t addr; - int baud, bits, error, space, stop; + int baud, bits, ch, error, space, stop; char flag, par; /* @@ -57,81 +73,73 @@ * the console is an UART of course. Note that we enforce that both * stdin and stdout are selected. For weird configurations, use * ofw_console(4). + * Note that the currently active console (ie /chosen/stdout and + * /chosen/stdin) may not be the same as the device selected in the + * environment (ie /options/output-device and /options/input-device) + * because the user may have changed the environment. In that case + * I would assume that the user expects that FreeBSD uses the new + * console setting. There's choice choice, really. */ - if ((chosen = OF_finddevice("/chosen")) == -1) + if ((options = OF_finddevice("/options")) == -1) return (ENXIO); - if (OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)) == -1) + if (OF_getprop(options, "input-device", dev, sizeof(dev)) == -1) return (ENXIO); - if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1) + if ((input = OF_finddevice(dev)) == -1) return (ENXIO); - if ((consin = OF_instance_to_package(stdin)) == -1) + if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1) return (ENXIO); - if ((consout = OF_instance_to_package(stdout)) == -1) - return (ENXIO); - if (devtype == UART_DEV_CONSOLE) { - if (consin != consout) + if (strcmp(buf, "serial")) + return (ENODEV); + if (devtype == UART_DEV_KEYBOARD) { + if (OF_getprop(input, "keyboard", buf, sizeof(buf)) == -1) + return (ENXIO); + } else if (devtype == UART_DEV_CONSOLE) { + if (OF_getprop(options, "output-device", buf, sizeof(buf)) + == -1) + return (ENXIO); + if ((output = OF_finddevice(buf)) == -1) return (ENXIO); - } else if (devtype == UART_DEV_KEYBOARD) { - if (OF_getprop(consin, "keyboard", buffer, - sizeof(buffer)) == -1) + if (input != output) return (ENXIO); - } - if (OF_getprop(consin, "device_type", buffer, sizeof(buffer)) == -1) - return (ENXIO); - if (strcmp(buffer, "serial")) - return (ENXIO); + } else + return (ENODEV); - error = OF_decode_addr(consin, &space, &addr); + error = OF_decode_addr(input, &space, &addr); if (error) return (error); - /* Fill in the device info. */ - di->bas.bst = &bst_store[devtype]; - di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst); + /* Get the device class. */ + if (OF_getprop(input, "name", buf, sizeof(buf)) == -1) + return (ENXIO); di->bas.regshft = 0; di->bas.rclk = 0; - - /* Get the device class. */ - if (OF_getprop(consin, "name", buffer, sizeof(buffer)) == -1) - return (ENXIO); - if (!strcmp(buffer, "se")) + if (!strcmp(buf, "se")) { di->ops = uart_sab82532_ops; - else if (!strcmp(buffer, "su") || !strcmp(buffer, "su_pnp")) - di->ops = uart_ns8250_ops; - else if (!strcmp(buffer, "zs")) { + addr += 64 * uart_cpu_channel(dev); + } else if (!strcmp(buf, "zs")) { di->ops = uart_z8530_ops; di->bas.regshft = 1; - di->bas.bsh += 4; - } else + ch = uart_cpu_channel(dev); + addr += 4 - 4 * ch; + } else if (!strcmp(buf, "su") || !strcmp(buf, "su_pnp")) + di->ops = uart_ns8250_ops; + else return (ENXIO); - /* - * Get the line settings. This is tricky because the settings are - * stored under some (possibly) random alias as a property of - * /options and we don't even know if they apply to the currently - * selected device. We simply assume 9600,n,8,1 if something wrong. - * Note that we always return success from here on. - */ + /* Fill in the device info. */ + di->bas.bst = &bst_store[devtype]; + di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst); + + /* Get the line settings. */ di->baudrate = 9600; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; - - if ((options = OF_finddevice("/options")) == -1) + snprintf(buf, sizeof(buf), "%s-mode", dev); + if (OF_getprop(options, buf, buf, sizeof(buf)) == -1) return (0); - if (OF_getprop(options, "output-device", buffer, sizeof(buffer)) == -1) - return (0); - if ((consout = OF_finddevice(buffer)) == -1) - return (0); - if (consout != consin) - return (0); - if (sizeof(buffer) - strlen(buffer) < 6) - return (0); - strcat(buffer, "-mode"); - if (OF_getprop(options, buffer, buffer, sizeof(buffer)) == -1) - return (0); - if (sscanf(buffer, "%d,%d,%c,%d,%c", &baud, &bits, &par, &stop, - &flag) != 5) + if (sscanf(buf, "%d,%d,%c,%d,%c", &baud, &bits, &par, &stop, &flag) + != 5) return (0); di->baudrate = baud; di->databits = bits; From owner-p4-projects@FreeBSD.ORG Mon Sep 1 16:53:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7485416A4C1; Mon, 1 Sep 2003 16:53:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3644616A4BF for ; Mon, 1 Sep 2003 16:53:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A32943FE9 for ; Mon, 1 Sep 2003 16:53:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81NrQ0U008497 for ; Mon, 1 Sep 2003 16:53:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81NrPLa008494 for perforce@freebsd.org; Mon, 1 Sep 2003 16:53:25 -0700 (PDT) Date: Mon, 1 Sep 2003 16:53:25 -0700 (PDT) Message-Id: <200309012353.h81NrPLa008494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 23:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=37344 Change 37344 by marcel@marcel_nfs on 2003/09/01 16:52:40 IFC @37342 Affected files ... .. //depot/projects/uart/alpha/include/varargs.h#2 integrate .. //depot/projects/uart/amd64/include/varargs.h#2 integrate .. //depot/projects/uart/conf/files.i386#8 integrate .. //depot/projects/uart/conf/options.i386#4 integrate .. //depot/projects/uart/dev/aac/aac.c#6 integrate .. //depot/projects/uart/dev/ata/ata-all.c#5 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/uart/dev/ath/if_ath.c#8 integrate .. //depot/projects/uart/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/uart/dev/pci/pci.c#7 integrate .. //depot/projects/uart/dev/usb/usb_mem.h#4 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#5 integrate .. //depot/projects/uart/geom/geom.h#3 integrate .. //depot/projects/uart/geom/geom_bsd.c#2 integrate .. //depot/projects/uart/geom/geom_dev.c#5 integrate .. //depot/projects/uart/geom/geom_disk.c#2 integrate .. //depot/projects/uart/geom/geom_mbr.c#3 integrate .. //depot/projects/uart/geom/geom_pc98.c#2 integrate .. //depot/projects/uart/i386/i386/geode.c#1 branch .. //depot/projects/uart/i386/include/varargs.h#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#10 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/uart/kern/uipc_domain.c#2 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#3 integrate .. //depot/projects/uart/kern/vfs_bio.c#5 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#4 integrate .. //depot/projects/uart/netinet/ip_flow.c#2 integrate .. //depot/projects/uart/netinet/ip_flow.h#2 integrate .. //depot/projects/uart/netinet/ip_output.c#5 integrate .. //depot/projects/uart/netinet/raw_ip.c#6 integrate .. //depot/projects/uart/netipsec/ipsec.c#3 integrate .. //depot/projects/uart/netipsec/ipsec.h#2 integrate .. //depot/projects/uart/netipsec/ipsec_input.c#3 integrate .. //depot/projects/uart/netipsec/ipsec_output.c#3 integrate .. //depot/projects/uart/netipsec/key.c#3 integrate .. //depot/projects/uart/netipsec/key.h#2 integrate .. //depot/projects/uart/netipsec/keydb.h#2 integrate .. //depot/projects/uart/netipsec/xform_ah.c#3 integrate .. //depot/projects/uart/netipsec/xform_esp.c#3 integrate .. //depot/projects/uart/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/uart/pci/amdpm.c#3 integrate .. //depot/projects/uart/powerpc/include/varargs.h#2 integrate .. //depot/projects/uart/sparc64/include/varargs.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/uart/sys/buf.h#4 integrate .. //depot/projects/uart/sys/mbuf.h#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/uart/vm/vm_init.c#4 integrate .. //depot/projects/uart/vm/vm_kern.c#5 integrate Differences ... ==== //depot/projects/uart/alpha/include/varargs.h#2 (text+ko) ==== @@ -38,11 +38,11 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.5 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.6 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _ALPHA_VARARGS_H_ -#define _ALPHA_VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -80,4 +80,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_ALPHA_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/uart/amd64/include/varargs.h#2 (text+ko) ==== @@ -37,11 +37,11 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.11 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.12 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _VARARGS_H_ -#define _VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -86,4 +86,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/uart/conf/files.i386#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.452 2003/08/23 18:00:31 mdodd Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.453 2003/08/31 16:20:34 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ i386/i386/elan-mmcr.c optional cpu_elan i386/i386/elf_machdep.c standard i386/i386/exception.s standard +i386/i386/geode.c optional cpu_geode i386/i386/i386-gdbstub.c optional ddb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard ==== //depot/projects/uart/conf/options.i386#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.196 2003/07/22 11:42:45 ticso Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.197 2003/08/31 16:20:34 phk Exp $ # Options specific to the i386 platform kernels DISABLE_PSE opt_pmap.h @@ -48,6 +48,7 @@ CPU_DISABLE_5X86_LSSER opt_cpu.h CPU_ELAN opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h +CPU_GEODE opt_cpu.h CPU_I486_ON_386 opt_cpu.h CPU_IORT opt_cpu.h CPU_L2_LATENCY opt_cpu.h ==== //depot/projects/uart/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.75 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.77 2003/09/01 20:44:18 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -727,6 +727,8 @@ sc->flags |= AAC_QUEUE_FRZN; error = 0; } + } else { + aac_map_command_sg(cm, NULL, 0, 0); } return (error); } @@ -1581,8 +1583,9 @@ * virtue of a table. */ qoffset = offsetof(struct aac_common, ac_qbuf) + AAC_QUEUE_ALIGN; - qoffset &= (AAC_QUEUE_ALIGN - 1); - sc->aac_queues = (struct aac_queue_table *)((uintptr_t)sc->aac_common + qoffset); + qoffset &= ~(AAC_QUEUE_ALIGN - 1); + sc->aac_queues = + (struct aac_queue_table *)((uintptr_t)sc->aac_common + qoffset); ip->CommHeaderAddress = sc->aac_common_busaddr + qoffset; sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][AAC_PRODUCER_INDEX] = ==== //depot/projects/uart/dev/ata/ata-all.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.187 2003/08/27 15:27:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.188 2003/09/01 11:13:21 sos Exp $"); #include "opt_ata.h" #include @@ -523,14 +523,19 @@ if (request) { request->device = atadev; request->u.ata.command = command; - request->flags = ATA_R_READ; + request->flags = (ATA_R_READ | ATA_R_QUIET); request->data = (caddr_t)atacap; request->timeout = 2; - request->retries = 2; + request->retries = 3; request->bytecount = sizeof(struct ata_params); request->transfersize = DEV_BSIZE; - ata_queue_request(request); - error = request->result; + while (request->retries) { + ata_queue_request(request); + if (!(error = request->result)) + break; + request->flags &= ~ATA_R_QUIET; + request->retries--; + } ata_free_request(request); } if (error) { ==== //depot/projects/uart/dev/ata/ata-lowlevel.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.7 2003/08/28 09:15:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.8 2003/09/01 11:13:21 sos Exp $"); #include "opt_ata.h" #include @@ -480,7 +480,7 @@ static void ata_reset(struct ata_channel *ch) { - u_int8_t lsb, msb, ostat0, ostat1; + u_int8_t err, lsb, msb, ostat0, ostat1; u_int8_t stat0 = 0, stat1 = 0; int mask = 0, timeout; @@ -496,6 +496,7 @@ ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); DELAY(10); ostat1 = ATA_IDX_INB(ch, ATA_STATUS); + /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { @@ -511,7 +512,7 @@ return; if (bootverbose) - ata_printf(ch, -1, "pre reset mask=%02x ostat0=%02x ostat2=%02x\n", + ata_printf(ch, -1, "reset tp1 mask=%02x ostat0=%02x ostat1=%02x\n", mask, ostat0, ostat1); /* reset channel */ @@ -527,36 +528,40 @@ if (stat0 & ATA_S_BUSY) { ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); - ATA_IDX_INB(ch, ATA_ERROR); + err = ATA_IDX_INB(ch, ATA_ERROR); + lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); + msb = ATA_IDX_INB(ch, ATA_CYL_MSB); stat0 = ATA_IDX_INB(ch, ATA_STATUS); - if (!(stat0 & ATA_S_BUSY)) { - /* check for ATAPI signature while its still there */ - lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); - msb = ATA_IDX_INB(ch, ATA_CYL_MSB); - if (bootverbose) - ata_printf(ch, ATA_MASTER, "ATAPI %02x %02x\n", lsb, msb); - if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { + if (bootverbose) + ata_printf(ch, ATA_MASTER, + "stat=0x%02x err=0x%02x lsb=0x%02x msb=0x%02x\n", + stat0, err, lsb, msb); + if (!(stat0 & ATA_S_BUSY) && err == ATA_E_ILI) { + if (stat0 & ATA_S_READY) { + ch->devices |= ATA_ATA_MASTER; + } + else if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { ch->devices |= ATA_ATAPI_MASTER; - ATA_IDX_OUTB(ch, ATA_CYL_LSB, 0x00); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, 0x00); } } } if (stat1 & ATA_S_BUSY) { ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); DELAY(10); - ATA_IDX_INB(ch, ATA_ERROR); + err = ATA_IDX_INB(ch, ATA_ERROR); + lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); + msb = ATA_IDX_INB(ch, ATA_CYL_MSB); stat1 = ATA_IDX_INB(ch, ATA_STATUS); - if (!(stat1 & ATA_S_BUSY)) { - /* check for ATAPI signature while its still there */ - lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); - msb = ATA_IDX_INB(ch, ATA_CYL_MSB); - if (bootverbose) - ata_printf(ch, ATA_SLAVE, "ATAPI %02x %02x\n", lsb, msb); - if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { + if (bootverbose) + ata_printf(ch, ATA_SLAVE, + "stat=0x%02x err=0x%02x lsb=0x%02x msb=0x%02x\n", + stat0, err, lsb, msb); + if (!(stat1 & ATA_S_BUSY) && err == ATA_E_ILI) { + if (stat1 & ATA_S_READY) { + ch->devices |= ATA_ATA_SLAVE; + } + else if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { ch->devices |= ATA_ATAPI_SLAVE; - ATA_IDX_OUTB(ch, ATA_CYL_LSB, 0x00); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, 0x00); } } } @@ -567,51 +572,55 @@ if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20)) break; if (mask == 0x03) /* wait for both master & slave */ - if ((!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) || - (stat0 == 0xff && stat1 == 0xff && timeout > 20)) - + if ((!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20)) && + (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20))) break; DELAY(100000); } - DELAY(10); - ATA_IDX_OUTB(ch, ATA_ALTSTAT, ATA_A_4BIT); if (stat0 & ATA_S_BUSY) mask &= ~0x01; if (stat1 & ATA_S_BUSY) mask &= ~0x02; + if (bootverbose) - ata_printf(ch, -1, "after reset mask=%02x stat0=%02x stat1=%02x\n", - mask, stat0, stat1); + ata_printf(ch, -1, + "reset tp2 mask=%02x stat0=%02x stat1=%02x devices=0x%b\n", + mask, stat0, stat1, ch->devices, + "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); if (!mask) return; - if (mask & 0x01 && ostat0 != 0x00 && !(ch->devices & ATA_ATAPI_MASTER)) { + if (mask & 0x01 && ostat0 != 0x00 && + !(ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER))) { ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ATA_IDX_OUTB(ch, ATA_ERROR, 0x58); ATA_IDX_OUTB(ch, ATA_CYL_LSB, 0xa5); - lsb = ATA_IDX_INB(ch, ATA_ERROR); - msb = ATA_IDX_INB(ch, ATA_CYL_LSB); + err = ATA_IDX_INB(ch, ATA_ERROR); + lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); if (bootverbose) - ata_printf(ch, ATA_MASTER, "ATA %02x %02x\n", lsb, msb); - if (lsb != 0x58 && msb == 0xa5) + ata_printf(ch, ATA_MASTER, "ATA err=0x%02x lsb=0x%02x\n", err, lsb); + if (err != 0x58 && lsb == 0xa5) ch->devices |= ATA_ATA_MASTER; } - if (mask & 0x02 && ostat1 != 0x00 && !(ch->devices & ATA_ATAPI_SLAVE)) { + if (mask & 0x02 && ostat1 != 0x00 && + !(ch->devices & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE))) { ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); DELAY(10); ATA_IDX_OUTB(ch, ATA_ERROR, 0x58); ATA_IDX_OUTB(ch, ATA_CYL_LSB, 0xa5); - lsb = ATA_IDX_INB(ch, ATA_ERROR); - msb = ATA_IDX_INB(ch, ATA_CYL_LSB); + err = ATA_IDX_INB(ch, ATA_ERROR); + lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); if (bootverbose) - ata_printf(ch, ATA_SLAVE, "ATA %02x %02x\n", lsb, msb); - if (lsb != 0x58 && msb == 0xa5) + ata_printf(ch, ATA_SLAVE, "ATA err=0x%02x lsb=0x%02x\n", err, lsb); + if (err != 0x58 && lsb == 0xa5) ch->devices |= ATA_ATA_SLAVE; } + if (bootverbose) - ata_printf(ch, -1, "devices=%02x\n", ch->devices); + ata_printf(ch, -1, "reset tp3 devices=0x%b\n", ch->devices, + "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); } static int @@ -682,6 +691,9 @@ return -1; } + /* enable interrupt */ + ATA_IDX_OUTB(atadev->channel, ATA_ALTSTAT, ATA_A_4BIT); + /* only use 48bit addressing if needed (avoid bugs and overhead) */ if ((lba > 268435455 || count > 256) && atadev->param && atadev->param->support.command2 & ATA_SUPPORT_ADDRESS48) { ==== //depot/projects/uart/dev/ath/if_ath.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.12 2003/08/19 22:17:03 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.13 2003/09/01 03:12:19 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -899,6 +899,8 @@ /* receive filter */ rfilt = (ath_hal_getrxfilter(ah) & HAL_RX_FILTER_PHYERR) | HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST | HAL_RX_FILTER_MCAST; + if (ic->ic_opmode != IEEE80211_M_STA) + rfilt |= HAL_RX_FILTER_PROBEREQ; if (ic->ic_opmode != IEEE80211_M_HOSTAP && (ifp->if_flags & IFF_PROMISC)) rfilt |= HAL_RX_FILTER_PROM; @@ -2231,6 +2233,8 @@ goto bad; rfilt = (ath_hal_getrxfilter(ah) & HAL_RX_FILTER_PHYERR) | HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST | HAL_RX_FILTER_MCAST; + if (ic->ic_opmode != IEEE80211_M_STA) + rfilt |= HAL_RX_FILTER_PROBEREQ; if (ic->ic_opmode != IEEE80211_M_HOSTAP && (ifp->if_flags & IFF_PROMISC)) rfilt |= HAL_RX_FILTER_PROM; ==== //depot/projects/uart/dev/ichsmb/ichsmb_pci.c#5 (text+ko) ==== @@ -37,11 +37,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.9 2003/08/31 01:28:02 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.10 2003/08/31 19:23:00 njl Exp $"); /* * Support for the SMBus controller logical device which is part of the - * Intel 81801AA/AB/BA/CA/DC (ICH/ICH[0234]) I/O controller hub chips. + * Intel 81801AA/AB/BA/CA/DC/EB (ICH/ICH[02345]) I/O controller hub chips. */ #include ==== //depot/projects/uart/dev/pci/pci.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.227 2003/08/28 21:22:25 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.228 2003/09/01 15:01:49 dfr Exp $ * */ @@ -1344,12 +1344,15 @@ break; case SYS_RES_IOPORT: case SYS_RES_MEMORY: - /* - * Enable the I/O mode. We should also be allocating - * resources too. XXX - */ - if (PCI_ENABLE_IO(dev, child, type)) - return (NULL); + if (*rid < PCIR_MAPS + 4*cfg->nummaps) { + /* + * Enable the I/O mode. We should + * also be allocating resources + * too. XXX + */ + if (PCI_ENABLE_IO(dev, child, type)) + return (NULL); + } break; } } ==== //depot/projects/uart/dev/usb/usb_mem.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_mem.h,v 1.18 2002/05/28 17:45:17 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.19 2003/07/15 22:42:37 jmg Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.20 2003/09/01 01:07:24 jmg Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ } usb_dma_block_t; #ifdef __FreeBSD__ -#define DMAADDR(dma, o) ((uint32_t)(uintptr_t)(((char *)(dma)->block->segs[0].ds_addr) + (dma)->offs + (o))) +#define DMAADDR(dma, o) ((dma)->block->segs[0].ds_addr + (dma)->offs + (o)) #else #define DMAADDR(dma, o) (((char *)(dma)->block->map->dm_segs[0].ds_addr) + (dma)->offs + (o)) #endif ==== //depot/projects/uart/dev/usb/usb_subr.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.57 2003/08/24 17:55:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.58 2003/09/01 07:47:42 ticso Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -971,6 +971,7 @@ usbd_device_handle dev; struct usbd_device *hub; usb_device_descriptor_t *dd; + usb_port_status_t ps; usbd_status err; int addr; int i; @@ -1027,12 +1028,14 @@ up->device = dev; dd = &dev->ddesc; /* Try a few times in case the device is slow (i.e. outside specs.) */ - for (i = 0; i < 3; i++) { + for (i = 0; i < 15; i++) { /* Get the first 8 bytes of the device descriptor. */ err = usbd_get_desc(dev, UDESC_DEVICE, 0, USB_MAX_IPACKET, dd); if (!err) break; usbd_delay_ms(dev, 200); + if ((i & 3) == 3) + usbd_reset_port(up->parent, port, &ps); } if (err) { DPRINTFN(-1, ("usbd_new_device: addr=%d, getting first desc " ==== //depot/projects/uart/geom/geom.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.72 2003/08/30 18:33:55 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.73 2003/09/01 20:45:32 phk Exp $ */ #ifndef _GEOM_GEOM_H_ @@ -64,8 +64,8 @@ typedef int g_ctl_config_geom_t (struct gctl_req *, struct g_geom *gp, const char *verb); typedef void g_init_t (struct g_class *mp); typedef void g_fini_t (struct g_class *mp); -typedef struct g_geom * g_taste_t (struct g_class *, struct g_provider *, - int flags); +typedef struct g_geom * g_taste_t (struct g_class *, struct g_provider *, int flags); +typedef int g_ioctl_t(struct g_provider *pp, u_long cmd, void *data, struct thread *td); #define G_TF_NORMAL 0 #define G_TF_INSIST 1 #define G_TF_TRANSPARENT 2 @@ -116,6 +116,7 @@ g_dumpconf_t *dumpconf; g_access_t *access; g_orphan_t *orphan; + g_ioctl_t *ioctl; void *softc; unsigned flags; #define G_GEOM_WITHER 1 @@ -231,20 +232,6 @@ /* geom_kern.c / geom_kernsim.c */ -#ifndef _SYS_CONF_H_ -typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data, - int fflag, struct thread *td); -#endif - -struct g_ioctl { - u_long cmd; - void *data; - int fflag; - struct thread *td; - d_ioctl_t *func; - void *dev; -}; - #ifdef _KERNEL struct g_kerneldump { ==== //depot/projects/uart/geom/geom_bsd.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.65 2003/06/11 06:49:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.66 2003/09/01 20:45:32 phk Exp $"); #include #include @@ -267,99 +267,7 @@ return(error); } - /* - * Implement certain ioctls to modify disklabels with. This function - * is called by the event handler thread with topology locked as result - * of the g_post_event() in g_bsd_start(). It is not necessary to keep - * topology locked all the time but make sure to return with topology - * locked as well. - */ - -static void -g_bsd_ioctl(void *arg, int flag) -{ - struct bio *bp; - struct g_geom *gp; - struct g_ioctl *gio; - u_char *label; - int error; - - g_topology_assert(); - bp = arg; - if (flag == EV_CANCEL) { - g_io_deliver(bp, ENXIO); - return; - } - - gp = bp->bio_to->geom; - gio = (struct g_ioctl *)bp->bio_data; - - label = g_malloc(LABELSIZE, M_WAITOK); - - /* The disklabel to set is the ioctl argument. */ - bsd_disklabel_le_enc(label, gio->data); - - /* Validate and modify our slice instance to match. */ - error = g_bsd_modify(gp, label); /* Picks up topology lock on success. */ - g_free(label); - if (error || gio->cmd == DIOCSDINFO) { - g_io_deliver(bp, error); - return; - } - - KASSERT(gio->cmd == DIOCWDINFO, ("Unknown ioctl in g_bsd_ioctl")); - g_io_deliver(bp, g_bsd_writelabel(gp, NULL)); -} - -/* - * Rewrite the bootblock, which is BBSIZE bytes from the start of the disk. - * We punch down the disklabel where we expect it to be before writing. - */ -static int -g_bsd_diocbsdbb(dev_t dev, u_long cmd __unused, caddr_t data, int fflag __unused, struct thread *td __unused) -{ - struct g_geom *gp; - struct g_slicer *gsp; - struct g_bsd_softc *ms; - struct g_consumer *cp; - u_char *buf; - void *p; - int error, i; - uint64_t sum; - - /* Get hold of the interesting bits from the bio. */ - gp = (void *)dev; - gsp = gp->softc; - ms = gsp->softc; - - /* The disklabel to set is the ioctl argument. */ - buf = g_malloc(BBSIZE, M_WAITOK); - p = *(void **)data; - error = copyin(p, buf, BBSIZE); - if (!error) { - DROP_GIANT(); - g_topology_lock(); - /* Validate and modify our slice instance to match. */ - error = g_bsd_modify(gp, buf + ms->labeloffset); - if (!error) { - cp = LIST_FIRST(&gp->consumer); - if (ms->labeloffset == ALPHA_LABEL_OFFSET) { - sum = 0; - for (i = 0; i < 63; i++) - sum += le64dec(buf + i * 8); - le64enc(buf + 504, sum); - } - error = g_write_data(cp, 0, buf, BBSIZE); - } - g_topology_unlock(); - PICKUP_GIANT(); - } - g_free(buf); - return (error); -} - -/* * If the user tries to overwrite our disklabel through an open partition * or via a magicwrite config call, we end up here and try to prevent * footshooting as best we can. @@ -406,68 +314,96 @@ * * Don't grab the topology lock. * * Don't call biowait, g_getattr(), g_setattr() or g_read_data() */ +static int +g_bsd_ioctl(struct g_provider *pp, u_long cmd, void * data, struct thread *td) +{ + struct g_geom *gp; + struct g_bsd_softc *ms; + struct g_slicer *gsp; + u_char *label; + int error; + gp = pp->geom; + gsp = gp->softc; + ms = gsp->softc; + + switch(cmd) { + case DIOCGDINFO: + /* Return a copy of the disklabel to userland. */ + bsd_disklabel_le_dec(ms->label, data, MAXPARTITIONS); + return(0); + case DIOCBSDBB: { + struct g_consumer *cp; + u_char *buf; + void *p; + int error, i; + uint64_t sum; + + /* The disklabel to set is the ioctl argument. */ + buf = g_malloc(BBSIZE, M_WAITOK); + p = *(void **)data; + error = copyin(p, buf, BBSIZE); + if (!error) { + /* XXX: Rude, but supposedly safe */ + DROP_GIANT(); + g_topology_lock(); + /* Validate and modify our slice instance to match. */ + error = g_bsd_modify(gp, buf + ms->labeloffset); + if (!error) { + cp = LIST_FIRST(&gp->consumer); + if (ms->labeloffset == ALPHA_LABEL_OFFSET) { + sum = 0; + for (i = 0; i < 63; i++) + sum += le64dec(buf + i * 8); + le64enc(buf + 504, sum); + } + error = g_write_data(cp, 0, buf, BBSIZE); + } + g_topology_unlock(); + PICKUP_GIANT(); + } + g_free(buf); + return (error); + } + case DIOCSDINFO: + case DIOCWDINFO: { + label = g_malloc(LABELSIZE, M_WAITOK); + + /* The disklabel to set is the ioctl argument. */ + bsd_disklabel_le_enc(label, data); + + DROP_GIANT(); + g_topology_lock(); + /* Validate and modify our slice instance to match. */ + error = g_bsd_modify(gp, label); + if (error == 0 && cmd == DIOCWDINFO) + error = g_bsd_writelabel(gp, NULL); + g_topology_unlock(); + PICKUP_GIANT(); + g_free(label); + return(error); + } + default: + return (ENOIOCTL); + } +} + static int g_bsd_start(struct bio *bp) { struct g_geom *gp; struct g_bsd_softc *ms; struct g_slicer *gsp; - struct g_ioctl *gio; - int error; gp = bp->bio_to->geom; gsp = gp->softc; ms = gsp->softc; - switch(bp->bio_cmd) { - case BIO_GETATTR: + if (bp->bio_cmd == BIO_GETATTR) { if (g_handleattr(bp, "BSD::labelsum", ms->labelsum, sizeof(ms->labelsum))) return (1); - break; - default: - KASSERT(0 == 1, ("Unknown bio_cmd in g_bsd_start (%d)", - bp->bio_cmd)); } - - /* We only handle ioctl(2) requests of the right format. */ - if (strcmp(bp->bio_attribute, "GEOM::ioctl")) - return (0); - else if (bp->bio_length != sizeof(*gio)) - return (0); - - /* Get hold of the ioctl parameters. */ - gio = (struct g_ioctl *)bp->bio_data; - - switch (gio->cmd) { - case DIOCGDINFO: - /* Return a copy of the disklabel to userland. */ - bsd_disklabel_le_dec(ms->label, gio->data, MAXPARTITIONS); - g_io_deliver(bp, 0); - return (1); - case DIOCBSDBB: - gio->func = g_bsd_diocbsdbb; - gio->dev = (void *)gp; - g_io_deliver(bp, EDIRIOCTL); - return (1); - case DIOCSDINFO: - case DIOCWDINFO: - /* - * These we cannot do without the topology lock and some - * some I/O requests. Ask the event-handler to schedule - * us in a less restricted environment. - */ - error = g_post_event(g_bsd_ioctl, bp, M_NOWAIT, gp, NULL); - if (error) - g_io_deliver(bp, error); - /* - * We must return non-zero to indicate that we will deal - * with this bio, even though we have not done so yet. - */ - return (1); - default: - return (0); - } + return (0); } /* @@ -559,6 +495,7 @@ * routine which the "slice" code should call at the right time */ gp->dumpconf = g_bsd_dumpconf; + gp->ioctl = g_bsd_ioctl; /* Get the geom_slicer softc from the geom. */ gsp = gp->softc; ==== //depot/projects/uart/geom/geom_dev.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.66 2003/08/30 18:33:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.67 2003/09/01 20:45:32 phk Exp $"); #include #include @@ -279,17 +279,14 @@ struct g_kerneldump kd; int i, error; u_int u; - struct g_ioctl *gio; gp = dev->si_drv1; cp = dev->si_drv2; - gio = NULL; error = 0; KASSERT(cp->acr || cp->acw, ("Consumer with zero access count in g_dev_ioctl")); - gio = NULL; i = IOCPARM_LEN(cmd); switch (cmd) { case DIOCGSECTORSIZE: @@ -331,46 +328,14 @@ break; default: - gio = g_malloc(sizeof *gio, M_WAITOK | M_ZERO); - gio->cmd = cmd; - gio->data = data; - gio->fflag = fflag; - gio->td = td; - i = sizeof *gio; - /* - * We always issue ioctls as getattr since the direction of data - * movement in ioctl is no indication of the ioctl being a "set" - * or "get" type ioctl or if such simplistic terms even apply - */ - error = g_io_getattr("GEOM::ioctl", cp, &i, gio); - break; + if (cp->provider->geom->ioctl != NULL) { + error = cp->provider->geom->ioctl(cp->provider, cmd, data, td); + if (error != ENOIOCTL) + return (error); + } } - if (error == EDIRIOCTL) { - KASSERT(gio != NULL, ("NULL gio but EDIRIOCTL")); - KASSERT(gio->func != NULL, ("NULL function but EDIRIOCTL")); - error = (gio->func)(gio->dev, cmd, data, fflag, td); - } g_waitidle(); - if (gio != NULL && (error == EOPNOTSUPP || error == ENOIOCTL)) { - if (g_debugflags & G_T_TOPOLOGY) { - i = IOCGROUP(cmd); - printf("IOCTL(0x%lx) \"%s\"", cmd, gp->name); - if (i > ' ' && i <= '~') - printf(" '%c'", (int)IOCGROUP(cmd)); - else - printf(" 0x%lx", IOCGROUP(cmd)); - printf("/%ld ", cmd & 0xff); - if (cmd & IOC_IN) - printf("I"); - if (cmd & IOC_OUT) - printf("O"); - printf("(%ld) = ENOIOCTL\n", IOCPARM_LEN(cmd)); - } - error = ENOTTY; - } - if (gio != NULL) - g_free(gio); return (error); } ==== //depot/projects/uart/geom/geom_disk.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.75 2003/06/11 06:49:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.77 2003/09/01 20:45:32 phk Exp $"); #include "opt_geom.h" @@ -194,12 +194,29 @@ mtx_unlock(&g_disk_done_mtx); } +static int +g_disk_ioctl(struct g_provider *pp, u_long cmd, void * data, struct thread *td) +{ + struct g_geom *gp; + struct disk *dp; + int error; + + gp = pp->geom; + dp = gp->softc; + + if (dp->d_ioctl == NULL) + return (ENOIOCTL); + g_disk_lock_giant(dp); + error = dp->d_ioctl(dp, cmd, data, 0, td); + g_disk_unlock_giant(dp); + return(error); +} + static void g_disk_start(struct bio *bp) { struct bio *bp2, *bp3; struct disk *dp; - struct g_ioctl *gio; int error; off_t off; @@ -264,15 +281,7 @@ break; else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump")) g_disk_kerneldump(bp, dp); - else if ((g_debugflags & G_F_DISKIOCTL) && - (dp->d_ioctl != NULL) && - !strcmp(bp->bio_attribute, "GEOM::ioctl") && - bp->bio_length == sizeof *gio) { - gio = (struct g_ioctl *)bp->bio_data; - gio->dev = dp; - gio->func = (d_ioctl_t *)(dp->d_ioctl); - error = EDIRIOCTL; - } else + else error = ENOIOCTL; break; default: @@ -317,6 +326,7 @@ gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit); gp->start = g_disk_start; gp->access = g_disk_access; + gp->ioctl = g_disk_ioctl; gp->softc = dp; gp->dumpconf = g_disk_dumpconf; pp = g_new_providerf(gp, "%s", gp->name); @@ -332,7 +342,16 @@ g_error_provider(pp, 0); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 16:58:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A0E616A4C1; Mon, 1 Sep 2003 16:58:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D123616A4BF for ; Mon, 1 Sep 2003 16:58:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9AE643FF9 for ; Mon, 1 Sep 2003 16:58:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81NwZ0U008702 for ; Mon, 1 Sep 2003 16:58:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81NwWI9008699 for perforce@freebsd.org; Mon, 1 Sep 2003 16:58:32 -0700 (PDT) Date: Mon, 1 Sep 2003 16:58:32 -0700 (PDT) Message-Id: <200309012358.h81NwWI9008699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2003 23:58:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=37345 Change 37345 by marcel@marcel_nfs on 2003/09/01 16:58:11 IFC @37342 Affected files ... .. //depot/projects/ia64/Makefile.inc1#81 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#9 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/ia64/contrib/libreadline/MANIFEST#2 integrate .. //depot/projects/ia64/contrib/libreadline/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/README#2 integrate .. //depot/projects/ia64/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/libreadline/ansi_stdlib.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/bind.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/callback.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/chardefs.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/compat.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/complete.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/configure#2 integrate .. //depot/projects/ia64/contrib/libreadline/configure.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/hist.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/history.3#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/hstech.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/hsuser.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/manvers.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rlman.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rltech.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluser.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluserman.texinfo#2 integrate .. //depot/projects/ia64/contrib/libreadline/emacs_keymap.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/Inputrc#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/fileman.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/histexamp.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/manexamp.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/readlinebuf.h#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlcat.c#1 branch .. //depot/projects/ia64/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/funmap.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/histlib.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/history.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/history.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/histsearch.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/input.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/keymaps.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/kill.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/macro.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/mbutil.c#1 branch .. //depot/projects/ia64/contrib/libreadline/misc.c#1 branch .. //depot/projects/ia64/contrib/libreadline/nls.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/parens.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/posixdir.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/readline.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/readline.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rldefs.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rlmbutil.h#1 branch .. //depot/projects/ia64/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rlshell.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rlstdc.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/rltypedefs.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/search.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/shell.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/shlib/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/signals.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/config.guess#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/config.sub#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/install.sh#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/mkdirs#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/mkdist#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/ia64/contrib/libreadline/support/wcwidth.c#1 branch .. //depot/projects/ia64/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/text.c#1 branch .. //depot/projects/ia64/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/ia64/contrib/libreadline/undo.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/util.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/xmalloc.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/xmalloc.h#2 integrate .. //depot/projects/ia64/etc/sendmail/Makefile#13 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#17 integrate .. //depot/projects/ia64/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/ia64/gnu/lib/libreadline/config.h#2 integrate .. //depot/projects/ia64/gnu/lib/libreadline/readline/Makefile#5 integrate .. //depot/projects/ia64/include/Makefile#31 integrate .. //depot/projects/ia64/include/varargs.h#1 branch .. //depot/projects/ia64/lib/libc/gen/sysctl.3#8 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#14 integrate .. //depot/projects/ia64/libexec/ftpd/popen.c#4 integrate .. //depot/projects/ia64/libexec/rpc.rquotad/rquotad.c#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#27 integrate .. //depot/projects/ia64/share/man/man4/ath.4#7 integrate .. //depot/projects/ia64/share/man/man4/ath_hal.4#4 integrate .. //depot/projects/ia64/share/man/man4/my.4#3 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#25 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#18 integrate .. //depot/projects/ia64/sys/alpha/include/varargs.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/ia64/sys/conf/files.i386#45 integrate .. //depot/projects/ia64/sys/conf/options.i386#21 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#30 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#41 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/ia64/sys/dev/ichsmb/ichsmb_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#30 integrate .. //depot/projects/ia64/sys/dev/usb/usb_mem.h#6 integrate .. //depot/projects/ia64/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/ia64/sys/geom/geom.h#36 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#38 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#42 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#32 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/geode.c#1 branch .. //depot/projects/ia64/sys/i386/include/varargs.h#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#92 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#36 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#58 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_flow.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_flow.h#2 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#31 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#27 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#6 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/ia64/sys/netipsec/key.c#7 integrate .. //depot/projects/ia64/sys/netipsec/key.h#2 integrate .. //depot/projects/ia64/sys/netipsec/keydb.h#2 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#5 integrate .. //depot/projects/ia64/sys/pci/amdpm.c#9 integrate .. //depot/projects/ia64/sys/powerpc/include/varargs.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/varargs.h#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#30 integrate .. //depot/projects/ia64/sys/sys/buf.h#26 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#24 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#29 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#11 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#28 integrate .. //depot/projects/ia64/usr.bin/lock/lock.c#8 integrate .. //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.1#7 integrate .. //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.c#11 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#81 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.388 2003/08/30 13:48:16 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.389 2003/09/01 06:43:24 scottl Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -297,33 +297,33 @@ _legacy: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 1: legacy release compatibility shims" + @echo ">>> stage 1.1: legacy release compatibility shims" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${BMAKE} legacy _bootstrap-tools: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 1: bootstrap tools" + @echo ">>> stage 1.2: bootstrap tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${BMAKE} bootstrap-tools _cleanobj: .if !defined(NOCLEAN) @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 2: cleaning up the object tree" + @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .endif _obj: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 2: rebuilding the object tree" + @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-obj _build-tools: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 2: build tools" + @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${TMAKE} build-tools _cross-tools: @@ -335,26 +335,26 @@ _includes: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" + @echo ">>> stage 4.1: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes _libraries: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4: building libraries" + @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ libraries _depend: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4: make dependencies" + @echo ">>> stage 4.3: make dependencies" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-depend everything: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4: building everything.." + @echo ">>> stage 4.4: building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-all ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#9 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.9 2003/08/24 16:56:31 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.11 2003/09/01 05:31:33 deischen Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify ==== //depot/projects/ia64/contrib/libreadline/CHANGELOG#2 (text+ko) ==== @@ -463,3 +463,237 @@ 4/5 --- [readline-4.2 frozen] + + 4/9 + --- +[readline-4.2 released] + + 5/2 + --- +Makefile.in,{doc,examples,shlib}/Makefile.in + - added support for DESTDIR installation root prefix, to support + building packages + +doc/Makefile.in + - add an info `dir' file entry for rluserman.info on `make install' + - change man1ext to `.1' and man3ext to `.3' + - install man pages with a $(man3ext) extension in the target directory + - add support for installing html documentation if `htmldir' has a + value + +Makefile.in + - on `make install', install from the `shlib' directory, too + - on `make uninstall', uninstall in the `doc' and `shlib' + subdirectories, too + +support/shlib-install + - add `freebsdelf*', `freebsdaout*', Hurd, `sysv4*', `sysv5*', `dgux*' + targets for symlink creation + + 5/7 + --- +configure.in, config.h.in + - check for , define HAVE_LIMITS_H if found + + 5/8 + --- +aclocal.m4 + - pick up change to BASH_CHECK_LIB_TERMCAP that adds check for + libtinfo (termcap-specific portion of ncurses-5.2) + + 5/9 + --- +configure.in + - call AC_C_CONST to find out whether or not the compiler supports + `const' + +config.h.in + - placeholder for `const' define, if any + + 5/10 + ---- +configure.in + - fix AC_CHECK_PROG(ar, ...) test to specify right value for the + case where ar is not found; should produce a better error message + + 5/14 + ---- +configure.in,config.h.in + - check for vsnprintf, define HAVE_VSNPRINTF if found + + 5/21 + ---- +configure.in, config.h.in + - add checks for size_t, ssize_t + + 5/30 + ---- +configure.in + - update autoconf to version 2.50, use in AC_PREREQ + - changed AC_INIT to new flavor + - added AC_CONFIG_SRCDIR + - AC_CONFIG_HEADER -> AC_CONFIG_HEADERS + - call AC_C_PROTOTYPES + - AC_RETSIGTYPE -> AC_TYPE_SIGNAL + + 8/22 + ---- +configure.in + - updated the version number to 4.2a + +Makefile.in,shlib/Makefile.in + - make sure tilde.o is built -DREADLINE_LIBRARY when being built as + part of the standalone library, so it picks up the right include + files + + 8/23 + ---- +support/shlib-install + - support for Darwin/MacOS X shared library installation + + 9/24 + ---- +examples/readlinebuf.h + - a new file, a C++ streambuf interface that uses readline for I/O. + Donated by Dimitris Vyzovitis + + 10/9 + ---- +configure.in + - replaced call to BASH_HAVE_TIOCGWINSZ with AC_HEADER_TIOCGWINSZ + +[readline-4.2a-beta1 frozen] + + 10/15 + ----- +configure.in, config.h.in + - check for , define HAVE_MEMORY_H if found + - check for , define HAVE_STRINGS_H if found + + 10/18 + ----- +configure.in, config.h.in + - check for isascii, define HAVE_ISASCII if found + +configure.in + - changed the macro names from bash as appropriate: + BASH_SIGNAL_CHECK -> BASH_SYS_SIGNAL_VINTAGE + BASH_REINSTALL_SIGHANDLERS -> BASH_SYS_REINSTALL_SIGHANDLERS + BASH_MISC_SPEED_T -> BASH_CHECK_SPEED_T + + 10/22 + ----- +configure.in + - check for isxdigit with AC_CHECK_FUNCS + +config.h.in + - new define for HAVE_ISXDIGIT + + 10/29 + ----- +configure.in, config.h.in + - check for strpbrk with AC_CHECK_FUNCS, define HAVE_STRPBRK if found + + 11/1 + ---- +Makefile.in + - make sure DESTDIR is passed to install and uninstall makes in + subdirectories + - when saving old copies of installed libraries, make sure we use + DESTDIR for the old installation tree + +[readline-4.2a-rc1 frozen] + + 11/2 + ---- +Makefile.in, shlib/Makefile.in + - don't put -I$(includedir) into CFLAGS + + 11/15 + ----- +[readline-4.2a released] + + 11/20 + ----- +examples/rlcat.c + - new file + +examples/Makefile.in + - changes for rlcat + + 11/28 + ----- +configure.in + - default TERMCAP_LIB to -lcurses if $prefer_curses == yes (as when + --with-curses is supplied) + +examples/Makefile.in + - substitute @LDFLAGS@ in LDFLAGS assignment + + 11/29 + ----- +config.h.in + - add necessary defines for multibyte include files and functions + - add code to define HANDLE_MULTIBYTE if prerequisites are met + +configure.in + - call BASH_CHECK_MULTIBYTE + + 12/14 + ----- +config.h.in + - add #undef PROTOTYPES, filled in by AC_C_PROTOTYPES + + 12/17 + ----- +config.h.in + - moved HANDLE_MULTIBYTE code to rlmbutil.h + +rlmbutil.h, mbutil.c + - new files + +Makefile.in, shlib/Makefile.in + - added rules for mbutil.c + + 12/20 + ----- +configure.in + - added --enable-shared, --enable-static options to configure to + say which libraries are built by default (both default to yes) + - if SHLIB_STATUS == 'unsupported', turn off default shared library + building + - substitute new STATIC_TARGET, SHARED_TARGET, STATIC_INSTALL_TARGET, + and SHARED_INSTALL_TARGET + +Makefile.in + - `all' target now depends on (substituted) @STATIC_TARGET@ and + @SHARED_TARGET@ + - `install' target now depends on (substituted) @STATIC_INSTALL_TARGET@ + and @SHARED_INSTALL_TARGET@ + +INSTALL, README + - updated with new info about --enable-shared and --enable-static + + 1/10/2002 + --------- +configure.in + - bumped the library version number to 4.3 + + 1/24 + ---- +Makefile.in,shlib/Makefile.in + - changes for new file, text.c, with character and text handling + functions from readline.c + + 2/20 + ---- +{configure.config.h}.in + - call AC_C_CHAR_UNSIGNED, define __CHAR_UNSIGNED__ if chars are + unsigned by default + + 5/20 + ---- +doc/Makefile.in + - new maybe-clean target that removes the generated documentation if + the build directory differs from the source directory + - distclean target now depends on maybe-clean ==== //depot/projects/ia64/contrib/libreadline/CHANGES#2 (text+ko) ==== @@ -1,3 +1,161 @@ +This document details the changes between this version, readline-4.3, +and the previous version, readline-4.2a. + +1. Changes to Readline + +a. Fixed output of comment-begin character when listing variable values. + +b. Added some default key bindings for common escape sequences produced by + HOME and END keys. + +c. Fixed the mark handling code to be more emacs-compatible. + +d. A bug was fixed in the code that prints possible completions to keep it + from printing empty strings in certain circumstances. + +e. Change the key sequence printing code to print ESC as M\- if ESC is a + meta-prefix character -- it's easier for users to understand than \e. + +f. Fixed unstifle_history() to return values that match the documentation. + +g. Fixed the event loop (rl_event_hook) to handle the case where the input + file descriptor is invalidated. + +h. Fixed the prompt display code to work better when the application has a + custom redisplay function. + +i. Changes to make reading and writing the history file a little faster, and + to cope with huge history files without calling abort(3) from xmalloc. + +j. The vi-mode `S' and `s' commands are now undone correctly. + +k. Fixed a problem which caused the display to be messed up when the last + line of a multi-line prompt (possibly containing invisible characters) + was longer than the screen width. + +2. New Features in Readline + +a. Support for key `subsequences': allows, e.g., ESC and ESC-a to both + be bound to readline functions. Now the arrow keys may be used in vi + insert mode. + +b. When listing completions, and the number of lines displayed is more than + the screen length, readline uses an internal pager to display the results. + This is controlled by the `page-completions' variable (default on). + +c. New code to handle editing and displaying multibyte characters. + +d. The behavior introduced in bash-2.05a of deciding whether or not to + append a slash to a completed name that is a symlink to a directory has + been made optional, controlled by the `mark-symlinked-directories' + variable (default is the 2.05a behavior). + +e. The `insert-comment' command now acts as a toggle if given a numeric + argument: if the first characters on the line don't specify a + comment, insert one; if they do, delete the comment text + +f. New application-settable completion variable: + rl_completion_mark_symlink_dirs, allows an application's completion + function to temporarily override the user's preference for appending + slashes to names which are symlinks to directories. + +g. New function available to application completion functions: + rl_completion_mode, to tell how the completion function was invoked + and decide which argument to supply to rl_complete_internal (to list + completions, etc.). + +h. Readline now has an overwrite mode, toggled by the `overwrite-mode' + bindable command, which could be bound to `Insert'. + +i. New application-settable completion variable: + rl_completion_suppress_append, inhibits appending of + rl_completion_append_character to completed words. + +j. New key bindings when reading an incremental search string: ^W yanks + the currently-matched word out of the current line into the search + string; ^Y yanks the rest of the current line into the search string, + DEL or ^H deletes characters from the search string. + +------------------------------------------------------------------------------- +This document details the changes between this version, readline-4.2a, +and the previous version, readline-4.2. + +1. Changes to Readline + +a. More `const' and type casting fixes. + +b. Changed rl_message() to use vsnprintf(3) (if available) to fix buffer + overflow problems. + +c. The completion code no longer appends a `/' or ` ' to a match when + completing a symbolic link that resolves to a directory name, unless + the match does not add anything to the word being completed. This + means that a tab will complete the word up to the full name, but not + add anything, and a subsequent tab will add a slash. + +d. Fixed a trivial typo that made the vi-mode `dT' command not work. + +e. Fixed the tty code so that ^S and ^Q can be inserted with rl_quoted_insert. + +f. Fixed the tty code so that ^V works more than once. + +g. Changed the use of __P((...)) for function prototypes to PARAMS((...)) + because the use of __P in typedefs conflicted g++ and glibc. + +h. The completion code now attempts to do a better job of preserving the + case of the word the user typed if ignoring case in completions. + +i. Readline defaults to not echoing the input and lets the terminal + initialization code enable echoing if there is a controlling terminal. + +j. The key binding code now processes only two hex digits after a `\x' + escape sequence, and the documentation was changed to note that the + octal and hex escape sequences result in an eight-bit value rather + than strict ASCII. + +k. Fixed a few places where negative array subscripts could have occurred. + +l. Fixed the vi-mode code to use a better method to determine the bounds of + the array used to hold the marks, and to avoid out-of-bounds references. + +m. Fixed the defines in chardefs.h to work better when chars are signed. + +n. Fixed configure.in to use the new names for bash autoconf macros. + +o. Readline no longer attempts to define its own versions of some ctype + macros if they are implemented as functions in libc but not as macros in + . + +p. Fixed a problem where rl_backward could possibly set point to before + the beginning of the line. + +q. Fixed Makefile to not put -I/usr/include into CFLAGS, since it can cause + include file problems. + +2. New Features in Readline + +a. Added extern declaration for rl_get_termcap to readline.h, making it a + public function (it was always there, just not in readline.h). + +b. New #defines in readline.h: RL_READLINE_VERSION, currently 0x0402, + RL_VERSION_MAJOR, currently 4, and RL_VERSION_MINOR, currently 2. + +c. New readline variable: rl_readline_version, mirrors RL_READLINE_VERSION. + +d. New bindable boolean readline variable: match-hidden-files. Controls + completion of files beginning with a `.' (on Unix). Enabled by default. + +e. The history expansion code now allows any character to terminate a + `:first-' modifier, like csh. + +f. The incremental search code remembers the last search string and uses + it if ^R^R is typed without a search string. + +h. New bindable variable `history-preserve-point'. If set, the history + code attempts to place the user at the same location on each history + line retrived with previous-history or next-history. + +------------------------------------------------------------------------------- This document details the changes between this version, readline-4.2, and the previous version, readline-4.1. ==== //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.3 2001/04/21 22:02:18 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.4 2003/08/31 18:29:38 ache Exp $ rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* rm savestring.c + +cvs import \ + -m "Virgin import of GNU Readline 4.3" \ + src/contrib/libreadline FSF v4_3 ==== //depot/projects/ia64/contrib/libreadline/INSTALL#2 (text+ko) ==== @@ -1,73 +1,81 @@ Basic Installation ================== - These are generic installation instructions. +These are installation instructions for Readline-4.3. - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +The simplest way to compile readline is: - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're + 1. `cd' to the directory containing the readline source code and type + `./configure' to configure readline for your system. If you're using `csh' on an old version of System V, you might need to type `sh ./configure' instead to prevent `csh' from trying to execute `configure' itself. - Running `configure' takes awhile. While running, it prints some + Running `configure' takes some time. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type `make' to compile readline and build the static readline + and history libraries. If supported, the shared readline and history + libraries will be built also. See below for instructions on compiling + the other parts of the distribution. Typing `make everything' will + cause the static and shared libraries (if supported) and the example + programs to be built. - 3. Optionally, type `make check' to run any self-tests that come with - the package. + 3. Type `make install' to install the static readline and history + libraries, the readline include files, the documentation, and, if + supported, the shared readline and history libraries. - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for + 4. You can remove the created libraries and object files from the + build directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile readline for a different kind of computer), type `make distclean'. There is also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. + for the readline developers, and should be used with care. + +The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It +uses those values to create a `Makefile' in the build directory, +and Makefiles in the `doc', `shlib', and `examples' +subdirectories. It also creates a `config.h' file containing +system-dependent definitions. Finally, it creates a shell script +`config.status' that you can run in the future to recreate the +current configuration, a file `config.cache' that saves the +results of its tests to speed up reconfiguring, and a file +`config.log' containing compiler output (useful mainly for +debugging `configure'). + +If you need to do unusual things to compile readline, please try +to figure out how `configure' could check whether to do them, and +mail diffs or instructions to so they can +be considered for the next release. If at some point +`config.cache' contains results you don't want to keep, you may +remove or edit it. + +The file `configure.in' is used to create `configure' by a +program called `autoconf'. You only need `configure.in' if you +want to change it or regenerate `configure' using a newer version +of `autoconf'. The readline `configure.in' requires autoconf +version 2.50 or newer. Compilers and Options ===================== - Some systems require unusual options for compilation or linking that +Some systems require unusual options for compilation or linking that the `configure' script does not know about. You can give `configure' initial values for variables by setting them in the environment. Using a Bourne-compatible shell, you can do that on the command line like this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile readline for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -75,80 +83,59 @@ the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. +If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile readline for one architecture at a +time in the source code directory. After you have installed +readline for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' will install the readline libraries in +`/usr/local/lib', the include files in +`/usr/local/include/readline', the man pages in `/usr/local/man', +and the info files in `/usr/local/info'. You can specify an +installation prefix other than `/usr/local' by giving `configure' +the option `--prefix=PATH' or by supplying a value for the +DESTDIR variable when running `make install'. - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. +If you give `configure' the option `--exec-prefix=PATH', the +readline Makefiles will use PATH as the prefix for installing the +libraries. Documentation and other data files will still use the +regular prefix. -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM +There may be some features `configure' can not figure out +automatically, but need to determine by the type of host readline +will run on. Usually `configure' can figure that out, but if it +prints a message saying it can not guess the host type, give it +the `--host=TYPE' option. TYPE can either be a short name for +the system type, such as `sun4', or a canonical name with three +fields: CPU-COMPANY-SYSTEM (e.g., i386-unknown-freebsd4.2). -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. +See the file `config.sub' for the possible values of each field. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. - Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, +If you want to set default values for `configure' scripts to share, you can create a site shell script called `config.site' that gives default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. +A warning: the readline `configure' looks for a site script, but not +all `configure' scripts do. Operation Controls ================== - `configure' recognizes the following options to control how it +`configure' recognizes the following options to control how it operates. `--cache-file=FILE' @@ -174,3 +161,113 @@ `configure' also accepts some other, not widely useful, options. +Optional Features +================= + +The readline `configure' recognizes a single `--with-PACKAGE' option: + +`--with-curses' + This tells readline that it can find the termcap library functions + (tgetent, et al.) in the curses library, rather than a separate + termcap library. Readline uses the termcap functions, but does not + link with the termcap or curses library itself, allowing applications + which link with readline the to choose an appropriate library. + This option tells readline to link the example programs with the + curses library rather than libtermcap. + +`configure' also recognizes two `--enable-FEATURE' options: + +`--enable-shared' + Build the shared libraries by default on supported platforms. The + default is `yes'. + +`--enable-static' + Build the static libraries by default. The default is `yes'. + +Shared Libraries +================ + +There is support for building shared versions of the readline and +history libraries. The configure script creates a Makefile in +the `shlib' subdirectory, and typing `make shared' will cause +shared versions of the readline and history libraries to be built +on supported platforms. + +If `configure' is given the `--enable-shared' option, it will attempt +to build the shared libraries by default on supported platforms. + +Configure calls the script support/shobj-conf to test whether or +not shared library creation is supported and to generate the values +of variables that are substituted into shlib/Makefile. If you +try to build shared libraries on an unsupported platform, `make' +will display a message asking you to update support/shobj-conf for +your platform. + +If you need to update support/shobj-conf, you will need to create +a `stanza' for your operating system and compiler. The script uses +the value of host_os and ${CC} as determined by configure. For +instance, FreeBSD 4.2 with any version of gcc is identified as +`freebsd4.2-gcc*'. + +In the stanza for your operating system-compiler pair, you will need to +define several variables. They are: + +SHOBJ_CC The C compiler used to compile source files into shareable + object files. This is normally set to the value of ${CC} + by configure, and should not need to be changed. + +SHOBJ_CFLAGS Flags to pass to the C compiler ($SHOBJ_CC) to create + position-independent code. If you are using gcc, this + should probably be set to `-fpic'. + +SHOBJ_LD The link editor to be used to create the shared library from + the object files created by $SHOBJ_CC. If you are using + gcc, a value of `gcc' will probably work. + +SHOBJ_LDFLAGS Flags to pass to SHOBJ_LD to enable shared object creation. + If you are using gcc, `-shared' may be all that is necessary. + These should be the flags needed for generic shared object + creation. + +SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library + creation. Many systems use the -R option to the link + editor to embed a path within the library for run-time + library searches. A reasonable value for such systems would + be `-R$(libdir)'. + +SHLIB_LIBS Any additional libraries that shared libraries should be + linked against when they are created. + +SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when + generating the filename of the shared library. Many systems + use `so'; HP-UX uses `sl'. + +SHLIB_LIBVERSION The string to append to the filename to indicate the version >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 21:54:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69FF316A4C1; Mon, 1 Sep 2003 21:54:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27ECB16A4BF for ; Mon, 1 Sep 2003 21:54:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FA6443FAF for ; Mon, 1 Sep 2003 21:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h824sc0U030115 for ; Mon, 1 Sep 2003 21:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h824sc6D030112 for perforce@freebsd.org; Mon, 1 Sep 2003 21:54:38 -0700 (PDT) Date: Mon, 1 Sep 2003 21:54:38 -0700 (PDT) Message-Id: <200309020454.h824sc6D030112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 04:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37353 Change 37353 by marcel@marcel_nfs on 2003/09/01 21:53:59 Remove uart_debug(). It's not used enough. Delete uart_subr.c. It only contains uart_debug(). Affected files ... .. //depot/projects/uart/conf/files#20 edit .. //depot/projects/uart/dev/uart/uart_bus.h#21 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#23 edit .. //depot/projects/uart/dev/uart/uart_subr.c#2 delete .. //depot/projects/uart/modules/uart/Makefile#4 edit Differences ... ==== //depot/projects/uart/conf/files#20 (text+ko) ==== @@ -790,7 +790,6 @@ dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart dev/uart/uart_dev_z8530.c optional uart -dev/uart/uart_subr.c optional uart dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # ==== //depot/projects/uart/dev/uart/uart_bus.h#21 (text+ko) ==== @@ -156,8 +156,6 @@ int uart_tty_detach(struct uart_softc *); void uart_tty_intr(void *arg); -void uart_debug(struct uart_softc *, const char *, ...); - /* * Receive buffer operations. */ ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#23 (text+ko) ==== @@ -124,7 +124,7 @@ while ((uart_getreg(bas, REG_LSR) & LSR_TEMT) == 0 && --limit) DELAY(delay); if (limit == 0) { - uart_debug(NULL, "transmitter appears stuck... "); + /* printf("ns8250: transmitter appears stuck... "); */ return (EIO); } } @@ -145,7 +145,7 @@ DELAY(delay << 2); } if (limit == 0) { - uart_debug(NULL, "receiver appears broken... "); + /* printf("ns8250: receiver appears broken... "); */ return (EIO); } } ==== //depot/projects/uart/modules/uart/Makefile#4 (text+ko) ==== @@ -6,7 +6,7 @@ SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \ uart_bus_puc.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \ uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \ - uart_subr.c uart_tty.c + uart_tty.c SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h .include From owner-p4-projects@FreeBSD.ORG Mon Sep 1 22:16:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F396116A4C1; Mon, 1 Sep 2003 22:16:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A136816A4BF for ; Mon, 1 Sep 2003 22:16:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D2FB43F3F for ; Mon, 1 Sep 2003 22:16:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h825G60U031958 for ; Mon, 1 Sep 2003 22:16:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h825G6jD031955 for perforce@freebsd.org; Mon, 1 Sep 2003 22:16:06 -0700 (PDT) Date: Mon, 1 Sep 2003 22:16:06 -0700 (PDT) Message-Id: <200309020516.h825G6jD031955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 05:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=37356 Change 37356 by marcel@marcel_nfs on 2003/09/01 22:15:23 FLesh-out the comments. It's rather minimally now, but better than nothing. Affected files ... .. //depot/projects/uart/dev/uart/uart_if.m#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_if.m#8 (text+ko) ==== @@ -34,20 +34,27 @@ INTERFACE uart; -# attach() -# XXX needs explanation. +# attach() - attach hardware. +# This method is called when the device is being attached. All resources +# have been allocated. The transmit and receive buffers exist, but no +# high-level (ie tty) initialization has been done yet. +# The intend of this method is to setup the hardware for normal operation. METHOD int attach { struct uart_softc *this; }; -# detach() -# XXX needs explanation. +# detach() - detach hardware. +# This method is called when a device is being detached from its bus. It +# is the first action performed, so even the high-level (ie tty) interface +# is still operational. +# The intend of this method is to disable the hardware. METHOD int detach { struct uart_softc *this; }; -# flush() -# XXX needs explanation. +# flush() - flush FIFOs. +# This method is called to flush the transmitter and/or the receiver as +# specified by the what argument. Characters are expected to be lost. METHOD int flush { struct uart_softc *this; int what; @@ -58,8 +65,8 @@ # delta bits. The delta bits include those corresponding to DTE signals # when they were changed by a call to setsig. The delta bits maintained # by the hardware driver are cleared as a side-effect. A second call to -# this function will have not have any delta bits set, unless there was -# a change in the signals in the mean time. +# this function will not have any delta bits set, unless there was a +# change in the signals in the mean time. METHOD int getsig { struct uart_softc *this; }; @@ -77,8 +84,8 @@ struct uart_softc *this; } -# param() -# XXX needs explanation. +# param() - set communication parameters. +# This method is called to change the communication parameters. METHOD int param { struct uart_softc *this; int baudrate; @@ -87,8 +94,10 @@ int parity; }; -# probe() -# XXX needs explanation. +# probe() - detect hardware. +# This method is called as part of the bus probe to make sure the +# hardware exists. This function should also set the device description +# to something that represents the hardware. METHOD int probe { struct uart_softc *this; }; @@ -111,7 +120,9 @@ }; # transmit() - move data from the transmit buffer to the transmit FIFO. -# XXX needs explanation. +# This method is responsible for writing the Tx buffer to the UART and +# additionally should make sure that a transmit interrupt is generated +# when transmission is complete. METHOD int transmit { struct uart_softc *this; }; From owner-p4-projects@FreeBSD.ORG Mon Sep 1 23:10:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D98716A4C1; Mon, 1 Sep 2003 23:10:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D3FE16A4BF for ; Mon, 1 Sep 2003 23:10:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55AA644022 for ; Mon, 1 Sep 2003 23:10:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h826AI0U034854 for ; Mon, 1 Sep 2003 23:10:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h826AHhT034851 for perforce@freebsd.org; Mon, 1 Sep 2003 23:10:17 -0700 (PDT) Date: Mon, 1 Sep 2003 23:10:17 -0700 (PDT) Message-Id: <200309020610.h826AHhT034851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 06:10:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=37364 Change 37364 by marcel@marcel_nfs on 2003/09/01 23:09:32 Prepare the grounds for hardware flow control: o Add the sc_rtscts and sc_xonxoff flags. I'm not sure we're going to do SW flow control in hardware, but we have plenty of bits... o Add a bit bucket or kitchen sink method, UART_IOCTL() to the hardware interface. The method can be used for anything we don't want seperate methods for. o Stop abusing UART_SETSIG() to set or clear the break condition. Use an ioctl for that instead. Hey, it's why we got it... Note: none of the hardware drivers set the flag nor do they implement the ioctls for that. While here, fix style(9) and the likes. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#22 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#24 edit .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#19 edit .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#10 edit .. //depot/projects/uart/dev/uart/uart_if.m#9 edit .. //depot/projects/uart/dev/uart/uart_tty.c#11 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#22 (text+ko) ==== @@ -65,20 +65,23 @@ #define UART_SIG_CTS 0x0008 #define UART_SIG_DCD 0x0010 #define UART_SIG_RI 0x0020 -#define UART_SIG_BREAK 0x0040 #define UART_SIG_DDTR 0x0100 #define UART_SIG_DRTS 0x0200 #define UART_SIG_DDSR 0x0400 #define UART_SIG_DCTS 0x0800 #define UART_SIG_DDCD 0x1000 #define UART_SIG_DRI 0x2000 -#define UART_SIG_DBREAK 0x4000 #define UART_SIGMASK_DTE 0x0003 #define UART_SIGMASK_DCE 0x003c #define UART_SIGMASK_STATE 0x003f #define UART_SIGMASK_DELTA 0x3f00 +/* UART_IOCTL() requests */ +#define UART_IOCTL_BREAK 1 +#define UART_IOCTL_RTSCTS 2 +#define UART_IOCTL_XONXOFF 3 + /* * UART class & instance (=softc) */ @@ -111,7 +114,9 @@ int sc_leaving:1; /* This UART is going away. */ int sc_opened:1; /* This UART is open for business. */ int sc_polled:1; /* This UART has no interrupts. */ + int sc_rtscts:1; /* This UART can do HW flow control. */ int sc_txbusy:1; /* This UART is transmitting. */ + int sc_xonxoff:1; /* This UART can do SW flow control. */ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#24 (text+ko) ==== @@ -345,6 +345,7 @@ static int ns8250_bus_detach(struct uart_softc *); static int ns8250_bus_flush(struct uart_softc *, int); static int ns8250_bus_getsig(struct uart_softc *); +static int ns8250_bus_ioctl(struct uart_softc *, int, intptr_t); static int ns8250_bus_ipend(struct uart_softc *); static int ns8250_bus_param(struct uart_softc *, int, int, int, int); static int ns8250_bus_probe(struct uart_softc *); @@ -357,6 +358,7 @@ KOBJMETHOD(uart_detach, ns8250_bus_detach), KOBJMETHOD(uart_flush, ns8250_bus_flush), KOBJMETHOD(uart_getsig, ns8250_bus_getsig), + KOBJMETHOD(uart_ioctl, ns8250_bus_ioctl), KOBJMETHOD(uart_ipend, ns8250_bus_ipend), KOBJMETHOD(uart_param, ns8250_bus_param), KOBJMETHOD(uart_probe, ns8250_bus_probe), @@ -453,6 +455,29 @@ } static int +ns8250_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) +{ + struct uart_bas *bas; + uint8_t lcr; + + bas = &sc->sc_bas; + switch (request) { + case UART_IOCTL_BREAK: + lcr = uart_getreg(bas, REG_LCR); + if (data) + lcr |= LCR_SBREAK; + else + lcr &= ~LCR_SBREAK; + uart_setreg(bas, REG_LCR, lcr); + uart_barrier(bas); + break; + default: + return (EINVAL); + } + return (0); +} + +static int ns8250_bus_ipend(struct uart_softc *sc) { struct uart_bas *bas; @@ -651,8 +676,9 @@ ns8250_bus_setsig(struct uart_softc *sc, int sig) { struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; - uint8_t lcr; + struct uart_bas *bas; + bas = &sc->sc_bas; if (sig & UART_SIG_DDTR) { SIGCHG(sig & UART_SIG_DTR, sc->sc_hwsig, UART_SIG_DTR, UART_SIG_DDTR); @@ -666,16 +692,8 @@ ns8250->mcr |= MCR_DTR; if (sc->sc_hwsig & UART_SIG_RTS) ns8250->mcr |= MCR_RTS; - uart_setreg(&sc->sc_bas, REG_MCR, ns8250->mcr); - uart_barrier(&sc->sc_bas); - if (sig & UART_SIG_DBREAK) { - lcr = uart_getreg(&sc->sc_bas, REG_LCR); - if (sig & UART_SIG_BREAK) - lcr |= LCR_SBREAK; - else - lcr &= ~LCR_SBREAK; - uart_setreg(&sc->sc_bas, REG_LCR, lcr); - } + uart_setreg(bas, REG_MCR, ns8250->mcr); + uart_barrier(bas); return (0); } ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#19 (text+ko) ==== @@ -340,6 +340,7 @@ static int sab82532_bus_detach(struct uart_softc *); static int sab82532_bus_flush(struct uart_softc *, int); static int sab82532_bus_getsig(struct uart_softc *); +static int sab82532_bus_ioctl(struct uart_softc *, int, intptr_t); static int sab82532_bus_ipend(struct uart_softc *); static int sab82532_bus_param(struct uart_softc *, int, int, int, int); static int sab82532_bus_probe(struct uart_softc *); @@ -352,6 +353,7 @@ KOBJMETHOD(uart_detach, sab82532_bus_detach), KOBJMETHOD(uart_flush, sab82532_bus_flush), KOBJMETHOD(uart_getsig, sab82532_bus_getsig), + KOBJMETHOD(uart_ioctl, sab82532_bus_ioctl), KOBJMETHOD(uart_ipend, sab82532_bus_ipend), KOBJMETHOD(uart_param, sab82532_bus_param), KOBJMETHOD(uart_probe, sab82532_bus_probe), @@ -444,6 +446,29 @@ } static int +sab82532_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) +{ + struct uart_bas *bas; + uint8_t dafo; + + bas = &sc->sc_bas; + switch (request) { + case UART_IOCTL_BREAK: + dafo = uart_getreg(bas, SAB_DAFO); + if (data) + dafo |= SAB_DAFO_XBRK; + else + dafo &= ~SAB_DAFO_XBRK; + uart_setreg(bas, SAB_DAFO, dafo); + uart_barrier(bas); + break; + default: + return (EINVAL); + } + return (0); +} + +static int sab82532_bus_ipend(struct uart_softc *sc) { struct uart_bas *bas; @@ -551,7 +576,7 @@ sab82532_bus_setsig(struct uart_softc *sc, int sig) { struct uart_bas *bas; - uint8_t dafo, mode, pvr; + uint8_t mode, pvr; bas = &sc->sc_bas; if (sig & UART_SIG_DDTR) { @@ -575,14 +600,6 @@ mode |= SAB_MODE_FRTS; uart_setreg(bas, SAB_MODE, mode); uart_barrier(bas); - if (sig & UART_SIG_DBREAK) { - dafo = uart_getreg(bas, SAB_DAFO); - if (sig & UART_SIG_BREAK) - dafo |= SAB_DAFO_XBRK; - else - dafo &= ~SAB_DAFO_XBRK; - uart_setreg(bas, SAB_DAFO, dafo); - } return (0); } ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#10 (text+ko) ==== @@ -245,6 +245,7 @@ static int z8530_bus_detach(struct uart_softc *); static int z8530_bus_flush(struct uart_softc *, int); static int z8530_bus_getsig(struct uart_softc *); +static int z8530_bus_ioctl(struct uart_softc *, int, intptr_t); static int z8530_bus_ipend(struct uart_softc *); static int z8530_bus_param(struct uart_softc *, int, int, int, int); static int z8530_bus_probe(struct uart_softc *); @@ -256,13 +257,14 @@ KOBJMETHOD(uart_attach, z8530_bus_attach), KOBJMETHOD(uart_detach, z8530_bus_detach), KOBJMETHOD(uart_flush, z8530_bus_flush), - KOBJMETHOD(uart_getsig, z8530_bus_getsig), - KOBJMETHOD(uart_ipend, z8530_bus_ipend), + KOBJMETHOD(uart_getsig, z8530_bus_getsig), + KOBJMETHOD(uart_ioctl, z8530_bus_ioctl), + KOBJMETHOD(uart_ipend, z8530_bus_ipend), KOBJMETHOD(uart_param, z8530_bus_param), KOBJMETHOD(uart_probe, z8530_bus_probe), - KOBJMETHOD(uart_receive, z8530_bus_receive), + KOBJMETHOD(uart_receive, z8530_bus_receive), KOBJMETHOD(uart_setsig, z8530_bus_setsig), - KOBJMETHOD(uart_transmit, z8530_bus_transmit), + KOBJMETHOD(uart_transmit, z8530_bus_transmit), { 0, 0 } }; @@ -344,6 +346,28 @@ } static int +z8530_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) +{ + struct z8530_softc *z8530 = (struct z8530_softc*)sc; + struct uart_bas *bas; + + bas = &sc->sc_bas; + switch (request) { + case UART_IOCTL_BREAK: + if (data) + z8530->tpc |= TPC_BRK; + else + z8530->tpc &= ~TPC_BRK; + uart_setmreg(bas, WR_TPC, z8530->tpc); + uart_barrier(bas); + break; + default: + return (EINVAL); + } + return (0); +} + +static int z8530_bus_ipend(struct uart_softc *sc) { struct uart_bas *bas; @@ -455,12 +479,6 @@ z8530->tpc |= TPC_RTS; else z8530->tpc &= ~TPC_RTS; - if (sig & UART_SIG_DBREAK) { - if (sig & UART_SIG_BREAK) - z8530->tpc |= TPC_BRK; - else - z8530->tpc &= ~TPC_BRK; - } uart_setmreg(bas, WR_TPC, z8530->tpc); uart_barrier(bas); return (0); ==== //depot/projects/uart/dev/uart/uart_if.m#9 (text+ko) ==== @@ -71,6 +71,16 @@ struct uart_softc *this; }; +# ioctl() - get or set miscellaneous parameters. +# This method is the bitbucket method. It can (and will) be used when there's +# something we need to set or get for which a new method is overkill. It's +# used for example to set HW or SW flow-control. +METHOD int ioctl { + struct uart_softc *this; + int request; + intptr_t data; +}; + # ipend() - query UART for pending interrupts. # When an interrupt is signalled, the handler will call this method to find # out which of the interrupt sources needs attention. The handler will use ==== //depot/projects/uart/dev/uart/uart_tty.c#11 (text+ko) ==== @@ -472,10 +472,10 @@ switch (cmd) { case TIOCSBRK: - UART_SETSIG(sc, UART_SIG_DBREAK | UART_SIG_BREAK); + UART_IOCTL(sc, UART_IOCTL_BREAK, 1); break; case TIOCCBRK: - UART_SETSIG(sc, UART_SIG_DBREAK); + UART_IOCTL(sc, UART_IOCTL_BREAK, 0); break; case TIOCSDTR: UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 23:13:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8986316A4C1; Mon, 1 Sep 2003 23:13:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B0C416A4BF for ; Mon, 1 Sep 2003 23:13:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B08914400D for ; Mon, 1 Sep 2003 23:13:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h826DM0U034971 for ; Mon, 1 Sep 2003 23:13:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h826DMEb034965 for perforce@freebsd.org; Mon, 1 Sep 2003 23:13:22 -0700 (PDT) Date: Mon, 1 Sep 2003 23:13:22 -0700 (PDT) Message-Id: <200309020613.h826DMEb034965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 06:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=37365 Change 37365 by marcel@marcel_nfs on 2003/09/01 23:13:12 Fix a style(9) bug in the previous commit. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#23 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#23 (text+ko) ==== @@ -79,7 +79,7 @@ /* UART_IOCTL() requests */ #define UART_IOCTL_BREAK 1 -#define UART_IOCTL_RTSCTS 2 +#define UART_IOCTL_RTSCTS 2 #define UART_IOCTL_XONXOFF 3 /* From owner-p4-projects@FreeBSD.ORG Mon Sep 1 23:17:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A47716A4C1; Mon, 1 Sep 2003 23:17:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BC4C16A4C0 for ; Mon, 1 Sep 2003 23:17:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DB5B44001 for ; Mon, 1 Sep 2003 23:17:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h826HS0U035130 for ; Mon, 1 Sep 2003 23:17:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h826HRKP035127 for perforce@freebsd.org; Mon, 1 Sep 2003 23:17:27 -0700 (PDT) Date: Mon, 1 Sep 2003 23:17:27 -0700 (PDT) Message-Id: <200309020617.h826HRKP035127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 06:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=37366 Change 37366 by marcel@marcel_nfs on 2003/09/01 23:17:20 This is lame: a whole block of code without the proper indentation. Time to call it day... Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#20 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#20 (text+ko) ==== @@ -454,17 +454,17 @@ bas = &sc->sc_bas; switch (request) { case UART_IOCTL_BREAK: - dafo = uart_getreg(bas, SAB_DAFO); - if (data) - dafo |= SAB_DAFO_XBRK; - else - dafo &= ~SAB_DAFO_XBRK; - uart_setreg(bas, SAB_DAFO, dafo); + dafo = uart_getreg(bas, SAB_DAFO); + if (data) + dafo |= SAB_DAFO_XBRK; + else + dafo &= ~SAB_DAFO_XBRK; + uart_setreg(bas, SAB_DAFO, dafo); uart_barrier(bas); break; default: return (EINVAL); - } + } return (0); } From owner-p4-projects@FreeBSD.ORG Tue Sep 2 12:04:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2813D16A4C1; Tue, 2 Sep 2003 12:04:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F236D16A4BF for ; Tue, 2 Sep 2003 12:04:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F69643FF9 for ; Tue, 2 Sep 2003 12:04:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82J4H0U096745 for ; Tue, 2 Sep 2003 12:04:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82J4GP0096742 for perforce@freebsd.org; Tue, 2 Sep 2003 12:04:16 -0700 (PDT) Date: Tue, 2 Sep 2003 12:04:16 -0700 (PDT) Message-Id: <200309021904.h82J4GP0096742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 37394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 19:04:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=37394 Change 37394 by cvance@cvance_release on 2003/09/02 12:03:28 Bug fix Add 'L' option to menu Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/label.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/label.c#8 (text+ko) ==== @@ -705,7 +705,7 @@ strcat(newfs, "L"); else needspaces++; - for (j = 0; j < needspaces; i++) + for (j = 0; j < needspaces; j++) strcat(newfs, " "); break; @@ -784,6 +784,7 @@ mvprintw(18, 56, "W = Write"); mvprintw(19, 0, "N = Newfs Opts Q = Finish S = Toggle SoftUpdates Z = Custom Newfs"); mvprintw(20, 0, "T = Toggle Newfs U = Undo A = Auto Defaults R = Delete+Merge"); + mvprintw(21, 0, "L = Label Support"); mvprintw(22, 0, "Use F1 or ? to get more help, arrow keys to select."); move(0, 0); } From owner-p4-projects@FreeBSD.ORG Tue Sep 2 14:46:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD94716A4C2; Tue, 2 Sep 2003 14:46:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AD0216A4BF for ; Tue, 2 Sep 2003 14:46:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED17043FF3 for ; Tue, 2 Sep 2003 14:46:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82Lkb0U010448 for ; Tue, 2 Sep 2003 14:46:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82LkbrE010445 for perforce@freebsd.org; Tue, 2 Sep 2003 14:46:37 -0700 (PDT) Date: Tue, 2 Sep 2003 14:46:37 -0700 (PDT) Message-Id: <200309022146.h82LkbrE010445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 21:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37401 Change 37401 by sam@sam_ebb on 2003/09/02 14:46:12 IFC Affected files ... .. //depot/projects/netperf/sys/kern/uipc_domain.c#3 integrate Differences ... ==== //depot/projects/netperf/sys/kern/uipc_domain.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.32 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.34 2003/09/02 20:59:23 sam Exp $"); #include #include @@ -71,6 +71,7 @@ struct domain *domains; /* registered protocol domains */ struct mtx dom_mtx; /* domain list lock */ +MTX_SYSINIT(domain, &dom_mtx, "domain list", MTX_DEF); /* * Add a new protocol domain to the list of supported domains @@ -80,7 +81,7 @@ static void net_init_domain(struct domain *dp) { - register struct protosw *pr; + struct protosw *pr; if (dp->dom_init) (*dp->dom_init)(); @@ -110,10 +111,10 @@ struct domain *dp; dp = (struct domain *)data; - DOMAIN_LOCK(); + mtx_lock(&dom_mtx); dp->dom_next = domains; domains = dp; - DOMAIN_UNLOCK(); + mtx_unlock(&dom_mtx); net_init_domain(dp); } From owner-p4-projects@FreeBSD.ORG Tue Sep 2 15:42:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F93116A4C1; Tue, 2 Sep 2003 15:42:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC40D16A4BF for ; Tue, 2 Sep 2003 15:42:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50B8D43FE1 for ; Tue, 2 Sep 2003 15:42:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82Mgk0U013183 for ; Tue, 2 Sep 2003 15:42:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82Mgje3013180 for perforce@freebsd.org; Tue, 2 Sep 2003 15:42:45 -0700 (PDT) Date: Tue, 2 Sep 2003 15:42:45 -0700 (PDT) Message-Id: <200309022242.h82Mgje3013180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 22:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=37402 Change 37402 by marcel@marcel_nfs on 2003/09/02 15:42:00 IFC @37400 Affected files ... .. //depot/projects/uart/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/uart/dev/advansys/adw_pci.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#5 integrate .. //depot/projects/uart/dev/an/if_an_pci.c#6 integrate .. //depot/projects/uart/dev/asr/asr.c#4 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#5 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#3 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/uart/dev/buslogic/bt_pci.c#5 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/uart/dev/dpt/dpt_pci.c#5 integrate .. //depot/projects/uart/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/uart/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#8 integrate .. //depot/projects/uart/dev/hea/hea_pci.c#3 integrate .. //depot/projects/uart/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/uart/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/uart/dev/hme/if_hme_pci.c#6 integrate .. //depot/projects/uart/dev/hme/if_hme_sbus.c#5 integrate .. //depot/projects/uart/dev/ida/ida_pci.c#5 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#5 integrate .. //depot/projects/uart/dev/ips/ips_pci.c#5 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/uart/dev/lnc/if_lnc_pci.c#5 integrate .. //depot/projects/uart/dev/mlx/mlx.c#4 integrate .. //depot/projects/uart/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/uart/dev/mly/mly.c#5 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/uart/dev/musycc/musycc.c#4 integrate .. //depot/projects/uart/dev/pci/pci.c#8 integrate .. //depot/projects/uart/dev/pci/pcireg.h#4 integrate .. //depot/projects/uart/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/uart/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/uart/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/uart/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/uart/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/uart/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/uart/dev/sound/pci/csa.c#4 integrate .. //depot/projects/uart/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/uart/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/uart/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/uart/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/uart/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/uart/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#4 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/uart/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/uart/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/uart/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/uart/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/uart/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/uart/dev/trm/trm.c#7 integrate .. //depot/projects/uart/dev/tx/if_txreg.h#2 integrate .. //depot/projects/uart/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/uart/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/uart/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/uart/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/uart/kern/uipc_domain.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/uart/pci/if_dc.c#12 integrate .. //depot/projects/uart/pci/if_mn.c#3 integrate .. //depot/projects/uart/pci/if_rl.c#11 integrate .. //depot/projects/uart/pci/xrpu.c#3 integrate .. //depot/projects/uart/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/uart/sparc64/sparc64/ofw_machdep.c#6 integrate .. //depot/projects/uart/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/uart/vm/swap_pager.c#10 integrate Differences ... ==== //depot/projects/uart/dev/advansys/adv_pci.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.21 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.22 2003/09/02 17:30:33 jhb Exp $"); #include #include @@ -78,8 +78,8 @@ #include -#define PCI_BASEADR0 PCIR_MAPS /* I/O Address */ -#define PCI_BASEADR1 PCIR_MAPS + 4 /* Mem I/O Address */ +#define PCI_BASEADR0 PCIR_BAR(0) /* I/O Address */ +#define PCI_BASEADR1 PCIR_BAR(1) /* Mem I/O Address */ #define PCI_DEVICE_ID_ADVANSYS_1200A 0x110010CD #define PCI_DEVICE_ID_ADVANSYS_1200B 0x120010CD ==== //depot/projects/uart/dev/advansys/adw_pci.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.18 2003/08/24 17:48:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.19 2003/09/02 17:30:33 jhb Exp $"); #include #include @@ -60,8 +60,8 @@ #include #include -#define ADW_PCI_IOBASE PCIR_MAPS /* I/O Address */ -#define ADW_PCI_MEMBASE PCIR_MAPS + 4 /* Mem I/O Address */ +#define ADW_PCI_IOBASE PCIR_BAR(0) /* I/O Address */ +#define ADW_PCI_MEMBASE PCIR_BAR(1) /* Mem I/O Address */ #define PCI_ID_ADVANSYS_3550 0x230010CD00000000ull #define PCI_ID_ADVANSYS_38C0800_REV1 0x250010CD00000000ull ==== //depot/projects/uart/dev/aic7xxx/ahc_pci.c#4 (text+ko) ==== @@ -32,12 +32,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.55 2003/08/24 17:48:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.56 2003/09/02 17:30:34 jhb Exp $"); #include -#define AHC_PCI_IOADDR PCIR_MAPS /* I/O Address */ -#define AHC_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ +#define AHC_PCI_IOADDR PCIR_BAR(0) /* I/O Address */ +#define AHC_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */ static int ahc_pci_probe(device_t dev); static int ahc_pci_attach(device_t dev); ==== //depot/projects/uart/dev/aic7xxx/ahd_pci.c#4 (text+ko) ==== @@ -32,13 +32,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.10 2003/08/24 17:48:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.11 2003/09/02 17:30:34 jhb Exp $"); #include -#define AHD_PCI_IOADDR0 PCIR_MAPS /* Primary I/O BAR */ -#define AHD_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ -#define AHD_PCI_IOADDR1 (PCIR_MAPS + 12)/* Secondary I/O BAR */ +#define AHD_PCI_IOADDR0 PCIR_BAR(0) /* Primary I/O BAR */ +#define AHD_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */ +#define AHD_PCI_IOADDR1 PCIR_BAR(3) /* Secondary I/O BAR */ static int ahd_pci_probe(device_t dev); static int ahd_pci_attach(device_t dev); ==== //depot/projects/uart/dev/aic7xxx/aic79xx.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#94 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.15 2003/06/28 04:45:25 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.16 2003/09/02 17:30:34 jhb Exp $ */ #ifndef _AIC79XX_H_ @@ -1298,9 +1298,9 @@ }; /****************************** PCI Structures ********************************/ -#define AHD_PCI_IOADDR0 PCIR_MAPS /* I/O BAR*/ -#define AHD_PCI_MEMADDR (PCIR_MAPS + 4) /* Memory BAR */ -#define AHD_PCI_IOADDR1 (PCIR_MAPS + 12)/* Second I/O BAR */ +#define AHD_PCI_IOADDR0 PCIR_BAR(0) /* I/O BAR*/ +#define AHD_PCI_MEMADDR PCIR_BAR(1) /* Memory BAR */ +#define AHD_PCI_IOADDR1 PCIR_BAR(3) /* Second I/O BAR */ typedef int (ahd_device_setup_t)(struct ahd_softc *); ==== //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.29 2003/08/24 17:48:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.30 2003/09/02 17:30:34 jhb Exp $"); #ifdef __linux__ #include "aic7xxx_osm.h" @@ -55,8 +55,8 @@ #include #endif -#define AHC_PCI_IOADDR PCIR_MAPS /* I/O Address */ -#define AHC_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ +#define AHC_PCI_IOADDR PCIR_BAR(0) /* I/O Address */ +#define AHC_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */ static __inline uint64_t ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) ==== //depot/projects/uart/dev/amr/amr_pci.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.19 2003/08/24 17:48:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.20 2003/09/02 17:30:34 jhb Exp $"); #include #include @@ -210,7 +210,7 @@ /* * Allocate the PCI register window. */ - rid = PCIR_MAPS; + rid = PCIR_BAR(0); rtype = AMR_IS_QUARTZ(sc) ? SYS_RES_MEMORY : SYS_RES_IOPORT; sc->amr_reg = bus_alloc_resource(dev, rtype, &rid, 0, ~0, 1, RF_ACTIVE); if (sc->amr_reg == NULL) { @@ -468,7 +468,7 @@ if (sc->amr_reg != NULL) bus_release_resource(sc->amr_dev, AMR_IS_QUARTZ(sc) ? SYS_RES_MEMORY : SYS_RES_IOPORT, - PCIR_MAPS, sc->amr_reg); + PCIR_BAR(0), sc->amr_reg); } /******************************************************************************** ==== //depot/projects/uart/dev/an/if_an_pci.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.24 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.25 2003/09/02 17:30:34 jhb Exp $"); /* * This is a PCI shim for the Aironet PC4500/4800 wireless network @@ -156,7 +156,7 @@ if (pci_get_vendor(dev) == AIRONET_VENDORID && pci_get_device(dev) == AIRONET_DEVICEID_MPI350) { sc->mpi350 = 1; - sc->port_rid = PCIR_MAPS; + sc->port_rid = PCIR_BAR(0); } else { /* * Map control/status registers. @@ -186,7 +186,7 @@ /* Allocate memory for MPI350 */ if (sc->mpi350) { /* Allocate memory */ - sc->mem_rid = PCIR_MAPS + 4; + sc->mem_rid = PCIR_BAR(1); error = an_alloc_memory(dev, sc->mem_rid, 1); if (error) { printf("an%d: couldn't map memory\n", unit); @@ -196,7 +196,7 @@ sc->an_mem_bhandle = rman_get_bushandle(sc->mem_res); /* Allocate aux. memory */ - sc->mem_aux_rid = PCIR_MAPS + 8; + sc->mem_aux_rid = PCIR_BAR(2); error = an_alloc_aux_memory(dev, sc->mem_aux_rid, AN_AUX_MEM_SIZE); if (error) { ==== //depot/projects/uart/dev/asr/asr.c#4 (text+ko) ==== @@ -105,7 +105,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.36 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.37 2003/09/02 17:30:34 jhb Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '0' @@ -2549,10 +2549,8 @@ /* * I2O specification says we must find first *memory* mapped BAR */ - for (rid = PCIR_MAPS; - rid < (PCIR_MAPS + 4 * sizeof(u_int32_t)); - rid += sizeof(u_int32_t)) { - p = pci_read_config(tag, rid, sizeof(p)); + for (rid = 0; rid < 4; rid++) { + p = pci_read_config(tag, PCIR_BAR(rid), sizeof(p)); if ((p & 1) == 0) { break; } @@ -2560,9 +2558,10 @@ /* * Give up? */ - if (rid >= (PCIR_MAPS + 4 * sizeof(u_int32_t))) { - rid = PCIR_MAPS; + if (rid >= 4) { + rid = 0; } + rid = PCIR_BAR(rid); p = pci_read_config(tag, rid, sizeof(p)); pci_write_config(tag, rid, -1, sizeof(p)); l = 0 - (pci_read_config(tag, rid, sizeof(l)) & ~15); @@ -2599,8 +2598,7 @@ } sc->ha_Virt = (i2oRegs_t *) rman_get_virtual(sc->ha_mem_res); if (s == 0xA5111044) { /* Split BAR Raptor Daptor */ - if ((rid += sizeof(u_int32_t)) - >= (PCIR_MAPS + 4 * sizeof(u_int32_t))) { + if ((rid += sizeof(u_int32_t)) >= PCIR_BAR(4)) { return (0); } p = pci_read_config(tag, rid, sizeof(p)); ==== //depot/projects/uart/dev/ata/ata-chipset.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.37 2003/08/25 11:13:04 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.38 2003/09/02 21:02:46 obrien Exp $"); #include "opt_ata.h" #include @@ -996,6 +996,7 @@ static struct ata_chip_id ids[] = {{ ATA_NFORCE1, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA5, "nVidia nForce" }, { ATA_NFORCE2, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA6, "nVidia nForce2" }, + { ATA_NFORCE3, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA6, "nVidia nForce3" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; ==== //depot/projects/uart/dev/ata/ata-pci.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.14 2003/08/25 11:13:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.15 2003/09/02 21:02:46 obrien Exp $ */ /* structure holding chipset config info */ @@ -121,6 +121,7 @@ #define ATA_NVIDIA_ID 0x10de #define ATA_NFORCE1 0x01bc10de #define ATA_NFORCE2 0x006510de +#define ATA_NFORCE3 0x00d510de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/uart/dev/ata/ata-raid.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.67 2003/08/24 17:48:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.68 2003/09/02 13:26:02 sos Exp $"); #include "opt_ata.h" #include @@ -180,7 +180,7 @@ rdp->disk.d_mediasize = (off_t)rdp->total_sectors * DEV_BSIZE; rdp->disk.d_fwsectors = rdp->sectors; rdp->disk.d_fwheads = rdp->heads; - rdp->disk.d_maxsize = 256 * DEV_BSIZE; + rdp->disk.d_maxsize = 128 * DEV_BSIZE; rdp->disk.d_drv1 = rdp; disk_create(rdp->lun, &rdp->disk, 0, NULL, NULL); ==== //depot/projects/uart/dev/ata/atapi-cd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.140 2003/08/25 09:01:49 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.141 2003/09/02 15:53:01 sos Exp $"); #include "opt_ata.h" #include @@ -773,7 +773,7 @@ break; } - format=args->data_format; + format = args->data_format; if ((format != CD_CURRENT_POSITION) && (format != CD_MEDIA_CATALOG) && (format != CD_TRACK_INFO)) { error = EINVAL; @@ -782,7 +782,7 @@ ccb[1] = args->address_format & CD_MSF_FORMAT; - if ((error = ata_atapicmd(cdp->device,ccb,(caddr_t)&cdp->subchan, + if ((error = ata_atapicmd(cdp->device, ccb, (caddr_t)&cdp->subchan, sizeof(cdp->subchan), ATA_R_READ, 10))) break; ==== //depot/projects/uart/dev/bktr/bktr_os.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.38 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.39 2003/09/02 17:30:34 jhb Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -343,7 +343,7 @@ /* * Map control/status registers. */ - bktr->mem_rid = PCIR_MAPS; + bktr->mem_rid = PCIR_BAR(0); bktr->res_mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &bktr->mem_rid, 0, ~0, 1, RF_ACTIVE); ==== //depot/projects/uart/dev/buslogic/bt_pci.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.16 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.17 2003/09/02 17:30:35 jhb Exp $"); #include #include @@ -48,8 +48,8 @@ #include -#define BT_PCI_IOADDR PCIR_MAPS -#define BT_PCI_MEMADDR PCIR_MAPS + 4 +#define BT_PCI_IOADDR PCIR_BAR(0) +#define BT_PCI_MEMADDR PCIR_BAR(1) #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER 0x1040104Bul #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140104Bul ==== //depot/projects/uart/dev/cardbus/cardbus_cis.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.39 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.40 2003/09/02 17:30:35 jhb Exp $"); /* * CIS Handling for the Cardbus Bus @@ -1044,7 +1044,7 @@ * XXX: should we do this or use quirks? */ for (reg = 0; reg < dinfo->pci.cfg.nummaps; reg++) { - cardbus_add_map(cbdev, child, PCIR_MAPS + reg * 4); + cardbus_add_map(cbdev, child, PCIR_BAR(reg)); } for (q = &cardbus_quirks[0]; q->devid; q++) { ==== //depot/projects/uart/dev/dpt/dpt_pci.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.28 2003/08/24 17:46:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.29 2003/09/02 17:30:35 jhb Exp $"); #include #include @@ -54,8 +54,8 @@ #define DPT_VENDOR_ID 0x1044 #define DPT_DEVICE_ID 0xa400 -#define DPT_PCI_IOADDR PCIR_MAPS /* I/O Address */ -#define DPT_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ +#define DPT_PCI_IOADDR PCIR_BAR(0) /* I/O Address */ +#define DPT_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */ #define ISA_PRIMARY_WD_ADDRESS 0x1f8 ==== //depot/projects/uart/dev/ed/if_ed_pci.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.32 2003/08/24 17:46:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.33 2003/09/02 17:30:35 jhb Exp $"); #include #include @@ -84,7 +84,7 @@ int flags = 0; int error; - error = ed_probe_Novell(dev, PCIR_MAPS, flags); + error = ed_probe_Novell(dev, PCIR_BAR(0), flags); if (error) return (error); ==== //depot/projects/uart/dev/fxp/if_fxp.c#10 (text+ko) ==== @@ -28,14 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.192 2003/08/24 17:46:07 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.193 2003/09/02 17:30:35 jhb Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.192 2003/08/24 17:46:07 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.193 2003/09/02 17:30:35 jhb Exp $"); #include #include @@ -994,7 +994,7 @@ fxp_stop(sc); for (i = 0; i < 5; i++) - sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); + sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4); sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4); sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1); @@ -1027,7 +1027,7 @@ #endif /* better way to do this? */ for (i = 0; i < 5; i++) - pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4); + pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4); pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4); pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1); pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1); ==== //depot/projects/uart/dev/gem/if_gem_pci.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.11 2003/08/24 17:46:07 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.12 2003/09/02 20:24:42 marcel Exp $"); /* * PCI bindings for Sun GEM ethernet controllers. @@ -53,6 +53,7 @@ #include #include +#include #include #include ==== //depot/projects/uart/dev/hatm/if_hatm.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.9 2003/08/22 06:00:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.10 2003/09/02 17:30:35 jhb Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -1693,7 +1693,7 @@ error = ENXIO; goto failed; } - sc->memid = PCIR_MAPS; + sc->memid = PCIR_BAR(0); sc->memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->memid, 0, ~0, 1, RF_ACTIVE); if (sc->memres == NULL) { ==== //depot/projects/uart/dev/hea/hea_pci.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hea/hea_pci.c,v 1.6 2003/08/24 17:46:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hea/hea_pci.c,v 1.7 2003/09/02 17:30:35 jhb Exp $"); /* * @@ -157,7 +157,7 @@ pci_enable_busmaster(dev); - sc->mem_rid = PCIR_MAPS; + sc->mem_rid = PCIR_BAR(0); sc->mem_type = SYS_RES_MEMORY; sc->irq_rid = 0; ==== //depot/projects/uart/dev/hifn/hifn7751.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.21 2003/08/24 17:46:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.22 2003/09/02 17:30:36 jhb Exp $"); /* * Driver for the Hifn 7751 encryption processor. @@ -588,7 +588,7 @@ hifn_stop(sc); for (i = 0; i < 5; i++) - sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); + sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4); sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4); sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1); @@ -613,7 +613,7 @@ /* better way to do this? */ for (i = 0; i < 5; i++) - pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4); + pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4); pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4); pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1); pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1); ==== //depot/projects/uart/dev/hifn/hifn7751reg.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.1 2002/10/04 20:32:37 sam Exp $ */ +/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.2 2003/09/02 17:30:36 jhb Exp $ */ /* $OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $ */ /* @@ -49,8 +49,8 @@ * Some PCI configuration space offset defines. The names were made * identical to the names used by the Linux kernel. */ -#define HIFN_BAR0 (PCIR_MAPS+0x0) /* PUC register map */ -#define HIFN_BAR1 (PCIR_MAPS+0x4) /* DMA register map */ +#define HIFN_BAR0 PCIR_BAR(0) /* PUC register map */ +#define HIFN_BAR1 PCIR_BAR(1) /* DMA register map */ #define HIFN_TRDY_TIMEOUT 0x40 #define HIFN_RETRY_TIMEOUT 0x41 ==== //depot/projects/uart/dev/hme/if_hme_pci.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.10 2003/08/24 17:46:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.11 2003/09/02 20:24:42 marcel Exp $"); /* * PCI front-end device driver for the HME ethernet device. @@ -43,6 +43,7 @@ #include #include +#include #include #include ==== //depot/projects/uart/dev/hme/if_hme_sbus.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.7 2003/08/24 17:46:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.8 2003/09/02 20:24:42 marcel Exp $"); /* * SBus front-end device driver for the HME ethernet device. @@ -51,6 +51,7 @@ #include #include +#include #include #include ==== //depot/projects/uart/dev/ida/ida_pci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.25 2003/08/24 17:49:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.26 2003/09/02 17:30:36 jhb Exp $"); #include #include @@ -52,7 +52,7 @@ #define IDA_PCI_MAX_DMA_ADDR 0xFFFFFFFF #define IDA_PCI_MAX_DMA_COUNT 0xFFFFFFFF -#define IDA_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ +#define IDA_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */ #define IDA_DEVICEID_SMART 0xAE100E11 #define IDA_DEVICEID_DEC_SMART 0x00461011 @@ -254,7 +254,7 @@ ida->regs_res_type = SYS_RES_MEMORY; ida->regs_res_id = IDA_PCI_MEMADDR; if (id == IDA_DEVICEID_DEC_SMART) - ida->regs_res_id = PCIR_MAPS; + ida->regs_res_id = PCIR_BAR(0); ida->regs = bus_alloc_resource(dev, ida->regs_res_type, &ida->regs_res_id, 0, ~0, 1, RF_ACTIVE); ==== //depot/projects/uart/dev/iir/iir_pci.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #ident "$Id: iir_pci.c 1.1 2001/05/22 20:14:12 achim Exp $" #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.10 2003/08/24 17:49:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.11 2003/09/02 17:30:36 jhb Exp $"); /* * iir_pci.c: PCI Bus Attachment for Intel Integrated RAID Controller driver @@ -66,7 +66,7 @@ #include /* Mapping registers for various areas */ -#define PCI_DPMEM PCIR_MAPS +#define PCI_DPMEM PCIR_BAR(0) /* Product numbers for Fibre-Channel are greater than or equal to 0x200 */ #define GDT_PCI_PRODUCT_FC 0x200 ==== //depot/projects/uart/dev/ips/ips_pci.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.5 2003/08/24 17:49:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.6 2003/09/02 17:30:36 jhb Exp $"); #include @@ -87,15 +87,15 @@ if(command & PCIM_CMD_MEMEN){ PRINTF(10, "trying MEMIO\n"); if(pci_get_device(dev) == IPS_MORPHEUS_DEVICE_ID) - sc->rid = PCIR_MAPS; + sc->rid = PCIR_BAR(0); else - sc->rid = PCIR_MAPS + 4; + sc->rid = PCIR_BAR(1); sc->iotype = SYS_RES_MEMORY; sc->iores = bus_alloc_resource(dev, sc->iotype, &sc->rid, 0, ~0, 1, RF_ACTIVE); } if(!sc->iores && command & PCIM_CMD_PORTEN){ PRINTF(10, "trying PORTIO\n"); - sc->rid = PCIR_MAPS; + sc->rid = PCIR_BAR(0); sc->iotype = SYS_RES_IOPORT; sc->iores = bus_alloc_resource(dev, sc->iotype, &sc->rid, 0, ~0, 1, RF_ACTIVE); } ==== //depot/projects/uart/dev/isp/isp_sbus.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.10 2003/08/24 17:49:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.11 2003/09/02 19:52:31 marcel Exp $"); #include #include @@ -35,10 +35,10 @@ #include #include #include -#include #include #include #include +#include #include #include ==== //depot/projects/uart/dev/lnc/if_lnc_pci.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_pci.c,v 1.30 2003/08/24 17:49:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_pci.c,v 1.31 2003/09/02 17:30:36 jhb Exp $"); #include #include @@ -102,7 +102,7 @@ command |= PCIM_CMD_PORTEN | PCIM_CMD_BUSMASTEREN; pci_write_config(dev, PCIR_COMMAND, command, 4); - rid = PCIR_MAPS; + rid = PCIR_BAR(0); sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); @@ -195,7 +195,7 @@ lnc_stop(sc); bus_teardown_intr(dev, sc->irqres, sc->intrhand); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irqres); - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS, sc->portres); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), sc->portres); bus_dmamap_unload(sc->dmat, sc->dmamap); bus_dmamem_free(sc->dmat, sc->recv_ring, sc->dmamap); ==== //depot/projects/uart/dev/mlx/mlx.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.40 2003/08/09 23:07:21 scottl Exp $ + * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.41 2003/09/02 08:30:31 scottl Exp $ */ /* @@ -108,9 +108,15 @@ static int mlx_rebuild(struct mlx_softc *sc, int channel, int target); static int mlx_wait_command(struct mlx_command *mc); static int mlx_poll_command(struct mlx_command *mc); +void mlx_startio_cb(void *arg, + bus_dma_segment_t *segs, + int nsegments, int error); static void mlx_startio(struct mlx_softc *sc); static void mlx_completeio(struct mlx_command *mc); -static int mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu); +static int mlx_user_command(struct mlx_softc *sc, + struct mlx_usercommand *mu); +void mlx_user_cb(void *arg, bus_dma_segment_t *segs, + int nsegments, int error); /* * Command buffer allocation. @@ -123,7 +129,9 @@ * Command management. */ static int mlx_getslot(struct mlx_command *mc); -static void mlx_mapcmd(struct mlx_command *mc); +static void mlx_setup_dmamap(struct mlx_command *mc, + bus_dma_segment_t *segs, + int nsegments, int error); static void mlx_unmapcmd(struct mlx_command *mc); static int mlx_start(struct mlx_command *mc); static int mlx_done(struct mlx_softc *sc); @@ -271,8 +279,8 @@ device_printf(sc->mlx_dev, "can't allocate s/g table\n"); return(ENOMEM); } - bus_dmamap_load(sc->mlx_sg_dmat, sc->mlx_sg_dmamap, sc->mlx_sgtable, - segsize, mlx_dma_map_sg, sc, 0); + (void)bus_dmamap_load(sc->mlx_sg_dmat, sc->mlx_sg_dmamap, sc->mlx_sgtable, + segsize, mlx_dma_map_sg, sc, 0); return(0); } @@ -371,14 +379,14 @@ /* * Create DMA tag for mapping buffers into controller-addressable space. */ - error = bus_dma_tag_create(sc->mlx_parent_dmat, /* parent */ - 1, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - MAXBSIZE, MLX_NSEG, /* maxsize, nsegments */ - BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ - 0, /* flags */ + error = bus_dma_tag_create(sc->mlx_parent_dmat, /* parent */ + 1, 0, /* align, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MAXBSIZE, MLX_NSEG, /* maxsize, nsegments */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ + 0, /* flags */ busdma_lock_mutex, /* lockfunc */ &Giant, /* lockarg */ &sc->mlx_buffer_dmat); @@ -389,7 +397,8 @@ } /* - * Create some initial scatter/gather mappings so we can run the probe commands. + * Create some initial scatter/gather mappings so we can run the probe + * commands. */ error = mlx_sglist_map(sc); if (error != 0) { @@ -1175,6 +1184,29 @@ mlx_releasecmd(mc); } +static void +mlx_eventlog_cb(void *arg, bus_dma_segment_t *segs, int nsegments, int error) +{ + struct mlx_command *mc; + + mc = (struct mlx_command *)arg; + mlx_setup_dmamap(mc, segs, nsegments, error); + + /* build the command to get one entry */ + mlx_make_type3(mc, MLX_CMD_LOGOP, MLX_LOGOP_GET, 1, + mc->mc_sc->mlx_lastevent, 0, 0, mc->mc_dataphys, 0); + mc->mc_complete = mlx_periodic_eventlog_respond; + mc->mc_private = mc; + + /* start the command */ + if (mlx_start(mc) != 0) { + mlx_releasecmd(mc); + free(mc->mc_data, M_DEVBUF); + mc->mc_data = NULL; + } + +} + /******************************************************************************** * Instigate a poll for one event log message on (sc). * We only poll for one message at a time, to keep our command usage down. @@ -1184,7 +1216,7 @@ { struct mlx_command *mc; void *result = NULL; - int error; + int error = 0; debug_called(1); @@ -1192,9 +1224,12 @@ error = 1; if ((mc = mlx_alloccmd(sc)) == NULL) goto out; + /* allocate the response structure */ - if ((result = malloc(/*sizeof(struct mlx_eventlog_entry)*/1024, M_DEVBUF, M_NOWAIT)) == NULL) + if ((result = malloc(/*sizeof(struct mlx_eventlog_entry)*/1024, M_DEVBUF, + M_NOWAIT)) == NULL) goto out; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 15:52:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B45D16A4C1; Tue, 2 Sep 2003 15:52:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5B2216A4BF for ; Tue, 2 Sep 2003 15:52:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFC7F43FDD for ; Tue, 2 Sep 2003 15:52:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82MqN0U014337 for ; Tue, 2 Sep 2003 15:52:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82MqJNf014264 for perforce@freebsd.org; Tue, 2 Sep 2003 15:52:19 -0700 (PDT) Date: Tue, 2 Sep 2003 15:52:19 -0700 (PDT) Message-Id: <200309022252.h82MqJNf014264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 22:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=37403 Change 37403 by marcel@marcel_nfs on 2003/09/02 15:51:19 IFC @37400 Affected files ... .. //depot/projects/ia64/contrib/amd/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/AUTHORS#2 integrate .. //depot/projects/ia64/contrib/amd/BUGS#2 integrate .. //depot/projects/ia64/contrib/amd/COPYING#2 integrate .. //depot/projects/ia64/contrib/amd/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/amd/INSTALL#2 integrate .. //depot/projects/ia64/contrib/amd/MIRRORS#2 integrate .. //depot/projects/ia64/contrib/amd/NEWS#2 integrate .. //depot/projects/ia64/contrib/amd/README#2 integrate .. //depot/projects/ia64/contrib/amd/README.ldap#2 integrate .. //depot/projects/ia64/contrib/amd/amd/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/ia64/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/ia64/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/map.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_autofs.c#2 delete .. //depot/projects/ia64/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/ia64/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/amq/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.c#4 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/ia64/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/ia64/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/ia64/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/ia64/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/ia64/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/ia64/contrib/amd/bootstrap#1 branch .. //depot/projects/ia64/contrib/amd/commit#1 branch .. //depot/projects/ia64/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/ia64/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/ia64/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#2 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/ia64/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/ia64/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/ia64/contrib/amd/config.guess#1 branch .. //depot/projects/ia64/contrib/amd/config.guess.long#1 branch .. //depot/projects/ia64/contrib/amd/config.sub#1 branch .. //depot/projects/ia64/contrib/amd/configure.in#1 branch .. //depot/projects/ia64/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/ia64/contrib/amd/depcomp#1 branch .. //depot/projects/ia64/contrib/amd/doc/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/ia64/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/ia64/contrib/amd/doc/stamp-vti#2 delete .. //depot/projects/ia64/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/ia64/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/ia64/contrib/amd/fixmount/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/ia64/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/ia64/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/ia64/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/ia64/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/ia64/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/ia64/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/ia64/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/ia64/contrib/amd/install-sh#1 branch .. //depot/projects/ia64/contrib/amd/libamu/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/ia64/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/ia64/contrib/amd/ltmain.sh#1 branch .. //depot/projects/ia64/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/ia64/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/ia64/contrib/amd/m4/amindent#1 branch .. //depot/projects/ia64/contrib/amd/m4/autopat#1 branch .. //depot/projects/ia64/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/ia64/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/ia64/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/ia64/contrib/amd/m4/mkconf#1 branch .. //depot/projects/ia64/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/ia64/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/ia64/contrib/amd/missing#1 branch .. //depot/projects/ia64/contrib/amd/mk-amd-map/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/ia64/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/ia64/contrib/amd/scripts/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/lostaltmail.in#2 integrate .. //depot/projects/ia64/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/ia64/contrib/amd/tasks#2 integrate .. //depot/projects/ia64/contrib/amd/wire-test/.cvsignore#1 branch .. //depot/projects/ia64/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/ia64/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/ia64/contrib/isc-dhcp/FREEBSD-upgrade#7 integrate .. //depot/projects/ia64/contrib/isc-dhcp/README#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/RELNOTES#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#12 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.conf.5#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/scripts/freebsd#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/dhcp-options.5#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/discover.c#4 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/options.c#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/parse.c#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/print.c#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/tables.c#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/includes/dhcpd.h#10 integrate .. //depot/projects/ia64/contrib/isc-dhcp/includes/version.h#6 integrate .. //depot/projects/ia64/contrib/isc-dhcp/minires/res_mkupdate.c#2 integrate .. //depot/projects/ia64/contrib/isc-dhcp/omapip/result.c#2 integrate .. //depot/projects/ia64/lib/libc/sys/open.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#6 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#12 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#5 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#11 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#25 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#19 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#27 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#15 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#17 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#44 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#8 integrate .. //depot/projects/ia64/sys/dev/hea/hea_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#16 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_sbus.c#8 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx.c#12 integrate .. //depot/projects/ia64/sys/dev/mlx/mlxvar.h#6 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#18 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/musycc/musycc.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#31 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csa.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csamidi.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#13 integrate .. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#11 integrate .. //depot/projects/ia64/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/solo.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/ia64/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#16 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#16 integrate .. //depot/projects/ia64/sys/dev/tx/if_txreg.h#4 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx_pci.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#9 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#11 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#12 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_pci.c#6 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#48 integrate .. //depot/projects/ia64/sys/pci/if_mn.c#9 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#43 integrate .. //depot/projects/ia64/sys/pci/xrpu.c#11 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_machdep.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#45 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_machdep.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#31 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#41 integrate .. //depot/projects/ia64/usr.sbin/amd/include/config.h#2 integrate Differences ... ==== //depot/projects/ia64/contrib/amd/AUTHORS#2 (text+ko) ==== @@ -1,4 +1,3 @@ -# -*- text -*- PRIMARY AUTHORS AND MAJOR CONTRIBUTORS TO AM_UTILS: Original authors of amd were the Berkeley team and especially Jan-Simon Pendry. Since then many people have contributed patches. @@ -168,6 +167,9 @@ server is down or does not support a portmapper call, then mark it down as version 2, and try again later. +April 12, 2003: support new "unmount" option, useful to timeout removable +local media mounts. + * Bill Paul November 5, 1997: NFS v.3 support for AIX 4.2.1, which does *not* include @@ -268,6 +270,7 @@ * Peter Breitenlohner July 24, 1999: patch for linux 2.2.x to work with older libc5 systems, and nis_isup mis-logic fixes. +December 13, 2001: report typos in scripts/amd.conf.5. * Dale Talcott July 26, 1999: added NFS3 support for AIX mounting. @@ -311,3 +314,28 @@ * Ahmon Dancy February 9, 2001: Apple Rhapsody/Darwin/OS X port + +* Sebastien Bahloul +July 3, 2001: LDAP fixes and updates to support new APIs + +March 27, 2002: LDAP bug and port to HPUX-11. + +* Philippe Troin +July 12, 2001: Proper handling of GNU getopt, support for optionally +disabling LDAP/Hesiod, fixes for the dev/nodev option on Linux + +November 28, 2001: Bug fix. Support "nolock" as an NFS option, not a +generic mount option. + +July 17, 2003: Debian fixes. Null am_pref free. + +* Trond Myklebust +January 10, 2002: Proper initialization of the timeo parameter on Linux, TCP +_must_ have a timeout 2 orders of magnitude larger than UDP + +* Sean Fagan +March 14, 2003: detect and use the MNT2_GEN_OPT_AUTOMNTFS mount flag +on OS X / Darwin. + +* Hendrik Scholz +June 9, 2003: mk-amd-map should open temp db file using O_EXCL. ==== //depot/projects/ia64/contrib/amd/BUGS#2 (text+ko) ==== @@ -1,5 +1,3 @@ -# -*- text -*- - LIST OF KNOWN BUGS IN AM-UTILS OR OPERATING SYSTEMS @@ -20,10 +18,20 @@ (I have some reports that older version of hpux-9, with older libc, also leak file descriptors.) +[1C] SGI's MIPSpro C compiler on IRIX 6 has the unfortunate habit of +creating code specificially for the machine it runs on. The ABI and ISA +used depend very much on the OS version and compiler release used. This +means that the resulting amd binary won't run on machines different from +the build host, particularly older ones. Older versions of am-utils +enforced the O32 ABI when compiling with cc to work around this, but this +ABI is deprecated in favor of the N32 ABI now, so we use -n32 -mips3 to +ensure that the binaries run on every host capable of running IRIX 6 at +all. If this is not appropriate for you, configure with something like +CC='cc -64' instead to get the desired ABI and ISA. (2) alpha-unknown-linux-gnu (RedHat Linux 4.2) -hasmntopt(mnt, opt) can goes into an infinite loop if opt is any substring +hasmntopt(mnt, opt) can go into an infinite loop if opt is any substring of mnt->mnt_opts. Redhat 5.0 does not have this libc bug. Here is an example program: @@ -99,7 +107,7 @@ in strlen inside strdup inside svc_register(). -(5) *-linux-gnu (RedHat Linux 5.1) +(5) *-linux-rh51 (RedHat Linux 5.1) There's a UDP file descriptor leak in libnsl in RedHat Linux 5.1. This library part of glibc2. Am-utils currently declares redhat 5.1 systems as @@ -129,19 +137,19 @@ you do nothing). -(8) *-linux-gnu (systems using glibc 2.1, such as RedHat-6.1) +(8) *-linux (systems using glibc 2.1, such as RedHat-6.x) -There's a UDP file descriptor leak in the nis routines in glibc, especially +There's a UDP file descriptor leak in the NIS routines in glibc, especially those that do yp_bind. Until this is bug fixed, do not set nis_domain in amd.conf, but let the system pick up the default domain name as set by your system. That would avoid using the buggy yp_bind routines in libc. -(9) *-linux-gnu (SuSE systems using unfsd) +(9) *-linux (SuSE systems using unfsd) -The user-level nfsd (2.2beta44) on SuSE Linux systems (and possibly others) -dies with a SEGV when amd tries to contact it for access to a volume that -does not exist, or one for which there is no permission to mount. +The user-level nfsd (2.2beta44) on older SuSE Linux systems (and possibly +others) dies with a SEGV when amd tries to contact it for access to a volume +that does not exist, or one for which there is no permission to mount. (10) *-*-hpux11 @@ -150,13 +158,49 @@ PHNE_20371. If you don't, and you try to use amd with NFSv3 over TCP, your kernel will panic. + (11) *-linux* (any system using a 2.2.18+ kernel) The Linux kernels don't support Amd's direct mounts very well, leading to erratic behavior: shares that don't get remounted after the first timeout, inability to restart Amd because its mount points cannot be unmounted, etc. There are some kernel patches on the am-utils Web site, which solve -these problems. +these problems. See http://www.am-utils.org/patches/. + +UPDATE: kernels 2.4.10 and later completely disallow the direct mount hack, +so direct mounts are simply not possible on those Linux kernels. + +(12) *-aix5.1.0.0 and *-hpux9* + +/bin/sh is broken and fails to run the configure script properly. You need +to use /bin/ksh instead. The buildall script will do it for you; if for some +reason you need to run configure directly, run it using 'ksh configure' +instead of just 'configure'. + +[12A] *-aix5.1.* + +Apparently there is an NFS client side bug in vmount() which causes amd to +hang when it starts (and tries to NFS-mount itself). According to IBM +engineers, this has to do with partial support code for IPv6: the NFS kernel +code doesn't appear to recognize the sin_family of the amd vmount(), +although amd does the right thing. The bug appears to have been fixed in +AIX 5.2. No known fix/patch is available for AIX 5.1 as of now (1/25/2003). + +(13) *-linux and *-darwin6.0 + +Certain linux kernels (2.4.18+ are fine, 2.4.10- are probably bad, those in +between have not been tested) have a bug which causes them to reconnect +broken NFS/TCP connections using unprivileged ports (greater than 1024), +unlike the initial connections which do originate from privileged +ports. This can upset quite a few NFS servers and causes accesses to the +mounted shares to fail with "Operation not permitted" (EPERM). + +The darwin (MacOS X) kernel defaults to using unprivileged ports, but that +can be changed by setting the resvport mount flag (which amd sets by +default). Nonetheless, if a TCP connection breaks, under certain unclear +circumstances the kernel might "forget" about that flag and start using +unprivileged ports, causing the same EPERM error above. + +Erez & Ion. -Erez. ==== //depot/projects/ia64/contrib/amd/COPYING#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (c) 1997-2001 Erez Zadok +Copyright (c) 1997-2003 Erez Zadok Copyright (c) 1989 Jan-Simon Pendry Copyright (c) 1989 Imperial College of Science, Technology & Medicine Copyright (c) 1989 The Regents of the University of California. ==== //depot/projects/ia64/contrib/amd/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,660 @@ +2003-08-27 Ion Badulescu + + * conf/nfs_prot/nfs_prot_freebsd3.h (na_uid): freebsd4.5 uses nfs + atttributes field named "uid". So #define na_uid to it. [backport + of Erez's 6.1 change from 2002-02-26] + +2003-08-22 Nick Williams + + * amd/info_ldap.c (amu_ldap_init): don't try to pass a null + pointer as a string to plog, Solaris (and other OS's) don't like + it and will dump core. + +2003-07-17 Erez Zadok + + * fsinfo/*.[hc]: rename fsinfo function log() to fsi_log(), to + avoid conflict with builtin function in gcc-3.3. + +2003-07-17 Philippe Troin + + * amd/amfs_auto.c (amfs_auto_mount): When pref:=NULL set am_pref + to strdup("") instead of NULL since this value will be + freed. Contributed by Matt Chapman . + +2003-06-09 Erez Zadok + + * mk-amd-map/mk-amd-map.c (main): open temp db file using O_EXCL, + next best thing to using mkstemp(). Patch from Hendrik Scholz + . + +2003-05-08 Ion Badulescu + + * libamu/mount_fs.c (compute_automounter_mount_flags): use + MNT2_GEN_OPT_AUTOMNTFS if available; minor cleanup, removed + redundant code for MNT2_GEN_OPT_OVERLAY + + * m4/macros/header_templates.m4: added template for + MNT2_GEN_OPT_AUTOMOUNTED + +2003-04-23 Erez Zadok + + * conf/transp/transp_sockets.c (create_amq_service): minor cpp + directive indentation and commenting. + +2003-04-22 Ion Badulescu + + * conf/transp/transp_sockets.c (create_amq_service): Ugly *BSD fix for + an RPC library DoS issue (original patch from Martin Blapp, + massaged into something more digestable by me) + +2003-04-13 Erez Zadok + + * doc/Makefile.am (DVIPS): use proper options for dvips. + + * doc/am-utils.texi (opts Option): document new 'unmount' option, + and better explain the 'nounmount' option. Also some misc options + for better generation of html manual. + + * doc/Makefile.am (install-html): support newer text2html 4.0 + options, as older options were renamed or changed behavior. + + * amd/autil.c (am_mounted): support new 'unmount' option, to allow + all file system mounts to timeout and thus expire. This option is + useful for removable local media such as CD-ROMs, USB drives, + etc. so they can expire when not in use, and get unmounted (such + drives can get work out when they keep spinning). Patch from + Christos Zoulas (originally from Koji + Imada). + +2003-04-10 Erez Zadok + + * configure.in: use AM_MAINTAINER_MODE, so maintainer-only rules + do not get added to Makefiles by default (they are confusing to + users who don't have autotools installed). + +2003-04-04 Erez Zadok + + * libamu/xutil.c (switch_to_logfile): don't try to print logfile + if it is null (strlen core dump on solaris). Bug report from John + P. Rouillard . + +2003-03-31 Erez Zadok + + * fsinfo/fsinfo.8: typo co-ordinate -> coordinate. Typo report + from Perry E. Metzger" . + +2003-03-20 Erez Zadok + + * minor new port: sparc64-unknown-linux-suse7.3. + +2003-03-20 Erez Zadok + + * minor new port: i386-unknown-freebsd5.0. + + * configure.in: detect nfsclient/nfsargs.h. + + * conf/nfs_prot/nfs_prot_freebsd3.h: include + , needed in FreeBSD 5.0. + +2003-03-15 Erez Zadok + + * amd/amd.8, amd/amd.8, fixmount/fixmount.8, hlfsd/hlfsd.8, + scripts/amd.conf.5, scripts/expn.1: minor spell checking and + extraneous space elimination. + +2003-01-25 Erez Zadok + + * BUGS (Note): document AIX-5.1 NFS-client side bug (hangs in + vmount). + +2003-01-25 Ion Badulescu + + ******************************************************************* + *** Released am-utils-6.0.9 *** + ******************************************************************* + +2003-01-23 Ion Badulescu + + * NEWS: updated for Darwin changes + + * .cvsignore: added A.i386-apple-darwin6.0 and + A.sparc-sun-solaris2.9 + + * m4/macros/check_nfs_fh_dref.m4: darwin/rhapsody is another + freebsd22 derivative + +2002-12-28 Ion Badulescu + + * amd/srvr_nfs.c (start_nfs_pings): don't set FSF_PINGING if + pings are disabled + + * libamu/misc_rpc.c (make_rpc_packet): fix make_rpc_packet() on + 64-bit big-endian platforms, bug report from Bill Fenner + + + * configure.in: increase library patchlevel + + * libamu/xutil.c (amu_release_controlling_tty): close and reopen + file descriptors 0,1,2 before calling setsid() + +2002-12-27 Erez Zadok + + * updated copyright year to 2003 on all files + +2002-12-11 Ion Badulescu + + Solaris9 build fixes: + + * amd/info_ldap.c (amu_ldap_rebind): call ldap_enable_cache() only + if configure detected it + + * configure.in: check for ldap_enable_cache() + +2002-12-10 Erez Zadok + + * rename "aux/" subdir into "m4/" so as to avoid problems with + MS-DOS systems (where "AUX" is a reserved name). This required + fixing numerous files. + +2002-11-21 Erez Zadok + + * config.guess.long: updated script so it will properly find the + version number of the new Itanium 2 machines running "Red Hat + Linux Advanced Workstation release 2.1AW (Derry)". The script now + will report ia64-unknown-linux-rh2.1AW. + +2002-11-11 Ion Badulescu + + * doc/am-utils.texi (Keep-alives): removed outdated info about not + maintaining the state of TCP NFS servers + +2002-10-01 Ion Badulescu + + * hlfsd/hlfsd.h: removed sys_nerr declaration + + * amq/amq.c, hlfsd/hlfsd.c, libamu/xutil.c: always use strerror() + + * libamu/strerror.c: new file, strerror() implementation for + systems that don't have it + + * libamu/Makefile.am: added strerror.c + + * include/am_utils.h: debug code improvements ported from 6.1 + + * conf/mount/mount_aix.c: compile fix for --disable-debug + +2002-09-09 Ion Badulescu + + ******************************************************************* + *** Released am-utils-6.0.8 *** + ******************************************************************* + +2002-09-09 Ion Badulescu + + * amd/srvr_nfs.c (nfs_timed_out): add #ifdef DEBUG around dlog + +2002-09-04 Ion Badulescu + + * amd/mntfs.c (free_mntfs): sanity check for mf_refc [patch from + George Ross ported from 6.1] + + * amd/srvr_nfs.c (nfs_timed_out): allocate a new XID on server + timeout to avoid problems with late ping replies [patch from + George Ross ported from 6.1] + +2002-07-11 Erez Zadok + + * scripts/expn.{1,in}: fixed typos as reported by Thomas Klausner + . + +2002-06-26 + + * doc/Makefile.am (install-html): don't use locally hacked + texi2html features. + + * doc/am-utils.texi: don't use ':' in @cindex entries. + +2002-06-24 Ion Badulescu + + * doc/am-utils.texi (automount2amd): minor rewording + + * aux/macros/struct_nfs_args.m4: added test for aix51_nfs_args + + * conf/nfs_prot/nfs_prot_aix5_1.h: rename aix42_nfs_args to + aix51_nfs_args, rename unknown fields to u + +2002-06-24 Ion Badulescu + + * buildall: use ksh for configure on aix5.1; pass the extra + arguments after "--" to configure, not to make; fix 'buildall -b' + on hpux9 and aix5.1 + +2002-06-22 Ion Badulescu + + * hlfsd/homedir.c (homedir): use setgid() instead of setegid() + + * buildall: use ksh for configure on aix5.1 + +2002-06-21 Ion Badulescu + + * Makefile.am: added nfs_prot_aix4_3.h to EXTRA_DIST_CONF + + * conf/mount/mount_aix.c (mount_aix3): if the NFSv3 mount fails + with EINVAL and we have MOUNT_TYPE_NFS3_BIS defined, retry the + mount with the alternative nfs3_args structure + + * conf/nfs_prot/nfs_prot_aix4_3.h: added alternative nfs3_args + structure, similar to that in aix5.1, for a hack that tries to + compensate for IBM's brain fart + + * conf/nfs_prot/nfs_prot_aix5_1.h: new nfs_prot header for aix5.1+ + + * aux/macros/check_nfs_prot_headers.m4: added new header for aix5.1+ + + * BUGS: update for direct mounts on Linux; document the brokenness + of /bin/sh on AIX 5.1 and HP-UX 9 + +2002-06-21 Erez Zadok + + * ALL source/header files: change use of HAVE_FIELD_* macros to + HAVE_*, since aux/macros/check_field.m4 changed as well. + + * configure.in, Makefile.am, bootstrap, aux/amdgrep, + aux/macros/*.m4: MAJOR port of autotool files from 6.1 branch, to + work with newer autotools. + +2002-06-21 Erez Zadok + + * aux/macros/with_addon.m4: correct M4 quoting. + + * aux/macros/cache_check_dynamic.m4: correct M4 quoting. + + * bootstrap: show version of autotools being used. Helps + maintainer debugging. + + * configure.in: new proper syntax for libtool and + ansi2knr-filtering rules, required by autoconf 1.53 and higher. + +2002-06-21 Erez Zadok + + * aux/GNUmakefile: new search paths for "update" target. + + * config.guess, config.sub, doc/texinfo.tex, ltmain: updates from + the latest GNU distributions. + +2002-05-30 Erez Zadok + + * config.guess.long: support SuSE version names in long + config.guess format. + +2002-05-03 Ion Badulescu + + * hlfsd/homedir.c (homedir): last chance checking for zombies; + (interlock): anal-retentive checking for all sorts of error + conditions during child recovery + + * hlfsd/hlfsd.c (main): use SA_RESTART in sigaction + (cleanup): indentation + +2002-05-01 Erez Zadok + + * scripts/lostaltmail.in (vrfy_user): unlink temp files if too + small. + +2002-03-29 Ion Badulescu + + * amd/nfs_start.c: use plog() instead of perror() + +2002-03-28 Erez Zadok + + * amd/info_ldap.c: patch from "Sebastien Bahloul" + to fix a simple initialization bug + and change "HE" to HE_ENT so as to compile on HPUX. + +2002-02-12 Erez Zadok + + * scripts/lostaltmail.in: don't verify user if -noverify option + was turned on. fix comment typo. + +2002-02-11 Ion Badulescu + + * Ripped out all traces of autofs support + +2002-02-11 Ion Badulescu + + * README: require newer auto-tools, update mailing list address + + * README.autofs: point to the 6.1 branch for autofs support + +2002-01-20 Erez Zadok + + * updated copyright year to 2002 on all files + + * hlfsd/hlfsd.h (HLFSD_VERSION): up version of hlfsd to 1.2, + because we made some important changes. + +2002-01-20 Ion Badulescu + + * NEWS: document latest changes + + * amd/map.c (unmount_mp): same fix as for hlfsd, update the + seconds field in mtime because Linux ignores the useconds field + + * hlfsd/homedir.c: made some global vars static + (plt_init): remove all trailing '/' chars from root's home; + use root's home, not the username (silly bugfix) + +2002-01-20 Ion Badulescu + + * hlfsd/homedir.c (homedir): don't special case uid 0 as having / + as home; instead use the root accounts home + (plt_init): properly initialize root_home from the root account's + home directory, or as "" if root doesn't exist + (plt_reset): free root_home + +2002-01-20 Ion Badulescu + + * hlfsd/hlfsd.h: update prototype for homedir() + + * hlfsd/stubs.c (nfsproc_lookup_2_svc): get the credentials at the + begining of the function and assign the uid to the symlink + attributes; increment the mtime's seconds field each time the uid + changes + (nfsproc_lookup_2_svc): ditto + (nfsproc_readlink_2_svc): pass the groupid to homedir(); + + * hlfsd/homedir.c (homedir): take a second argument, the user's + primary gid, and switch to it when doing filesystem operations; + save the old uid and gid and revert to them instead of the + hardcoded uid 0 + +2002-01-10 Ion Badulescu + + * conf/mount/mount_linux.c (mount_linux): tcp _must_ have a timeo + parameter 2 orders of magnitude larger than udp (patch from Trond + Myklebust) + +2001-12-13 Erez Zadok + + * scripts/amd.conf.5: correct title to section 5, not 8. Correct + reversed meaning of nfs_proto and nfs_vers parameters. Typos + reported by Peter Breitenlohner . + +2001-12-02 Erez Zadok + + * scripts/ctl-amd.in: run "test" or "[" in front of -x/-f + + * scripts/ctl-hlfsd.in: run "test" or "[" in front of -x/-f + +2001-11-29 Ion Badulescu + + * tasks: updated + + * amq/amq.8: better document the -f option + +2001-11-29 Erez Zadok + + * libamu/mount_fs.c (mnt_flags): same as for nolock option + handling, do for maxgrps. + +2001-11-28 Philippe Troin + + * libamu/mount_fs.c (mnt_flags): Drop nolock from generic mount + opts. + (compute_nfs_args): Added nolock handling. + Adapted from an original patch from Avery Pennarun . + +2001-11-27 Erez Zadok + + * ported to ia64-hp-hpux11.20 using HP's ANSI/C compiler. + Couldn't use bison/flex because of 32-bit vs. 64-bit binaries + issues. Had to use HP's own yacc/lex. This was discovered by + using HP's non-GNU make program. + +2001-11-26 Erez Zadok + + * */Makefile.am: don't use $(OBJECTS) directly because it is no + longer automatically defined now that Automake has automatic + dependency tracking (which I turn off). Instead, hard-code + minimal dependencies on am-utils' header files to depend on + PROG_OBJECTS (where PROG is the program name being built) + + * amd/nfs_start.c (checkup): cast getpagesize() return val to + long, to avoid conflicts in division of a long by an int (on + hpux11i, with their ANSI/C compiler). >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 16:26:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE62816A4C1; Tue, 2 Sep 2003 16:26:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD4C116A4BF for ; Tue, 2 Sep 2003 16:26:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0768943FAF for ; Tue, 2 Sep 2003 16:26:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82NQ40U018654 for ; Tue, 2 Sep 2003 16:26:04 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82NQ409018651 for perforce@freebsd.org; Tue, 2 Sep 2003 16:26:04 -0700 (PDT) Date: Tue, 2 Sep 2003 16:26:04 -0700 (PDT) Message-Id: <200309022326.h82NQ409018651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 23:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=37404 Change 37404 by sam@sam_ebb on 2003/09/02 16:25:51 try integrating again Affected files ... .. //depot/projects/netperf/sys/kern/uipc_domain.c#4 edit Differences ... ==== //depot/projects/netperf/sys/kern/uipc_domain.c#4 (text+ko) ==== @@ -96,7 +96,7 @@ /* * update global information about maximums */ - max_hdr = max_linkhdr + max_protohdr; /** XXX locking */ + max_hdr = max_linkhdr + max_protohdr; max_datalen = MHLEN - max_hdr; } @@ -131,8 +131,6 @@ NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(socket_zone, maxsockets); - mtx_init(&dom_mtx, "domain list lock", NULL, MTX_DEF); - if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; @@ -152,14 +150,11 @@ register struct domain *dp; register struct protosw *pr; - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) if (dp->dom_family == family) goto found; - DOMAIN_UNLOCK(); return (0); found: - DOMAIN_UNLOCK(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_type && pr->pr_type == type) return (pr); @@ -178,14 +173,11 @@ if (family == 0) return (0); - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) if (dp->dom_family == family) goto found; - DOMAIN_UNLOCK(); return (0); found: - DOMAIN_UNLOCK(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { if ((pr->pr_protocol == protocol) && (pr->pr_type == type)) return (pr); @@ -205,12 +197,10 @@ register struct domain *dp; register struct protosw *pr; - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_ctlinput) (*pr->pr_ctlinput)(cmd, sa, (void *)0); - DOMAIN_UNLOCK(); } void @@ -224,7 +214,6 @@ if (!sa) return; - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) { /* * the check must be made by xx_ctlinput() anyways, to @@ -238,7 +227,6 @@ if (pr->pr_ctlinput) (*pr->pr_ctlinput)(cmd, sa, ctlparam); } - DOMAIN_UNLOCK(); } static void @@ -248,13 +236,10 @@ register struct domain *dp; register struct protosw *pr; - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_slowtimo) (*pr->pr_slowtimo)(); - DOMAIN_UNLOCK(); - callout_reset(&pfslow_callout, hz/2, pfslowtimo, NULL); } @@ -265,12 +250,9 @@ register struct domain *dp; register struct protosw *pr; - DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_fasttimo) (*pr->pr_fasttimo)(); - DOMAIN_UNLOCK(); - callout_reset(&pffast_callout, hz/5, pffasttimo, NULL); } From owner-p4-projects@FreeBSD.ORG Tue Sep 2 16:27:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95EA216A4C2; Tue, 2 Sep 2003 16:27:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5865E16A4C0 for ; Tue, 2 Sep 2003 16:27:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3367843F93 for ; Tue, 2 Sep 2003 16:27:07 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82NR70U018697 for ; Tue, 2 Sep 2003 16:27:07 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82NR6re018694 for perforce@freebsd.org; Tue, 2 Sep 2003 16:27:06 -0700 (PDT) Date: Tue, 2 Sep 2003 16:27:06 -0700 (PDT) Message-Id: <200309022327.h82NR6re018694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 23:27:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=37405 Change 37405 by sam@sam_ebb on 2003/09/02 16:26:47 push Giant up one level on the input path Affected files ... .. //depot/projects/netperf/sys/kern/kern_poll.c#2 edit .. //depot/projects/netperf/sys/net/if_ppp.c#2 edit .. //depot/projects/netperf/sys/net/netisr.c#2 edit .. //depot/projects/netperf/sys/netatalk/aarp.c#2 edit .. //depot/projects/netperf/sys/netatalk/ddp_input.c#2 edit .. //depot/projects/netperf/sys/netatm/atm_subr.c#3 edit .. //depot/projects/netperf/sys/netinet/if_ether.c#5 edit .. //depot/projects/netperf/sys/netinet/ip_divert.c#3 edit .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#6 edit .. //depot/projects/netperf/sys/netinet/ip_fw2.c#4 edit .. //depot/projects/netperf/sys/netinet/ip_input.c#3 edit .. //depot/projects/netperf/sys/netinet/ip_mroute.c#7 edit .. //depot/projects/netperf/sys/netinet6/ip6_input.c#2 edit .. //depot/projects/netperf/sys/netipx/ipx_input.c#2 edit .. //depot/projects/netperf/sys/netnatm/natm.c#3 edit Differences ... ==== //depot/projects/netperf/sys/kern/kern_poll.c#2 (text+ko) ==== @@ -182,11 +182,13 @@ }; static struct pollrec pr[POLL_LIST_LEN]; +static struct mtx poll_mtx; static void init_device_poll(void) { + mtx_init(&poll_mtx, "device polling", NULL, MTX_DEF); netisr_register(NETISR_POLL, (netisr_t *)netisr_poll, NULL); netisr_register(NETISR_POLLMORE, (netisr_t *)netisr_pollmore, NULL); } @@ -223,6 +225,7 @@ else prev_t = t; + mtx_lock(&poll_mtx); if (pending_polls > 100) { /* * Too much, assume it has stalled (not always true @@ -242,6 +245,7 @@ } if (pending_polls++ > 0) lost_polls++; + mtx_unlock(&poll_mtx); } /* @@ -252,15 +256,16 @@ { int i; - mtx_lock(&Giant); + mtx_assert(&Giant, MA_NOTOWNED); + mtx_lock(&poll_mtx); if (count > poll_each_burst) count = poll_each_burst; for (i = 0 ; i < poll_handlers ; i++) if (pr[i].handler && (IFF_UP|IFF_RUNNING) == (pr[i].ifp->if_flags & (IFF_UP|IFF_RUNNING)) ) pr[i].handler(pr[i].ifp, 0, count); /* quick check */ - mtx_unlock(&Giant); + mtx_unlock(&poll_mtx); } /* @@ -288,10 +293,14 @@ int kern_load; /* XXX run at splhigh() or equivalent */ + mtx_assert(&Giant, MA_NOTOWNED); + + mtx_lock(&poll_mtx); phase = 5; if (residual_burst > 0) { schednetisrbits(1 << NETISR_POLL | 1 << NETISR_POLLMORE); /* will run immediately on return, followed by netisrs */ + mtx_unlock(&poll_mtx); return; } /* here we can account time spent in netisr's in this tick */ @@ -322,12 +331,12 @@ schednetisrbits(1 << NETISR_POLL | 1 << NETISR_POLLMORE); phase = 6; } + mtx_unlock(&poll_mtx); } /* * netisr_poll is scheduled by schednetisr when appropriate, typically once - * per tick. It is called at splnet() so first thing to do is to upgrade to - * splimp(), and call all registered handlers. + * per tick. */ static void netisr_poll(void) @@ -335,8 +344,10 @@ static int reg_frac_count; int i, cycles; enum poll_cmd arg = POLL_ONLY; - mtx_lock(&Giant); + + mtx_assert(&Giant, MA_NOTOWNED); + mtx_lock(&poll_mtx); phase = 3; if (residual_burst == 0) { /* first call in this tick */ microuptime(&poll_start_t); @@ -394,7 +405,7 @@ } /* on -stable, schednetisr(NETISR_POLLMORE); */ phase = 4; - mtx_unlock(&Giant); + mtx_lock(&poll_mtx); } /* @@ -408,8 +419,6 @@ int ether_poll_register(poll_handler_t *h, struct ifnet *ifp) { - int s; - if (polling == 0) /* polling disabled, cannot register */ return 0; if (h == NULL || ifp == NULL) /* bad arguments */ @@ -419,7 +428,7 @@ if (ifp->if_flags & IFF_POLLING) /* already polling */ return 0; - s = splhigh(); + mtx_lock(&poll_mtx); if (poll_handlers >= POLL_LIST_LEN) { /* * List full, cannot register more entries. @@ -428,8 +437,8 @@ * this at runtime is expensive, and won't solve the problem * anyways, so just report a few times and then give up. */ - static int verbose = 10 ; - splx(s); + static int verbose = 10; + mtx_unlock(&poll_mtx); if (verbose >0) { printf("poll handlers list full, " "maybe a broken driver ?\n"); @@ -442,7 +451,7 @@ pr[poll_handlers].ifp = ifp; poll_handlers++; ifp->if_flags |= IFF_POLLING; - splx(s); + mtx_unlock(&poll_mtx); if (idlepoll_sleeping) wakeup(&idlepoll_sleeping); return 1; /* polling enabled in next call */ @@ -459,9 +468,9 @@ { int i; - mtx_lock(&Giant); + mtx_lock(&poll_mtx); if ( !ifp || !(ifp->if_flags & IFF_POLLING) ) { - mtx_unlock(&Giant); + mtx_unlock(&poll_mtx); return 0; } for (i = 0 ; i < poll_handlers ; i++) @@ -469,8 +478,8 @@ break; ifp->if_flags &= ~IFF_POLLING; /* found or not... */ if (i == poll_handlers) { - mtx_unlock(&Giant); - printf("ether_poll_deregister: ifp not found!!!\n"); + mtx_unlock(&poll_mtx); + printf("%s: ifp not found!!!\n", __func__); return 0; } poll_handlers--; @@ -478,7 +487,7 @@ pr[i].handler = pr[poll_handlers].handler; pr[i].ifp = pr[poll_handlers].ifp; } - mtx_unlock(&Giant); + mtx_unlock(&poll_mtx); return 1; } @@ -499,10 +508,7 @@ for (;;) { if (poll_in_idle_loop && poll_handlers > 0) { idlepoll_sleeping = 0; - mtx_lock(&Giant); ether_poll(poll_each_burst); - mtx_unlock(&Giant); - mtx_assert(&Giant, MA_NOTOWNED); mtx_lock_spin(&sched_lock); td->td_proc->p_stats->p_ru.ru_nvcsw++; mi_switch(); ==== //depot/projects/netperf/sys/net/if_ppp.c#2 (text+ko) ==== @@ -1131,6 +1131,7 @@ int s; struct mbuf *m; + mtx_lock(&Giant); LIST_FOREACH(sc, &ppp_softc_list, sc_list) { s = splimp(); if (!(sc->sc_flags & SC_TBUSY) @@ -1152,6 +1153,7 @@ ppp_inproc(sc, m); } } + mtx_unlock(&Giant); } #ifdef PPP_COMPRESS ==== //depot/projects/netperf/sys/net/netisr.c#2 (text+ko) ==== @@ -245,7 +245,7 @@ { mtx_init(&netisr_mtx, "netisr lock", NULL, MTX_DEF); - if (swi_add(NULL, "net", swi_net, NULL, SWI_NET, 0, &net_ih)) + if (swi_add(NULL, "net", swi_net, NULL, SWI_NET, INTR_MPSAFE, &net_ih)) panic("start_netisr"); } SYSINIT(start_netisr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_netisr, NULL) ==== //depot/projects/netperf/sys/netatalk/aarp.c#2 (text+ko) ==== @@ -284,7 +284,9 @@ switch( ntohs( ar->ar_pro )) { case ETHERTYPE_AT : + mtx_lock(&Giant); at_aarpinput( ac, m ); + mtx_unlock(&Giant); return; default: ==== //depot/projects/netperf/sys/netatalk/ddp_input.c#2 (text+ko) ==== @@ -43,7 +43,9 @@ /* * Phase 2 packet handling */ + mtx_lock(&Giant); ddp_input(m, m->m_pkthdr.rcvif, NULL, 2); + mtx_unlock(&Giant); return; } @@ -66,12 +68,14 @@ elhp = mtod(m, struct elaphdr *); m_adj(m, SZ_ELAPHDR); + mtx_lock(&Giant); if (elhp->el_type == ELAP_DDPEXTEND) { ddp_input(m, m->m_pkthdr.rcvif, NULL, 1); } else { bcopy((caddr_t)elhp, (caddr_t)&elh, SZ_ELAPHDR); ddp_input(m, m->m_pkthdr.rcvif, &elh, 1); } + mtx_unlock(&Giant); return; } ==== //depot/projects/netperf/sys/netatm/atm_subr.c#3 (text+ko) ==== @@ -557,6 +557,7 @@ atm_intr_func_t func; void *token; + mtx_lock(&Giant); /* * Get function to call and token value */ @@ -580,6 +581,7 @@ * Drain any deferred calls */ STACK_DRAIN(); + mtx_unlock(&Giant); } /* ==== //depot/projects/netperf/sys/netinet/if_ether.c#5 (text+ko) ==== @@ -507,6 +507,7 @@ struct arphdr *ar; if (!arpinit_done) { + /* NB: this race should not matter */ arpinit_done = 1; callout_reset(&arp_callout, hz, arptimer, NULL); } ==== //depot/projects/netperf/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -158,6 +158,8 @@ u_int16_t nport; struct sockaddr_in divsrc; + mtx_assert(&Giant, MA_NOTOWNED); + /* Sanity check */ KASSERT(port != 0, ("%s: port=0", __func__)); ==== //depot/projects/netperf/sys/netinet/ip_dummynet.c#6 (text+ko) ==== @@ -1122,6 +1122,8 @@ is_pipe = (fwa->rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_PIPE; #endif + mtx_assert(&Giant, MA_NOTOWNED); + pipe_nr &= 0xffff ; DUMMYNET_LOCK(); ==== //depot/projects/netperf/sys/netinet/ip_fw2.c#4 (text+ko) ==== @@ -1396,6 +1396,8 @@ ipfw_dyn_rule *q = NULL; struct ip_fw_chain *chain = &layer3_chain; + mtx_assert(&Giant, MA_NOTOWNED); + if (m->m_flags & M_SKIP_FIREWALL) return 0; /* accept */ /* ==== //depot/projects/netperf/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -313,6 +313,8 @@ int s, error; #endif /* FAST_IPSEC */ + mtx_assert(&Giant, MA_NOTOWNED); + args.eh = NULL; args.oif = NULL; args.rule = NULL; @@ -468,11 +470,14 @@ * in the list may have previously cleared it. */ m0 = m; + /* XXX locking */ pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IP]].pr_pfh); for (; pfh; pfh = TAILQ_NEXT(pfh, pfil_link)) if (pfh->pfil_func) { + mtx_lock(&Giant); /* XXX */ rv = pfh->pfil_func(ip, hlen, m->m_pkthdr.rcvif, 0, &m0); + mtx_unlock(&Giant); /* XXX */ if (rv) return; m = m0; @@ -945,6 +950,7 @@ * Switch out to protocol's input routine. */ ipstat.ips_delivered++; + mtx_lock(&Giant); /* XXX */ if (args.next_hop && ip->ip_p == IPPROTO_TCP) { /* TCP needs IPFORWARD info if available */ struct m_hdr tag; @@ -958,6 +964,7 @@ (struct mbuf *)&tag, hlen); } else (*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen); + mtx_unlock(&Giant); /* XXX */ return; bad: m_freem(m); ==== //depot/projects/netperf/sys/netinet/ip_mroute.c#7 (text+ko) ==== @@ -1302,6 +1302,8 @@ int error; vifi_t vifi; + mtx_assert(&Giant, MA_NOTOWNED); + if (mrtdebug & DEBUG_FORWARD) log(LOG_DEBUG, "ip_mforward: src %lx, dst %lx, ifp %p\n", (u_long)ntohl(ip->ip_src.s_addr), (u_long)ntohl(ip->ip_dst.s_addr), ==== //depot/projects/netperf/sys/netinet6/ip6_input.c#2 (text+ko) ==== @@ -247,6 +247,9 @@ int rv; #endif /* PFIL_HOOKS */ + mtx_assert(&Giant, MA_NOTOWNED); + mtx_lock(&Giant); + #ifdef IPSEC /* * should the inner packet be considered authentic? @@ -326,6 +329,7 @@ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == 0) { ip6stat.ip6s_toosmall++; in6_ifstat_inc(inifp, ifs6_in_hdrerr); + mtx_unlock(&Giant); return; } } @@ -352,8 +356,10 @@ if (pfh->pfil_func) { rv = pfh->pfil_func(ip6, sizeof(*ip6), m->m_pkthdr.rcvif, 0, &m0); - if (rv) + if (rv) { + mtx_unlock(&Giant); return; + } m = m0; if (m == NULL) return; @@ -374,8 +380,10 @@ m_freem(m); m = NULL; } - if (!m) + if (!m) { + mtx_unlock(&Giant); return; + } } /* @@ -469,6 +477,7 @@ icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR, 0); /* m is already freed */ + mtx_unlock(&Giant); return; } @@ -671,6 +680,7 @@ #if 0 /*touches NULL pointer*/ in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); #endif + mtx_unlock(&Giant); return; /* m have already been freed */ } @@ -694,6 +704,7 @@ icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, (caddr_t)&ip6->ip6_plen - (caddr_t)ip6); + mtx_unlock(&Giant); return; } #ifndef PULLDOWN_TEST @@ -704,6 +715,7 @@ sizeof(struct ip6_hbh)); if (hbh == NULL) { ip6stat.ip6s_tooshort++; + mtx_unlock(&Giant); return; } #endif @@ -752,14 +764,17 @@ if (ip6_mrouter && ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) { ip6stat.ip6s_cantforward++; m_freem(m); + mtx_unlock(&Giant); return; } if (!ours) { m_freem(m); + mtx_unlock(&Giant); return; } } else if (!ours) { ip6_forward(m, 0); + mtx_unlock(&Giant); return; } @@ -835,9 +850,11 @@ nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt); } + mtx_unlock(&Giant); return; bad: m_freem(m); + mtx_unlock(&Giant); } /* ==== //depot/projects/netperf/sys/netipx/ipx_input.c#2 (text+ko) ==== @@ -133,6 +133,7 @@ struct ipx_ifaddr *ia; int len; + mtx_lock(&Giant); /* * If no IPX addresses have been set yet but the interfaces * are receiving, can't do anything with incoming packets yet. @@ -191,6 +192,7 @@ if (ipx->ipx_pt == IPXPROTO_NETBIOS) { if (ipxnetbios) { ipx_output_type20(m); + mtx_unlock(&Giant); return; } else goto bad; @@ -226,6 +228,7 @@ */ if (ipx->ipx_tc < IPX_MAXHOPS) { ipx_forward(m); + mtx_unlock(&Giant); return; } } @@ -241,6 +244,7 @@ if (ia == NULL) { ipx_forward(m); + mtx_unlock(&Giant); return; } } @@ -258,16 +262,19 @@ switch (ipx->ipx_pt) { case IPXPROTO_SPX: spx_input(m, ipxp); + mtx_unlock(&Giant); return; } ipx_input(m, ipxp); } else goto bad; + mtx_unlock(&Giant); return; bad: m_freem(m); + mtx_unlock(&Giant); } void ==== //depot/projects/netperf/sys/netnatm/natm.c#3 (text+ko) ==== @@ -685,6 +685,8 @@ struct socket *so; struct natmpcb *npcb; + mtx_lock(&Giant); + #ifdef DIAGNOSTIC M_ASSERTPKTHDR(m); #endif @@ -700,12 +702,12 @@ m_freem(m); if (npcb->npcb_inq == 0) FREE(npcb, M_PCB); /* done! */ - return; + goto done; } if (npcb->npcb_flags & NPCB_FREE) { m_freem(m); /* drop */ - return; + goto done; } #ifdef NEED_TO_RESTORE_IFP @@ -730,6 +732,8 @@ #endif m_freem(m); } +done: + mtx_unlock(&Giant); } /* From owner-p4-projects@FreeBSD.ORG Tue Sep 2 16:53:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEAD816A4C1; Tue, 2 Sep 2003 16:53:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5E2416A4BF for ; Tue, 2 Sep 2003 16:53:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2D8143FEA for ; Tue, 2 Sep 2003 16:53:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82Nrh0U025054 for ; Tue, 2 Sep 2003 16:53:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82NrduW025043 for perforce@freebsd.org; Tue, 2 Sep 2003 16:53:39 -0700 (PDT) Date: Tue, 2 Sep 2003 16:53:39 -0700 (PDT) Message-Id: <200309022353.h82NrduW025043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 23:53:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=37406 Change 37406 by sam@sam_ebb on 2003/09/02 16:52:39 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/netperf/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/netperf/sys/boot/common/bcache.c#2 integrate .. //depot/projects/netperf/sys/boot/common/boot.c#2 integrate .. //depot/projects/netperf/sys/boot/common/commands.c#2 integrate .. //depot/projects/netperf/sys/boot/common/console.c#2 integrate .. //depot/projects/netperf/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/netperf/sys/boot/common/devopen.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_backslash.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_forth.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_parse.c#2 integrate .. //depot/projects/netperf/sys/boot/common/isapnp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf32.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf64.c#2 integrate .. //depot/projects/netperf/sys/boot/common/ls.c#2 integrate .. //depot/projects/netperf/sys/boot/common/misc.c#2 integrate .. //depot/projects/netperf/sys/boot/common/module.c#2 integrate .. //depot/projects/netperf/sys/boot/common/panic.c#2 integrate .. //depot/projects/netperf/sys/boot/common/pnp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/kgzldr/boot.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/kgzldr/lib.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#3 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/comconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/gatea20.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/nullconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/pread.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/netperf/sys/conf/files#7 integrate .. //depot/projects/netperf/sys/conf/files.i386#5 integrate .. //depot/projects/netperf/sys/conf/files.pc98#4 integrate .. //depot/projects/netperf/sys/conf/majors#3 integrate .. //depot/projects/netperf/sys/conf/options.i386#2 integrate .. //depot/projects/netperf/sys/ddb/db_ps.c#3 integrate .. //depot/projects/netperf/sys/dev/aac/aac.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpica_support.c#3 delete .. //depot/projects/netperf/sys/dev/acpica/acpica_support.h#2 delete .. //depot/projects/netperf/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/netperf/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/asr/asr.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/netperf/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#6 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/netperf/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/em/README#2 integrate .. //depot/projects/netperf/sys/dev/em/if_em.c#4 integrate .. //depot/projects/netperf/sys/dev/em/if_em.h#5 integrate .. //depot/projects/netperf/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/netperf/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/exca/exca.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/netperf/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/netperf/sys/dev/hea/hea_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/netperf/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/isp/isp.c#3 integrate .. //depot/projects/netperf/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/netperf/sys/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/netperf/sys/dev/mly/mly.c#4 integrate .. //depot/projects/netperf/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/netperf/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#4 integrate .. //depot/projects/netperf/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/netperf/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/netperf/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/netperf/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/netperf/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/trm/trm.c#6 integrate .. //depot/projects/netperf/sys/dev/tx/if_txreg.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ums.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/urio.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/usb.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/netperf/sys/fs/specfs/spec_vnops.c#4 integrate .. //depot/projects/netperf/sys/geom/geom.h#2 integrate .. //depot/projects/netperf/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_dev.c#4 integrate .. //depot/projects/netperf/sys/geom/geom_disk.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/fs.h#2 integrate .. //depot/projects/netperf/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/bios.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/geode.c#1 branch .. //depot/projects/netperf/sys/i386/i386/i386-gdbstub.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_clock.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/mpapic.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/netperf/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/bs/bshw_dma.c#2 integrate .. //depot/projects/netperf/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/netperf/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/netperf/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_mac.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#6 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#4 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/netperf/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/netperf/sys/modules/Makefile#4 integrate .. //depot/projects/netperf/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/pst/Makefile#1 branch .. //depot/projects/netperf/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/netperf/sys/netatalk/aarp.c#3 integrate .. //depot/projects/netperf/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/netperf/sys/netinet/igmp.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_flow.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_flow.h#3 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#4 integrate .. //depot/projects/netperf/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/netperf/sys/netipsec/key.c#3 integrate .. //depot/projects/netperf/sys/netipsec/key.h#3 integrate .. //depot/projects/netperf/sys/netipsec/keydb.h#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/syscons.c#2 delete .. //depot/projects/netperf/sys/pccard/i82365.h#2 integrate .. //depot/projects/netperf/sys/pccard/pcic.c#2 integrate .. //depot/projects/netperf/sys/pci/amdpm.c#3 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#5 integrate .. //depot/projects/netperf/sys/pci/if_mn.c#3 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#6 integrate .. //depot/projects/netperf/sys/pci/meteor.c#5 integrate .. //depot/projects/netperf/sys/pci/xrpu.c#3 integrate .. //depot/projects/netperf/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/netperf/sys/sparc64/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/sys/buf.h#3 integrate .. //depot/projects/netperf/sys/sys/mac.h#4 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_init.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_map.h#4 integrate .. //depot/projects/netperf/sys/vm/vm_page.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_page.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/netperf/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.134 2003/08/20 20:12:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $"); #include #include @@ -340,7 +340,6 @@ static int pmap_release_free_page(pmap_t pmap, vm_page_t p); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); -static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP static void pmap_invalidate_page_action(void *arg); @@ -914,22 +913,6 @@ return ALPHA_PHYS_TO_K0SEG(start); } - -static vm_page_t -pmap_page_lookup(vm_object_t object, vm_pindex_t pindex) -{ - vm_page_t m; -retry: - m = vm_page_lookup(object, pindex); - if (m != NULL) { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(m, FALSE, "pplookp")) - goto retry; - vm_page_unlock_queues(); - } - return m; -} - /*************************************************** * Page table page management routines..... ***************************************************/ @@ -967,10 +950,8 @@ if (m->pindex < NUSERLEV3MAPS) { /* unhold the level 2 page table */ vm_page_t lev2pg; - lev2pg = vm_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + pmap_lev1_index(va)); - while (vm_page_sleep_if_busy(lev2pg, FALSE, "pulook")) - vm_page_lock_queues(); + + lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va))); vm_page_unhold(lev2pg); if (lev2pg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, lev2pg); @@ -1027,9 +1008,7 @@ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - while ((mpte = vm_page_lookup(pmap->pm_pteobj, ptepindex)) != NULL && - vm_page_sleep_if_busy(mpte, FALSE, "pulook")) - vm_page_lock_queues(); + mpte = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev2pte(pmap, va))); pmap->pm_ptphint = mpte; } } @@ -1240,9 +1219,9 @@ if (!pmap_pte_v(l1pte)) _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); else { - vm_page_t l2page = - pmap_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + l1index); + vm_page_t l2page; + + l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); l2page->hold_count++; } l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(l1pte)); @@ -1297,7 +1276,7 @@ (pmap->pm_ptphint->pindex == ptepindex)) { m = pmap->pm_ptphint; } else { - m = pmap_page_lookup(pmap->pm_pteobj, ptepindex); + m = PHYS_TO_VM_PAGE(pmap_pte_pa(lev2pte)); pmap->pm_ptphint = m; } m->hold_count++; @@ -1999,7 +1978,6 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { -retry: /* * Get the level 2 entry */ @@ -2014,12 +1992,9 @@ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - mpte = pmap_page_lookup(pmap->pm_pteobj, - ptepindex); + mpte = PHYS_TO_VM_PAGE(pmap_pte_pa(l2pte)); pmap->pm_ptphint = mpte; } - if (mpte == NULL) - goto retry; mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.93 2003/08/16 23:15:13 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.94 2003/08/29 20:04:09 alc Exp $"); #include "opt_kstack_pages.h" @@ -82,6 +82,8 @@ #include #include #include +#include +#include #include #include @@ -101,6 +103,20 @@ #include +static void sf_buf_init(void *arg); +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) + +/* + * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the + * sf_freelist head with the sf_lock mutex. + */ +static struct { + SLIST_HEAD(, sf_buf) sf_head; + struct mtx sf_lock; +} sf_freelist; + +static u_int sf_buf_alloc_want; + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -370,6 +386,91 @@ } /* + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + */ +static void +sf_buf_init(void *arg) +{ + struct sf_buf *sf_bufs; + vm_offset_t sf_base; + int i; + + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); + mtx_lock(&sf_freelist.sf_lock); + SLIST_INIT(&sf_freelist.sf_head); + sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE); + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, + M_NOWAIT | M_ZERO); + for (i = 0; i < nsfbufs; i++) { + sf_bufs[i].kva = sf_base + i * PAGE_SIZE; + SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); + } + sf_buf_alloc_want = 0; + mtx_unlock(&sf_freelist.sf_lock); +} + +/* + * Get an sf_buf from the freelist. Will block if none are available. + */ +struct sf_buf * +sf_buf_alloc(struct vm_page *m) +{ + struct sf_buf *sf; + int error; + + mtx_lock(&sf_freelist.sf_lock); + while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { + sf_buf_alloc_want++; + error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, + "sfbufa", 0); + sf_buf_alloc_want--; + + /* + * If we got a signal, don't risk going back to sleep. + */ + if (error) + break; + } + if (sf != NULL) { + SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); + sf->m = m; + pmap_qenter(sf->kva, &sf->m, 1); + } + mtx_unlock(&sf_freelist.sf_lock); + return (sf); +} + +/* + * Detatch mapped page and release resources back to the system. + */ +void +sf_buf_free(void *addr, void *args) +{ + struct sf_buf *sf; + struct vm_page *m; + + sf = args; + pmap_qremove((vm_offset_t)addr, 1); + m = sf->m; + vm_page_lock_queues(); + vm_page_unwire(m, 0); + /* + * Check for the object going away on us. This can + * happen since we don't hold a reference to it. + * If so, we're responsible for freeing the page. + */ + if (m->wire_count == 0 && m->object == NULL) + vm_page_free(m); + vm_page_unlock_queues(); + sf->m = NULL; + mtx_lock(&sf_freelist.sf_lock); + SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + if (sf_buf_alloc_want > 0) + wakeup_one(&sf_freelist); + mtx_unlock(&sf_freelist.sf_lock); +} + +/* * Software interrupt handler for queued VM system processing. */ void ==== //depot/projects/netperf/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -38,11 +38,11 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.5 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.6 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _ALPHA_VARARGS_H_ -#define _ALPHA_VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -80,4 +80,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_ALPHA_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $"); /* * 6.1 : Environmental support @@ -40,7 +40,7 @@ u_long amd64_acpi_root; SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, - "The physical address of the RSDP"); + "The physical address of the RSDP"); ACPI_STATUS AcpiOsInitialize(void) ==== //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.11 2003/08/28 16:30:31 njl Exp $"); #include #include @@ -38,9 +38,8 @@ { struct acpi_softc *sc; - if ((sc = device_get_softc(dev)) == NULL) { + if ((sc = device_get_softc(dev)) == NULL) return (ENXIO); - } acpi_install_wakeup_handler(sc); ==== //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.21 2003/08/28 16:30:31 njl Exp $"); #include #include @@ -37,7 +37,6 @@ int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - return (0); } ==== //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.216 2003/08/16 23:15:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.217 2003/08/29 20:04:09 alc Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -57,7 +57,9 @@ #include #include #include +#include #include +#include #include #include @@ -78,8 +80,21 @@ #include static void cpu_reset_real(void); +static void sf_buf_init(void *arg); +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) /* + * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the + * sf_freelist head with the sf_lock mutex. + */ +static struct { + SLIST_HEAD(, sf_buf) sf_head; + struct mtx sf_lock; +} sf_freelist; + +static u_int sf_buf_alloc_want; + +/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -349,6 +364,86 @@ } /* + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + */ +static void +sf_buf_init(void *arg) +{ + struct sf_buf *sf_bufs; + int i; + + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); + mtx_lock(&sf_freelist.sf_lock); + SLIST_INIT(&sf_freelist.sf_head); + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, + M_NOWAIT | M_ZERO); + for (i = 0; i < nsfbufs; i++) + SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); + sf_buf_alloc_want = 0; + mtx_unlock(&sf_freelist.sf_lock); +} + +/* + * Get an sf_buf from the freelist. Will block if none are available. + */ +struct sf_buf * +sf_buf_alloc(struct vm_page *m) +{ + struct sf_buf *sf; + int error; + + mtx_lock(&sf_freelist.sf_lock); + while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { + sf_buf_alloc_want++; + error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, + "sfbufa", 0); + sf_buf_alloc_want--; + + /* + * If we got a signal, don't risk going back to sleep. + */ + if (error) + break; + } + if (sf != NULL) { + SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); + sf->m = m; + sf->kva = PHYS_TO_DMAP(m->phys_addr); + } + mtx_unlock(&sf_freelist.sf_lock); + return (sf); +} + +/* + * Detatch mapped page and release resources back to the system. + */ +void +sf_buf_free(void *addr, void *args) +{ + struct sf_buf *sf; + struct vm_page *m; + + sf = args; + m = sf->m; + vm_page_lock_queues(); + vm_page_unwire(m, 0); + /* + * Check for the object going away on us. This can + * happen since we don't hold a reference to it. + * If so, we're responsible for freeing the page. + */ + if (m->wire_count == 0 && m->object == NULL) + vm_page_free(m); + vm_page_unlock_queues(); + sf->m = NULL; + mtx_lock(&sf_freelist.sf_lock); + SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + if (sf_buf_alloc_want > 0) + wakeup_one(&sf_freelist); + mtx_unlock(&sf_freelist.sf_lock); +} + +/* * Software interrupt handler for queued VM system processing. */ void ==== //depot/projects/netperf/sys/amd64/include/varargs.h#2 (text+ko) ==== @@ -37,11 +37,11 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.11 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.12 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _VARARGS_H_ -#define _VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -86,4 +86,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/netperf/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.101 2003/08/22 07:36:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.102 2003/08/28 21:22:24 jhb Exp $"); #include "opt_cpu.h" @@ -328,10 +328,18 @@ for (slot = 0; slot <= PCI_SLOTMAX; slot++) { func = 0; hdrtype = nexus_pcib_read_config(0, bus, slot, func, - PCIR_HEADERTYPE, 1); + PCIR_HDRTYPE, 1); + /* + * When enumerating bus devices, the standard says that + * one should check the header type and ignore the slots whose + * header types that the software doesn't know about. We use + * this to filter out devices. + */ + if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) + continue; if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) - pcifunchigh = 7; + pcifunchigh = PCI_FUNCMAX; else pcifunchigh = 0; for (func = 0; func <= pcifunchigh; func++) { ==== //depot/projects/netperf/sys/boot/common/bcache.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/bcache.c,v 1.11 2002/02/25 03:45:09 bde Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.12 2003/08/25 23:30:41 obrien Exp $"); + /* * Simple LRU block cache */ ==== //depot/projects/netperf/sys/boot/common/boot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/boot.c,v 1.28 2001/09/11 01:09:19 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); + /* * Loading modules, booting the system */ ==== //depot/projects/netperf/sys/boot/common/commands.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/commands.c,v 1.18 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.19 2003/08/25 23:30:41 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/common/console.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/console.c,v 1.5 1999/08/28 00:39:46 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $ - * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ + * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ /*- @@ -39,7 +38,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +#include +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.12 2003/08/25 23:30:41 obrien Exp $"); + +/*- * This module implements a "raw device" interface suitable for * use by the stand-alone I/O library NFS code. This interface * does not support any "block" access, and exists only for the ==== //depot/projects/netperf/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -22,10 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/devopen.c,v 1.3 1999/08/28 00:39:47 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $"); #include #include ==== //depot/projects/netperf/sys/boot/common/interp.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/interp.c,v 1.28 2001/11/19 17:30:26 obrien Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); + /* * Simple commandline interpreter, toplevel and misc. * ==== //depot/projects/netperf/sys/boot/common/interp_backslash.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -11,11 +11,12 @@ * Jordan K. Hubbard * 29 August 1998 * - * $FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.5 2000/08/03 09:13:54 jhb Exp $ - * * Routine for doing backslash elimination. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); + #include #include #include "bootstrap.h" ==== //depot/projects/netperf/sys/boot/common/interp_forth.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Michael Smith * All rights reserved. * @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.22 2002/04/09 20:59:34 dcs Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/common/interp_forth.c,v 1.23 2003/08/25 23:30:41 obrien Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 19:15:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6855F16A4C1; Tue, 2 Sep 2003 19:15:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 102C416A4BF for ; Tue, 2 Sep 2003 19:15:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8470A43FEA for ; Tue, 2 Sep 2003 19:15:39 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h832Fd0U033908 for ; Tue, 2 Sep 2003 19:15:39 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h832FdSk033905 for perforce@freebsd.org; Tue, 2 Sep 2003 19:15:39 -0700 (PDT) Date: Tue, 2 Sep 2003 19:15:39 -0700 (PDT) Message-Id: <200309030215.h832FdSk033905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 02:15:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=37412 Change 37412 by sam@sam_ebb on 2003/09/02 19:15:13 cannot assert Giant not owned yet--Giant is still inherited through the output path (but we don't depend on it) Affected files ... .. //depot/projects/netperf/sys/netinet/ip_fw2.c#5 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_fw2.c#5 (text+ko) ==== @@ -1396,8 +1396,6 @@ ipfw_dyn_rule *q = NULL; struct ip_fw_chain *chain = &layer3_chain; - mtx_assert(&Giant, MA_NOTOWNED); - if (m->m_flags & M_SKIP_FIREWALL) return 0; /* accept */ /* From owner-p4-projects@FreeBSD.ORG Tue Sep 2 20:33:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F3B616A4C1; Tue, 2 Sep 2003 20:33:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0DAD16A4BF for ; Tue, 2 Sep 2003 20:33:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB5FD43F93 for ; Tue, 2 Sep 2003 20:33:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h833XF0U037634 for ; Tue, 2 Sep 2003 20:33:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h833XFYh037631 for perforce@freebsd.org; Tue, 2 Sep 2003 20:33:15 -0700 (PDT) Date: Tue, 2 Sep 2003 20:33:15 -0700 (PDT) Message-Id: <200309030333.h833XFYh037631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 03:33:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=37416 Change 37416 by marcel@marcel_nfs on 2003/09/02 20:33:09 o Remove inclusion of . It was needed for uart_debug(), which got axed yesterday. o Remove sc_xonxoff, which got added yesterday. We're not going to support XON/XOFF flow control with hardware support. It's way too complicated to do it right and we already have the support in the tty layer. o Replace sc_rtscts with sc_hwiflow and sc_hwoflow. We'd like to take advantage of hardware flow control, even if only input or output flow control works for us. If we have a single flag, then it's a both or neither situation. Also, since we seperate flags for input and output flow control in the termios structure, it makes sense to keep them seperated as long as possible. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#24 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#24 (text+ko) ==== @@ -29,8 +29,6 @@ #ifndef _DEV_UART_BUS_H_ #define _DEV_UART_BUS_H_ -#include - /* Drain and flush targets. */ #define UART_DRAIN_RECEIVER 0x0001 #define UART_DRAIN_TRANSMITTER 0x0002 @@ -111,12 +109,12 @@ int sc_callout:1; /* This UART is opened for callout. */ int sc_fastintr:1; /* This UART uses fast interrupts. */ int sc_hasfifo:1; /* This UART has FIFOs. */ + int sc_hwiflow:1; /* This UART has HW input flow ctl. */ + int sc_hwoflow:1; /* This UART has HW output flow ctl. */ int sc_leaving:1; /* This UART is going away. */ int sc_opened:1; /* This UART is open for business. */ int sc_polled:1; /* This UART has no interrupts. */ - int sc_rtscts:1; /* This UART can do HW flow control. */ int sc_txbusy:1; /* This UART is transmitting. */ - int sc_xonxoff:1; /* This UART can do SW flow control. */ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ From owner-p4-projects@FreeBSD.ORG Tue Sep 2 22:00:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D04EA16A4C1; Tue, 2 Sep 2003 22:00:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9375816A4BF for ; Tue, 2 Sep 2003 22:00:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B10A43FFD for ; Tue, 2 Sep 2003 22:00:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h835050U047283 for ; Tue, 2 Sep 2003 22:00:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83505wl047280 for perforce@freebsd.org; Tue, 2 Sep 2003 22:00:05 -0700 (PDT) Date: Tue, 2 Sep 2003 22:00:05 -0700 (PDT) Message-Id: <200309030500.h83505wl047280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 05:00:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=37423 Change 37423 by sam@sam_ebb on 2003/09/02 21:59:37 correct lock assertions Affected files ... .. //depot/projects/netperf/sys/netinet/ip_mroute.c#8 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_mroute.c#8 (text+ko) ==== @@ -2975,7 +2975,7 @@ struct igmpmsg *im; struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET }; - VIF_TABLE_ASSERT(MA_OWNED); + VIF_LOCK_ASSERT(); /* * Add a new mbuf with an upcall header @@ -3030,7 +3030,7 @@ int len = ntohs(ip->ip_len); vifi_t vifi = rt->mfc_parent; - VIF_TABLE_ASSERT(MA_OWNED); + VIF_LOCK_ASSERT(); if ((vifi >= numvifs) || (viftable[vifi].v_lcl_addr.s_addr == 0)) { m_freem(mb_copy); From owner-p4-projects@FreeBSD.ORG Tue Sep 2 22:31:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C946E16A4C1; Tue, 2 Sep 2003 22:31:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F20316A4C0 for ; Tue, 2 Sep 2003 22:31:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6770044003 for ; Tue, 2 Sep 2003 22:31:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h835Vi0U049527 for ; Tue, 2 Sep 2003 22:31:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h835VhWl049524 for perforce@freebsd.org; Tue, 2 Sep 2003 22:31:43 -0700 (PDT) Date: Tue, 2 Sep 2003 22:31:43 -0700 (PDT) Message-Id: <200309030531.h835VhWl049524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 05:31:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=37424 Change 37424 by marcel@marcel_nfs on 2003/09/02 22:30:54 Remove UART_IOCTL_RTSCTS and UART_IOCTL_XONXOFF and replace them with UART_IOCTL_IFLOW and UART_IOCTL_OFLOW. This was forgotten in the previous commit. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#25 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#25 (text+ko) ==== @@ -77,8 +77,8 @@ /* UART_IOCTL() requests */ #define UART_IOCTL_BREAK 1 -#define UART_IOCTL_RTSCTS 2 -#define UART_IOCTL_XONXOFF 3 +#define UART_IOCTL_IFLOW 2 +#define UART_IOCTL_OFLOW 3 /* * UART class & instance (=softc) From owner-p4-projects@FreeBSD.ORG Wed Sep 3 02:46:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B2E416A4C1; Wed, 3 Sep 2003 02:46:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E01416A4BF for ; Wed, 3 Sep 2003 02:46:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10B6A43FE9 for ; Wed, 3 Sep 2003 02:46:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h839k60U068480 for ; Wed, 3 Sep 2003 02:46:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h839k6VT068477 for perforce@freebsd.org; Wed, 3 Sep 2003 02:46:06 -0700 (PDT) Date: Wed, 3 Sep 2003 02:46:06 -0700 (PDT) Message-Id: <200309030946.h839k6VT068477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 09:46:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=37439 Change 37439 by marcel@marcel_nfs on 2003/09/03 02:45:48 Implement flow control. Note that none of the hardware drivers report that they have hardware support for flow control, so it's all software based for now. The logic is there to set hardware flow control... Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.c#12 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_tty.c#12 (text+ko) ==== @@ -160,22 +160,36 @@ if (sc == NULL || sc->sc_leaving) return; - if (tp->t_state & TS_TBLOCK) - UART_SETSIG(sc, UART_SIG_DRTS); - else - UART_SETSIG(sc, UART_SIG_DRTS|UART_SIG_RTS); + /* + * Handle input flow control. Note that if we have hardware support, + * we don't do anything here. We continue to receive until our buffer + * is full. At that time we cannot empty the UART itself and it will + * de-assert RTS for us. In that situation we're completely stuffed. + * Without hardware support, we need to toggle RTS ourselves. + */ + if ((tp->t_cflag & CRTS_IFLOW) && !sc->sc_hwiflow) { + if ((tp->t_state & TS_TBLOCK) && + (sc->sc_hwsig & UART_SIG_RTS)) + UART_SETSIG(sc, UART_SIG_DRTS); + else if (!(tp->t_state & TS_TBLOCK) && + !(sc->sc_hwsig & UART_SIG_RTS)) + UART_SETSIG(sc, UART_SIG_DRTS|UART_SIG_RTS); + } + + if (tp->t_state & TS_TTSTOP) + return; + + if ((tp->t_state & TS_BUSY) || sc->sc_txbusy) + return; - if (tp->t_state & (TS_BUSY | TS_TIMEOUT | TS_TTSTOP)) { + if (tp->t_outq.c_cc == 0) { ttwwakeup(tp); return; } - if (tp->t_outq.c_cc > 0 && !sc->sc_txbusy) { - sc->sc_txdatasz = q_to_b(&tp->t_outq, sc->sc_txbuf, - sc->sc_txfifosz); - tp->t_state |= TS_BUSY; - UART_TRANSMIT(sc); - } + sc->sc_txdatasz = q_to_b(&tp->t_outq, sc->sc_txbuf, sc->sc_txfifosz); + tp->t_state |= TS_BUSY; + UART_TRANSMIT(sc); ttwwakeup(tp); } @@ -215,8 +229,17 @@ parity = UART_PARITY_NONE; UART_PARAM(sc, t->c_ospeed, databits, stopbits, parity); UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); - if ((t->c_cflag & CRTS_IFLOW) == 0) - UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS); + /* Set input flow control state. */ + if (!sc->sc_hwiflow) { + if ((t->c_cflag & CRTS_IFLOW) && (tp->t_state & TS_TBLOCK)) + UART_SETSIG(sc, UART_SIG_DRTS); + else + UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS); + } else + UART_IOCTL(sc, UART_IOCTL_IFLOW, (t->c_cflag & CRTS_IFLOW)); + /* Set output flow control state. */ + if (sc->sc_hwoflow) + UART_IOCTL(sc, UART_IOCTL_OFLOW, (t->c_cflag & CCTS_OFLOW)); ttsetwater(tp); return (0); } @@ -260,7 +283,7 @@ tp = sc->sc_u.u_tty.tp; if (pend & UART_IPEND_RXREADY) { - while (!uart_rx_empty(sc)) { + while (!uart_rx_empty(sc) && !(tp->t_state & TS_TBLOCK)) { xc = uart_rx_get(sc); c = xc & 0xff; if (xc & UART_STAT_FRAMERR) @@ -280,6 +303,14 @@ sig = pend & UART_IPEND_SIGMASK; if (sig & UART_SIG_DDCD) (*linesw[tp->t_line].l_modem)(tp, sig & UART_SIG_DCD); + if ((sig & UART_SIG_DCTS) && (tp->t_cflag & CCTS_OFLOW) && + !sc->sc_hwoflow) { + if (sig & UART_SIG_CTS) { + tp->t_state &= ~TS_TTSTOP; + (*linesw[tp->t_line].l_start)(tp); + } else + tp->t_state |= TS_TTSTOP; + } } if (pend & UART_IPEND_TXIDLE) { From owner-p4-projects@FreeBSD.ORG Wed Sep 3 02:51:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCD1D16A4C1; Wed, 3 Sep 2003 02:51:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0F9516A4BF for ; Wed, 3 Sep 2003 02:51:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2133243FF7 for ; Wed, 3 Sep 2003 02:51:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h839pD0U069082 for ; Wed, 3 Sep 2003 02:51:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h839pDsX069079 for perforce@freebsd.org; Wed, 3 Sep 2003 02:51:13 -0700 (PDT) Date: Wed, 3 Sep 2003 02:51:13 -0700 (PDT) Message-Id: <200309030951.h839pDsX069079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 09:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37440 Change 37440 by marcel@marcel_nfs on 2003/09/03 02:50:13 Add a test program for flow control. You need 2 UARTs and a null-modem cable for this to work. It's threaded, so you need to link against your favorite pthreads implementation. All line signals are displayed (when they change), so you don't need a break-out box to play with this. Affected files ... .. //depot/projects/uart/dev/uart/uarttest.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 3 07:14:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 671C616A4C1; Wed, 3 Sep 2003 07:14:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E79EC16A4BF for ; Wed, 3 Sep 2003 07:14:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C22CB43FEA for ; Wed, 3 Sep 2003 07:14:10 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83EEA0U088813 for ; Wed, 3 Sep 2003 07:14:10 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83ECfbg088737 for perforce@freebsd.org; Wed, 3 Sep 2003 07:12:41 -0700 (PDT) Date: Wed, 3 Sep 2003 07:12:41 -0700 (PDT) Message-Id: <200309031412.h83ECfbg088737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov To: Perforce Change Reviews Subject: PERFORCE change 37443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 14:14:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37443 Change 37443 by tzukanov@tzukanov_antares on 2003/09/03 07:11:45 It's time to work: IFC. Affected files ... .. //depot/projects/s390/MAINTAINERS#11 integrate .. //depot/projects/s390/Makefile#10 integrate .. //depot/projects/s390/Makefile.inc1#15 integrate .. //depot/projects/s390/UPDATING#11 integrate .. //depot/projects/s390/bin/Makefile.inc#2 integrate .. //depot/projects/s390/bin/cp/cp.1#4 integrate .. //depot/projects/s390/bin/cp/cp.c#6 integrate .. //depot/projects/s390/bin/cp/utils.c#5 integrate .. //depot/projects/s390/bin/csh/Makefile#4 integrate .. //depot/projects/s390/bin/date/Makefile#2 integrate .. //depot/projects/s390/bin/dd/Makefile#3 integrate .. //depot/projects/s390/bin/df/Makefile#2 integrate .. //depot/projects/s390/bin/df/df.1#4 integrate .. //depot/projects/s390/bin/df/df.c#6 integrate .. //depot/projects/s390/bin/ed/Makefile#3 integrate .. //depot/projects/s390/bin/ed/cbc.c#3 integrate .. //depot/projects/s390/bin/ed/ed.h#3 integrate .. //depot/projects/s390/bin/ed/re.c#2 integrate .. //depot/projects/s390/bin/expr/Makefile#2 integrate .. //depot/projects/s390/bin/kenv/Makefile#3 integrate .. //depot/projects/s390/bin/pax/Makefile#3 integrate .. //depot/projects/s390/bin/ps/Makefile#4 integrate .. //depot/projects/s390/bin/ps/extern.h#5 integrate .. //depot/projects/s390/bin/ps/keyword.c#7 integrate .. //depot/projects/s390/bin/ps/print.c#7 integrate .. //depot/projects/s390/bin/ps/ps.1#6 integrate .. //depot/projects/s390/bin/ps/ps.c#6 integrate .. //depot/projects/s390/bin/pwd/pwd.c#3 integrate .. //depot/projects/s390/bin/rmail/Makefile#2 integrate .. //depot/projects/s390/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/s390/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/s390/bin/sh/alias.c#2 integrate .. //depot/projects/s390/bin/sh/arith.h#2 integrate .. //depot/projects/s390/bin/sh/arith.y#3 integrate .. //depot/projects/s390/bin/sh/arith_lex.l#3 integrate .. //depot/projects/s390/bin/sh/cd.c#3 integrate .. //depot/projects/s390/bin/sh/exec.c#3 integrate .. //depot/projects/s390/bin/sh/exec.h#2 integrate .. //depot/projects/s390/bin/sh/expand.c#6 integrate .. //depot/projects/s390/bin/sh/input.c#3 integrate .. //depot/projects/s390/bin/sh/jobs.c#6 integrate .. //depot/projects/s390/bin/sh/memalloc.c#5 integrate .. //depot/projects/s390/bin/sh/nodes.c.pat#5 integrate .. //depot/projects/s390/bin/sh/output.c#3 integrate .. //depot/projects/s390/bin/sh/parser.c#3 integrate .. //depot/projects/s390/bin/sh/redir.c#3 integrate .. //depot/projects/s390/bin/sh/shell.h#3 integrate .. //depot/projects/s390/bin/sh/var.c#4 integrate .. //depot/projects/s390/contrib/amd/AUTHORS#2 integrate .. //depot/projects/s390/contrib/amd/BUGS#2 integrate .. //depot/projects/s390/contrib/amd/COPYING#2 integrate .. //depot/projects/s390/contrib/amd/ChangeLog#2 integrate .. //depot/projects/s390/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/s390/contrib/amd/INSTALL#2 integrate .. //depot/projects/s390/contrib/amd/MIRRORS#2 integrate .. //depot/projects/s390/contrib/amd/NEWS#2 integrate .. //depot/projects/s390/contrib/amd/README#2 integrate .. //depot/projects/s390/contrib/amd/README.ldap#2 integrate .. //depot/projects/s390/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/s390/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/s390/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/s390/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/map.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_autofs.c#2 delete .. //depot/projects/s390/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/s390/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/s390/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/s390/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/s390/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/s390/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/s390/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/s390/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/s390/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/s390/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/s390/contrib/amd/bootstrap#1 branch .. //depot/projects/s390/contrib/amd/commit#1 branch .. //depot/projects/s390/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/s390/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/s390/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#2 integrate .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/s390/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/s390/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/s390/contrib/amd/config.guess#1 branch .. //depot/projects/s390/contrib/amd/config.guess.long#1 branch .. //depot/projects/s390/contrib/amd/config.sub#1 branch .. //depot/projects/s390/contrib/amd/configure.in#1 branch .. //depot/projects/s390/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/s390/contrib/amd/depcomp#1 branch .. //depot/projects/s390/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/s390/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/s390/contrib/amd/doc/stamp-vti#2 delete .. //depot/projects/s390/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/s390/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/s390/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/s390/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/s390/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/s390/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/s390/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/s390/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/s390/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/s390/contrib/amd/install-sh#1 branch .. //depot/projects/s390/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/s390/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/s390/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/s390/contrib/amd/ltmain.sh#1 branch .. //depot/projects/s390/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/s390/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/s390/contrib/amd/m4/amindent#1 branch .. //depot/projects/s390/contrib/amd/m4/autopat#1 branch .. //depot/projects/s390/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/s390/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/s390/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/s390/contrib/amd/m4/mkconf#1 branch .. //depot/projects/s390/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/s390/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/s390/contrib/amd/missing#1 branch .. //depot/projects/s390/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/s390/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/s390/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/s390/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/s390/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/s390/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/s390/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/s390/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/s390/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/s390/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/s390/contrib/amd/scripts/lostaltmail.in#2 integrate .. //depot/projects/s390/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/s390/contrib/amd/tasks#2 integrate .. //depot/projects/s390/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/s390/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/s390/contrib/bind/CHANGES#4 integrate .. //depot/projects/s390/contrib/bind/FREEBSD-Upgrade#2 integrate .. //depot/projects/s390/contrib/bind/README#3 integrate .. //depot/projects/s390/contrib/bind/Version#3 integrate .. //depot/projects/s390/contrib/bind/bin/dig/dig.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/dnsquery/dnsquery.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/host/host.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named-xfer/named-xfer.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_defs.h#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_ixfr.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_load.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_sec.c#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_config.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_ctl.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_defs.h#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_forw.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_func.h#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_glob.h#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_init.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_ixfr.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_lexer.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_main.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_maint.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_ncache.c#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_parser.y#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_req.c#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_update.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/ndc/ndc.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/nslookup/getinfo.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/nslookup/main.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/nslookup/send.c#2 integrate .. //depot/projects/s390/contrib/bind/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/s390/contrib/bind/doc/html/options.html#3 integrate .. //depot/projects/s390/contrib/bind/doc/man/dig.1#2 integrate .. //depot/projects/s390/contrib/bind/doc/man/named-xfer.8#2 integrate .. //depot/projects/s390/contrib/bind/doc/man/named.8#2 integrate .. //depot/projects/s390/contrib/bind/doc/man/named.conf.5#3 integrate .. //depot/projects/s390/contrib/bind/doc/man/resolver.3#3 integrate .. //depot/projects/s390/contrib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/s390/contrib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/s390/contrib/bind/include/hesiod.h#2 integrate .. //depot/projects/s390/contrib/bind/include/irp.h#2 integrate .. //depot/projects/s390/contrib/bind/include/irs.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/dst.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/logging.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/misc.h#2 integrate .. //depot/projects/s390/contrib/bind/include/isc/tree.h#2 integrate .. //depot/projects/s390/contrib/bind/include/netgroup.h#2 integrate .. //depot/projects/s390/contrib/bind/include/resolv.h#2 integrate .. //depot/projects/s390/contrib/bind/lib/dst/bsafe_link.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/dst/cylink_link.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/dst/dst_api.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/dst/hmac_link.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/dns_gr.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/dns_ho.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/dns_nw.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/gen_gr.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/getaddrinfo.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/gethostent.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/getnameinfo.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/getnetgrent.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/getnetgrent_r.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/hesiod.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/irp_p.h#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/irs_data.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/nis_gr.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/irs/nis_ho.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/ctl_clnt.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/ctl_srvr.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/ev_files.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/ev_timers.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/ev_waits.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/eventlib.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/eventlib_p.h#2 integrate .. //depot/projects/s390/contrib/bind/lib/isc/logging.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_name.c#4 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_parse.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_print.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_samedomain.c#4 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_sign.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_comp.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_debug.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_findzonecut.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_init.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_mkquery.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_mkupdate.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_query.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_send.c#2 integrate .. //depot/projects/s390/contrib/bind/lib/resolv/res_update.c#2 integrate .. //depot/projects/s390/contrib/bind/port/freebsd/bin/probe_ipv6#2 integrate .. //depot/projects/s390/contrib/bind/port/freebsd/include/port_after.h#3 integrate .. //depot/projects/s390/contrib/cpio/copypass.c#2 integrate .. //depot/projects/s390/contrib/cvs/src/main.c#4 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog#5 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.0#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.1#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.2#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.3#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.4#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.5#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.6#2 integrate .. //depot/projects/s390/contrib/gcc/ChangeLog.7#1 branch .. //depot/projects/s390/contrib/gcc/FSFChangeLog.10#2 integrate .. //depot/projects/s390/contrib/gcc/FSFChangeLog.11#2 integrate .. //depot/projects/s390/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/s390/contrib/gcc/Makefile.in#5 integrate .. //depot/projects/s390/contrib/gcc/ONEWS#2 integrate .. //depot/projects/s390/contrib/gcc/README.Portability#2 integrate .. //depot/projects/s390/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/s390/contrib/gcc/alias.c#5 integrate .. //depot/projects/s390/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/s390/contrib/gcc/attribs.c#3 integrate .. //depot/projects/s390/contrib/gcc/basic-block.h#3 integrate .. //depot/projects/s390/contrib/gcc/bb-reorder.c#3 integrate .. //depot/projects/s390/contrib/gcc/bitmap.c#3 integrate .. //depot/projects/s390/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/s390/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/s390/contrib/gcc/builtin-types.def#3 integrate .. //depot/projects/s390/contrib/gcc/builtins.c#5 integrate .. //depot/projects/s390/contrib/gcc/builtins.def#2 integrate .. //depot/projects/s390/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/s390/contrib/gcc/c-common.c#5 integrate .. //depot/projects/s390/contrib/gcc/c-common.def#2 integrate .. //depot/projects/s390/contrib/gcc/c-common.h#4 integrate .. //depot/projects/s390/contrib/gcc/c-config-lang.in#1 branch .. //depot/projects/s390/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/s390/contrib/gcc/c-decl.c#5 integrate .. //depot/projects/s390/contrib/gcc/c-dump.c#1 branch .. //depot/projects/s390/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/s390/contrib/gcc/c-format.c#5 integrate .. //depot/projects/s390/contrib/gcc/c-lang.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-lex.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-objc-common.c#4 integrate .. //depot/projects/s390/contrib/gcc/c-opts.c#1 branch .. //depot/projects/s390/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/s390/contrib/gcc/c-pragma.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/s390/contrib/gcc/c-pretty-print.c#1 branch .. //depot/projects/s390/contrib/gcc/c-pretty-print.h#1 branch .. //depot/projects/s390/contrib/gcc/c-semantics.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-tree.h#4 integrate .. //depot/projects/s390/contrib/gcc/c-typeck.c#4 integrate .. //depot/projects/s390/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/s390/contrib/gcc/calls.c#5 integrate .. //depot/projects/s390/contrib/gcc/cfg.c#2 integrate .. //depot/projects/s390/contrib/gcc/cfganal.c#4 integrate .. //depot/projects/s390/contrib/gcc/cfgbuild.c#3 integrate .. //depot/projects/s390/contrib/gcc/cfgcleanup.c#5 integrate .. //depot/projects/s390/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/s390/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/s390/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/s390/contrib/gcc/cfgrtl.c#4 integrate .. //depot/projects/s390/contrib/gcc/collect2.c#3 integrate .. //depot/projects/s390/contrib/gcc/collect2.h#2 integrate .. //depot/projects/s390/contrib/gcc/combine.c#4 integrate .. //depot/projects/s390/contrib/gcc/config.gcc#6 integrate .. //depot/projects/s390/contrib/gcc/config.in#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/alpha-interix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/alpha-protos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/alpha.c#4 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/alpha.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/alpha.md#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/elf.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/ev4.md#1 branch .. //depot/projects/s390/contrib/gcc/config/alpha/ev5.md#1 branch .. //depot/projects/s390/contrib/gcc/config/alpha/ev6.md#1 branch .. //depot/projects/s390/contrib/gcc/config/alpha/freebsd.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/gnu.h#1 branch .. //depot/projects/s390/contrib/gcc/config/alpha/linux-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/linux.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/netbsd.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/openbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/osf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/osf5.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/t-crtfm#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/unicosmk.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-cc.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-crt0-64.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-crt0.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-ld.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms-psxcrt0.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vms.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/alpha/vxworks.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/arm-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/s390/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/arm/arm.md#3 integrate .. //depot/projects/s390/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/conix-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/netbsd-elf.h#1 branch .. //depot/projects/s390/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/unknown-elf-oabi.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/vxarm.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/darwin-crt2.c#1 branch .. //depot/projects/s390/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/s390/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/frv/cmovd.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/cmovh.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/cmovw.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv-abi.h#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv-asm.h#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv-protos.h#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv.h#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frv.md#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frvbegin.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/frvend.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/lib1funcs.asm#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/modi.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/t-frv#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/uitod.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/uitof.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/ulltod.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/ulltof.c#1 branch .. //depot/projects/s390/contrib/gcc/config/frv/umodi.c#1 branch .. //depot/projects/s390/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/athlon.md#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/cygwin.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/darwin.h#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/freebsd-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/freebsd.h#6 integrate .. //depot/projects/s390/contrib/gcc/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/s390/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/gstabs.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/gthr-win32.c#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/i386-protos.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.c#6 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.h#6 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/k6.md#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/linux-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/linux64.h#4 integrate .. //depot/projects/s390/contrib/gcc/config/i386/lynx-ng.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/mach.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/mingw32.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/mmintrin.h#4 integrate .. //depot/projects/s390/contrib/gcc/config/i386/moss.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/netbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/netbsd64.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/openbsd.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/pentium.md#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/ppro.md#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/svr3dbx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/svr3gas.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/sysv3.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/sysv4-cpp.h#1 branch .. //depot/projects/s390/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/t-cygwin#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/t-interix#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/t-linux64#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/t-sco5gas#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/unix.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/vsta.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/vxi386.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/win32.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/winnt.c#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/xm-vsta.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/xmmintrin.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/aix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/hpux_longdouble.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/ia64-c.c#1 branch .. //depot/projects/s390/contrib/gcc/config/ia64/ia64-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/linux.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/sysv4.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/t-aix#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/s390/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/linux-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/lynx-ng.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/openbsd-oldgas.h#1 branch .. //depot/projects/s390/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/psos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix31.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix43.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/aix52.h#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/altivec.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/altivec.md#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/eabiaix.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/eabispe.h#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/linux.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/mach.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/netbsd.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/ppc64-fp.c#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000-c.c#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000-protos.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000.c#5 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/rs6000.md#4 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/rtems.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/spe.h#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/spe.md#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/sysv4.h#5 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/t-aix43#3 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/t-aix52#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/t-netbsd#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/t-ppcendian#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/t-rs6000-c-rule#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/vxppc.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/rs6000/windiss.h#1 branch .. //depot/projects/s390/contrib/gcc/config/rs6000/xcoff.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/s390/s390-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/s390/t-crtstuff#1 branch .. //depot/projects/s390/contrib/gcc/config/sol2.h#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/cypress.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/freebsd.h#4 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/hypersparc.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/lb1spc.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/lb1spl.asm#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/linux-aout.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/linux64.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/litecoff.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/liteelf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/lynx.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/netbsd-elf.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/netbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/openbsd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/pbd.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sol2-bi.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sol2.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sol26-sld.h#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sp86x-elf.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sparc-modes.def#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/sparc-protos.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sparc.c#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sparc.h#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sparc.md#3 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/sparclet.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/sunos4.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/supersparc.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/ultra1_2.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/ultra3.md#1 branch .. //depot/projects/s390/contrib/gcc/config/sparc/vxsim.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/sparc/vxsparc64.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/s390/contrib/gcc/config/t-darwin#1 branch .. //depot/projects/s390/contrib/gcc/config/t-libc-ok#2 integrate .. //depot/projects/s390/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/s390/contrib/gcc/config/t-linux-gnulibc1#2 integrate .. //depot/projects/s390/contrib/gcc/config/t-netbsd#2 integrate .. //depot/projects/s390/contrib/gcc/configure#5 integrate .. //depot/projects/s390/contrib/gcc/configure.in#5 integrate .. //depot/projects/s390/contrib/gcc/conflict.c#2 integrate .. //depot/projects/s390/contrib/gcc/convert.c#3 integrate .. //depot/projects/s390/contrib/gcc/cp-demangle.c#3 integrate .. //depot/projects/s390/contrib/gcc/cp/ChangeLog#5 integrate .. //depot/projects/s390/contrib/gcc/cp/ChangeLog.1#2 integrate .. //depot/projects/s390/contrib/gcc/cp/ChangeLog.2#2 integrate .. //depot/projects/s390/contrib/gcc/cp/Make-lang.in#4 integrate .. //depot/projects/s390/contrib/gcc/cp/NEWS#3 integrate .. //depot/projects/s390/contrib/gcc/cp/call.c#3 integrate .. //depot/projects/s390/contrib/gcc/cp/cfns.gperf#2 integrate .. //depot/projects/s390/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/s390/contrib/gcc/cp/cp-lang.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/s390/contrib/gcc/cp/cp-tree.h#5 integrate .. //depot/projects/s390/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/decl.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/s390/contrib/gcc/cp/decl2.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/error.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/except.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/init.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/lang-options.h#2 integrate .. //depot/projects/s390/contrib/gcc/cp/lang-specs.h#3 integrate .. //depot/projects/s390/contrib/gcc/cp/lex.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/lex.h#2 integrate .. //depot/projects/s390/contrib/gcc/cp/mangle.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/method.c#3 integrate .. //depot/projects/s390/contrib/gcc/cp/operators.def#4 integrate .. //depot/projects/s390/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/parse.y#5 integrate .. //depot/projects/s390/contrib/gcc/cp/pt.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/s390/contrib/gcc/cp/rtti.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/search.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/s390/contrib/gcc/cp/spew.c#3 integrate .. //depot/projects/s390/contrib/gcc/cp/tree.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/typeck.c#5 integrate .. //depot/projects/s390/contrib/gcc/cp/typeck2.c#4 integrate .. //depot/projects/s390/contrib/gcc/cplus-dem.c#2 integrate .. //depot/projects/s390/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/s390/contrib/gcc/cpperror.c#2 integrate .. //depot/projects/s390/contrib/gcc/cppexp.c#2 integrate .. //depot/projects/s390/contrib/gcc/cppfiles.c#3 integrate .. //depot/projects/s390/contrib/gcc/cpphash.c#2 integrate .. //depot/projects/s390/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/s390/contrib/gcc/cppinit.c#3 integrate .. //depot/projects/s390/contrib/gcc/cpplex.c#2 integrate .. //depot/projects/s390/contrib/gcc/cpplib.c#4 integrate .. //depot/projects/s390/contrib/gcc/cpplib.h#3 integrate .. //depot/projects/s390/contrib/gcc/cppmacro.c#3 integrate .. //depot/projects/s390/contrib/gcc/cppmain.c#2 integrate .. //depot/projects/s390/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/s390/contrib/gcc/cpptrad.c#1 branch .. //depot/projects/s390/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/s390/contrib/gcc/cse.c#3 integrate .. //depot/projects/s390/contrib/gcc/cselib.c#3 integrate .. //depot/projects/s390/contrib/gcc/cselib.h#2 integrate .. //depot/projects/s390/contrib/gcc/dbxout.c#5 integrate .. //depot/projects/s390/contrib/gcc/debug.c#2 integrate .. //depot/projects/s390/contrib/gcc/debug.h#2 integrate .. //depot/projects/s390/contrib/gcc/defaults.h#3 integrate .. //depot/projects/s390/contrib/gcc/demangle.h#2 integrate .. //depot/projects/s390/contrib/gcc/df.c#2 integrate .. //depot/projects/s390/contrib/gcc/df.h#2 integrate .. //depot/projects/s390/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/s390/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/s390/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/s390/contrib/gcc/doc/bugreport.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/c-tree.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/collect2.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/compat.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/contrib.texi#4 integrate .. //depot/projects/s390/contrib/gcc/doc/cpp.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/cppenv.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/cppopts.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/extend.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/gcc.texi#4 integrate .. //depot/projects/s390/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/gcov.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/gty.texi#1 branch .. //depot/projects/s390/contrib/gcc/doc/headerdirs.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/s390/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/s390/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/invoke.texi#5 integrate .. //depot/projects/s390/contrib/gcc/doc/makefile.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/md.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/passes.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/rtl.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/service.texi#2 integrate .. //depot/projects/s390/contrib/gcc/doc/sourcebuild.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/standards.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doc/tm.texi#4 integrate .. //depot/projects/s390/contrib/gcc/doc/trouble.texi#3 integrate .. //depot/projects/s390/contrib/gcc/doloop.c#4 integrate .. //depot/projects/s390/contrib/gcc/dominance.c#2 integrate .. //depot/projects/s390/contrib/gcc/doschk.c#2 integrate .. //depot/projects/s390/contrib/gcc/dummy-conditions.c#1 branch .. //depot/projects/s390/contrib/gcc/dwarf2.h#2 integrate .. //depot/projects/s390/contrib/gcc/dwarf2asm.c#2 integrate .. //depot/projects/s390/contrib/gcc/dwarf2asm.h#2 integrate .. //depot/projects/s390/contrib/gcc/dwarf2out.c#3 integrate .. //depot/projects/s390/contrib/gcc/dwarf2out.h#2 integrate .. //depot/projects/s390/contrib/gcc/dwarfout.c#4 integrate .. //depot/projects/s390/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/s390/contrib/gcc/errors.h#2 integrate .. //depot/projects/s390/contrib/gcc/et-forest.c#1 branch .. //depot/projects/s390/contrib/gcc/et-forest.h#1 branch .. //depot/projects/s390/contrib/gcc/except.c#2 integrate .. //depot/projects/s390/contrib/gcc/except.h#2 integrate .. //depot/projects/s390/contrib/gcc/explow.c#3 integrate .. //depot/projects/s390/contrib/gcc/expmed.c#4 integrate .. //depot/projects/s390/contrib/gcc/expr.c#5 integrate .. //depot/projects/s390/contrib/gcc/expr.h#4 integrate .. //depot/projects/s390/contrib/gcc/f/ChangeLog#5 integrate .. //depot/projects/s390/contrib/gcc/f/ChangeLog.0#2 integrate .. //depot/projects/s390/contrib/gcc/f/Make-lang.in#3 integrate .. //depot/projects/s390/contrib/gcc/f/bad.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/bit.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/bld.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/bugs.texi#3 integrate .. //depot/projects/s390/contrib/gcc/f/com.c#3 integrate .. //depot/projects/s390/contrib/gcc/f/com.h#2 integrate .. //depot/projects/s390/contrib/gcc/f/config-lang.in#2 integrate .. //depot/projects/s390/contrib/gcc/f/data.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/expr.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/ffe.texi#2 integrate .. //depot/projects/s390/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/s390/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/intdoc.in#2 integrate .. //depot/projects/s390/contrib/gcc/f/intdoc.texi#2 integrate .. //depot/projects/s390/contrib/gcc/f/invoke.texi#3 integrate .. //depot/projects/s390/contrib/gcc/f/lang-specs.h#3 integrate .. //depot/projects/s390/contrib/gcc/f/lex.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/news.texi#4 integrate .. //depot/projects/s390/contrib/gcc/f/parse.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/root.texi#4 integrate .. //depot/projects/s390/contrib/gcc/f/stc.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/std.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/ste.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/target.c#3 integrate .. //depot/projects/s390/contrib/gcc/f/target.h#3 integrate .. //depot/projects/s390/contrib/gcc/f/top.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/where.c#2 integrate .. //depot/projects/s390/contrib/gcc/f/where.h#2 integrate .. //depot/projects/s390/contrib/gcc/fibheap.c#2 integrate .. //depot/projects/s390/contrib/gcc/fibheap.h#2 integrate .. //depot/projects/s390/contrib/gcc/final.c#4 integrate .. //depot/projects/s390/contrib/gcc/fix-header.c#2 integrate .. //depot/projects/s390/contrib/gcc/fixproto#2 integrate .. //depot/projects/s390/contrib/gcc/flags.h#4 integrate .. //depot/projects/s390/contrib/gcc/flow.c#4 integrate .. //depot/projects/s390/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/s390/contrib/gcc/function.c#5 integrate .. //depot/projects/s390/contrib/gcc/function.h#2 integrate .. //depot/projects/s390/contrib/gcc/gbl-ctors.h#2 integrate .. //depot/projects/s390/contrib/gcc/gcc.1#4 integrate .. //depot/projects/s390/contrib/gcc/gcc.c#7 integrate .. //depot/projects/s390/contrib/gcc/gcc.h#2 integrate .. //depot/projects/s390/contrib/gcc/gccbug.in#2 integrate .. //depot/projects/s390/contrib/gcc/gccspec.c#2 integrate .. //depot/projects/s390/contrib/gcc/gcov-io.h#2 integrate .. //depot/projects/s390/contrib/gcc/gcov.c#2 integrate .. //depot/projects/s390/contrib/gcc/gcse.c#2 integrate .. //depot/projects/s390/contrib/gcc/gdbinit.in#2 integrate .. //depot/projects/s390/contrib/gcc/genattr.c#2 integrate .. //depot/projects/s390/contrib/gcc/genattrtab.c#2 integrate .. //depot/projects/s390/contrib/gcc/genattrtab.h#1 branch .. //depot/projects/s390/contrib/gcc/genautomata.c#1 branch .. //depot/projects/s390/contrib/gcc/gencodes.c#2 integrate .. //depot/projects/s390/contrib/gcc/genconditions.c#1 branch .. //depot/projects/s390/contrib/gcc/genconfig.c#2 integrate .. //depot/projects/s390/contrib/gcc/genemit.c#2 integrate .. //depot/projects/s390/contrib/gcc/genflags.c#2 integrate .. //depot/projects/s390/contrib/gcc/gengenrtl.c#2 integrate .. //depot/projects/s390/contrib/gcc/gengtype-lex.l#1 branch .. //depot/projects/s390/contrib/gcc/gengtype-yacc.y#1 branch .. //depot/projects/s390/contrib/gcc/gengtype.c#1 branch .. //depot/projects/s390/contrib/gcc/gengtype.h#1 branch .. //depot/projects/s390/contrib/gcc/genopinit.c#2 integrate .. //depot/projects/s390/contrib/gcc/genpreds.c#2 integrate .. //depot/projects/s390/contrib/gcc/genrecog.c#2 integrate .. //depot/projects/s390/contrib/gcc/gensupport.c#2 integrate .. //depot/projects/s390/contrib/gcc/gensupport.h#2 integrate .. //depot/projects/s390/contrib/gcc/getopt.c#2 integrate .. //depot/projects/s390/contrib/gcc/getopt.h#3 integrate .. //depot/projects/s390/contrib/gcc/getruntime.c#1 branch .. //depot/projects/s390/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/s390/contrib/gcc/ggc-none.c#2 integrate .. //depot/projects/s390/contrib/gcc/ggc-page.c#2 integrate .. //depot/projects/s390/contrib/gcc/ggc-simple.c#2 integrate .. //depot/projects/s390/contrib/gcc/ggc.h#2 integrate .. //depot/projects/s390/contrib/gcc/ginclude/float.h#1 branch .. //depot/projects/s390/contrib/gcc/ginclude/stdarg.h#3 integrate .. //depot/projects/s390/contrib/gcc/ginclude/varargs.h#3 integrate .. //depot/projects/s390/contrib/gcc/glimits.h#2 integrate .. //depot/projects/s390/contrib/gcc/global.c#3 integrate .. //depot/projects/s390/contrib/gcc/graph.c#2 integrate .. //depot/projects/s390/contrib/gcc/graph.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-dce.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-posix.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-rtems.h#3 integrate .. //depot/projects/s390/contrib/gcc/gthr-single.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-solaris.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-vxworks.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr-win32.h#2 integrate .. //depot/projects/s390/contrib/gcc/gthr.h#2 integrate .. //depot/projects/s390/contrib/gcc/haifa-sched.c#3 integrate .. //depot/projects/s390/contrib/gcc/hard-reg-set.h#2 integrate .. //depot/projects/s390/contrib/gcc/hashtab.c#3 integrate .. //depot/projects/s390/contrib/gcc/hashtab.h#2 integrate .. //depot/projects/s390/contrib/gcc/hashtable.c#2 integrate .. //depot/projects/s390/contrib/gcc/hashtable.h#2 integrate .. //depot/projects/s390/contrib/gcc/hex.c#2 integrate .. //depot/projects/s390/contrib/gcc/hooks.c#4 integrate .. //depot/projects/s390/contrib/gcc/hooks.h#4 integrate .. //depot/projects/s390/contrib/gcc/hwint.h#2 integrate .. //depot/projects/s390/contrib/gcc/ifcvt.c#3 integrate .. //depot/projects/s390/contrib/gcc/input.h#2 integrate .. //depot/projects/s390/contrib/gcc/insn-addr.h#2 integrate .. //depot/projects/s390/contrib/gcc/integrate.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 07:23:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FBA816A4C1; Wed, 3 Sep 2003 07:23:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E557016A4BF for ; Wed, 3 Sep 2003 07:23:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 543F14400B for ; Wed, 3 Sep 2003 07:23:23 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83ENN0U089298 for ; Wed, 3 Sep 2003 07:23:23 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83ENMrb089295 for perforce@freebsd.org; Wed, 3 Sep 2003 07:23:22 -0700 (PDT) Date: Wed, 3 Sep 2003 07:23:22 -0700 (PDT) Message-Id: <200309031423.h83ENMrb089295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 37444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 14:23:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=37444 Change 37444 by areisse@areisse_tislabs on 2003/09/03 07:22:50 branch off nsa policy. Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/COPYING#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/README#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/VERSION#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/appconfig/default_contexts#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/appconfig/default_type#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/appconfig/initrc_context#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/assert.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/attrib.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/constraints#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/admin.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/httpadm.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/misc/kernel.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/misc/unused/auth-net.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/misc/unused/fcron.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/misc/unused/startx.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/checkpolicy.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/chkpwd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/crond.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/crontab.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/fsadm.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/getty.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ifconfig.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/init.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/initrc.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/klogd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ldconfig.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/load_policy.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/login.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/logrotate.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/modutil.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/mount.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/netutils.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/newrole.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/passwd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/setfiles.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/su.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/syslogd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/tmpreaper.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/acct.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/amanda.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/amavis.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/apache.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/apmd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/atd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/authbind.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/automount.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/backup.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/bootloader.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/calamaris.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/cardmgr.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/chroot.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/clamav.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/courier.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/crack.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/cups.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ddt-client.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/devfsd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dhcpc.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dhcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dictd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dpkg.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/fingerd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/games.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/gatekeeper.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/gnome-pty-helper.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/gpg.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/gpm.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/hotplug.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/hwclock.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/inetd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ipchains.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ipsec.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/irc.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ircd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/kcheckpass.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/lpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/lpr.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mailman.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mrtg.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mta.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mysqld.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/named.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/nessusd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/netsaint.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/netscape.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/nscd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/nsd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ntpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/oav-update.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/openca-ca.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/pamconsole.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/perdition.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ping.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/portmap.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/portslave.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/postfix.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/postgresql.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/pppd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/procmail.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/pump.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/qmail.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/quota.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/radius.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/radvd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rlogind.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rpcd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rpm.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rshd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/samba.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/scannerdaemon.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/screen.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/selopt.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/sendmail.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/slapd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/snmpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/snort.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/sound.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/speedmgmt.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/squid.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/sxid.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/sysstat.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/tcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/tftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/traceroute.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/transproxy.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/usbmodules.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/utempter.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/vmware.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/watchdog.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/xauth.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/xdm.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/xfs.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/xserver.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/ypbind.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/useradd.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/user.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/acct.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/amanda.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/amavis.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/apache.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/apmd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/atd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/authbind.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/automount.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/backup.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/bootloader.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/calamaris.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/cardmgr.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/checkpolicy.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/chkpwd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/chroot.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/clamav.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/courier.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/crack.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/crond.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/crontab.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/cups.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ddt-client.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/devfsd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/dhcpc.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/dhcpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/dictd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/dpkg.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/fingerd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/fsadm.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ftpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/games.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/gatekeeper.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/getty.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/gnome-pty-helper.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/gpg.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/gpm.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/groupadd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/hotplug.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/hwclock.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ifconfig.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/inetd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/init.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/initrc.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ipchains.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ipsec.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/irc.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ircd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/kcheckpass.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/klogd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ldconfig.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/load_policy.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/login.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/logrotate.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/lpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/lpr.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mailman.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/modutil.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mount.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mrtg.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mta.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mysqld.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/named.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/nessusd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/netsaint.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/netscape.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/netutils.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/newrole.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/nscd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/nsd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ntpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/oav-update.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/openca-ca.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/openca-common.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/pamconsole.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/passwd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/perdition.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ping.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/portmap.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/portslave.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/postfix.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/postgresql.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/pppd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/procmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/pump.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/qmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/quota.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/radius.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/radvd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/rlogind.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/rpcd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/rpm.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/rshd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/samba.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/scannerdaemon.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/screen.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/sendmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/setfiles.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/slapd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/snmpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/snort.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/sound.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/speedmgmt.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/squid.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ssh.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/su.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/sxid.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/syslogd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/sysstat.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/tcpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/tftpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/tmpreaper.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/traceroute.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/transproxy.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/usbmodules.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/useradd.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/utempter.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/vmware.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/watchdog.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/xauth.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/xdm.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/xfs.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/xserver.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ypbind.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/types.fc#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/access_vectors#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/initial_sids#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/mkaccess_vector.sh#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/mkflask.sh#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/security_classes#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/fs_use#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/genfs_contexts#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/initial_sid_contexts#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/admin_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/chkpwd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/chroot_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/clamav_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/crond_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/crontab_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/fingerd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/gpg_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/gph_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/irc_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/lpr_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/mount_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/mta_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/netscape_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/run_program_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/screen_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/sendmail_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/ssh_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/su_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/x_client_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/xauth_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/xserver_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/user_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/mls#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/net_contexts#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/policy.spec#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/rbac#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/device.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/devpts.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/network.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/nfs.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/procfs.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/types/security.te#1 branch .. //depot/projects/trustedbsd/sebsd_policy/policy/users#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 3 07:27:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5302816A4C2; Wed, 3 Sep 2003 07:27:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25B3F16A4BF for ; Wed, 3 Sep 2003 07:27:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E215243FCB for ; Wed, 3 Sep 2003 07:27:28 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83ERS0U091317 for ; Wed, 3 Sep 2003 07:27:28 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83ERSI8091314 for perforce@freebsd.org; Wed, 3 Sep 2003 07:27:28 -0700 (PDT) Date: Wed, 3 Sep 2003 07:27:28 -0700 (PDT) Message-Id: <200309031427.h83ERSI8091314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 37445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 14:27:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=37445 Change 37445 by areisse@areisse_tislabs on 2003/09/03 07:26:37 somehow missing from new branch Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/types/file.te#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 3 08:18:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6228F16A4C1; Wed, 3 Sep 2003 08:18:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CABE16A4BF for ; Wed, 3 Sep 2003 08:18:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE5EE43FFB for ; Wed, 3 Sep 2003 08:18:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83FIU0U094104 for ; Wed, 3 Sep 2003 08:18:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83FIUkI094101 for perforce@freebsd.org; Wed, 3 Sep 2003 08:18:30 -0700 (PDT) Date: Wed, 3 Sep 2003 08:18:30 -0700 (PDT) Message-Id: <200309031518.h83FIUkI094101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 37446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 15:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=37446 Change 37446 by areisse@areisse_tislabs on 2003/09/03 08:17:53 Updates to selinux policy to allow boot and login in sebsd. Some domains wanted by the default init process are in unused/: mta ping sendmail rpcd lpd named dhcpc gmake is required. The file_contexts have not been ported. First label with the old sebsd policy and then label some things manually. The flask directory has not been completely ported; the security class has been completely changed, and some other classes have new permissions. Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/assert.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/cleanvar.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/crond.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/fsadm.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/getty.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ifconfig.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/init.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/initrc.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ldconfig.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/login.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/mount.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/save-entropy.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/syslogd.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dhcpc.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rpcd.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/usbd.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/flask/access_vectors#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/fs_use#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/genfs_contexts#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/mount_macros.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/selinux_macros.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/types/device.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/types/file.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd_policy/policy/Makefile#2 (text+ko) ==== @@ -19,12 +19,15 @@ PREFIX = /usr BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -LOADPOLICY = $(SBINDIR)/load_policy -CHECKPOLICY = $(BINDIR)/checkpolicy -SETFILES = $(SBINDIR)/setfiles + +CHECKPOLICY = $(REALDESTDIR)/sbin/sebsd_checkpolicy +LOADPOLICY = /sbin/sebsd_loadpolicy +SETFILES = $(REALDESTDIR)/sbin/sebsd_setfiles +M4 = $(REALDESTDIR)/usr/bin/m4 -Imacros -s -POLICYVER := policy.$(shell $(CHECKPOLICY) -V) -INSTALLDIR = $(DESTDIR)/etc/security/selinux +#POLICYVER := policy.$(shell $(CHECKPOLICY) -V) +POLICYVER := policy.13 +INSTALLDIR = $(DESTDIR)/etc/security/sebsd LOADPATH = $(INSTALLDIR)/$(POLICYVER) SRCINSTALLDIR = $(INSTALLDIR)/src POLICYCONF = $(SRCINSTALLDIR)/policy.conf @@ -48,13 +51,13 @@ install: $(APPFILES) $(LOADPATH) $(APPDIR)/default_contexts: appconfig/default_contexts - install -m 644 -o root -g root $< $@ + install -m 644 -o root -g wheel $< $@ $(APPDIR)/default_type: appconfig/default_type - install -m 644 -o root -g root $< $@ + install -m 644 -o root -g wheel $< $@ $(APPDIR)/initrc_context: appconfig/initrc_context - install -m 644 -o root -g root $< $@ + install -m 644 -o root -g wheel $< $@ $(LOADPATH): $(POLICYCONF) $(CHECKPOLICY) mkdir -p $(INSTALLDIR) @@ -92,10 +95,10 @@ CONSTRAINT_CONTEXT_MACRO_FILES := tmp/program_used_flags.te tmp/all_macros.te constraints initial_sid_contexts fs_use genfs_contexts net_contexts tmp/te-rbac.m4: $(TE_RBAC_MACRO_FILES) - m4 -Imacros -s $^ > $@ + $(M4) $^ > $@ tmp/constraints-contexts.m4: $(CONSTRAINT_CONTEXT_MACRO_FILES) - m4 -Imacros -s $^ > $@ + $(M4) -Imacros -s $^ > $@ tmp/all.te: $(ALLTEFILES) cat $^ > $@ ==== //depot/projects/trustedbsd/sebsd_policy/policy/assert.te#2 (text+ko) ==== @@ -118,7 +118,8 @@ # # Verify that only the admin domains and initrc_t have setenforce. # -neverallow ~{ admin initrc_t } security_t:security setenforce; +#neverallow ~{ admin initrc_t } security_t:security setenforce; +neverallow ~{ admin initrc_t } kernel_t:system avc_toggle; # # Verify that only the kernel and load_policy_t have load_policy. ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/crond.te#2 (text+ko) ==== @@ -51,7 +51,7 @@ file_type_auto_trans(crond_t, var_log_t, cron_log_t) # Use capabilities. -allow crond_t crond_t:capability { setgid setuid net_bind_service }; +allow crond_t crond_t:capability { sys_resource setgid setuid net_bind_service }; # Get security policy decisions. can_getsecurity(crond_t) ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/fsadm.te#2 (text+ko) ==== @@ -54,6 +54,8 @@ # mkreiserfs needs this allow fsadm_t proc_t:filesystem getattr; +allow fsadm_t device_t:filesystem getattr; + # mkreiserfs and other programs need this for UUID allow fsadm_t random_device_t:chr_file { getattr read }; @@ -87,6 +89,7 @@ # Enable swapping to devices and files allow fsadm_t swapfile_t:file { getattr swapon }; allow fsadm_t fixed_disk_device_t:blk_file { getattr swapon }; +allow fsadm_t fixed_disk_device_t:chr_file { getattr swapon }; # XXX Why does updfstab run insmod? domain_auto_trans(fsadm_t, insmod_exec_t, insmod_t) @@ -100,3 +103,5 @@ allow fsadm_t privfd:fd use; read_locale(fsadm_t) + +allow fsadm_t fs_type:filesystem getattr; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/getty.te#2 (text+ko) ==== @@ -23,6 +23,7 @@ allow getty_t self:process { getpgid getsession }; allow getty_t self:unix_dgram_socket create_socket_perms; allow getty_t self:unix_stream_socket create_socket_perms; +allow getty_t self:fd { create use }; # for ldap and other authentication services allow getty_t resolv_conf_t:file { getattr read }; @@ -56,5 +57,6 @@ allow getty_t tty_device_t:chr_file { setattr rw_file_perms }; allow getty_t ttyfile:chr_file { setattr rw_file_perms }; +rw_dir_create_file(getty_t, var_lock_t) -rw_dir_create_file(getty_t, var_lock_t) +dontaudit getty_t sysadm_home_t:dir search; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ifconfig.te#2 (text+ko) ==== @@ -36,6 +36,10 @@ allow ifconfig_t proc_t:dir r_dir_perms; allow ifconfig_t proc_t:file r_file_perms; +# read the kernel +allow ifconfig_t boot_t:dir r_dir_perms; +allow ifconfig_t boot_t:file r_file_perms; + allow ifconfig_t privfd:fd use; # Create UDP sockets, necessary when called from dhcpc @@ -53,3 +57,6 @@ dontaudit ifconfig_t { sysctl_t sysctl_net_t }:dir search; allow ifconfig_t fs_t:filesystem getattr; + +# read /etc/mac.conf +allow ifconfig_t etc_t:file r_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/init.te#2 (text+ko) ==== @@ -22,6 +22,8 @@ type initctl_t, file_type, sysadmfile; type sulogin_exec_t, file_type, exec_type, sysadmfile; +allow init_t self:fd { create use }; + # for mount points allow init_t file_t:dir search; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/initrc.te#2 (text+ko) ==== @@ -21,6 +21,8 @@ uses_shlib(initrc_t); type initrc_exec_t, file_type, sysadmfile, exec_type; +allow initrc_t self:fd { create use }; + # read files in /etc/init.d allow initrc_t etc_t:lnk_file r_file_perms; @@ -42,6 +44,8 @@ allow initrc_t usbdevfs_t:{ file lnk_file } r_file_perms; allow initrc_t usbdevfs_device_t:file getattr; +allow initrc_t device_t:dir r_dir_perms; + # allow initrc to fork and renice itself allow initrc_t self:process { fork sigchld setsched }; @@ -113,7 +117,7 @@ file_type_auto_trans(initrc_t, etc_t, etc_runtime_t, file) # Update /etc/ld.so.cache. -allow initrc_t ld_so_cache_t:file rw_file_perms; +allow initrc_t ld_so_cache_t:file { unlink rw_file_perms }; ifdef(`sendmail.te', ` # Update /etc/mail. @@ -181,6 +185,10 @@ allow initrc_t ttyfile:chr_file relabelfrom; allow initrc_t tty_device_t:chr_file relabelto; +# Use lock files in /var/spool/lock. +allow initrc_t var_spool_t:dir create_file_perms; +allow initrc_t var_spool_t:file { rw_file_perms unlink }; + ifdef(`rpm.te', ` # Create and read /boot/kernel.h. # Redhat systems typically create this file at boot time. @@ -225,6 +233,10 @@ allow initrc_t var_lib_rpm_t:file create_file_perms; ') +# access /var/db/entropy +allow initrc_t var_db_entropy_t:dir read; +allow initrc_t var_db_entropy_t:file { unlink rw_file_perms }; + # Update /var/log/ksyms.*. file_type_auto_trans(initrc_t, var_log_t, var_log_ksyms_t) @@ -259,6 +271,10 @@ allow initrc_t tmpfile:dir { rw_dir_perms rmdir }; allow initrc_t tmpfile:notdevfile_class_set { getattr unlink }; +# allow making links in /dev +allow initrc_t device_t:dir { add_name }; +allow initrc_t device_t:lnk_file { create }; + ################################# # # Rules for the run_init_t domain. ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ldconfig.te#2 (text+ko) ==== @@ -18,10 +18,11 @@ dontaudit ldconfig_t device_t:dir search; allow ldconfig_t { initrc_devpts_t admin_tty_type }:chr_file rw_file_perms; allow ldconfig_t privfd:fd use; +allow ldconfig_t self:fd *; uses_shlib(ldconfig_t) -file_type_auto_trans(ldconfig_t, etc_t, ld_so_cache_t) +file_type_auto_trans(ldconfig_t, var_run_t, ld_so_cache_t) file_type_auto_trans(ldconfig_t, lib_t, shlib_t) # allow removing mis-labelled links allow ldconfig_t lib_t:lnk_file unlink; @@ -29,5 +30,12 @@ allow ldconfig_t userdomain:fd use; allow ldconfig_t etc_t:file { getattr read }; allow ldconfig_t etc_t:lnk_file read; +allow ldconfig_t var_t:dir r_dir_perms; allow ldconfig_t fs_t:filesystem getattr; + +# libraries may not be owned by root +allow ldconfig_t self:capability { dac_write dac_read_search }; + +# ldconfig uses /dev/random for some reason +allow ldconfig_t random_device_t:{chr_file lnk_file} r_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/login.te#2 (text+ko) ==== @@ -49,12 +49,15 @@ allow $1_login_t device_t:dir r_dir_perms; allow $1_login_t device_t:lnk_file r_file_perms; +# Use pam libraries. +allow $1_login_t lib_t:{file lnk_file} rx_file_perms; + uses_shlib($1_login_t); tmp_domain($1_login) # Use capabilities -allow $1_login_t self:capability { setuid setgid chown fowner fsetid net_bind_service sys_tty_config dac_override sys_nice sys_resource }; +allow $1_login_t self:capability { linux_immutable setuid setgid chown fowner fsetid net_bind_service sys_tty_config dac_override sys_nice sys_resource }; # Run shells in user_t by default. domain_auto_trans($1_login_t, shell_exec_t, user_t) @@ -149,6 +152,8 @@ allow local_login_t var_run_t:dir rw_dir_perms; allow local_login_t var_run_t:file create_file_perms; +allow local_login_t sysadm_home_t:dir search; + ################################# # # Rules for the remote_login_t domain. ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/mount.te#2 (text+ko) ==== @@ -19,8 +19,9 @@ allow mount_t init_t:fd use; allow mount_t privfd:fd use; -allow mount_t self:capability { ipc_lock dac_override }; +allow mount_t self:capability { mknod ipc_lock dac_override }; allow mount_t self:process { fork signal_perms }; +allow mount_t self:fd { create use }; allow mount_t file_type:dir search; @@ -28,6 +29,9 @@ allow mount_t fixed_disk_device_t:devfile_class_set rw_file_perms; allow mount_t removable_device_t:devfile_class_set rw_file_perms; +# device_t is also used as a fs_type in freebsd +allow mount_t device_t:filesystem mount_fs_perms; + # Mount, remount and unmount file systems. allow mount_t fs_type:filesystem mount_fs_perms; allow mount_t file_t:dir mounton; @@ -43,4 +47,8 @@ ') allow mount_t root_t:filesystem unmount; +# run fs-specific mount programs +allow mount_t mount_exec_t:file execute_no_trans; +# read resolv.conf +allow mount_t resolv_conf_t:file r_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#2 (text+ko) ==== @@ -15,6 +15,7 @@ allow $1 self:unix_stream_socket create_stream_socket_perms; allow $1 self:fifo_file rw_file_perms; allow $1 self:process { fork sigchld setsched }; +allow $1 self:fd *; # Read system information files in /proc. allow $1 proc_t:dir r_dir_perms; @@ -49,7 +50,7 @@ allow $1 { null_device_t zero_device_t }:chr_file rw_file_perms; # Read /dev/random and /dev/zero. -allow $1 random_device_t:chr_file r_file_perms; +allow $1 random_device_t:{ lnk_file chr_file } r_file_perms; can_network($1) ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/syslogd.te#2 (text+ko) ==== @@ -14,6 +14,7 @@ # by syslogd. # daemon_domain(syslogd) +#read_locale(syslogd_t) # can_network is for the UDP socket can_network(syslogd_t) @@ -30,17 +31,20 @@ allow syslogd_t resolv_conf_t:{ file lnk_file } r_file_perms; # Use capabilities. -allow syslogd_t syslogd_t:capability { net_bind_service dac_override }; +allow syslogd_t syslogd_t:capability { kill net_bind_service dac_override }; # Inherit and use descriptors from init. allow syslogd_t init_t:fd use; allow syslogd_t { initrc_devpts_t console_device_t }:chr_file { read write }; # Modify/create log files. -create_append_log_file(syslogd_t, var_log_t) +#create_append_log_file(syslogd_t, var_log_t) +allow syslogd_t var_log_t:dir create_file_perms; +allow syslogd_t var_log_t:file rw_file_perms; # Create and bind to /dev/log or /var/run/log. -file_type_auto_trans(syslogd_t, { device_t var_run_t }, devlog_t, sock_file) +file_type_auto_trans(syslogd_t, { device_t var_run_t syslogd_var_run_t }, devlog_t, sock_file) +allow syslogd_t { var_t var_log_t }:dir search; allow syslogd_t self:unix_dgram_socket create_socket_perms; allow syslogd_t self:unix_dgram_socket { sendto }; allow syslogd_t self:unix_stream_socket create_socket_perms; @@ -71,3 +75,6 @@ #allow syslogd_t proc_t:dir search; #allow syslogd_t proc_kmsg_t:file { getattr read }; +# allow access to klog +allow syslogd_t klog_device_t:chr_file { poll read }; + ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/dhcpc.te#2 (text+ko) ==== @@ -20,6 +20,7 @@ allow dhcpc_t self:unix_dgram_socket create_socket_perms; allow dhcpc_t self:unix_stream_socket create_socket_perms; allow dhcpc_t self:fifo_file rw_file_perms; +allow dhcpc_t self:fd { create use }; ifdef(`cardmgr.te', ` domain_auto_trans(cardmgr_t, dhcpc_exec_t, dhcpc_t) @@ -71,13 +72,16 @@ allow dhcpc_t self:packet_socket recvfrom; allow dhcpc_t { netmsg_eth0_t netmsg_eth1_t }:packet_socket { recvfrom }; allow dhcpc_t icmp_socket_t:packet_socket { recvfrom }; -allow dhcpc_t var_lib_t:dir search; +allow dhcpc_t var_db_t:dir search; +file_type_auto_trans(dhcpc_t, var_db_t, dhcpc_state_t) file_type_auto_trans(dhcpc_t, dhcp_state_t, dhcpc_state_t) allow dhcpc_t bin_t:dir search; allow dhcpc_t bin_t:lnk_file read; can_exec(dhcpc_t, { bin_t shell_exec_t }) +allow dhcpc_t bpf_device_t:chr_file { poll rw_file_perms }; + dontaudit dhcpc_t domain:packet_socket recvfrom; dontaudit dhcpc_t { netmsg_t icmp_socket_t tcp_socket_t }:packet_socket recvfrom; dontaudit dhcpc_t icmp_socket_t:rawip_socket recvfrom; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/rpcd.te#2 (text+ko) ==== @@ -20,7 +20,11 @@ allow init_t rpcd_t:udp_socket write; read_locale(rpcd_t) + +# read/write mounttab +allow rpcd_t { var_t var_db_t }: dir { search }; allow rpcd_t etc_t:file { getattr read }; +allow rpcd_t etc_runtime_t:file rw_file_perms; allow rpcd_t self:unix_dgram_socket create_socket_perms; allow rpcd_t self:unix_stream_socket create_socket_perms; @@ -29,6 +33,9 @@ can_udp_send(mount_t, rpcd_t) can_udp_send(rpcd_t, mount_t) +# statfs /dev +allow rpcd_t device_t:filesystem getattr; + tmp_domain(rpcd) # for /proc/fs/nfs/exports - should we have a new type? @@ -59,6 +66,8 @@ # allow nfsd to do its thing - should go into its own domain #allow rpcd_t self:capability sys_admin; +allow rpcd_t nfs_t:filesystem getattr; + # nfs kernel server needs kernel UDP access. It is less risky and painful # to just give it everything. can_network(kernel_t) ==== //depot/projects/trustedbsd/sebsd_policy/policy/flask/access_vectors#2 (text+ko) ==== @@ -10,6 +10,7 @@ common file { + poll ioctl read write @@ -19,7 +20,9 @@ lock relabelfrom relabelto + transition append + access unlink link rename @@ -37,6 +40,7 @@ common socket { # inherited from file + poll ioctl read write @@ -46,6 +50,7 @@ lock relabelfrom relabelto + transition append # socket-specific bind @@ -137,6 +142,7 @@ class fd { + create use } @@ -175,6 +181,8 @@ class netif { + getattr + setattr tcp_recv tcp_send udp_recv @@ -212,11 +220,10 @@ { fork transition - sigchld # commonly granted from child to parent - sigkill # cannot be caught or ignored - sigstop # cannot be caught or ignored - signull # for kill(pid, 0) - signal # all other signals + sigchld + sigkill + sigstop + signal ptrace getsched setsched @@ -226,6 +233,7 @@ getcap setcap share + signull getattr setexec setfscreate @@ -275,7 +283,6 @@ load_policy compute_relabel compute_user - setenforce # was avc_toggle in system class } @@ -285,8 +292,15 @@ class system { + net_io_control + route_control + arp_control + rarp_control ipc_info - syslog_read + avc_toggle + nfsd_control + bdflush + syslog_read syslog_mod syslog_console } @@ -302,14 +316,29 @@ # those definitions. (Order matters) chown - dac_override + dac_execute + dac_write dac_read_search fowner fsetid - kill + kill + link_dir + setfcap setgid - setuid - setpcap + setuid + mac_downgrade + mac_read + mac_relabel_subj + mac_upgrade + mac_write + inf_nofloat_obj + inf_nofloat_subj + inf_relabel_obj + inf_relabel_subj + audit_control + audit_write + setpcap + xxx_invalid1 linux_immutable net_bind_service net_broadcast @@ -332,11 +361,6 @@ lease } - -# -# Define the access vector interpretation for controlling -# changes to passwd information. -# class passwd { passwd ==== //depot/projects/trustedbsd/sebsd_policy/policy/fs_use#2 (text+ko) ==== @@ -2,10 +2,9 @@ # Define the labeling behavior for inodes in particular filesystem types. # This information was formerly hardcoded in the SELinux module. -# Use xattrs for the following filesystem types. -# Requires that a security xattr handler exist for the filesystem. -fs_use_xattr ext2 system_u:object_r:fs_t; -fs_use_xattr ext3 system_u:object_r:fs_t; +fs_use_psid ext2; +fs_use_psid ext3; +fs_use_psid ufs; # Use the allocating task SID to label inodes in the following filesystem # types, and label the filesystem itself with the specified context. ==== //depot/projects/trustedbsd/sebsd_policy/policy/genfs_contexts#2 (text+ko) ==== @@ -2,8 +2,8 @@ # # Security contexts for files in filesystems that -# cannot support xattr or use one of the fixed labeling schemes -# specified in fs_use. +# cannot support persistent label mappings or use one of the +# fixed labeling schemes specified in fs_use. # # Each specifications has the form: # genfscon fstype pathname-prefix [ -type ] context @@ -18,51 +18,67 @@ # field by ls, e.g. use -c to match only character device files, -b # to match only block device files. # -# Except for proc, other filesystems are limited to a single entry (/) -# that covers all entries in the filesystem with a default file context. -# For proc, a pathname can be reliably generated from the proc_dir_entry -# tree. The proc /sys entries are used for both proc inodes and for sysctl(2) -# calls. /proc/PID entries are automatically labeled based on the associated -# process. -# -# Support for other filesystem types requires corresponding code to be -# added to the kernel, either as an xattr handler in the filesystem -# implementation (preferred, and necessary if you want to access the labels -# from userspace) or as logic in the SELinux module. -# proc (excluding /proc/PID) +# proc (excluding /proc/PID and /proc/sys) genfscon proc / system_u:object_r:proc_t genfscon proc /kmsg system_u:object_r:proc_kmsg_t genfscon proc /kcore system_u:object_r:proc_kcore_t -genfscon proc /sysvipc system_u:object_r:proc_t -genfscon proc /sys system_u:object_r:sysctl_t -genfscon proc /sys/kernel system_u:object_r:sysctl_kernel_t -genfscon proc /sys/kernel/modprobe system_u:object_r:sysctl_modprobe_t -genfscon proc /sys/net system_u:object_r:sysctl_net_t -genfscon proc /sys/net/unix system_u:object_r:sysctl_net_unix_t -genfscon proc /sys/vm system_u:object_r:sysctl_vm_t -genfscon proc /sys/dev system_u:object_r:sysctl_dev_t -# rootfs -genfscon rootfs / system_u:object_r:root_t +# procfs (FreeBSD) +genfscon procfs / system_u:object_r:proc_t -# sysfs -genfscon sysfs / system_u:object_r:sysfs_t +# nfs +genfscon nfs / system_u:object_r:nfs_t -# selinuxfs -genfscon selinuxfs / system_u:object_r:security_t +# driverfs +genfscon driverfs / system_u:object_r:driverfs_t -# autofs -ifdef(`automount.te', ` -genfscon autofs / system_u:object_r:autofs_t -') +# usbdevfs +genfscon usbdevfs / system_u:object_r:usbdevfs_t +genfscon usbdevfs /0 -- system_u:object_r:usbdevfs_device_t -# iso9660 -genfscon iso9660 / system_u:object_r:iso9660_t - -# vfat, msdos -genfscon vfat / system_u:object_r:dosfs_t -genfscon msdos / system_u:object_r:dosfs_t - -# nfs -genfscon nfs / system_u:object_r:nfs_t +# devfs +genfscon devfs / system_u:object_r:device_t +genfscon devfs /null system_u:object_r:null_device_t +genfscon devfs /zero system_u:object_r:zero_device_t +genfscon devfs /console system_u:object_r:console_device_t +genfscon devfs /kmem system_u:object_r:memory_device_t +genfscon devfs /mem system_u:object_r:memory_device_t +genfscon devfs /random system_u:object_r:random_device_t +genfscon devfs /urandom system_u:object_r:random_device_t +genfscon devfs /tty system_u:object_r:devtty_t +genfscon devfs /ctty system_u:object_r:devtty_t +genfscon devfs /ttyv system_u:object_r:tty_device_t +genfscon devfs /pty system_u:object_r:devpts_t +genfscon devfs /ttyp system_u:object_r:devpts_t +genfscon devfs /ttyq system_u:object_r:devpts_t +genfscon devfs /ttyr system_u:object_r:devpts_t +genfscon devfs /ttys system_u:object_r:devpts_t +genfscon devfs /ttyP system_u:object_r:devpts_t +genfscon devfs /ttyQ system_u:object_r:devpts_t +genfscon devfs /ttyR system_u:object_r:devpts_t +genfscon devfs /ttyS system_u:object_r:devpts_t +#genfscon devfs /cua system_u:object_r:serial_device_t +#genfscon devfs /ttyd system_u:object_r:serial_device_t +#genfscon devfs /ttyid system_u:object_r:serial_device_t +#genfscon devfs /ttyld system_u:object_r:serial_device_t +genfscon devfs /ad -c system_u:object_r:fixed_disk_device_t +genfscon devfs /acd -c system_u:object_r:fixed_disk_device_t +genfscon devfs /fd -c system_u:object_r:removable_device_t +genfscon devfs /ppp system_u:object_r:ppp_device_t +genfscon devfs /initctl system_u:object_r:initctl_t +genfscon devfs /log system_u:object_r:devlog_t +genfscon devfs /misc/psaux system_u:object_r:mouse_device_t +genfscon devfs /input/mouse system_u:object_r:mouse_device_t +genfscon devfs /mse system_u:object_r:mouse_device_t +genfscon devfs /psm system_u:object_r:mouse_device_t +genfscon devfs /ums system_u:object_r:mouse_device_t +#genfscon devfs /sysmouse system_u:object_r:sysmouse_device_t +#genfscon devfs /gpmctl system_u:object_r:gpmctl_t +genfscon devfs /ptmx system_u:object_r:ptmx_t +genfscon devfs /acpi system_u:object_r:apm_bios_t +genfscon devfs /sound -c system_u:object_r:sound_device_t +genfscon devfs /usb system_u:object_r:usbdevfs_device_t +genfscon devfs /bpf -c system_u:object_r:bpf_device_t +genfscon devfs /klog system_u:object_r:klog_device_t +# FLASK ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#2 (text+ko) ==== @@ -233,8 +233,10 @@ define(`can_setenforce',` allow $1 security_t:dir { read search getattr }; allow $1 security_t:file { getattr read write }; -allow $1 security_t:security setenforce; -auditallow $1 security_t:security setenforce; +#allow $1 security_t:security setenforce; +#auditallow $1 security_t:security setenforce; +allow $1 kernel_t:system avc_toggle; +auditallow $1 kernel_t:system avc_toggle; ') ################################## @@ -352,6 +354,8 @@ # define(`uses_shlib',` allow $1 { root_t usr_t lib_t etc_t }:dir r_dir_perms; +allow $1 lib_t:file getattr; #!!! +allow $1 { var_t var_run_t }:dir search; allow $1 lib_t:lnk_file r_file_perms; allow $1 ld_so_t:file rx_file_perms; allow $1 ld_so_t:file execute_no_trans; @@ -361,6 +365,9 @@ allow $1 ld_so_cache_t:file r_file_perms; allow $1 device_t:dir search; allow $1 null_device_t:chr_file rw_file_perms; + +# on freebsd /dev/random uses a PRNG, so this is safe +allow $1 random_device_t:{chr_file lnk_file} { poll r_file_perms }; ') ################################# @@ -611,9 +618,7 @@ # Access the pty master multiplexer. allow $1_t ptmx_t:chr_file rw_file_perms; -ifdef(`devfsd.te', ` allow $1_t device_t:filesystem getattr; -') allow $1_t devpts_t:filesystem getattr; # allow searching /dev/pts @@ -893,6 +898,7 @@ # Read /dev/random and /dev/zero. allow $1 random_device_t:chr_file r_file_perms; +allow $1 random_device_t:lnk_file r_file_perms; allow $1 zero_device_t:chr_file r_file_perms; # Read the root directory of a tmpfs filesytem and any symbolic links. @@ -1019,6 +1025,7 @@ allow $1_t { self proc_t }:dir r_dir_perms; allow $1_t { self proc_t }:lnk_file read; +allow $1_t self:fd { create use }; allow $1_t device_t:dir { getattr search }; allow $1_t null_device_t:chr_file rw_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/mount_macros.te#2 (text+ko) ==== @@ -35,8 +35,9 @@ # Use capabilities. allow $2_t self:capability { net_bind_service sys_rawio sys_admin }; -# Create and modify /etc/mtab. -file_type_auto_trans($2_t, etc_t, etc_runtime_t, file) +# Create and modify /var/db/mtab. +allow $2_t var_db_t:dir r_dir_perms; +file_type_auto_trans($2_t, var_db_t, etc_runtime_t, file) allow $2_t etc_t:file { getattr read }; ==== //depot/projects/trustedbsd/sebsd_policy/policy/types/device.te#2 (text+ko) ==== @@ -110,9 +110,14 @@ # Type for /dev/cpu/mtrr type mtrr_device_t, file_type; +# Type for /dev/bpf* +type bpf_device_t, file_type; # Type for /dev/apm_bios type apm_bios_t, file_type; # Type for v4l type v4l_device_t, file_type; + +# Type for /dev/klog +type klog_device_t, file_type; ==== //depot/projects/trustedbsd/sebsd_policy/policy/types/file.te#2 (text+ko) ==== @@ -167,6 +167,7 @@ type tetex_data_t, file_type, sysadmfile, tmpfile; type var_spool_t, file_type, sysadmfile; type var_yp_t, file_type, sysadmfile; +type var_db_t, file_type, sysadmfile; # Type for /var/log/sa. type var_log_sa_t, file_type, sysadmfile, logfile; @@ -271,3 +272,5 @@ type dosfs_t, fs_type, root_dir_type, sysadmfile; allow dosfs_t dosfs_t:filesystem associate; + +type var_db_entropy_t, file_type, sysadmfile; From owner-p4-projects@FreeBSD.ORG Wed Sep 3 08:49:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1AD516A4C1; Wed, 3 Sep 2003 08:49:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4E8616A4BF for ; Wed, 3 Sep 2003 08:49:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54EF943F75 for ; Wed, 3 Sep 2003 08:49:09 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83Fn90U001058 for ; Wed, 3 Sep 2003 08:49:09 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83Fn8Z7001055 for perforce@freebsd.org; Wed, 3 Sep 2003 08:49:08 -0700 (PDT) Date: Wed, 3 Sep 2003 08:49:08 -0700 (PDT) Message-Id: <200309031549.h83Fn8Z7001055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 37448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 15:49:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=37448 Change 37448 by areisse@areisse_tislabs on 2003/09/03 08:48:55 Fix for wrong security class being used in transition at vnode creation. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#18 (text+ko) ==== @@ -791,19 +791,21 @@ u_int32_t context_len; security_id_t newsid; int error; + int tclass; task = SLOT(&cred->cr_label); dir = SLOT(parentlabel); vsec = SLOT(childlabel); + tclass = vnode_type_to_security_class (child->v_type); - error = security_transition_sid(task->sid, dir->sid, SECCLASS_FILE, + error = security_transition_sid(task->sid, dir->sid, tclass, &newsid); if (error) return (error); vsec->sid = newsid; vsec->task_sid = task->sid; - vsec->sclass = vnode_type_to_security_class(child->v_type); + vsec->sclass = tclass; /* store label in vnode */ error = security_sid_to_context(vsec->sid, &context, From owner-p4-projects@FreeBSD.ORG Wed Sep 3 12:13:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9196416A4C4; Wed, 3 Sep 2003 12:13:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DB0716A4BF for ; Wed, 3 Sep 2003 12:13:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C00E943FF5 for ; Wed, 3 Sep 2003 12:13:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83JDJ0U012173 for ; Wed, 3 Sep 2003 12:13:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83JDJKF012170 for perforce@freebsd.org; Wed, 3 Sep 2003 12:13:19 -0700 (PDT) Date: Wed, 3 Sep 2003 12:13:19 -0700 (PDT) Message-Id: <200309031913.h83JDJKF012170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 19:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=37454 Change 37454 by marcel@marcel_nfs on 2003/09/03 12:12:24 Diff reduction with HEAD. Affected files ... .. //depot/projects/uart/sparc64/sparc64/ofw_machdep.c#7 edit Differences ... ==== //depot/projects/uart/sparc64/sparc64/ofw_machdep.c#7 (text+ko) ==== @@ -46,8 +46,6 @@ #include #include -int OF_decode_addr(phandle_t node, int *space, bus_addr_t *addr); - void OF_getetheraddr(device_t dev, u_char *addr) { From owner-p4-projects@FreeBSD.ORG Wed Sep 3 12:49:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 439D416A4C1; Wed, 3 Sep 2003 12:49:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD5A316A4BF for ; Wed, 3 Sep 2003 12:49:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 703494400E for ; Wed, 3 Sep 2003 12:49:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83Jn30U018835 for ; Wed, 3 Sep 2003 12:49:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83Jn2eR018832 for perforce@freebsd.org; Wed, 3 Sep 2003 12:49:02 -0700 (PDT) Date: Wed, 3 Sep 2003 12:49:02 -0700 (PDT) Message-Id: <200309031949.h83Jn2eR018832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 19:49:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=37455 Change 37455 by marcel@marcel_nfs on 2003/09/03 12:48:44 Include for the prototype of OF_decode_addr(). Remove the one in this file. Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#10 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#10 (text+ko) ==== @@ -34,12 +34,11 @@ #include #include +#include #include #include -int OF_decode_addr(phandle_t node, int *space, bus_addr_t *addr); - static struct bus_space_tag bst_store[3]; static int From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:22:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 330B216A4C1; Wed, 3 Sep 2003 16:22:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D136C16A4C0 for ; Wed, 3 Sep 2003 16:22:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 304B743FE0 for ; Wed, 3 Sep 2003 16:22:29 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83NMT0U030465 for ; Wed, 3 Sep 2003 16:22:29 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83NMSPP030462 for perforce@freebsd.org; Wed, 3 Sep 2003 16:22:28 -0700 (PDT) Date: Wed, 3 Sep 2003 16:22:28 -0700 (PDT) Message-Id: <200309032322.h83NMSPP030462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 23:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=37462 Change 37462 by sam@sam_ebb on 2003/09/03 16:21:56 IFC Affected files ... .. //depot/projects/netperf/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/netperf/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/netperf/sys/boot/i386/pxeldr/pxeldr.s#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#5 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/netperf/sys/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_tc.c#4 integrate .. //depot/projects/netperf/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#9 integrate .. //depot/projects/netperf/sys/pci/if_sisreg.h#3 integrate .. //depot/projects/netperf/sys/sys/taskqueue.h#3 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#3 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.390 2003/06/27 23:11:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.391 2003/09/03 01:24:47 obrien Exp $ machine amd64 cpu HAMMER @@ -76,6 +76,7 @@ # ATA and ATAPI devices device ata device atadisk # ATA disk drives +device ataraid # ATA RAID drives device atapicd # ATAPI CDROM drives device atapifd # ATAPI floppy drives device atapist # ATAPI tape drives ==== //depot/projects/netperf/sys/boot/i386/pxeldr/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.8 2002/09/17 01:48:56 peter Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.9 2003/09/03 08:12:20 phk Exp $ MAINTAINER=jhb@FreeBSD.org @@ -17,6 +17,11 @@ M4FLAGS+= -DPROBE_KEYBOARD .endif +.if defined(BOOT_PXELDR_ALWAYS_SERIAL) +M4FLAGS+= -DALWAYS_SERIAL +.endif + + .if exists(${.OBJDIR}/../loader) LOADERBIN= ${.OBJDIR}/../loader/loader.bin .else ==== //depot/projects/netperf/sys/boot/i386/pxeldr/pxeldr.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.s,v 1.8 2001/08/09 20:47:58 mp Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.s,v 1.9 2003/09/03 08:12:20 phk Exp $ # # This simple program is a preloader for the normal boot3 loader. It is simply @@ -110,6 +110,11 @@ orb $KARGS_FLAGS_PXE, 0x8(%bx) # kargs->bootflags |= # KARGS_FLAGS_PXE popl 0xc(%bx) # kargs->pxeinfo = *PXENV+ +ifdef(`ALWAYS_SERIAL',` +# +# set the RBX_SERIAL bit in the howto byte. + orl $RB_SERIAL, (%bx) # enable serial console +') ifdef(`PROBE_KEYBOARD',` # # Look at the BIOS data area to see if we have an enhanced keyboard. If not, ==== //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.80 2003/07/28 06:15:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.81 2003/09/03 04:46:28 ken Exp $"); #include "opt_cd.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -154,6 +155,7 @@ eventhandler_tag clonetag; int minimum_command_size; int outstanding_cmds; + struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; @@ -598,6 +600,43 @@ } } +static void +cdsysctlinit(void *context, int pending) +{ + struct cam_periph *periph; + struct cd_softc *softc; + char tmpstr[80], tmpstr2[80]; + + periph = (struct cam_periph *)context; + softc = (struct cd_softc *)periph->softc; + + snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); + snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + + mtx_lock(&Giant); + + sysctl_ctx_init(&softc->sysctl_ctx); + softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, + tmpstr2, CTLFLAG_RD, 0, tmpstr); + + if (softc->sysctl_tree == NULL) { + printf("cdsysctlinit: unable to allocate sysctl tree\n"); + return; + } + + /* + * Now register the sysctl handler, so the user can the value on + * the fly. + */ + SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, + &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", + "Minimum CDB size"); + + mtx_unlock(&Giant); +} + /* * We have a handler function for this so we can check the values when the * user sets them, instead of every time we look at them. @@ -642,7 +681,7 @@ struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; - char tmpstr[80], tmpstr2[80]; + char tmpstr[80]; caddr_t match; cgd = (struct ccb_getdev *)arg; @@ -696,17 +735,7 @@ if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE)) softc->quirks |= CD_Q_10_BYTE_ONLY; - snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); - snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); - sysctl_ctx_init(&softc->sysctl_ctx); - softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, - tmpstr2, CTLFLAG_RD, 0, tmpstr); - if (softc->sysctl_tree == NULL) { - printf("cdregister: unable to allocate sysctl tree\n"); - free(softc, M_DEVBUF); - return (CAM_REQ_CMP_ERR); - } + TASK_INIT(&softc->sysctl_task, 0, cdsysctlinit, periph); /* The default is 6 byte commands, unless quirked otherwise */ if (softc->quirks & CD_Q_10_BYTE_ONLY) @@ -728,15 +757,6 @@ softc->minimum_command_size = 10; /* - * Now register the sysctl handler, so the user can the value on - * the fly. - */ - SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, - &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", - "Minimum CDB size"); - - /* * We need to register the statistics structure for this device, * but we don't have the blocksize yet for it. So, we register * the structure and indicate that we don't have the blocksize @@ -1847,6 +1867,11 @@ xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); + /* + * Create our sysctl variables, now that we know + * we have successfully attached. + */ + taskqueue_enqueue(taskqueue_thread,&softc->sysctl_task); } softc->state = CD_STATE_NORMAL; /* ==== //depot/projects/netperf/sys/cam/scsi/scsi_da.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.156 2003/08/25 18:48:45 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.158 2003/09/03 12:31:03 ken Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -41,6 +41,7 @@ #include #include #include +#include #endif /* _KERNEL */ #include @@ -133,6 +134,7 @@ struct disk_params params; struct disk disk; union ccb saved_ccb; + struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; }; @@ -388,6 +390,7 @@ static periph_init_t dainit; static void daasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg); +static void dasysctlinit(void *context, int pending); static int dacmdsizesysctl(SYSCTL_HANDLER_ARGS); static periph_ctor_t daregister; static periph_dtor_t dacleanup; @@ -915,6 +918,41 @@ } } +static void +dasysctlinit(void *context, int pending) +{ + struct cam_periph *periph; + struct da_softc *softc; + char tmpstr[80], tmpstr2[80]; + + periph = (struct cam_periph *)context; + softc = (struct da_softc *)periph->softc; + + snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); + snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + + mtx_lock(&Giant); + sysctl_ctx_init(&softc->sysctl_ctx); + softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2, + CTLFLAG_RD, 0, tmpstr); + if (softc->sysctl_tree == NULL) { + printf("dasysctlinit: unable to allocate sysctl tree\n"); + return; + } + + /* + * Now register the sysctl handler, so the user can the value on + * the fly. + */ + SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, + &softc->minimum_cmd_size, 0, dacmdsizesysctl, "I", + "Minimum CDB size"); + + mtx_unlock(&Giant); +} + static int dacmdsizesysctl(SYSCTL_HANDLER_ARGS) { @@ -955,7 +993,7 @@ struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; - char tmpstr[80], tmpstr2[80]; + char tmpstr[80]; caddr_t match; cgd = (struct ccb_getdev *)arg; @@ -1008,17 +1046,7 @@ if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE)) softc->quirks |= DA_Q_NO_6_BYTE; - snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); - snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); - sysctl_ctx_init(&softc->sysctl_ctx); - softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2, - CTLFLAG_RD, 0, tmpstr); - if (softc->sysctl_tree == NULL) { - printf("daregister: unable to allocate sysctl tree\n"); - free(softc, M_DEVBUF); - return (CAM_REQ_CMP_ERR); - } + TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph); /* * RBC devices don't have to support READ(6), only READ(10). @@ -1050,15 +1078,6 @@ softc->minimum_cmd_size = 16; /* - * Now register the sysctl handler, so the user can the value on - * the fly. - */ - SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, - &softc->minimum_cmd_size, 0, dacmdsizesysctl, "I", - "Minimum CDB size"); - - /* * Block our timeout handler while we * add this softc to the dev list. */ @@ -1539,8 +1558,14 @@ } } free(csio->data_ptr, M_TEMP); - if (announce_buf[0] != '\0') + if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); + /* + * Create our sysctl variables, now that we know + * we have successfully attached. + */ + taskqueue_enqueue(taskqueue_thread,&softc->sysctl_task); + } softc->state = DA_STATE_NORMAL; /* * Since our peripheral may be invalidated by an error ==== //depot/projects/netperf/sys/dev/pci/pci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.229 2003/09/02 17:30:37 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.230 2003/09/03 15:24:31 jhb Exp $ * */ @@ -1344,7 +1344,7 @@ break; case SYS_RES_IOPORT: case SYS_RES_MEMORY: - if (*rid < PCIR_MAPS + 4*cfg->nummaps) { + if (*rid < PCIR_BAR(cfg->nummaps)) { /* * Enable the I/O mode. We should * also be allocating resources ==== //depot/projects/netperf/sys/dev/sound/pci/ich.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.35 2003/08/28 19:24:49 obrien Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.36 2003/09/03 07:38:21 obrien Exp $"); /* -------------------------------------------------------------------- */ @@ -648,6 +648,10 @@ device_set_desc(dev, "Nvidia nForce2"); return 0; + case 0x00da10de: + device_set_desc(dev, "Nvidia nForce3"); + return 0; + case 0x74451022: device_set_desc(dev, "AMD-768"); return 0; ==== //depot/projects/netperf/sys/dev/usb/ohci_pci.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.33 2003/08/24 17:55:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.34 2003/09/03 07:40:17 obrien Exp $"); /* * USB Open Host Controller driver. @@ -77,6 +77,7 @@ #define PCI_OHCI_VENDORID_APPLE 0x106b #define PCI_OHCI_VENDORID_CMDTECH 0x1095 #define PCI_OHCI_VENDORID_NEC 0x1033 +#define PCI_OHCI_VENDORID_NVIDIA 0x12D2 #define PCI_OHCI_VENDORID_OPTI 0x1045 #define PCI_OHCI_VENDORID_SIS 0x1039 @@ -95,6 +96,9 @@ #define PCI_OHCI_DEVICEID_NEC 0x00351033 static const char *ohci_device_nec = "NEC uPD 9210 USB controller"; +#define PCI_OHCI_DEVICEID_NFORCE3 0x00d710de +static const char *ohci_device_nforce3 = "nVidia nForce3 USB Controller"; + #define PCI_OHCI_DEVICEID_USB0670 0x06701095 static const char *ohci_device_usb0670 = "CMD Tech 670 (USB0670) USB controller"; @@ -135,6 +139,8 @@ return (ohci_device_firelink); case PCI_OHCI_DEVICEID_NEC: return (ohci_device_nec); + case PCI_OHCI_DEVICEID_NFORCE3: + return (ohci_device_nforce3); case PCI_OHCI_DEVICEID_SIS5571: return (ohci_device_sis5571); case PCI_OHCI_DEVICEID_KEYLARGO: @@ -219,6 +225,9 @@ case PCI_OHCI_VENDORID_NEC: sprintf(sc->sc_vendor, "NEC"); break; + case PCI_OHCI_VENDORID_NVIDIA: + sprintf(sc->sc_vendor, "nVidia"); + break; case PCI_OHCI_VENDORID_OPTI: sprintf(sc->sc_vendor, "OPTi"); break; ==== //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.16 2003/08/25 09:48:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.17 2003/09/03 08:13:12 phk Exp $"); #include "opt_cpu.h" #include @@ -101,7 +101,8 @@ NULL, 0xffff, ELAN_XTAL / 4, - "ELAN" + "ELAN", + 1000 }; static int ==== //depot/projects/netperf/sys/kern/kern_tc.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.156 2003/08/20 19:12:46 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.157 2003/09/03 08:14:16 phk Exp $"); #include "opt_ntp.h" @@ -288,16 +288,20 @@ { unsigned u; - if (tc->tc_quality >= 0 || bootverbose) + u = tc->tc_frequency / tc->tc_counter_mask; + if (u > hz && tc->tc_quality >= 0) { + tc->tc_quality = -2000; + if (bootverbose) { + printf("Timecounter \"%s\" frequency %ju Hz", + tc->tc_name, (intmax_t)tc->tc_frequency); + printf(" -- Insufficient hz, needs at least %u\n", u); + } + } else if (tc->tc_quality >= 0 || bootverbose) { printf("Timecounter \"%s\" frequency %ju Hz quality %d", tc->tc_name, (intmax_t)tc->tc_frequency, tc->tc_quality); + } - u = tc->tc_frequency / tc->tc_counter_mask; - if (u > hz) { - printf(" -- Insufficient hz, needs at least %u\n", u); - return; - } printf("\n"); tc->tc_next = timecounters; timecounters = tc; ==== //depot/projects/netperf/sys/kern/subr_taskqueue.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.16 2003/06/11 00:56:57 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.17 2003/09/03 04:46:28 ken Exp $"); #include #include @@ -36,6 +36,8 @@ #include #include #include +#include +#include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); @@ -44,6 +46,7 @@ static void *taskqueue_ih; static void *taskqueue_giant_ih; static struct mtx taskqueue_queues_mutex; +static struct proc *taskqueue_thread_proc; struct taskqueue { STAILQ_ENTRY(taskqueue) tq_link; @@ -233,6 +236,31 @@ taskqueue_run(taskqueue_swi_giant); } +static void +taskqueue_kthread(void *arg) +{ + struct mtx kthread_mutex; + + bzero(&kthread_mutex, sizeof(kthread_mutex)); + + mtx_init(&kthread_mutex, "taskqueue kthread", NULL, MTX_DEF); + + mtx_lock(&kthread_mutex); + + for (;;) { + mtx_unlock(&kthread_mutex); + taskqueue_run(taskqueue_thread); + mtx_lock(&kthread_mutex); + msleep(&taskqueue_thread, &kthread_mutex, PWAIT, "tqthr", 0); + } +} + +static void +taskqueue_thread_enqueue(void *context) +{ + wakeup(&taskqueue_thread); +} + TASKQUEUE_DEFINE(swi, taskqueue_swi_enqueue, 0, swi_add(NULL, "task queue", taskqueue_swi_run, NULL, SWI_TQ, INTR_MPSAFE, &taskqueue_ih)); @@ -241,6 +269,10 @@ swi_add(NULL, "Giant task queue", taskqueue_swi_giant_run, NULL, SWI_TQ_GIANT, 0, &taskqueue_giant_ih)); +TASKQUEUE_DEFINE(thread, taskqueue_thread_enqueue, 0, + kthread_create(taskqueue_kthread, NULL, + &taskqueue_thread_proc, RFNOWAIT, 0, "taskqueue")); + int taskqueue_enqueue_fast(struct taskqueue *queue, struct task *task) { ==== //depot/projects/netperf/sys/pci/if_sis.c#9 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.82 2003/08/22 07:13:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.83 2003/09/03 07:40:04 phk Exp $"); #include #include @@ -107,7 +107,7 @@ static struct sis_type sis_devs[] = { { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" }, { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" }, - { NS_VENDORID, NS_DEVICEID_DP83815, "NatSemi DP83815 10/100BaseTX" }, + { NS_VENDORID, NS_DEVICEID_DP83815, "NatSemi DP8381[56] 10/100BaseTX" }, { 0, 0, NULL } }; @@ -1052,6 +1052,8 @@ sc = device_get_softc(dev); unit = device_get_unit(dev); + sc->sis_self = dev; + mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); @@ -1131,6 +1133,18 @@ */ switch (pci_get_vendor(dev)) { case NS_VENDORID: + sc->sis_srr = CSR_READ_4(sc, NS_SRR); + + /* We can't update the device description, so spew */ + if (sc->sis_srr == NS_SRR_15C) + device_printf(dev, "Silicon Revision: DP83815C\n"); + else if (sc->sis_srr == NS_SRR_15D) + device_printf(dev, "Silicon Revision: DP83815D\n"); + else if (sc->sis_srr == NS_SRR_16A) + device_printf(dev, "Silicon Revision: DP83816A\n"); + else + device_printf(dev, "Silicon Revision %x\n", sc->sis_srr); + /* * Reading the MAC address out of the EEPROM on * the NatSemi chip takes a bit more work than @@ -2033,6 +2047,16 @@ */ sis_stop(sc); +#ifdef notyet + if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr >= NS_SRR_16A) { + /* + * Configure 400usec of interrupt holdoff. This is based + * on emperical tests on a Soekris 4801. + */ + CSR_WRITE_4(sc, NS_IHR, 0x100 | 4); + } +#endif + mii = device_get_softc(sc->sis_miibus); /* Set MAC address */ @@ -2148,7 +2172,7 @@ SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS); } - if (sc->sis_type == SIS_TYPE_83815 && + if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr < NS_SRR_16A && IFM_SUBTYPE(mii->mii_media_active) == IFM_100_TX) { uint32_t reg; @@ -2165,6 +2189,7 @@ DELAY(100); reg = CSR_READ_4(sc, NS_PHY_TDATA); if ((reg & 0x0080) == 0 || (reg & 0xff) >= 0xd8) { + device_printf(sc->sis_self, "Applying short cable fix (reg=%x)\n", reg); CSR_WRITE_4(sc, NS_PHY_TDATA, 0x00e8); SIS_SETBIT(sc, NS_PHY_DSPCFG, 0x20); } ==== //depot/projects/netperf/sys/pci/if_sisreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.22 2003/07/22 01:35:09 cognet Exp $ + * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.23 2003/09/03 07:40:04 phk Exp $ */ /* @@ -74,8 +74,10 @@ #define SIS_TIMEUNIT 0xA4 #define SIS_GPIO 0xB8 -/* NS DP83815 registers */ +/* NS DP83815/6 registers */ +#define NS_IHR 0x1C #define NS_CLKRUN 0x3C +#define NS_SRR 0x58 #define NS_BMCR 0x80 #define NS_BMSR 0x84 #define NS_PHYIDR1 0x88 @@ -97,6 +99,11 @@ #define NS_CLKRUN_PMEENB 0x00000100 #define NS_CLNRUN_CLKRUN_ENB 0x00000001 +/* NS silicon revisions */ +#define NS_SRR_15C 0x302 +#define NS_SRR_15D 0x403 +#define NS_SRR_16A 0x505 + #define SIS_CSR_TX_ENABLE 0x00000001 #define SIS_CSR_TX_DISABLE 0x00000002 #define SIS_CSR_RX_ENABLE 0x00000004 @@ -442,6 +449,7 @@ #define SIS_TYPE_900 1 #define SIS_TYPE_7016 2 #define SIS_TYPE_83815 3 +#define SIS_TYPE_83816 4 struct sis_softc { struct arpcom arpcom; /* interface info */ @@ -450,11 +458,13 @@ struct resource *sis_res; struct resource *sis_irq; void *sis_intrhand; + device_t sis_self; device_t sis_miibus; u_int8_t sis_unit; u_int8_t sis_type; u_int8_t sis_rev; u_int8_t sis_link; + u_int sis_srr; struct sis_list_data sis_ldata; bus_dma_tag_t sis_parent_tag; bus_dma_tag_t sis_tag; ==== //depot/projects/netperf/sys/sys/taskqueue.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/taskqueue.h,v 1.7 2003/02/26 03:15:42 scottl Exp $ + * $FreeBSD: src/sys/sys/taskqueue.h,v 1.8 2003/09/03 04:46:28 ken Exp $ */ #ifndef _SYS_TASKQUEUE_H_ @@ -107,13 +107,20 @@ struct __hack /* - * This queue is serviced by a software interrupt handler. To enqueue - * a task, call taskqueue_enqueue(taskqueue_swi, &task). + * These queues are serviced by software interrupt handlers. To enqueue + * a task, call taskqueue_enqueue(taskqueue_swi, &task) or + * taskqueue_enqueue(taskqueue_swi_giant, &task). */ TASKQUEUE_DECLARE(swi_giant); TASKQUEUE_DECLARE(swi); /* + * This queue is serviced by a kernel thread. To enqueue a task, call + * taskqueue_enqueue(taskqueue_thread, &task). + */ +TASKQUEUE_DECLARE(thread); + +/* * Queue for swi handlers dispatched from fast interrupt handlers. * These are necessarily different from the above because the queue * must be locked with spinlocks since sleep mutex's cannot be used ==== //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.143 2003/08/31 11:26:52 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.144 2003/09/03 04:08:15 jeff Exp $"); /* * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide. @@ -4694,7 +4694,8 @@ FREE_LOCK(&lk); return; } - ibp = getdirtybuf(&inodedep->id_buf, NULL, MNT_WAIT); + ibp = inodedep->id_buf; + ibp = getdirtybuf(&ibp, NULL, MNT_WAIT); FREE_LOCK(&lk); if (ibp && (error = BUF_WRITE(ibp)) != 0) softdep_error("softdep_update_inodeblock: bwrite", error); @@ -5015,7 +5016,8 @@ adp = WK_ALLOCDIRECT(wk); if (adp->ad_state & DEPCOMPLETE) continue; - nbp = getdirtybuf(&adp->ad_buf, NULL, waitfor); + nbp = adp->ad_buf; + nbp = getdirtybuf(&nbp, NULL, waitfor); if (nbp == NULL) continue; FREE_LOCK(&lk); @@ -5031,7 +5033,8 @@ aip = WK_ALLOCINDIR(wk); if (aip->ai_state & DEPCOMPLETE) continue; - nbp = getdirtybuf(&aip->ai_buf, NULL, waitfor); + nbp = aip->ai_buf; + nbp = getdirtybuf(&nbp, NULL, waitfor); if (nbp == NULL) continue; FREE_LOCK(&lk); @@ -5049,7 +5052,8 @@ LIST_FOREACH(aip, &WK_INDIRDEP(wk)->ir_deplisthd, ai_next) { if (aip->ai_state & DEPCOMPLETE) continue; - nbp = getdirtybuf(&aip->ai_buf, NULL, MNT_WAIT); + nbp = aip->ai_buf; + nbp = getdirtybuf(&nbp, NULL, MNT_WAIT); if (nbp == NULL) goto restart; FREE_LOCK(&lk); @@ -5098,7 +5102,8 @@ * been sync'ed, this dependency can show up. So, * rather than panic, just flush it. */ - nbp = getdirtybuf(&WK_MKDIR(wk)->md_buf, NULL, waitfor); + nbp = WK_MKDIR(wk)->md_buf; + nbp = getdirtybuf(&nbp, NULL, waitfor); if (nbp == NULL) continue; FREE_LOCK(&lk); @@ -5118,8 +5123,8 @@ * been sync'ed, this dependency can show up. So, * rather than panic, just flush it. */ - nbp = getdirtybuf(&WK_BMSAFEMAP(wk)->sm_buf, - NULL, waitfor); + nbp = WK_BMSAFEMAP(wk)->sm_buf; + nbp = getdirtybuf(&nbp, NULL, waitfor); if (nbp == NULL) continue; FREE_LOCK(&lk); @@ -5268,7 +5273,8 @@ TAILQ_FOREACH(adp, listhead, ad_next) { if (adp->ad_state & DEPCOMPLETE) continue; - bp = getdirtybuf(&adp->ad_buf, NULL, waitfor); + bp = adp->ad_buf; + bp = getdirtybuf(&bp, NULL, waitfor); if (bp == NULL) { if (waitfor == MNT_NOWAIT) continue; @@ -5383,7 +5389,8 @@ * push them to disk. */ if ((inodedep->id_state & DEPCOMPLETE) == 0) { - bp = getdirtybuf(&inodedep->id_buf, NULL, MNT_WAIT); + bp = inodedep->id_buf; + bp = getdirtybuf(&bp, NULL, MNT_WAIT); FREE_LOCK(&lk); if (bp && (error = BUF_WRITE(bp)) != 0) break; From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:23:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C220D16A4C1; Wed, 3 Sep 2003 16:23:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85FC416A4BF for ; Wed, 3 Sep 2003 16:23:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A4D943FE5 for ; Wed, 3 Sep 2003 16:23:31 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83NNU0U030507 for ; Wed, 3 Sep 2003 16:23:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83NNUbL030504 for perforce@freebsd.org; Wed, 3 Sep 2003 16:23:30 -0700 (PDT) Date: Wed, 3 Sep 2003 16:23:30 -0700 (PDT) Message-Id: <200309032323.h83NNUbL030504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 23:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=37463 Change 37463 by sam@sam_ebb on 2003/09/03 16:22:50 IFC Affected files ... .. //depot/projects/netperf/sys/netinet/udp_usrreq.c#5 integrate Differences ... ==== //depot/projects/netperf/sys/netinet/udp_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.135 2003/08/20 14:46:40 bms Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.137 2003/09/03 02:21:33 bms Exp $ */ #include "opt_ipsec.h" @@ -830,7 +830,9 @@ * Set up checksum and output datagram. */ if (udpcksum) { - ui->ui_sum = in_pseudo(ui->ui_src.s_addr, ui->ui_dst.s_addr, + if (inp->inp_flags & INP_ONESBCAST) + faddr.s_addr = INADDR_BROADCAST; + ui->ui_sum = in_pseudo(ui->ui_src.s_addr, faddr.s_addr, htons((u_short)len + sizeof(struct udphdr) + IPPROTO_UDP)); m->m_pkthdr.csum_flags = CSUM_UDP; m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:25:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 386C916A4C1; Wed, 3 Sep 2003 16:25:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D974816A4BF for ; Wed, 3 Sep 2003 16:25:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BF4843FAF for ; Wed, 3 Sep 2003 16:25:34 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h83NPY0U030631 for ; Wed, 3 Sep 2003 16:25:34 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83NPXRK030628 for perforce@freebsd.org; Wed, 3 Sep 2003 16:25:33 -0700 (PDT) Date: Wed, 3 Sep 2003 16:25:33 -0700 (PDT) Message-Id: <200309032325.h83NPXRK030628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2003 23:25:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=37464 Change 37464 by sam@sam_ebb on 2003/09/03 16:24:56 rt may be NULL so can't assert the lock Affected files ... .. //depot/projects/netperf/sys/netinet/if_atm.c#5 edit Differences ... ==== //depot/projects/netperf/sys/netinet/if_atm.c#5 (text+ko) ==== @@ -311,8 +311,6 @@ { struct sockaddr_dl *sdl; - RT_LOCK_ASSERT(rt, MA_NOTOWNED); - if (m->m_flags & (M_BCAST | M_MCAST)) { log(LOG_INFO, "atmresolve: BCAST/MCAST packet detected/dumped"); goto bad; From owner-p4-projects@FreeBSD.ORG Wed Sep 3 17:49:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC1316A4C1; Wed, 3 Sep 2003 17:49:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1001316A4BF for ; Wed, 3 Sep 2003 17:49:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0640F43FEA for ; Wed, 3 Sep 2003 17:49:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h840nH0U041207 for ; Wed, 3 Sep 2003 17:49:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h840nHtg041204 for perforce@freebsd.org; Wed, 3 Sep 2003 17:49:17 -0700 (PDT) Date: Wed, 3 Sep 2003 17:49:17 -0700 (PDT) Message-Id: <200309040049.h840nHtg041204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 00:49:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=37468 Change 37468 by marcel@marcel_nfs on 2003/09/03 17:48:26 Flesh-out the manpage. Describe the 4 components: core, hardware drivers, system devices and kernel interfaces. The intend is to provide a structure in which we can explain options, tunables and whatnots. With the potential of the driver I expect a wealth of options in the (near) future and we need a good way to explain them. Affected files ... .. //depot/projects/uart/dev/uart/uart.4#3 edit Differences ... ==== //depot/projects/uart/dev/uart/uart.4#3 (text+ko) ==== @@ -28,15 +28,18 @@ .Dd August 25, 2003 .Dt UART 4 .Os +.\" .Sh NAME .Nm uart .Nd driver for Universal Asynchronous Receiver/Transmitter (UART) devices +.\" .Sh SYNOPSIS .Cd "device uart" .Pp .Cd "device puc" .Cd "device uart" .Pp +.\" .Sh DESCRIPTION The .Nm @@ -46,8 +49,8 @@ the .Nm driver. -The primary support for devices that provide multiple serial interfaces or -that provide other functionality besides one or more serial interfaces is +The primary support for devices that contain multiple serial interfaces or +that contain other functionality besides one or more serial interfaces is provided by the .Xr puc 4 device driver. @@ -62,8 +65,49 @@ .Nm driver and hides the complexities that are inherent when elementary components are packaged together. +.Pp +The +.Nm +driver has a modular design to allow it to be used on differing hardware and +for various purposes. +In the following sections the components are discussed in detail. +Options are described in the section that covers the component to which each +option applies. +.\" +.Ss CORE COMPONENT +At the heart of the +.Nm +driver is the core component. It contains the bus attachments and the low-level +interrupt handler. +.\" +.Ss HARDWARE DRIVERS +The core component and the kernel interfaces talk to the hardware through the +hardware interface. +This interface serves as an abstraction of the hardware and allows varying +UARTs to be used for serial communications. +.\" +.Ss SYSTEM DEVICES +System devices are UARTs that have a special purpose by way of hardware +design or software setup. +For example, Sun UltraSparc machines use UARTs as their keyboard interface. +Such an UART cannot be used for general purpose communications. +Likewise, when the kernel is configured for a serial console, the +corresponding UART will in turn be a system device so that the kernel can +output boot messages early on in the boot process. +.\" +.Ss KERNEL INTERFACES +The last but not least of the components is the kernel interface. +This component ultimately determines how the UART is made visible to the +kernel in particular and to users in general. +The default kernel interface is the TTY interface. +This allows the UART to be used for terminals, modems and serial line IP +applications. +System devices, with the notable exception of serial consoles, generally +have specialized kernel interfaces. +.\" .Sh SEE ALSO .Xr puc 4 +.\" .Sh HISTORY The .Nm From owner-p4-projects@FreeBSD.ORG Wed Sep 3 19:58:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B05C16A4C1; Wed, 3 Sep 2003 19:58:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6EED16A4BF for ; Wed, 3 Sep 2003 19:58:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B0B943FAF for ; Wed, 3 Sep 2003 19:58:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h842wu0U048212 for ; Wed, 3 Sep 2003 19:58:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h842wteX048209 for perforce@freebsd.org; Wed, 3 Sep 2003 19:58:55 -0700 (PDT) Date: Wed, 3 Sep 2003 19:58:55 -0700 (PDT) Message-Id: <200309040258.h842wteX048209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 02:58:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37471 Change 37471 by marcel@marcel_nfs on 2003/09/03 19:58:22 o Display flow control capabilities of the UART. o Display the line settings (baudrate, parity, databits and stopbits) for system devices. The SAB 82532 driver (with uncommitted support for HW flow control) now announces itself as: : uart0: on puc0 uart0: RTS iflow, CTS oflow uart0: console (9600,n,8,1) uart1: on puc0 uart1: RTS iflow, CTS oflow : Affected files ... .. //depot/projects/uart/dev/uart/uart_core.c#26 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_core.c#26 (text+ko) ==== @@ -345,21 +345,18 @@ if (error) goto fail; - if (sc->sc_sysdev != NULL) { - switch (sc->sc_sysdev->type) { - case UART_DEV_CONSOLE: - device_printf(dev, "console\n"); - break; - case UART_DEV_DBGPORT: - device_printf(dev, "debug port\n"); - break; - case UART_DEV_KEYBOARD: - device_printf(dev, "keyboard\n"); - break; - default: - device_printf(dev, "unknown system device\n"); - break; + if (sc->sc_hwiflow || sc->sc_hwoflow) { + sep = ""; + device_print_prettyname(dev); + if (sc->sc_hwiflow) { + printf("%sRTS iflow", sep); + sep = ", "; + } + if (sc->sc_hwoflow) { + printf("%sCTS oflow", sep); + sep = ", "; } + printf("\n"); } if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) { @@ -376,6 +373,26 @@ printf("\n"); } + if (sc->sc_sysdev != NULL) { + switch (sc->sc_sysdev->type) { + case UART_DEV_CONSOLE: + device_printf(dev, "console"); + break; + case UART_DEV_DBGPORT: + device_printf(dev, "debug port"); + break; + case UART_DEV_KEYBOARD: + device_printf(dev, "keyboard"); + break; + default: + device_printf(dev, "unknown system device"); + break; + } + printf(" (%d,%c,%d,%d)\n", sc->sc_sysdev->baudrate, + "noems"[sc->sc_sysdev->parity], sc->sc_sysdev->databits, + sc->sc_sysdev->stopbits); + } + error = (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL) ? (*sc->sc_sysdev->attach)(sc) : uart_tty_attach(sc); if (error) From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:41:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3A5416A4C1; Wed, 3 Sep 2003 20:41:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EB2516A4C0 for ; Wed, 3 Sep 2003 20:41:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E0D943FCB for ; Wed, 3 Sep 2003 20:41:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h843fm0U050620 for ; Wed, 3 Sep 2003 20:41:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h843fmLY050617 for perforce@freebsd.org; Wed, 3 Sep 2003 20:41:48 -0700 (PDT) Date: Wed, 3 Sep 2003 20:41:48 -0700 (PDT) Message-Id: <200309040341.h843fmLY050617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 03:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=37472 Change 37472 by marcel@marcel_nfs on 2003/09/03 20:41:01 Make sure hardware flow control (both in and out) is disabled when we close the device. Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.c#13 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_tty.c#13 (text+ko) ==== @@ -469,6 +469,10 @@ } KASSERT(tp->t_state & TS_ISOPEN, ("foo")); + if (sc->sc_hwiflow) + UART_IOCTL(sc, UART_IOCTL_IFLOW, 0); + if (sc->sc_hwoflow) + UART_IOCTL(sc, UART_IOCTL_OFLOW, 0); if (sc->sc_sysdev == NULL) UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:48:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E826416A4C1; Wed, 3 Sep 2003 20:48:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60D3316A4BF for ; Wed, 3 Sep 2003 20:48:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCF1044001 for ; Wed, 3 Sep 2003 20:48:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h843mv0U056302 for ; Wed, 3 Sep 2003 20:48:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h843mvuO056299 for perforce@freebsd.org; Wed, 3 Sep 2003 20:48:57 -0700 (PDT) Date: Wed, 3 Sep 2003 20:48:57 -0700 (PDT) Message-Id: <200309040348.h843mvuO056299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 03:48:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=37473 Change 37473 by marcel@marcel_nfs on 2003/09/03 20:48:26 o Initialize the channel with flow control disabled. We accidentally had output flow control enabled. o The state of DSR is inverted. Just like all the other signals. We normally don't do anything with DSR, but uarttest.c displays all signals and it invalidly reported DSR deasserted when my break-out box was red in the face telling me otherwise. o Implement the UART_IOCTL_IFLOW and UART_IOCTL_OFLOW requests. Version 3.x of the chip supports both RTS and CTS based flow control. I haven't been able to test this properly yet. I need to change uarttest.c to work on different computers so that I have better odds to cause near overflow conditions. o Set sc_hwiflow and sc_hwoflow if we have a version 3.x chip. If we don't know the version, we don't set HW flow control capabilities. This is to be on the safe side. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#21 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#21 (text+ko) ==== @@ -239,7 +239,7 @@ uart_barrier(bas); uart_setreg(bas, SAB_CCR4, SAB_CCR4_MCK4|SAB_CCR4_EBRG|SAB_CCR4_ICD); uart_barrier(bas); - uart_setreg(bas, SAB_MODE, SAB_MODE_RTS|SAB_MODE_RAC); + uart_setreg(bas, SAB_MODE, SAB_MODE_FCTS|SAB_MODE_RTS|SAB_MODE_RAC); uart_barrier(bas); uart_setreg(bas, SAB_RFC, SAB_RFC_DPS|SAB_RFC_RFDF| SAB_RFC_RFTH_32CHAR); @@ -440,7 +440,7 @@ SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD); pvr = uart_getreg(bas, SAB_PVR); pvr &= (IS_CHANNEL_A(bas)) ? SAB_PVR_DSR_A : SAB_PVR_DSR_B; - SIGCHG(pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); + SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); sc->sc_hwsig = sig & ~UART_SIGMASK_DELTA; return (sig); } @@ -449,7 +449,7 @@ sab82532_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) { struct uart_bas *bas; - uint8_t dafo; + uint8_t dafo, mode; bas = &sc->sc_bas; switch (request) { @@ -462,6 +462,27 @@ uart_setreg(bas, SAB_DAFO, dafo); uart_barrier(bas); break; + case UART_IOCTL_IFLOW: + mode = uart_getreg(bas, SAB_MODE); + if (data) { + mode &= ~SAB_MODE_RTS; + mode |= SAB_MODE_FRTS; + } else { + mode |= SAB_MODE_RTS; + mode &= ~SAB_MODE_FRTS; + } + uart_setreg(bas, SAB_MODE, mode); + uart_barrier(bas); + break; + case UART_IOCTL_OFLOW: + mode = uart_getreg(bas, SAB_MODE); + if (data) + mode &= ~SAB_MODE_FCTS; + else + mode |= SAB_MODE_FCTS; + uart_setreg(bas, SAB_MODE, mode); + uart_barrier(bas); + break; default: return (EINVAL); } @@ -527,10 +548,20 @@ ch = IS_CHANNEL_A(&sc->sc_bas) ? "A" : "B"; switch (uart_getreg(&sc->sc_bas, SAB_VSTR) & SAB_VSTR_VMASK) { - case SAB_VSTR_V_1: vstr = "v1"; break; - case SAB_VSTR_V_2: vstr = "v2"; break; - case SAB_VSTR_V_32: vstr = "v3.2"; break; - default: vstr = "v4?"; break; + case SAB_VSTR_V_1: + vstr = "v1"; + break; + case SAB_VSTR_V_2: + vstr = "v2"; + break; + case SAB_VSTR_V_32: + vstr = "v3.2"; + sc->sc_hwiflow = 1; + sc->sc_hwoflow = 1; + break; + default: + vstr = "v4?"; + break; } snprintf(buf, sizeof(buf), "SAB 82532 %s, channel %s", vstr, ch); From owner-p4-projects@FreeBSD.ORG Wed Sep 3 21:23:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 605F316A4C1; Wed, 3 Sep 2003 21:23:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DA4816A4BF for ; Wed, 3 Sep 2003 21:23:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9094C43FE0 for ; Wed, 3 Sep 2003 21:23:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h844Nh0U058402 for ; Wed, 3 Sep 2003 21:23:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h844Nhec058399 for perforce@freebsd.org; Wed, 3 Sep 2003 21:23:43 -0700 (PDT) Date: Wed, 3 Sep 2003 21:23:43 -0700 (PDT) Message-Id: <200309040423.h844Nhec058399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 04:23:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=37475 Change 37475 by sam@sam_ebb on 2003/09/03 21:23:33 Don't hold a reference in rt_parent with a reference count, it is unnecessary and we cannot safely remove it. Specifically when deleting an rtentry from which cloned entries were created rtrequest1 recurses down the tree deleting cloned entries. But this is done while holding the parent rtentry lock. This means that when the backpointer in rt_parent is reclaimed we must recursively lock the parent (which fails because the mutex is non-recursive). It's not safe to do the clone purging first or to allow recursion on the lock. The better solution appears to be to depend on the ordered relationship between the parent rtentry and all cloned items to insure rt_parent is valid. This was (briefly) discussed with Garrett who initially added the refcnt bump in rev 1.19. FWIW BSD/OS does not hold use the refcnt. Affected files ... .. //depot/projects/netperf/sys/net/route.c#7 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#7 (text+ko) ==== @@ -262,8 +262,7 @@ */ if (rt->rt_ifa) IFAFREE(rt->rt_ifa); - if (rt->rt_parent) - RTFREE(rt->rt_parent); + rt->rt_parent = NULL; /* NB: no refcnt on parent */ /* * The key is separatly alloc'd so free it (see rt_setgate()). @@ -729,9 +728,17 @@ rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */ rt->rt_rmx.rmx_pksent = 0; /* reset packet counter */ if ((*ret_nrt)->rt_flags & (RTF_CLONING | RTF_PRCLONING)) { + /* + * NB: We do not bump the refcnt on the parent + * entry under the assumption that it will + * remain so long as we do. This is + * important when deleting the parent route + * as this operation requires traversing + * the tree to delete all clones and futzing + * with refcnts requires us to double-lock + * parent through this back reference. + */ rt->rt_parent = *ret_nrt; - /* XXX locking */ - (*ret_nrt)->rt_refcnt++; } } From owner-p4-projects@FreeBSD.ORG Wed Sep 3 21:27:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ABE516A4C1; Wed, 3 Sep 2003 21:27:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5E7216A4BF for ; Wed, 3 Sep 2003 21:27:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4413343F75 for ; Wed, 3 Sep 2003 21:27:49 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h844Rn0U058559 for ; Wed, 3 Sep 2003 21:27:49 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h844RmdQ058556 for perforce@freebsd.org; Wed, 3 Sep 2003 21:27:48 -0700 (PDT) Date: Wed, 3 Sep 2003 21:27:48 -0700 (PDT) Message-Id: <200309040427.h844RmdQ058556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 04:27:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=37476 Change 37476 by sam@sam_ebb on 2003/09/03 21:27:48 rtrequest(RTM_DELETE, ...) locks the rtentry found by looking up the destination address that's specified. This means the caller cannot be holding a locked reference when doing this operation so (for now) drop the lock and reaquire it after the delete. Various alternatives were considered, including adding a delete interface that takes a locked rtentry, but none are as clean as this. It appears that dropping+reacquiring the lock is safe in all these cases. This problem appeared when ejecting a cardbus network card configured with IPv6. Affected files ... .. //depot/projects/netperf/sys/netinet/in_rmx.c#4 edit .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/netperf/sys/netinet6/in6_rmx.c#4 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -72,7 +72,6 @@ struct sockaddr_in *sin = (struct sockaddr_in *)rt_key(rt); struct radix_node *ret; - /*XXX locking? */ /* * For IP, all unicast non-host routes are automatically cloning. */ @@ -126,12 +125,15 @@ rt2->rt_flags & RTF_HOST && rt2->rt_gateway && rt2->rt_gateway->sa_family == AF_LINK) { + /* NB: must unlock to avoid recursion */ + RT_UNLOCK(rt2); rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt2), rt2->rt_gateway, rt_mask(rt2), rt2->rt_flags, 0); ret = rn_addroute(v_arg, n_arg, head, treenodes); + RT_LOCK(rt2); } RTFREE_LOCKED(rt2); } @@ -212,10 +214,13 @@ rt->rt_flags |= RTPRF_OURS; rt->rt_rmx.rmx_expire = time_second + rtq_reallyold; } else { + /* NB: must unlock to avoid recursion */ + RT_UNLOCK(rt); rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); + RT_LOCK(rt); } } ==== //depot/projects/netperf/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== @@ -986,10 +986,13 @@ sin6.sin6_addr.s6_addr16[1] = htons(ifp->if_index); rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL); if (rt) { - if (rt->rt_ifp == ifp) + if (rt->rt_ifp == ifp) { + RT_UNLOCK(rt); rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); - rtfree(rt); + RTFREE(rt); + } else + rtfree(rt); } } ==== //depot/projects/netperf/sys/netinet6/in6_rmx.c#4 (text+ko) ==== @@ -166,12 +166,15 @@ rt2->rt_flags & RTF_HOST && rt2->rt_gateway && rt2->rt_gateway->sa_family == AF_LINK) { + /* NB: must unlock to avoid recursion */ + RT_UNLOCK(rt2); rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt2), rt2->rt_gateway, rt_mask(rt2), rt2->rt_flags, 0); ret = rn_addroute(v_arg, n_arg, head, treenodes); + RT_LOCK(rt2); } RTFREE_LOCKED(rt2); } @@ -272,10 +275,13 @@ rt->rt_flags |= RTPRF_OURS; rt->rt_rmx.rmx_expire = time_second + rtq_reallyold; } else { + /* NB: must unlock to avoid recursion */ + RT_UNLOCK(rt); rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); + RT_LOCK(rt); } } From owner-p4-projects@FreeBSD.ORG Wed Sep 3 22:16:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7720516A4C1; Wed, 3 Sep 2003 22:16:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37F3A16A4BF for ; Wed, 3 Sep 2003 22:16:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A408943FF2 for ; Wed, 3 Sep 2003 22:16:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h845Gn0U061404 for ; Wed, 3 Sep 2003 22:16:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h845GnMQ061401 for perforce@freebsd.org; Wed, 3 Sep 2003 22:16:49 -0700 (PDT) Date: Wed, 3 Sep 2003 22:16:49 -0700 (PDT) Message-Id: <200309040516.h845GnMQ061401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 05:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=37478 Change 37478 by marcel@marcel_nfs on 2003/09/03 22:16:00 Simplify the test program. It doesn't try to handle both sides of the communication anymore. You either start it as DTE (-t) or as DCE (-c). A loopback (-l) option has been added to remind me that we can also take advantage of loopback features... It has again been verified that flow control without hardware support works. The SAB 82532 works as sender (ie CTS_OFLOW works with hardware support), but does not work as receiver (ie RTS_IFLOW does not work). Affected files ... .. //depot/projects/uart/dev/uart/uarttest.c#2 edit Differences ... ==== //depot/projects/uart/dev/uart/uarttest.c#2 (text+ko) ==== @@ -37,14 +37,21 @@ #include #include #include +#include + +static void sethow(int); +static void usage(void); -static int open_uart(const char*dev); -static int usage(void); +#define AS_DCE 1 +#define AS_DTE 2 +#define AS_LOOP 3 + +int fd, how; char buffer[16384*4]; static int -getsig(int fd, const char *dev, size_t count, int oldsig) +getsig(const char *dev, size_t count, int oldsig) { int newsig; @@ -72,152 +79,144 @@ return (newsig); } -static void* -dte(void *arg) +static void +dte(void) { - struct termios t0, t1; ssize_t count, wc; - int fd, sig; + int sig; - fd = (intptr_t)arg; - tcgetattr(fd, &t0); - t1 = t0; - cfmakeraw(&t1); - cfsetspeed(&t1, B115200); - t1.c_cflag |= CCTS_OFLOW; - tcsetattr(fd, TCSAFLUSH|TCSANOW, &t1); - - sleep(1); count = 0; errno = 0; sig = 0; while (count < sizeof(buffer)) { - sig = getsig(fd, "dte", count, sig); + sig = getsig("dte", count, sig); wc = write(fd, buffer + count, sizeof(buffer) - count); if (wc > 0) { count += wc; errno = 0; - } else - pthread_yield(); + } } - printf("dte: %u bytes transmitted\n", count); - - tcsetattr(fd, TCSADRAIN, &t0); - return (NULL); } -static void* -dce(void *arg) +static void +dce(void) { - struct termios t0, t1; ssize_t count, rc; - int fd, sig; + int sig; - fd = (intptr_t)arg; - tcgetattr(fd, &t0); - t1 = t0; - cfmakeraw(&t1); - cfsetspeed(&t1, B115200); - t1.c_cflag |= CRTS_IFLOW; - tcsetattr(fd, TCSAFLUSH|TCSANOW, &t1); - - sleep(2); count = 0; errno = 0; sig = 0; - /* fcntl(fd, F_SETFL, 0); */ while (count < sizeof(buffer)) { - sig = getsig(fd, "dce", count, sig); - pthread_yield(); + sig = getsig("dce", count, sig); rc = MIN(16, sizeof(buffer) - count); rc = read(fd, buffer + count, rc); if (rc > 0) { count += rc; errno = 0; - } else + } else { + printf("sleeping after %u bytes...\n", count); sleep(1); + } } printf("dce: %u bytes received\n", count); - - tcsetattr(fd, TCSADRAIN, &t0); - return (NULL); } -static void -run(int dte_fd, int dce_fd) +int +main(int argc, char *argv[]) { - pthread_t dte_thr, dce_thr; - int error; + char buf[PATH_MAX]; + struct termios t0, t1; + int ch; - error = pthread_create(&dte_thr, NULL, dte, (void*)(intptr_t)dte_fd); - if (error) { - warnx("%s: pthread_create: %s (%d)", getprogname(), - strerror(error), error); - return; + while ((ch = getopt(argc, argv, "clt")) != -1) { + switch (ch) { + case 'c': /* DCE mode */ + sethow(AS_DCE); + break; + case 'l': /* Loopback mode */ + sethow(AS_LOOP); + break; + case 't': /* DTE mode */ + sethow(AS_DTE); + break; + default: + usage(); + } } - error = pthread_create(&dce_thr, NULL, dce, (void*)(intptr_t)dce_fd); - if (error) { - warnx("%s: pthread_create: %s (%d)", getprogname(), - strerror(error), error); - return; - } + if (how == 0) + usage(); - pthread_join(dce_thr, NULL); - pthread_join(dte_thr, NULL); -} + argc -= optind; + argv += optind; -int -main(int argc, char *argv[]) -{ - int dce_fd, dte_fd; + if (argc != 1) + usage(); - if (argc != 3) - return (usage()); + fd = open(argv[0], O_RDWR | O_NONBLOCK); + if (fd == -1) { + if (errno == ENOENT) { + snprintf(buf, PATH_MAX, "/dev/%s", argv[0]); + fd = open(buf, O_RDWR | O_NONBLOCK); + if (fd == -1) + warn("opening `%s' and `%s'", argv[0], buf); + } else + warn("opening `%s'", argv[0]); + } + if (fd == -1) + exit(EX_NOINPUT); - dte_fd = open_uart(argv[1]); - if (dte_fd == -1) - return (EX_NOINPUT); - dce_fd = open_uart(argv[2]); - if (dce_fd == -1) { - close(dte_fd); - return (EX_NOINPUT); + tcgetattr(fd, &t0); + t1 = t0; + cfmakeraw(&t1); + cfsetspeed(&t1, B115200); + switch (how) { + case AS_DCE: + t1.c_cflag |= CRTS_IFLOW; + break; + case AS_DTE: + t1.c_cflag |= CCTS_OFLOW; + break; + default: + t1.c_cflag |= CCTS_OFLOW | CRTS_IFLOW; + break; } + tcsetattr(fd, TCSAFLUSH|TCSANOW, &t1); - printf("%s: starting tests...\n", getprogname()); - run(dte_fd, dce_fd); + switch (how) { + case AS_DCE: + dce(); + break; + case AS_DTE: + dte(); + break; + default: + warn("not today"); + break; + } - close(dte_fd); - close(dce_fd); + tcsetattr(fd, TCSADRAIN, &t0); + sleep(1); + close(fd); return (EX_OK); } -static int -open_uart(const char *dev) +static void +sethow(int h) { - char buf[PATH_MAX]; - int fd; - fd = open(dev, O_RDWR | O_NONBLOCK); - if (fd == -1) { - if (errno == ENOENT) { - snprintf(buf, PATH_MAX, "/dev/%s", dev); - fd = open(buf, O_RDWR | O_NONBLOCK); - if (fd == -1) - warn("opening `%s' and `%s'", dev, buf); - } else - warn("opening `%s'", dev); - } - return (fd); + if (how != 0) + usage(); + how = h; } -static int +static void usage(void) { - fprintf(stderr, "usage: %s \n", - getprogname()); - return (EX_USAGE); + fprintf(stderr, "usage: %s -[c|l|t] \n", getprogname()); + exit(EX_USAGE); } From owner-p4-projects@FreeBSD.ORG Wed Sep 3 23:04:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10FC916A4C1; Wed, 3 Sep 2003 23:04:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF63416A4BF for ; Wed, 3 Sep 2003 23:04:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B7BF43F75 for ; Wed, 3 Sep 2003 23:04:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8464p0U064199 for ; Wed, 3 Sep 2003 23:04:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8464oHx064196 for perforce@freebsd.org; Wed, 3 Sep 2003 23:04:50 -0700 (PDT) Date: Wed, 3 Sep 2003 23:04:50 -0700 (PDT) Message-Id: <200309040604.h8464oHx064196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 06:04:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=37483 Change 37483 by marcel@marcel_nfs on 2003/09/03 23:04:00 Keep track of the patches I'm sending to njl@. This patch refines the way we print the RSD PTR and properly detects the RSDT or XSDT, depending on the revision. Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#14 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#14 (text+ko) ==== @@ -425,11 +425,22 @@ static void acpi_print_rsd_ptr(struct ACPIrsdp *rp) { + const char *version; printf(BEGIN_COMMENT); - printf(" RSD PTR: Checksum=%d, OEMID=", rp->sum); + printf(" RSD PTR: OEM="); acpi_print_string(rp->oem, 6); - printf(", RsdtAddress=0x%08x\n", rp->rsdt_addr); + switch (rp->revision) { + case 0: version = "ACPI 1.0"; break; + case 2: version = "ACPI 2.0"; break; + default: version = "unknown"; break; + } + printf(", rev=%s (%d)\n", version, rp->revision); + if (rp->revision >= 2) + printf("\tXSDT=0x%08lx, length=%u, cksum=%u\n", + (u_long)rp->xsdt_addr, rp->length, rp->xsum); + else + printf("\tRSDT=0x%08x, cksum=%u\n", rp->rsdt_addr, rp->sum); printf(END_COMMENT); } @@ -469,11 +480,17 @@ if (tflag) acpi_print_rsd_ptr(rp); - rsdp = (struct ACPIsdt *)acpi_map_sdt(rp->rsdt_addr); - if (memcmp(rsdp->signature, "RSDT", 4) != 0 || - acpi_checksum(rsdp, rsdp->len) != 0) - errx(1, "RSDT is corrupted"); - + if (rp->revision < 2) { + rsdp = (struct ACPIsdt *)acpi_map_sdt(rp->rsdt_addr); + if (memcmp(rsdp->signature, "RSDT", 4) != 0 || + acpi_checksum(rsdp, rsdp->len) != 0) + errx(1, "RSDT is corrupted"); + } else { + rsdp = (struct ACPIsdt *)acpi_map_sdt(rp->xsdt_addr); + if (memcmp(rsdp->signature, "XSDT", 4) != 0 || + acpi_checksum(rsdp, rsdp->len) != 0) + errx(1, "XSDT is corrupted"); + } return (rsdp); } From owner-p4-projects@FreeBSD.ORG Wed Sep 3 23:42:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26D8416A4C1; Wed, 3 Sep 2003 23:42:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D890716A4BF for ; Wed, 3 Sep 2003 23:42:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6864843FBD for ; Wed, 3 Sep 2003 23:42:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h846gb0U065707 for ; Wed, 3 Sep 2003 23:42:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h846gaDI065704 for perforce@freebsd.org; Wed, 3 Sep 2003 23:42:36 -0700 (PDT) Date: Wed, 3 Sep 2003 23:42:36 -0700 (PDT) Message-Id: <200309040642.h846gaDI065704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 06:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=37484 Change 37484 by marcel@marcel_nfs on 2003/09/03 23:42:28 Disable input flow control using CTS. I think the problem is that we're writing the status (ie parity error or framing error) into the receive FIFO. As such, we can only receive half as much characters than when we don't do that. The threshold at which RTS is deasserted is 28. Of course this assumes that we can write 32 characters in the FIFO. But if you write status bytes as wellm the FIFO is full at 16. Hence, we never reach the threshold. The alternative is to not write the status byte into the RFIFO, but that means that we won't know which character or characters in the FIFO have parity errors and/or framing errors. We just get an interrupt to tell us that the UART has detected some error, which given all the non-deterministic latencies is not informative. The Linux driver apparently marks ALL characters with the parity or framing error. I think that's rather brain- dead. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#22 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#22 (text+ko) ==== @@ -556,7 +556,7 @@ break; case SAB_VSTR_V_32: vstr = "v3.2"; - sc->sc_hwiflow = 1; + sc->sc_hwiflow = 0; /* CTS doesn't work with RFC:RFDF. */ sc->sc_hwoflow = 1; break; default: From owner-p4-projects@FreeBSD.ORG Thu Sep 4 07:52:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F59B16A4C2; Thu, 4 Sep 2003 07:52:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C47016A4BF for ; Thu, 4 Sep 2003 07:52:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B082443FCB for ; Thu, 4 Sep 2003 07:52:36 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84Eqa0U005713 for ; Thu, 4 Sep 2003 07:52:36 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84EqZ8B005710 for perforce@freebsd.org; Thu, 4 Sep 2003 07:52:35 -0700 (PDT) Date: Thu, 4 Sep 2003 07:52:35 -0700 (PDT) Message-Id: <200309041452.h84EqZ8B005710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 37493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 14:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=37493 Change 37493 by cvance@cvance_release on 2003/09/04 07:52:06 syslogd needs to send signals to a child process Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#2 (text+ko) ==== @@ -26,7 +26,7 @@ file_type_auto_trans(syslogd_t, var_run_t, syslogd_var_run_t) # Use capabilities. -allow syslogd_t syslogd_t:capability { net_bind_service dac_override }; +allow syslogd_t syslogd_t:capability { kill net_bind_service dac_override }; # Inherit and use descriptors from init. allow syslogd_t init_t:fd use; From owner-p4-projects@FreeBSD.ORG Thu Sep 4 12:48:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78E9C16A4C1; Thu, 4 Sep 2003 12:48:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C25C16A4BF for ; Thu, 4 Sep 2003 12:48:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B511E43FBD for ; Thu, 4 Sep 2003 12:48:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84Jml0U044452 for ; Thu, 4 Sep 2003 12:48:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84Jml55044449 for perforce@freebsd.org; Thu, 4 Sep 2003 12:48:47 -0700 (PDT) Date: Thu, 4 Sep 2003 12:48:47 -0700 (PDT) Message-Id: <200309041948.h84Jml55044449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 19:48:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=37521 Change 37521 by marcel@marcel_nfs on 2003/09/04 12:48:36 Patch 2: cleanup use of acpi_print_sdt(). Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#15 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#15 (text+ko) ==== @@ -55,7 +55,7 @@ static void acpi_print_apic(struct MADT_APIC *mp); static void acpi_handle_apic(struct ACPIsdt *sdp); static void acpi_handle_hpet(struct ACPIsdt *sdp); -static void acpi_print_sdt(struct ACPIsdt *sdp, int endcomment); +static void acpi_print_sdt(struct ACPIsdt *sdp); static void acpi_print_facp(struct FACPbody *facp); static void acpi_print_dsdt(struct ACPIsdt *dsdp); static struct ACPIsdt * @@ -237,7 +237,8 @@ struct MADTbody *madtp; struct MADT_APIC *madt_apicp; - acpi_print_sdt(sdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); madtp = (struct MADTbody *) sdp->body; printf("\tLocal APIC ADDR=0x%08x\n", madtp->lapic_addr); printf("\tFlags={"); @@ -259,7 +260,8 @@ { struct HPETbody *hpetp; - acpi_print_sdt(sdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); hpetp = (struct HPETbody *) sdp->body; printf("\tHPET Number=%d\n", hpetp->hpet_number); printf("\tADDR=0x%08x\n", hpetp->base_addr); @@ -277,9 +279,9 @@ } static void -acpi_print_sdt(struct ACPIsdt *sdp, int endcomment) +acpi_print_sdt(struct ACPIsdt *sdp) { - printf(BEGIN_COMMENT " "); + printf(" "); acpi_print_string(sdp->signature, 4); printf(": Length=%d, Revision=%d, Checksum=%d,\n", sdp->len, sdp->rev, sdp->check); @@ -291,16 +293,15 @@ printf("\tCreator ID="); acpi_print_string(sdp->creator, 4); printf(", Creator Revision=0x%x\n", sdp->crerev); - if (endcomment) - printf(END_COMMENT); } static void acpi_print_rsdt(struct ACPIsdt *rsdp) { - int i, entries; + int i, entries; - acpi_print_sdt(rsdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(rsdp); entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); printf("\tEntries={ "); for (i = 0; i < entries; i++) { @@ -395,7 +396,9 @@ static void acpi_print_dsdt(struct ACPIsdt *dsdp) { - acpi_print_sdt(dsdp, /*endcomment*/1); + printf(BEGIN_COMMENT); + acpi_print_sdt(dsdp); + printf(END_COMMENT); } int @@ -451,8 +454,8 @@ int entries; struct ACPIsdt *sdp; + acpi_print_rsdt(rsdp); entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); - acpi_print_rsdt(rsdp); for (i = 0; i < entries; i++) { sdp = (struct ACPIsdt *)acpi_map_sdt(rsdp->body[i]); if (acpi_checksum(sdp, sdp->len)) @@ -464,7 +467,7 @@ else if (!memcmp(sdp->signature, "HPET", 4)) acpi_handle_hpet(sdp); else - acpi_print_sdt(sdp, /*endcomment*/1); + acpi_print_dsdt(sdp); } } From owner-p4-projects@FreeBSD.ORG Thu Sep 4 14:02:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4334516A4C1; Thu, 4 Sep 2003 14:02:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F13B116A4BF for ; Thu, 4 Sep 2003 14:02:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7110443FE5 for ; Thu, 4 Sep 2003 14:02:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84L2K0U048082 for ; Thu, 4 Sep 2003 14:02:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84L2JZ7048079 for perforce@freebsd.org; Thu, 4 Sep 2003 14:02:19 -0700 (PDT) Date: Thu, 4 Sep 2003 14:02:19 -0700 (PDT) Message-Id: <200309042102.h84L2JZ7048079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 21:02:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=37527 Change 37527 by marcel@marcel_nfs on 2003/09/04 14:01:30 Patch 3: Introduce addr_size to handle 32-bit and 64-bit addresses. Use le32dec() and le64dec() since ACPI is little endian misaligned by definition. Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#16 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#16 (text+ko) ==== @@ -27,8 +27,8 @@ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.10 2003/08/28 03:33:07 njl Exp $ */ -#include #include +#include #include #include #include @@ -58,11 +58,15 @@ static void acpi_print_sdt(struct ACPIsdt *sdp); static void acpi_print_facp(struct FACPbody *facp); static void acpi_print_dsdt(struct ACPIsdt *dsdp); -static struct ACPIsdt * - acpi_map_sdt(vm_offset_t pa); +static struct ACPIsdt *acpi_map_sdt(vm_offset_t pa); static void acpi_print_rsd_ptr(struct ACPIrsdp *rp); static void acpi_handle_rsdt(struct ACPIsdt *rsdp); +/* + * Size of an address. 32-bit for ACPI 1.0, 64-bit for ACPI 2.0 and up. + */ +static int addr_size; + static void acpi_print_string(char *s, size_t length) { @@ -299,15 +303,26 @@ acpi_print_rsdt(struct ACPIsdt *rsdp) { int i, entries; + u_long addr; printf(BEGIN_COMMENT); acpi_print_sdt(rsdp); - entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); + entries = (rsdp->len - SIZEOF_SDT_HDR) / addr_size; printf("\tEntries={ "); for (i = 0; i < entries; i++) { if (i > 0) printf(", "); - printf("0x%08x", rsdp->body[i]); + switch (addr_size) { + case 4: + addr = le32dec((char*)rsdp->body + i * addr_size); + break; + case 8: + addr = le64dec((char*)rsdp->body + i * addr_size); + break; + default: + assert((addr = 0)); + } + printf("0x%08lx", addr); } printf(" }\n"); printf(END_COMMENT); @@ -450,14 +465,24 @@ static void acpi_handle_rsdt(struct ACPIsdt *rsdp) { - int i; - int entries; - struct ACPIsdt *sdp; + struct ACPIsdt *sdp; + vm_offset_t addr; + int entries, i; acpi_print_rsdt(rsdp); - entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); + entries = (rsdp->len - SIZEOF_SDT_HDR) / addr_size; for (i = 0; i < entries; i++) { - sdp = (struct ACPIsdt *)acpi_map_sdt(rsdp->body[i]); + switch (addr_size) { + case 4: + addr = le32dec((char*)rsdp->body + i * addr_size); + break; + case 8: + addr = le64dec((char*)rsdp->body + i * addr_size); + break; + default: + assert((addr = 0)); + } + sdp = (struct ACPIsdt *)acpi_map_sdt(addr); if (acpi_checksum(sdp, sdp->len)) errx(1, "RSDT entry %d is corrupt", i); if (!memcmp(sdp->signature, "FACP", 4)) @@ -488,11 +513,13 @@ if (memcmp(rsdp->signature, "RSDT", 4) != 0 || acpi_checksum(rsdp, rsdp->len) != 0) errx(1, "RSDT is corrupted"); + addr_size = sizeof(uint32_t); } else { rsdp = (struct ACPIsdt *)acpi_map_sdt(rp->xsdt_addr); if (memcmp(rsdp->signature, "XSDT", 4) != 0 || acpi_checksum(rsdp, rsdp->len) != 0) errx(1, "XSDT is corrupted"); + addr_size = sizeof(uint64_t); } return (rsdp); } @@ -568,17 +595,28 @@ struct ACPIsdt * sdt_from_rsdt(struct ACPIsdt *rsdt, const char *sig) { - int i; - int entries; - struct ACPIsdt *sdt; + struct ACPIsdt *sdt; + vm_offset_t addr; + int entries, i; - entries = (rsdt->len - SIZEOF_SDT_HDR) / sizeof(uint32_t); + entries = (rsdt->len - SIZEOF_SDT_HDR) / addr_size; for (i = 0; i < entries; i++) { - sdt = (struct ACPIsdt *)acpi_map_sdt(rsdt->body[i]); + switch (addr_size) { + case 4: + addr = le32dec((char*)rsdt->body + i * addr_size); + break; + case 8: + addr = le64dec((char*)rsdt->body + i * addr_size); + break; + default: + assert((addr = 0)); + } + sdt = (struct ACPIsdt *)acpi_map_sdt(addr); + if (memcmp(sdt->signature, sig, strlen(sig))) + continue; if (acpi_checksum(sdt, sdt->len)) errx(1, "RSDT entry %d is corrupt", i); - if (!memcmp(sdt->signature, sig, strlen(sig))) - return (sdt); + return (sdt); } return (NULL); From owner-p4-projects@FreeBSD.ORG Thu Sep 4 14:45:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A19B816A4C1; Thu, 4 Sep 2003 14:45:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6697C16A4BF for ; Thu, 4 Sep 2003 14:45:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F204843FCB for ; Thu, 4 Sep 2003 14:45:16 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84LjG0U050809 for ; Thu, 4 Sep 2003 14:45:16 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84LjGsx050806 for perforce@freebsd.org; Thu, 4 Sep 2003 14:45:16 -0700 (PDT) Date: Thu, 4 Sep 2003 14:45:16 -0700 (PDT) Message-Id: <200309042145.h84LjGsx050806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 21:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=37532 Change 37532 by sam@sam_ebb on 2003/09/04 14:44:21 Reduce window during which a race can occur when detaching an interface from each descriptor that references it. This is just a bandaid; the locking here is bogus. Affected files ... .. //depot/projects/netperf/sys/net/bpf.c#5 edit Differences ... ==== //depot/projects/netperf/sys/net/bpf.c#5 (text+ko) ==== @@ -278,7 +278,9 @@ struct bpf_d **p; struct bpf_if *bp; + /* XXX locking */ bp = d->bd_bif; + d->bd_bif = 0; /* * Check if this descriptor had requested promiscuous mode. * If so, turn it off. @@ -310,9 +312,8 @@ /* * Let the driver know that there are no more listeners. */ - *d->bd_bif->bif_driverp = 0; + *bp->bif_driverp = 0; BPFIF_UNLOCK(bp); - d->bd_bif = 0; } /* From owner-p4-projects@FreeBSD.ORG Thu Sep 4 14:47:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C5D716A4C1; Thu, 4 Sep 2003 14:47:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2023C16A4BF for ; Thu, 4 Sep 2003 14:47:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BD5843FF7 for ; Thu, 4 Sep 2003 14:47:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84LlK0U050906 for ; Thu, 4 Sep 2003 14:47:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84LlJt3050903 for perforce@freebsd.org; Thu, 4 Sep 2003 14:47:19 -0700 (PDT) Date: Thu, 4 Sep 2003 14:47:19 -0700 (PDT) Message-Id: <200309042147.h84LlJt3050903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 21:47:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=37533 Change 37533 by sam@sam_ebb on 2003/09/04 14:46:32 Add missing bpfdetach calls. These potentially caused the driver softc to be modified after free if dhclient was active as the interface was detached at the 802.11 and Ethernet layers but not the driver. Consequently when dhclient closed it's file descriptor the bpf code blindly wrote to the softc structure. Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#12 edit .. //depot/projects/netperf/sys/dev/wi/if_wi.c#7 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -332,6 +332,7 @@ mtx_lock(&sc->sc_mtx); ath_stop(ifp); + bpfdetach(ifp); ath_desc_free(sc); ath_hal_detach(sc->sc_ah); ieee80211_ifdetach(ifp); ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#7 (text+ko) ==== @@ -506,6 +506,9 @@ wi_stop(ifp, 0); +#if NBPFILTER > 0 + bpfdetach(ifp); +#endif ieee80211_ifdetach(ifp); WI_UNLOCK(sc); bus_teardown_intr(dev, sc->irq, sc->wi_intrhand); From owner-p4-projects@FreeBSD.ORG Thu Sep 4 15:37:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2944216A4C1; Thu, 4 Sep 2003 15:37:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D783616A4BF for ; Thu, 4 Sep 2003 15:37:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F2A54400B for ; Thu, 4 Sep 2003 15:37:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84MbN0U053587 for ; Thu, 4 Sep 2003 15:37:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84MbMi1053584 for perforce@freebsd.org; Thu, 4 Sep 2003 15:37:22 -0700 (PDT) Date: Thu, 4 Sep 2003 15:37:22 -0700 (PDT) Message-Id: <200309042237.h84MbMi1053584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 22:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=37537 Change 37537 by sam@sam_ebb on 2003/09/04 15:37:05 IFC Affected files ... .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/netperf/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/netperf/sys/geom/geom_dev.c#5 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#7 integrate .. //depot/projects/netperf/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/netperf/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/netperf/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/netperf/sys/sys/ioctl_bt848.h#1 branch .. //depot/projects/netperf/sys/sys/ioctl_meteor.h#1 branch Differences ... ==== //depot/projects/netperf/sys/cam/scsi/scsi_da.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.158 2003/09/03 12:31:03 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.159 2003/09/04 01:01:20 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -327,14 +327,6 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "NO BRAND", "PEN DRIVE", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, - { - /* - * FujiFilm Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", - "USB-DRIVEUNIT", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, { /* * Minolta Dimage E203 ==== //depot/projects/netperf/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.54 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.56 2003/09/04 16:30:03 njl Exp $"); #include #include @@ -809,6 +809,7 @@ /* If we're no longer enabled, throw away CCB */ if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { targfreeccb(softc, done_ccb); + TARG_UNLOCK(softc); return; } /* abort_all_pending() waits for pending queue to be empty */ @@ -822,6 +823,7 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); + TARG_UNLOCK(softc); notify_user(softc); break; default: @@ -829,7 +831,6 @@ done_ccb->ccb_h.func_code); /* NOTREACHED */ } - TARG_UNLOCK(softc); } /* Return CCBs to the user from the user queue and abort queue */ @@ -1095,8 +1096,19 @@ /* If we aborted anything from the work queue, wakeup user. */ if (!TAILQ_EMPTY(&softc->user_ccb_queue) - || !TAILQ_EMPTY(&softc->abort_queue)) + || !TAILQ_EMPTY(&softc->abort_queue)) { + /* + * XXX KNOTE calls back into targreadfilt, causing a + * lock recursion. So unlock around calls to it although + * this may open up a race allowing a user to submit + * another CCB after we have aborted all pending ones + * A better approach is to mark the softc as dying + * under lock and check for this in targstart(). + */ + TARG_UNLOCK(softc); notify_user(softc); + TARG_LOCK(softc); + } } /* Notify the user that data is ready */ ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.97 2003/08/29 04:02:19 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.98 2003/09/04 15:55:41 njl Exp $ */ #include "opt_acpi.h" @@ -1232,8 +1232,8 @@ status = AcpiEvaluateObject(handle, path, NULL, &buf); if (ACPI_SUCCESS(status)) status = acpi_ConvertBufferToInteger(&buf, number); + AcpiOsFree(buf.Pointer); } - AcpiOsFree(buf.Pointer); } return (status); } ==== //depot/projects/netperf/sys/dev/pci/pcireg.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.36 2003/09/02 17:11:27 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.37 2003/09/03 17:48:22 jhb Exp $ * */ @@ -81,6 +81,9 @@ #define PCIR_CACHELNSZ 0x0c #define PCIR_LATTIMER 0x0d #define PCIR_HDRTYPE 0x0e +#ifndef BURN_BRIDGES +#define PCIR_HEADERTYPE PCIR_HDRTYPE +#endif #define PCIM_HDRTYPE 0x7f #define PCIM_HDRTYPE_NORMAL 0x00 #define PCIM_HDRTYPE_BRIDGE 0x01 ==== //depot/projects/netperf/sys/geom/geom_dev.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.67 2003/09/01 20:45:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.68 2003/09/04 21:23:46 phk Exp $"); #include #include @@ -330,8 +330,8 @@ default: if (cp->provider->geom->ioctl != NULL) { error = cp->provider->geom->ioctl(cp->provider, cmd, data, td); - if (error != ENOIOCTL) - return (error); + } else { + error = ENOIOCTL; } } ==== //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.209 2003/09/02 16:46:31 dds Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.210 2003/09/04 11:27:13 dds Exp $"); /* * vnode op calls for Sun NFS version 2 and 3 @@ -285,7 +285,7 @@ } m_freem(mrep); nfsmout: - return error; + return (error); } /* @@ -960,9 +960,9 @@ case VREG: return (nfs_bioread(vp, ap->a_uio, ap->a_ioflag, ap->a_cred)); case VDIR: - return EISDIR; + return (EISDIR); default: - return EOPNOTSUPP; + return (EOPNOTSUPP); } } @@ -1286,7 +1286,7 @@ nfs_mknod(struct vop_mknod_args *ap) { - return nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap); + return (nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap)); } static u_long create_verf; ==== //depot/projects/netperf/sys/pci/if_rl.c#7 (text+ko) ==== @@ -134,7 +134,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.114 2003/09/02 17:30:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.115 2003/09/04 15:39:44 tmm Exp $"); #include #include @@ -2673,8 +2673,10 @@ * register write enable" mode to modify the ID registers. */ CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_WRITECFG); - CSR_WRITE_4(sc, RL_IDR0, *(u_int32_t *)(&sc->arpcom.ac_enaddr[0])); - CSR_WRITE_4(sc, RL_IDR4, *(u_int32_t *)(&sc->arpcom.ac_enaddr[4])); + CSR_WRITE_STREAM_4(sc, RL_IDR0, + *(u_int32_t *)(&sc->arpcom.ac_enaddr[0])); + CSR_WRITE_STREAM_4(sc, RL_IDR4, + *(u_int32_t *)(&sc->arpcom.ac_enaddr[4])); CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); /* ==== //depot/projects/netperf/sys/pci/if_rlreg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.33 2003/08/15 22:47:55 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.34 2003/09/04 15:39:44 tmm Exp $ */ /* @@ -667,6 +667,8 @@ /* * register space access macros */ +#define CSR_WRITE_STREAM_4(sc, reg, val) \ + bus_space_write_stream_4(sc->rl_btag, sc->rl_bhandle, reg, val) #define CSR_WRITE_4(sc, reg, val) \ bus_space_write_4(sc->rl_btag, sc->rl_bhandle, reg, val) #define CSR_WRITE_2(sc, reg, val) \ ==== //depot/projects/netperf/sys/sparc64/pci/psycho.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp * - * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.43 2003/08/23 00:11:15 imp Exp $ + * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.44 2003/09/04 15:25:10 tmm Exp $ */ /* @@ -745,12 +745,14 @@ struct psycho_softc *sc = (struct psycho_softc *)arg; u_int64_t afar, afsr; - PSYCHO_WRITE8(sc, PSR_CE_INT_CLR, 0); afar = PSYCHO_READ8(sc, PSR_CE_AFA); afsr = PSYCHO_READ8(sc, PSR_CE_AFS); /* It's correctable. Dump the regs and continue. */ device_printf(sc->sc_dev, "correctable DMA error AFAR %#lx " "AFSR %#lx\n", (u_long)afar, (u_long)afsr); + /* Clear the error bits that we caught. */ + PSYCHO_WRITE8(sc, PSR_CE_AFS, afsr & CEAFSR_ERRMASK); + PSYCHO_WRITE8(sc, PSR_CE_INT_CLR, 0); } static void ==== //depot/projects/netperf/sys/sparc64/pci/psychoreg.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp * - * $FreeBSD: src/sys/sparc64/pci/psychoreg.h,v 1.6 2003/01/06 16:51:06 tmm Exp $ + * $FreeBSD: src/sys/sparc64/pci/psychoreg.h,v 1.7 2003/09/04 15:25:10 tmm Exp $ */ #ifndef _SPARC64_PCI_PSYCHOREG_H_ @@ -232,13 +232,28 @@ #define PCICTL_6ENABLE 0x000000000000003f /* enable 6 PCI slots */ /* Uncorrectable error asynchronous fault status registers */ -#define UEAFSR_BLK (1UL << 22) /* pri. error caused by read */ -#define UEAFSR_P_DTE (1UL << 56) /* pri. DMA translation error */ -#define UEAFSR_S_DTE (1UL << 57) /* sec. DMA translation error */ -#define UEAFSR_S_DWR (1UL << 58) /* sec. error during write */ -#define UEAFSR_S_DRD (1UL << 59) /* sec. error during read */ -#define UEAFSR_P_DWR (1UL << 61) /* pri. error during write */ -#define UEAFSR_P_DRD (1UL << 62) /* pri. error during read */ +#define UEAFSR_BLK (1UL << 23) /* Error caused by block transaction. */ +#define UEAFSR_P_DTE (1UL << 56) /* Pri. DVMA translation error. */ +#define UEAFSR_S_DTE (1UL << 57) /* Sec. DVMA translation error. */ +#define UEAFSR_S_DWR (1UL << 58) /* Sec. error during DVMA write. */ +#define UEAFSR_S_DRD (1UL << 59) /* Sec. error during DVMA read. */ +#define UEAFSR_S_PIO (1UL << 60) /* Sec. error during PIO access. */ +#define UEAFSR_P_DWR (1UL << 61) /* Pri. error during DVMA write. */ +#define UEAFSR_P_DRD (1UL << 62) /* Pri. error during DVMA read. */ +#define UEAFSR_P_PIO (1UL << 63) /* Pri. error during PIO access. */ + +/* Correctable error asynchronous fault status registers */ +#define CEAFSR_BLK (1UL << 23) /* Error caused by block transaction. */ +#define CEAFSR_S_DWR (1UL << 58) /* Sec. error caused by DVMA write. */ +#define CEAFSR_S_DRD (1UL << 59) /* Sec. error caused by DVMA read. */ +#define CEAFSR_S_PIO (1UL << 60) /* Sec. error caused by PIO access. */ +#define CEAFSR_P_DWR (1UL << 61) /* Pri. error caused by DVMA write. */ +#define CEAFSR_P_DRD (1UL << 62) /* Pri. error caused by DVMA read. */ +#define CEAFSR_P_PIO (1UL << 63) /* Pri. error caused by PIO access. */ + +#define CEAFSR_ERRMASK \ + (CEAFSR_P_PIO | CEAFSR_P_DRD | CEAFSR_P_DWR | \ + CEAFSR_S_PIO | CEAFSR_S_DRD | CEAFSR_S_DWR) /* Definitions for the target address space register. */ #define PCITAS_ADDR_SHIFT 29 From owner-p4-projects@FreeBSD.ORG Thu Sep 4 16:26:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAD3916A4C1; Thu, 4 Sep 2003 16:26:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DAB616A4BF for ; Thu, 4 Sep 2003 16:26:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E40F743FF5 for ; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84NQN0U056175 for ; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84NQNQt056172 for perforce@freebsd.org; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) Date: Thu, 4 Sep 2003 16:26:23 -0700 (PDT) Message-Id: <200309042326.h84NQNQt056172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 23:26:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=37539 Change 37539 by sam@sam_ebb on 2003/09/04 16:26:00 remove unneeded domain list locking Affected files ... .. //depot/projects/netperf/sys/kern/subr_mbuf.c#6 edit .. //depot/projects/netperf/sys/kern/vfs_export.c#4 edit .. //depot/projects/netperf/sys/net/radix.c#3 edit .. //depot/projects/netperf/sys/net/route.c#8 edit .. //depot/projects/netperf/sys/sys/domain.h#3 edit Differences ... ==== //depot/projects/netperf/sys/kern/subr_mbuf.c#6 (text+ko) ==== @@ -1033,12 +1033,10 @@ mbstat.m_drain++; /* XXX: No consistency. */ - DOMAIN_LOCK(); for (dp = domains; dp != NULL; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_drain != NULL) (*pr->pr_drain)(); - DOMAIN_UNLOCK(); } /****************************************************************************** ==== //depot/projects/netperf/sys/kern/vfs_export.c#4 (text+ko) ==== @@ -146,14 +146,12 @@ * Seems silly to initialize every AF when most are not used, * do so on demand here */ - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_family == i && dom->dom_rtattach) { dom->dom_rtattach((void **) &nep->ne_rtable[i], dom->dom_rtoffset); break; } - DOMAIN_UNLOCK(); if ((rnh = nep->ne_rtable[i]) == NULL) { error = ENOBUFS; goto out; ==== //depot/projects/netperf/sys/net/radix.c#3 (text+ko) ==== @@ -1059,11 +1059,9 @@ #ifdef _KERNEL struct domain *dom; - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_maxrtkey > max_keylen) max_keylen = dom->dom_maxrtkey; - DOMAIN_UNLOCK(); #endif if (max_keylen == 0) { log(LOG_ERR, ==== //depot/projects/netperf/sys/net/route.c#8 (text+ko) ==== @@ -67,12 +67,10 @@ rtable_init(void **table) { struct domain *dom; - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_rtattach) dom->dom_rtattach(&table[dom->dom_family], dom->dom_rtoffset); - DOMAIN_UNLOCK(); } void ==== //depot/projects/netperf/sys/sys/domain.h#3 (text+ko) ==== @@ -67,10 +67,6 @@ extern struct domain *domains; extern struct domain localdomain; extern void net_add_domain(void *); -extern struct mtx dom_mtx; - -#define DOMAIN_LOCK() mtx_lock(&dom_mtx) -#define DOMAIN_UNLOCK() mtx_unlock(&dom_mtx) #define DOMAIN_SET(name) \ SYSINIT(domain_ ## name, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, net_add_domain, & name ## domain) From owner-p4-projects@FreeBSD.ORG Thu Sep 4 16:31:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD2916A4C1; Thu, 4 Sep 2003 16:31:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33D4816A4BF for ; Thu, 4 Sep 2003 16:31:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFC8D43FE9 for ; Thu, 4 Sep 2003 16:31:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84NVU0U056419 for ; Thu, 4 Sep 2003 16:31:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84NVUL8056416 for perforce@freebsd.org; Thu, 4 Sep 2003 16:31:30 -0700 (PDT) Date: Thu, 4 Sep 2003 16:31:30 -0700 (PDT) Message-Id: <200309042331.h84NVUL8056416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 23:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=37540 Change 37540 by sam@sam_ebb on 2003/09/04 16:30:50 diff reduction Affected files ... .. //depot/projects/netperf/sys/netinet/in_pcb.h#4 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_pcb.h#4 (text+ko) ==== @@ -261,9 +261,6 @@ #define INP_INFO_RUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) #define INP_INFO_WUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) -#define INP_INFO_RLOCK_ASSERT(ipi) mtx_assert(&(ipi)->ipi_mtx, MA_OWNED) -#define INP_INFO_WLOCK_ASSERT(ipi) mtx_assert(&(ipi)->ipi_mtx, MA_OWNED) - #define INP_PCBHASH(faddr, lport, fport, mask) \ (((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask)) #define INP_PCBPORTHASH(lport, mask) \ From owner-p4-projects@FreeBSD.ORG Thu Sep 4 18:42:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35B6416A4C1; Thu, 4 Sep 2003 18:42:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BADE416A4BF for ; Thu, 4 Sep 2003 18:42:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D04143FE0 for ; Thu, 4 Sep 2003 18:42:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h851g90U068372 for ; Thu, 4 Sep 2003 18:42:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h851g9Pl068369 for perforce@freebsd.org; Thu, 4 Sep 2003 18:42:09 -0700 (PDT) Date: Thu, 4 Sep 2003 18:42:09 -0700 (PDT) Message-Id: <200309050142.h851g9Pl068369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 01:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=37543 Change 37543 by marcel@marcel_nfs on 2003/09/04 18:41:32 Atomically update sc->sc_hwsig. This avoids having to use a lock, which pessimizes the common case more than the overhead of the cmpset operation. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#26 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#25 edit .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#23 edit .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#11 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#26 (text+ko) ==== @@ -119,7 +119,7 @@ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ int sc_altbrk; /* State for alt break sequence. */ - int sc_hwsig; /* Signal state. Used by HW driver. */ + uint32_t sc_hwsig; /* Signal state. Used by HW driver. */ /* Receiver data. */ uint16_t *sc_rxbuf; ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#25 (text+ko) ==== @@ -441,16 +441,19 @@ static int ns8250_bus_getsig(struct uart_softc *sc) { - int sig; + uint32_t new, old, sig; uint8_t msr; - msr = uart_getreg(&sc->sc_bas, REG_MSR); - sig = sc->sc_hwsig; - SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); - SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); - sc->sc_hwsig = sig & ~UART_SIGMASK_DELTA; + do { + old = sc->sc_hwsig; + sig = old; + msr = uart_getreg(&sc->sc_bas, REG_MSR); + SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); + SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + new = sig & ~UART_SIGMASK_DELTA; + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -677,20 +680,25 @@ { struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; struct uart_bas *bas; + uint32_t new, old; bas = &sc->sc_bas; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, sc->sc_hwsig, UART_SIG_DTR, - UART_SIG_DDTR); - } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, sc->sc_hwsig, UART_SIG_RTS, - UART_SIG_DRTS); - } + do { + old = sc->sc_hwsig; + new = old; + if (sig & UART_SIG_DDTR) { + SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, + UART_SIG_DDTR); + } + if (sig & UART_SIG_DRTS) { + SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, + UART_SIG_DRTS); + } + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); ns8250->mcr &= ~(MCR_DTR|MCR_RTS); - if (sc->sc_hwsig & UART_SIG_DTR) + if (new & UART_SIG_DTR) ns8250->mcr |= MCR_DTR; - if (sc->sc_hwsig & UART_SIG_RTS) + if (new & UART_SIG_RTS) ns8250->mcr |= MCR_RTS; uart_setreg(bas, REG_MCR, ns8250->mcr); uart_barrier(bas); ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#23 (text+ko) ==== @@ -429,19 +429,22 @@ sab82532_bus_getsig(struct uart_softc *sc) { struct uart_bas *bas; - int sig; + uint32_t new, old, sig; uint8_t pvr, star, vstr; bas = &sc->sc_bas; - sig = sc->sc_hwsig; - star = uart_getreg(bas, SAB_STAR); - SIGCHG(star & SAB_STAR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - vstr = uart_getreg(bas, SAB_VSTR); - SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD); - pvr = uart_getreg(bas, SAB_PVR); - pvr &= (IS_CHANNEL_A(bas)) ? SAB_PVR_DSR_A : SAB_PVR_DSR_B; - SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); - sc->sc_hwsig = sig & ~UART_SIGMASK_DELTA; + do { + old = sc->sc_hwsig; + sig = old; + star = uart_getreg(bas, SAB_STAR); + SIGCHG(star & SAB_STAR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + vstr = uart_getreg(bas, SAB_VSTR); + SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD); + pvr = uart_getreg(bas, SAB_PVR); + pvr &= (IS_CHANNEL_A(bas)) ? SAB_PVR_DSR_A : SAB_PVR_DSR_B; + SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); + new = sig & ~UART_SIGMASK_DELTA; + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -607,25 +610,34 @@ sab82532_bus_setsig(struct uart_softc *sc, int sig) { struct uart_bas *bas; + uint32_t new, old; uint8_t mode, pvr; bas = &sc->sc_bas; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, sc->sc_hwsig, UART_SIG_DTR, - UART_SIG_DDTR); - } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, sc->sc_hwsig, UART_SIG_RTS, - UART_SIG_DRTS); - } + do { + old = sc->sc_hwsig; + new = old; + if (sig & UART_SIG_DDTR) { + SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, + UART_SIG_DDTR); + } + if (sig & UART_SIG_DRTS) { + SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, + UART_SIG_DRTS); + } + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); + + /* Set DTR pin. */ pvr = uart_getreg(bas, SAB_PVR); - if (sc->sc_hwsig & UART_SIG_DTR) + if (new & UART_SIG_DTR) pvr &= (IS_CHANNEL_A(bas)) ? ~SAB_PVR_DTR_A : ~SAB_PVR_DTR_B; else pvr |= (IS_CHANNEL_A(bas)) ? SAB_PVR_DTR_A : SAB_PVR_DTR_B; uart_setreg(bas, SAB_PVR, pvr); + + /* Set RTS pin. */ mode = uart_getreg(bas, SAB_MODE); - if (sc->sc_hwsig & UART_SIG_RTS) + if (new & UART_SIG_RTS) mode &= ~SAB_MODE_FRTS; else mode |= SAB_MODE_FRTS; ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#11 (text+ko) ==== @@ -334,14 +334,19 @@ static int z8530_bus_getsig(struct uart_softc *sc) { - int sig; + struct uart_bas *bas; + uint32_t new, old, sig; uint8_t bes; - sig = sc->sc_hwsig; - bes = uart_getmreg(&sc->sc_bas, RR_BES); - SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - sc->sc_hwsig = sig & ~UART_SIGMASK_DELTA; + bas = &sc->sc_bas; + do { + old = sc->sc_hwsig; + sig = old; + bes = uart_getmreg(bas, RR_BES); + SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + new = sig & ~UART_SIGMASK_DELTA; + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -372,6 +377,7 @@ { struct uart_bas *bas; int ipend; + uint32_t sig; uint8_t bes, src; bas = &sc->sc_bas; @@ -389,9 +395,10 @@ } if (bes & BES_RXA) ipend |= UART_IPEND_RXREADY; - SIGCHG(bes & BES_CTS, sc->sc_hwsig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sc->sc_hwsig, UART_SIG_DCD, UART_SIG_DDCD); - if (sc->sc_hwsig & UART_SIGMASK_DELTA) + sig = sc->sc_hwsig; + SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + if (sig & UART_SIGMASK_DELTA) ipend |= UART_IPEND_SIGCHG; src = uart_getmreg(bas, RR_SRC); if (src & SRC_OVR) { @@ -461,21 +468,27 @@ { struct z8530_softc *z8530 = (struct z8530_softc*)sc; struct uart_bas *bas; + uint32_t new, old; bas = &sc->sc_bas; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, sc->sc_hwsig, UART_SIG_DTR, - UART_SIG_DDTR); - } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, sc->sc_hwsig, UART_SIG_RTS, - UART_SIG_DRTS); - } - if (sc->sc_hwsig & UART_SIG_DTR) + do { + old = sc->sc_hwsig; + new = old; + if (sig & UART_SIG_DDTR) { + SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, + UART_SIG_DDTR); + } + if (sig & UART_SIG_DRTS) { + SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, + UART_SIG_DRTS); + } + } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); + + if (new & UART_SIG_DTR) z8530->tpc |= TPC_DTR; else z8530->tpc &= ~TPC_DTR; - if (sc->sc_hwsig & UART_SIG_RTS) + if (new & UART_SIG_RTS) z8530->tpc |= TPC_RTS; else z8530->tpc &= ~TPC_RTS; From owner-p4-projects@FreeBSD.ORG Thu Sep 4 23:54:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4E0816A4C1; Thu, 4 Sep 2003 23:54:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 984F016A4BF for ; Thu, 4 Sep 2003 23:54:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FD0C44003 for ; Thu, 4 Sep 2003 23:54:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h856sg0U090454 for ; Thu, 4 Sep 2003 23:54:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h856sgGn090451 for perforce@freebsd.org; Thu, 4 Sep 2003 23:54:42 -0700 (PDT) Date: Thu, 4 Sep 2003 23:54:42 -0700 (PDT) Message-Id: <200309050654.h856sgGn090451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37554 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 06:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=37554 Change 37554 by marcel@marcel_nfs on 2003/09/04 23:53:59 Clear DTR and RTS for non-system devices and get the current DCE signals. This creates a cleaner initial state. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#24 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#24 (text+ko) ==== @@ -397,6 +397,10 @@ imr1 = SAB_IMR1_BRKT|SAB_IMR1_ALLS|SAB_IMR1_CSC; uart_setreg(bas, SAB_IMR1, 0xff & ~imr1); uart_barrier(bas); + + if (sc->sc_sysdev == NULL) + sab82532_bus_setsig(sc, UART_SIG_DDTR|UART_SIG_DRTS); + (void)sab82532_bus_getsig(sc); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Sep 5 00:04:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFE0716A4C1; Fri, 5 Sep 2003 00:04:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BD2F16A4BF for ; Fri, 5 Sep 2003 00:04:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E33143F75 for ; Fri, 5 Sep 2003 00:04:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8574t0U091755 for ; Fri, 5 Sep 2003 00:04:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8574tMk091752 for perforce@freebsd.org; Fri, 5 Sep 2003 00:04:55 -0700 (PDT) Date: Fri, 5 Sep 2003 00:04:55 -0700 (PDT) Message-Id: <200309050704.h8574tMk091752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37555 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 07:04:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37555 Change 37555 by marcel@marcel_nfs on 2003/09/05 00:04:10 Slightly change how sc_hwsig is to be used. We allow direct reads of even the DCE signals if accuracy is not of the highest importance. This, for example, applies to the TIOCMGET ioctl. The reason for this is that we avoid using UART_GETSIG() gratuitously. Since UART_GETSIG() gets the signals from the UART itself, it not only has the side-effect of clearing the delta bits, but also to suppress interrupts. We don't want that. Now that sc->sc_hwsig is updated atomically, any (atomic) read will yield a true representation of how signals are or have been without affecting the operation of the UART itself. Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.c#14 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_tty.c#14 (text+ko) ==== @@ -425,7 +425,7 @@ /* * Handle initial DCD. */ - if ((UART_GETSIG(sc) & UART_SIG_DCD) || sc->sc_callout) + if ((sc->sc_hwsig & UART_SIG_DCD) || sc->sc_callout) (*linesw[tp->t_line].l_modem)(tp, 1); } /* @@ -546,7 +546,7 @@ UART_SETSIG(sc, sig); break; case TIOCMGET: - sig = UART_GETSIG(sc); + sig = sc->sc_hwsig; bits = TIOCM_LE; if (sig & UART_SIG_DTR) bits |= TIOCM_DTR; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 01:00:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8798A16A4C1; Fri, 5 Sep 2003 01:00:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3465A16A4BF for ; Fri, 5 Sep 2003 01:00:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B883043FF7 for ; Fri, 5 Sep 2003 01:00:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h858030U002015 for ; Fri, 5 Sep 2003 01:00:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85803l1002012 for perforce@freebsd.org; Fri, 5 Sep 2003 01:00:03 -0700 (PDT) Date: Fri, 5 Sep 2003 01:00:03 -0700 (PDT) Message-Id: <200309050800.h85803l1002012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 08:00:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=37557 Change 37557 by marcel@marcel_nfs on 2003/09/05 00:59:42 Send a pattern that allows us to detect lost data or (god forbid) spontaneous data. Affected files ... .. //depot/projects/uart/dev/uart/uarttest.c#3 edit Differences ... ==== //depot/projects/uart/dev/uart/uarttest.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ int fd, how; -char buffer[16384*4]; +u_char buffer[16384*4]; static int getsig(const char *dev, size_t count, int oldsig) @@ -85,6 +85,9 @@ ssize_t count, wc; int sig; + for (count = 0; count < sizeof(buffer); count++) + buffer[count] = count; + count = 0; errno = 0; sig = 0; @@ -103,9 +106,10 @@ dce(void) { ssize_t count, rc; - int sig; + int delta, diff, sig; count = 0; + delta = 0; errno = 0; sig = 0; while (count < sizeof(buffer)) { @@ -113,11 +117,20 @@ rc = MIN(16, sizeof(buffer) - count); rc = read(fd, buffer + count, rc); if (rc > 0) { - count += rc; + while (rc--) { + diff = buffer[count] - (u_char)count - delta; + if (diff) { + printf("ERR: %u (%d): ", count, delta); + printf("lost %d bytes\n", diff); + delta += diff; + } + count++; + } errno = 0; } else { - printf("sleeping after %u bytes...\n", count); - sleep(1); + printf("sleeping after %u (%d) bytes...\n", count, + delta); + sleep(2); } } @@ -198,8 +211,8 @@ break; } + sleep(2); tcsetattr(fd, TCSADRAIN, &t0); - sleep(1); close(fd); return (EX_OK); } From owner-p4-projects@FreeBSD.ORG Fri Sep 5 09:11:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9784716A4E0; Fri, 5 Sep 2003 09:11:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D22716A4F5 for ; Fri, 5 Sep 2003 09:11:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A390243F3F for ; Fri, 5 Sep 2003 09:11:17 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85GBH0U040196 for ; Fri, 5 Sep 2003 09:11:17 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85GBHDd040193 for perforce@freebsd.org; Fri, 5 Sep 2003 09:11:17 -0700 (PDT) Date: Fri, 5 Sep 2003 09:11:17 -0700 (PDT) Message-Id: <200309051611.h85GBHDd040193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 16:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=37575 Change 37575 by sam@sam_ebb on 2003/09/05 09:10:33 Locking fixups based on testing by Pavlin Radoslavov . Move up VIF_LOCK in add_mfc to insure lock order for ip_mdq. ip_mdq handling of bw_meter_receive_packet does not require an explicit MFC lock; use an existing lock. Affected files ... .. //depot/projects/netperf/sys/netinet/ip_mroute.c#9 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_mroute.c#9 (text+ko) ==== @@ -1116,6 +1116,7 @@ u_short nstl; int s; + VIF_LOCK(); MFC_LOCK(); rt = mfc_find(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr); @@ -1130,6 +1131,7 @@ update_mfc_params(rt, mfccp); MFC_UNLOCK(); + VIF_UNLOCK(); return 0; } @@ -1212,6 +1214,7 @@ } } MFC_UNLOCK(); + VIF_UNLOCK(); return 0; } @@ -1331,6 +1334,7 @@ } VIF_LOCK(); + MFC_LOCK(); if (imo && ((vifi = imo->imo_multicast_vif) < numvifs)) { if (ip->ip_ttl < 255) ip->ip_ttl++; /* compensate for -1 in *_send routines */ @@ -1344,6 +1348,7 @@ vifp->v_ifp->if_name, vifp->v_ifp->if_unit); } error = ip_mdq(m, ifp, NULL, vifi); + MFC_UNLOCK(); VIF_UNLOCK(); return error; } @@ -1359,6 +1364,7 @@ * or a packet destined to a local-only group. */ if (ip->ip_ttl <= 1 || ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP) { + MFC_UNLOCK(); VIF_UNLOCK(); return 0; } @@ -1366,14 +1372,13 @@ /* * Determine forwarding vifs from the forwarding cache table */ - MFC_LOCK(); ++mrtstat.mrts_mfc_lookups; rt = mfc_find(ip->ip_src.s_addr, ip->ip_dst.s_addr); /* Entry exists, so forward if necessary */ if (rt != NULL) { + error = ip_mdq(m, ifp, rt, -1); MFC_UNLOCK(); - error = ip_mdq(m, ifp, rt, -1); VIF_UNLOCK(); return error; } else { @@ -1744,10 +1749,9 @@ struct timeval now; GET_TIME(now); - MFC_LOCK(); + MFC_LOCK_ASSERT(); for (x = rt->mfc_bw_meter; x != NULL; x = x->bm_mfc_next) bw_meter_receive_packet(x, plen, &now); - MFC_UNLOCK(); } return 0; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 09:54:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B45A16A4C1; Fri, 5 Sep 2003 09:54:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 010AE16A4BF for ; Fri, 5 Sep 2003 09:54:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E1E64400F for ; Fri, 5 Sep 2003 09:54:14 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85GsE0U041668 for ; Fri, 5 Sep 2003 09:54:14 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85GsDX9041665 for perforce@freebsd.org; Fri, 5 Sep 2003 09:54:13 -0700 (PDT) Date: Fri, 5 Sep 2003 09:54:13 -0700 (PDT) Message-Id: <200309051654.h85GsDX9041665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 16:54:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37579 Change 37579 by sam@sam_ebb on 2003/09/05 09:53:24 o add compatibility sysctl's under !BURN_BRIDGES o change version string to use RCS keywords and to be visible in the mib o update comments to reflect revised mib naming Affected files ... .. //depot/projects/netperf/sys/net/bridge.c#5 edit Differences ... ==== //depot/projects/netperf/sys/net/bridge.c#5 (text+ko) ==== @@ -35,16 +35,16 @@ * identified by a "cluster-id" which is a number in the range 1..2^16-1. * * Bridging is enabled by the sysctl variable - * net.link.ether.bridge + * net.link.ether.bridge.enable * the grouping of interfaces into clusters is done with - * net.link.ether.bridge_cfg + * net.link.ether.bridge.config * containing a list of interfaces each optionally followed by * a colon and the cluster it belongs to (1 is the default). * Separators can be * spaces, commas or tabs, e.g. - * net.link.ether.bridge_cfg="fxp0:2 fxp1:2 dc0 dc1:1" + * net.link.ether.bridge.config="fxp0:2 fxp1:2 dc0 dc1:1" * Optionally bridged packets can be passed through the firewall, * this is controlled by the variable - * net.link.ether.bridge_ipfw + * net.link.ether.bridge.ipfw * * For each cluster there is a descriptor (cluster_softc) storing * the following data structures: @@ -193,6 +193,9 @@ SYSCTL_DECL(_net_link_ether); SYSCTL_NODE(_net_link_ether, OID_AUTO, bridge, CTLFLAG_RD, 0, "Bridge parameters"); +static char bridge_version[] = "$Revision$ $Date$"; +SYSCTL_STRING(_net_link_ether_bridge, OID_AUTO, version, CTLFLAG_RD, + bridge_version, 0, "software version"); #define BRIDGE_DEBUG #ifdef BRIDGE_DEBUG @@ -279,8 +282,7 @@ * System initialization */ static struct bdg_stats bdg_stats ; -/* NB: leave at net.link.ether so netstat continues to work */ -SYSCTL_STRUCT(_net_link_ether, PF_BDG, bdgstats, CTLFLAG_RD, +SYSCTL_STRUCT(_net_link_ether_bridge, OID_AUTO, stats, CTLFLAG_RD, &bdg_stats, bdg_stats, "bridge statistics"); static struct callout bdg_callout; @@ -609,6 +611,38 @@ SYSCTL_PROC(_net_link_ether_bridge, OID_AUTO, refresh, CTLTYPE_INT|CTLFLAG_WR, NULL, 0, &sysctl_refresh, "I", "iface refresh"); +#ifndef BURN_BRIDGES +#define SYSCTL_OID_COMPAT(parent, nbr, name, kind, a1, a2, handler, fmt, descr)\ + static struct sysctl_oid sysctl__##parent##_##name##_compat = { \ + &sysctl_##parent##_children, { 0 }, \ + nbr, kind, a1, a2, #name, handler, fmt, 0, descr }; \ + DATA_SET(sysctl_set, sysctl__##parent##_##name##_compat) +#define SYSCTL_INT_COMPAT(parent, nbr, name, access, ptr, val, descr) \ + SYSCTL_OID_COMPAT(parent, nbr, name, CTLTYPE_INT|(access), \ + ptr, val, sysctl_handle_int, "I", descr) +#define SYSCTL_STRUCT_COMPAT(parent, nbr, name, access, ptr, type, descr)\ + SYSCTL_OID_COMPAT(parent, nbr, name, CTLTYPE_OPAQUE|(access), \ + ptr, sizeof(struct type), sysctl_handle_opaque, \ + "S," #type, descr) +#define SYSCTL_PROC_COMPAT(parent, nbr, name, access, ptr, arg, handler, fmt, descr) \ + SYSCTL_OID_COMPAT(parent, nbr, name, (access), \ + ptr, arg, handler, fmt, descr) + +SYSCTL_INT_COMPAT(_net_link_ether, OID_AUTO, bridge_ipf, CTLFLAG_RW, + &bdg_ipf, 0,"Pass bridged pkts through IPFilter"); +SYSCTL_INT_COMPAT(_net_link_ether, OID_AUTO, bridge_ipfw, CTLFLAG_RW, + &bdg_ipfw,0,"Pass bridged pkts through firewall"); +SYSCTL_STRUCT_COMPAT(_net_link_ether, PF_BDG, bdgstats, CTLFLAG_RD, + &bdg_stats, bdg_stats, "bridge statistics"); +SYSCTL_PROC_COMPAT(_net_link_ether, OID_AUTO, bridge_cfg, + CTLTYPE_STRING|CTLFLAG_RW, + &bridge_cfg, sizeof(bridge_cfg), &sysctl_bdg_cfg, "A", + "Bridge configuration"); +SYSCTL_PROC_COMPAT(_net_link_ether, OID_AUTO, bridge_refresh, + CTLTYPE_INT|CTLFLAG_WR, + NULL, 0, &sysctl_refresh, "I", "iface refresh"); +#endif + static int bdg_loops; static int bdg_slowtimer = 0; static int bdg_age_index = 0; /* index of table position to age */ @@ -1151,7 +1185,7 @@ bdginit(void) { if (bootverbose) - printf("BRIDGE 020214 loaded\n"); + printf("BRIDGE %s loaded\n", bridge_version); ifp2sc = malloc(BDG_MAX_PORTS * sizeof(struct bdg_softc), M_IFADDR, M_WAITOK | M_ZERO ); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 13:34:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D63C416A4C1; Fri, 5 Sep 2003 13:34:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7AD6216A4BF for ; Fri, 5 Sep 2003 13:34:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 075E443FCB for ; Fri, 5 Sep 2003 13:34:33 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85KYW0U059094 for ; Fri, 5 Sep 2003 13:34:32 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85KYWlL059091 for perforce@freebsd.org; Fri, 5 Sep 2003 13:34:32 -0700 (PDT) Date: Fri, 5 Sep 2003 13:34:32 -0700 (PDT) Message-Id: <200309052034.h85KYWlL059091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 20:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=37582 Change 37582 by sam@sam_ebb on 2003/09/05 13:34:26 o fix typo/braino o remove unneeded locking Affected files ... .. //depot/projects/netperf/sys/net/if_vlan.c#3 edit Differences ... ==== //depot/projects/netperf/sys/net/if_vlan.c#3 (text+ko) ==== @@ -114,7 +114,7 @@ #define VLAN_LOCK_DESTROY() mtx_destroy(&ifv_mtx) #define VLAN_LOCK_ASSERT() mtx_assert(&ifv_mtx, MA_OWNED) #define VLAN_LOCK() mtx_lock(&ifv_mtx) -#define VLAN_UNLOCK() mtx_lock(&ifv_mtx) +#define VLAN_UNLOCK() mtx_unlock(&ifv_mtx) static int vlan_clone_create(struct if_clone *, int); static void vlan_clone_destroy(struct ifnet *); @@ -147,8 +147,6 @@ struct sockaddr_dl sdl; int error; - VLAN_LOCK_ASSERT(); - /* Find the parent. */ sc = ifp->if_softc; ifp_p = sc->ifv_p; @@ -643,8 +641,6 @@ struct ifvlan *ifv = ifp->if_softc; int error = 0; - VLAN_LOCK_ASSERT(); - if ((ifp->if_flags & IFF_PROMISC) != 0) { if ((ifv->ifv_flags & IFVF_PROMISC) == 0) { error = ifpromisc(ifv->ifv_p, 1); @@ -754,10 +750,10 @@ if (vlr.vlr_parent[0] == '\0') { VLAN_LOCK(); vlan_unconfig(ifp); - VLAN_UNLOCK(); if (ifp->if_flags & IFF_UP) if_down(ifp); ifp->if_flags &= ~IFF_RUNNING; + VLAN_UNLOCK(); break; } p = ifunit(vlr.vlr_parent); @@ -781,10 +777,10 @@ } ifv->ifv_tag = vlr.vlr_tag; ifp->if_flags |= IFF_RUNNING; + VLAN_UNLOCK(); /* Update promiscuous mode, if necessary. */ vlan_set_promisc(ifp); - VLAN_UNLOCK(); break; case SIOCGETVLAN: @@ -804,17 +800,13 @@ * For promiscuous mode, we enable promiscuous mode on * the parent if we need promiscuous on the VLAN interface. */ - VLAN_LOCK(); if (ifv->ifv_p != NULL) error = vlan_set_promisc(ifp); - VLAN_UNLOCK(); break; case SIOCADDMULTI: case SIOCDELMULTI: - VLAN_LOCK(); error = vlan_setmulti(ifp); - VLAN_UNLOCK(); break; default: error = EINVAL; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:20:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BD8216A4C1; Fri, 5 Sep 2003 14:20:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32F8D16A4BF for ; Fri, 5 Sep 2003 14:20:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D64543FF3 for ; Fri, 5 Sep 2003 14:20:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85LKa0U061820 for ; Fri, 5 Sep 2003 14:20:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LKaOR061817 for perforce@freebsd.org; Fri, 5 Sep 2003 14:20:36 -0700 (PDT) Date: Fri, 5 Sep 2003 14:20:36 -0700 (PDT) Message-Id: <200309052120.h85LKaOR061817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:20:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=37587 Change 37587 by peter@peter_daintree on 2003/09/05 14:20:20 haul in base gcc-3.2.1 that ezm3-1.1 is derived from Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/.brik#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/.cvsignore#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/BUGS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/COPYING#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/COPYING.LIB#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/FAQ#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/GNATS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/binaries.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/build.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/configure.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/download.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/finalinstall.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/gfdl.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/index.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/old.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/specific.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/test.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/MAINTAINERS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/Makefile.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/bugs.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config-ml.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config.guess#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config.if#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config.sub#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/acinclude.m4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-a68bsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-aix386#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-apollo68#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-armpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-cxux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-cygwin#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-decstation#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-delta88#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-dgux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-dgux386#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-djgpp#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-elfalphapic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-hp300#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-hpux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-hpux8#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-i370pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-ia64pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-interix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-irix4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-irix5#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-irix6#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-lynxos#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-lynxrs6k#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-m68kpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-mingw32#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-ncr3000#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-ncrsvr43#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-necv4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-openedition#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-papic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-ppcpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-riscos#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sco#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-solaris#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sparcpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sun3#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sysv#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sysv4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-sysv5#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-vaxult2#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mh-x86pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw-mh-mpw#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/MoveIfChange#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/forward-include#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/g-mpw-make.sed#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/mpw-touch#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/mpw-true#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/null-command#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/open-brace#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/tr-7to8-src#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/true#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-aix43#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-alphaieee#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-armpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-d30v#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-elfalphapic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-i370pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-ia64pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-m68kpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-netware#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-ospace#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-papic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-ppcpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-sparcpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-v810#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-wince#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mt-x86pic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/configure#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/configure.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/analyze_brprob#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/compare_tests#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/convert_to_f2c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/convert_to_g2c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/download_f2c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/gcc_build#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/gcc_update#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/gccbug.el#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/gennews#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/index-prop#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/newcvsroot#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/btest-gcc.sh#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/objs-gcc.sh#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/site.exp#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/test_installed#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/test_summary#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/texi2pod.pl#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/warn_summary#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/faq.html#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/.cvsignore#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ABOUT-GCC-NLS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ABOUT-NLS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/COPYING#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/COPYING.LIB#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.0#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.1#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.2#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.3#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.5#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.6#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.lib#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog.10#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog.11#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/LANGUAGES#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/NEWS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ONEWS#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/README-fixinc#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/README.Portability#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/SERVICE#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/acconfig.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/aclocal.m4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/alias.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/attribs.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/basic-block.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/bb-reorder.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/bitmap.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/bitmap.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtin-attrs.def#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtin-types.def#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtins.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtins.def#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-aux-info.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-common.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-common.def#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-common.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-convert.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-decl.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-errors.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-format.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-lang.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-lex.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-lex.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-objc-common.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.y#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-pragma.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-pragma.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-semantics.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-tree.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-typeck.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/caller-save.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/calls.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfg.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfganal.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgbuild.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgcleanup.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfglayout.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfglayout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgloop.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgrtl.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/collect2.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/collect2.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/combine.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/conditions.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config.gcc#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config.guess#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config.in#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/1750a/1750a-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/1750a/1750a.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/1750a/1750a.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/1750a/1750a.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/1750a/ms1750.inc#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/a29k-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/a29k.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/a29k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/a29k.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/t-a29kbare#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/t-vx29k#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/unix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/a29k/vx29k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha-interix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/alpha32.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/crtfastmath.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/linux-ecoff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/linux-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/osf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/osf12.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/osf2or3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/osf5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/qrnnd.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-alpha#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-crtfm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-ieee#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-interix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-osf4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-unicosmk#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-vms#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-vms64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/unicosmk.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/va_list.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-cc.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-crt0-64.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-crt0.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-dwarf2.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-dwarf2eh.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-ld.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-psxcrt0-64.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms-psxcrt0.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vms_tramp.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/vxworks.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/x-vms#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/xm-alpha-interix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/xm-vms.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/xm-vms64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/aoutos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/arc-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/arc.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/arc.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/arc.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/initfini.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/t-arc#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/README-interworking#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/aof.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/arm-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/arm-wince-pe.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/arm.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/arm.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/arm.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/conix-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/ecos-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/linux-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/linux-gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/pe.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/pe.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/riscix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/riscix1-1.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/rix-gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/rtems-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/semi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/semiaof.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/strongarm-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/strongarm-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/strongarm-pe.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-arm-aout#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-arm-coff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-arm-elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-netbsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-pe#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-riscix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-semi#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-strongarm-coff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-strongarm-elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-strongarm-pe#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-xscale-coff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-xscale-elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/uclinux-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/unknown-elf-oabi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/unknown-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/vxarm.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/xscale-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/xscale-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/libgcc.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/t-avr#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/c4x-c.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/c4x-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/c4x.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/c4x.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/c4x.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/libgcc.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/c4x/t-c4x#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/chorus.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/clipper/clipper-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/clipper/clipper.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/clipper/clipper.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/clipper/clipper.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/clipper/clix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/convex-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/convex.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/convex.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/convex.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/fixinc.convex#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/convex/proto.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/arit.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/cris-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/cris.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/cris.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/cris.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/cris_abi_symbol.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/mulsi3.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/t-aout#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/t-cris#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/t-elfmulti#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/cris/t-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/abi#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/d30v-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/d30v.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/d30v.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/d30v.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/libgcc1.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/d30v/t-d30v#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/darwin-c.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/darwin-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/darwin.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/darwin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dbx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dbxcoff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dbxelf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/divmod.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dsp16xx/dsp16xx-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dsp16xx/dsp16xx.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dsp16xx/dsp16xx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/dsp16xx/dsp16xx.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/elfos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/elxsi/elxsi-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/elxsi/elxsi.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/elxsi/elxsi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/elxsi/elxsi.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-c4x.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-i128.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-i32.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-i386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-i64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-m68k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-sh.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-sparc.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/float-vax.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fp-bit.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fp-bit.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/fr30-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/fr30.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/fr30.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/fr30.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/t-fr30#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd-nthr.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd-spec.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/freebsd6.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/gnu.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/gofast.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/fixunssfsi.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/h8300-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/h8300.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/h8300.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/h8300.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/t-elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/h8300/t-h8300#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/README#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/i370-c.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/i370-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/i370.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/i370.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/i370.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/mvs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/oe.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/t-i370#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i370/t-oe#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/386bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/aix386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/aix386ng.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/att.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/beos-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/biarch64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/bsd386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/crtdll.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/cygwin.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/cygwin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/dgux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/djgpp-rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/djgpp.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/freebsd-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/freebsd64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/gmon-sol2.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/gnu.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/gstabs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386-interix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386-interix3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/interix.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/isc.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/isccoff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/iscdbx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/libgcc-x86_64-glibc.ver#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/linux-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/linux-oldld.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/linux64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/lynx-ng.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/lynx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/mach.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/mingw32.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/mmintrin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/moss.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/netbsd-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/netbsd64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/netware.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/next.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osf1-ci.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osf1-cn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osf1elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osf1elfgdb.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osfelf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/osfrose.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/ptx4-i.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/rtemself.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sco5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/seq-gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/seq-sysv3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/seq2-sysv3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sequent.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2-c1.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2-ci.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2-cn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2-gc1.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sol2gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sun.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sun386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/svr3.ifile#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/svr3dbx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/svr3gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/svr3z.ifile#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sysv3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sysv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/sysv5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-beos#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-crtpic#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-crtstuff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-cygwin#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-dgux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-djgpp#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-i386elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-interix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-linux64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-mingw32#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-netware#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-next#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-openbsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-osf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-osf1elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-rtems-i386#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-sco5#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-sco5gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-sol2#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-svr3dbx#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-udk#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/t-uwin#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/udk.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/unix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/uwin.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/uwin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/v3gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/vsta.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/vxi386.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/win32.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/winnt.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/x86-64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xm-cygwin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xm-djgpp.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xm-i386-interix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xm-mingw32.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xm-vsta.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/xmmintrin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/bsd-gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/fx2800.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/i860-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/i860.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/i860.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/i860.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/mach.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/paragon.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/sysv3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/sysv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/t-fx2800#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i860/varargs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960-c.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/i960.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/t-960bare#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/t-vxworks960#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/vx960-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i960/vx960.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/aix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/crtbegin.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/crtend.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/crtfastmath.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/fde-glibc.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/hpux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/hpux_longdouble.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/ia64-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/ia64.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/ia64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/ia64.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/ia64intrin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/libgcc-ia64.ver#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/quadlib.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/sysv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/t-aix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/t-glibc#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/t-hpux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/t-ia64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/unwind-aix.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/unwind-ia64.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ia64/unwind-ia64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/interix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/interix3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/libgcc-glibc.ver#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/libgloss.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/linux-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/lynx-ng.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/lynx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/initfini.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/m32r-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/m32r.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/m32r.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/m32r.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m32r/t-m32r#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/larith.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11-crt0.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc12.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/t-m68hc11-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/3b1.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/3b1g.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/a-ux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/altos3068.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/amix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/apollo68.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/atari.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-crt1.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-crt2.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-exit.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-low.gld#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/aux-mcount.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/auxas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/auxgas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/auxgld.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/auxld.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/ccur-GAS.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/crds.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/crti.s#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/crtn.s#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/ctix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/dpx2.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/dpx2.ifile#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/dpx2cdbx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/dpx2g.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/fpgnulib.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp2bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp310.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp310g.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp320.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp320g.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp3bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hp3bsd44.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/hpux7.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/isi-nfp.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/isi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/lb1sf68.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/linux-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/lynx-ng.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/lynx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68020-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k-none.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k-psos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68kelf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68kemb.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68kv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/math-3300.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/math-68881.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/mot3300-crt0.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/mot3300.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/mot3300Mcrt0.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/netbsd-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/news.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/news3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/news3gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/newsgas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/next.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/next21.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/pbb.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/plexus.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/rtemself.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sgs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun2.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun2o4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun3mach.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun3n.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun3n3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/sun3o3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-aux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-crtstuff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-hp320#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-linux-aout#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-lynx#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-m68kbare#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-m68kelf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-mot3300#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-mot3300-gald#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-mot3300-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-mot3300-gld#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-next#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-openbsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-vxworks68#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/tower-as.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/tower.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/vxm68k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/x-next#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/aout-dbx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/dgux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/dgux.ld#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/dguxbcs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/dolph.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/dolphin.ld#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/luna.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k-coff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k-move.sh#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/m88k.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/sysv3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/sysv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-bug#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-dgux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-dgux-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-dguxbcs#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-dolph#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-luna#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-luna-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-m88k#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-m88k-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-sysv4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/t-tekXD88#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/tekXD88.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m88k/tekXD88.ld#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/gfloat.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/lib1.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore-pe.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/mcore.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/t-mcore#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mcore/t-mcore-pe#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/abi64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/bsd-4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/bsd-5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/cross64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/dec-bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/dec-osf1.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/ecoff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/ecoffl.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elf64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elfl.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elfl64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elflorion.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/elforion.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris3.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris4loser.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris5gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris6.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/iris6gld.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/irix6-libc-compat.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/isa32-linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/isa3264.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/little.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips-5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/mips16.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/news4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/news5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/nws3250v4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/openbsd-be.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/osfrose.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/r3900.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/rtems64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/sni-gas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/sni-svr4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/svr3-4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/svr3-5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/svr4-4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/svr4-5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/svr4-t.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-bsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-bsd-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-cross64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-ecoff#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-elf#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-iris#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-iris6#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-netbsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-r3900#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-svr3#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-svr3-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-svr4#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-svr4-gas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-ultrix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/ultrix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/xm-iris5.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/crti.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/crtn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/mmix-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/mmix.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/mmix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/mmix.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mmix/t-mmix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/mn10200-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/mn10200.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/mn10200.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/mn10200.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10200/t-mn10200#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10300/mn10300-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10300/mn10300.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10300/mn10300.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10300/mn10300.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mn10300/t-mn10300#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/netbsd-aout.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/netbsd-elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/netware.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/nextstep-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/nextstep.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/nextstep.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/nextstep21.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/encore.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/merlin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/ns32k-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/ns32k.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/ns32k.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/ns32k.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/pc532-mach.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/pc532-min.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/pc532.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/sequent.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/tek6000.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/tek6100.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ns32k/tek6200.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/openbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/elf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/lib1funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/lib2funcs.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/long_double.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/milli32.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/milli64.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hiux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hpux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hpux10.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hpux11.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hpux7.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-hpux9.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-oldas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-osf.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-pro-end.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa32-linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa32-regs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa64-hpux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa64-linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa64-regs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa64-start.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/quadlib.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/som.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-bsd#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-dce-thr#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-hpux-shlib#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-linux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-linux64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-mpeix#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-pa#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-pa-hpux#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-pa64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-pro#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/x-ada#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/2bsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/pdp11-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/pdp11.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/pdp11.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/pdp11.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pdp11/t-pdp11#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/lib1funcs.S#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/pj-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/pj.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/pj.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/pj.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/pjl.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pj/t-pj#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/psos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/ptx4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/romp/romp-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/romp/romp.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/romp/romp.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/romp/romp.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix31.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix3newas.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix41.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix43.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/aix51.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/altivec-defs.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/altivec.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/beos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/crtsavres.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/darwin-tramp.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/darwin.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabi-ci.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabi-cn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabi.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabiaix.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabialtivec.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/eabisim.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/freebsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/gnu.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/linux64.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/linuxaltivec.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/lynx.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/mach.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/milli.exp#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/netbsd.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/ppc-asm.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/softfloat.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/sol-ci.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/sol-cn.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/sysv4.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/sysv4le.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-aix43#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-beos#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-darwin#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-linux64#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-newas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-ppccomm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-ppcgas#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-ppcos#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-rs6000#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/tramp.asm#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/vxppc.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/xcoff.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rtems.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/fixdfdi.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/libgcc-glibc.ver#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/linux.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/s390-protos.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/s390.c#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/s390.h#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/s390.md#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/s390/s390x.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:32:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E4C716A4BF; Fri, 5 Sep 2003 14:32:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D47F516A4BF for ; Fri, 5 Sep 2003 14:32:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FBEE43F85 for ; Fri, 5 Sep 2003 14:32:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85LWq0U062343 for ; Fri, 5 Sep 2003 14:32:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LWqLo062340 for perforce@freebsd.org; Fri, 5 Sep 2003 14:32:52 -0700 (PDT) Date: Fri, 5 Sep 2003 14:32:52 -0700 (PDT) Message-Id: <200309052132.h85LWqLo062340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37588 Change 37588 by peter@peter_daintree on 2003/09/05 14:32:09 Checkpoint ezm3-1.1. Label will be ezm3_1_1. Affected files ... .. //depot/projects/ezm3/INSTALL.html#1 add .. //depot/projects/ezm3/README#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/FVRuntime.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/FVRuntime.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/FVTypes.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/FormsVBT.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/FormsVBT.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/Macro.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/Macro.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/Manpage.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/Manpage.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/RefListUtils.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/RefListUtils.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImageRd.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImageRd.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImageVBT.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImageVBT.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImages.i3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/StubImages.m3#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/COPYRIGHT.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/acks.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Bar.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Boolean.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Border.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Browser.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Button.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Chisel.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Choice.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/CloseButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/DirMenu.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/FileBrowser.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Fill.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Filter.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Frame.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Generic.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Glue.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Guard.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/HBox.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/HPackSplit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/HTile.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Helper.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Insert.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/LinkButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/LinkMButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/MButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Menu.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/MultiBrowser.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Numeric.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/PageButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/PageMButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Pixmap.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/PopButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/PopMButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Radio.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Ridge.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Rim.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Scale.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Scroller.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Shape.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Source.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Stable.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/TSplit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Target.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Text.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/TextEdit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Texture.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/TrillButton.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/TypeIn.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Typescript.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/VBox.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/VPackSplit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/VTile.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/Viewport.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZBackground.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZChassis.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZChild.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZGrow.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZMove.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/ZSplit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/components/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/fefv.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/about.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/confirm.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/filedialog.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/finder.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/manpage.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/ppwidth.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-fe/revert.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-formsedit/error.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-formsedit/fileMenu.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-formsedit/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs-formsedit/start.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/calc3cell-menu.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/calc3cell.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/etude.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/fonts.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/formsedit.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/helloBoring.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/helloFancy.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/horn.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/modal.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/viewer.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/figs/viewer2.ps#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/formsedit.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/intro.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/language.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/longcatalog.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/miscinterfaces.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/programming.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/references.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/html/tutorial.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/index.html#1 add .. //depot/projects/ezm3/graphics/forms/formsvbt/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/Digital.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/arrowDown.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/arrowUp.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/blank.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/close.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/grow.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/menuArrow.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/middle.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/right.pbm#1 add .. //depot/projects/ezm3/graphics/forms/formsvbtpixmaps/src/triangleSE.pbm#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/ALPHA_OSF/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/ALPHA_OSF/XMachine.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/ALPHA_OSF/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/X.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xatom.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xaw.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xct.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xmbuf.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xmu.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xrm.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/Xt.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtC.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtC.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtE.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtE.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtN.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtN.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtR.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/XtR.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Common/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Vanilla/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Vanilla/XMachine.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/Vanilla/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/X11/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVAudio.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVAudio.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVBuffer.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVConverter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVConverter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVConverterF.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVDecomp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVDecomp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVDecompPool.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVDecompPool.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromDecomp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromDecomp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromSource.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromSource.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVSink.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVSinkPool.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVSinkPool.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/Jv.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/Jva.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/Jva.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JvaProtocol.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/Jvs.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/Jvs.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JvsBuffer.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JvsProtocol.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/decunix/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/decunix/JVSink.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/decunix/Jv.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/decunix/JvsBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/decunix/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/JVBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/JVSink.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/Jv.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/JvsBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/generic/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/jvprotocol.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/osf1/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/osf1/JVBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/osf1/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/ultrix/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/ultrix/JVBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/ultrix/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/WIN32/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/WIN32/JVDecomp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/WIN32/JVSink.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/WIN32/Jva.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/WIN32/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/COPYRIGHT.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/abstract.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/ack.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/filters.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/geometry.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/introduction.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/leafs.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/misc.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/ownpaint.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/ownsplits.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/references.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/resources.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/html/splits.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/index.html#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/Completion.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/Completion.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/FreeList.mg#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/Picture.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/Picture.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/PictureImpl.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/PictureRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/picture/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/AnchorBtnVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/AnchorBtnVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/BdrVBTClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/BorderedVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/BorderedVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/BtnVBTClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ButtonVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ButtonVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ComposeKey.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ComposeKey.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/DblBufferUtil.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/DblBufferUtil.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/DblBufferVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/DblBufferVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ETAgent.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ETAgent.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ETAgent1.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Filter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Filter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/FilterClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/FilterClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Gray.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Gray.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HVBar.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HVBar.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HVSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HVSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HighlightVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/HighlightVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinCMap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinCMap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinCursor.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinCursor.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinFont.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinFont.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinPaintOp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinPaintOp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinParent.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinParent.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinPixmap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinPixmap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinScreen.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinScreen.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinedVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/JoinedVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/MenuBtnVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/MenuBtnVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/OverlayVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/OverlayVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/PackSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/PackSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ProperSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ProperSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/QuickBtnVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/QuickBtnVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/RigidVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/RigidVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/RootVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/RootVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/STypeMap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/SelectQueue.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/SelectQueue.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Split.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/Split.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/StableVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/StableVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TextVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TextVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TextVBTClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TextureVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TextureVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TranslateVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TranslateVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TwoTone.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TwoTone.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TypeInVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/TypeInVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ZSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/ZSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/split/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/CostableVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/CostableVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/DpyFilter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/DpyFilter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/InstallQueue.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/InstallQueue.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/InstalledVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/InstalledVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/InstalledVBT.m3.new#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/ShTrestle.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/ShTrestle.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/Trestle.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/TrestleConf.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/TrestleGoo.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/TrestleGoo.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/TrestleImpl.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/TrestleOS.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/trestle/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Batch.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Batch.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/BatchRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/BatchUtil.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/BatchUtil.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Cursor.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Cursor.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Font.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Font.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/KeyboardKey.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Latin1Key.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/MiscDetail.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/MiscDetail.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/MouseSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/MouseSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaintExt.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaintOp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaintOp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaintPrivate.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaintPrivate.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Palette.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Palette.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PaletteRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Pixmap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Pixmap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PlttFrnds.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/PlttFrnds.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/README#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/RingBuffer.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/RingBuffer.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScreenPaint.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScreenType.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScreenType.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnColorMap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnColorMap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnCursor.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnCursor.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnFont.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnFont.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnPaintOp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnPaintOp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnPixmap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/ScrnPixmap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/Trestle.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/TrestleAux.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/TrestleClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/TrestleClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/TrestleComm.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTPatch.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTRep.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/VBTTuning.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/XKeySym.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/vbt/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/PictureImpl.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/TrestleConf.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/TrestleOS.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinAux.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinAux.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinContext.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinContext.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinKey.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinKey.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinMsg.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinMsg.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinPaint.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinPaint.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScreenType.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScreenType.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScreenTypePrivate.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnColorMap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnColorMap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnCursor.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnCursor.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnFont.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnFont.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnPaintOp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnPaintOp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnPixmap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinScrnPixmap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinTrestle.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/WinTrestle.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/winvbt/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/Compl.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/Compl.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/NTClientF.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/PictureImpl.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/TrestleOS.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/TrestleOnX.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/TrestleOnX.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/TrslOnXF.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XAtomQueue.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XAtomQueue.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XClient.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XClient.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XClientExt.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XClientF.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XClientF.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XConfCtl.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XConfCtl.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XCursors.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XEventQueue.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XEventQueue.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XExtensions.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XExtensions.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XGC.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XGC.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XImUtil.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XInput.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XInput.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XMessenger.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XMessenger.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XNoSharedMem.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XPaint.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XPaint.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XPicture.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XPicture.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XPictureFree.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XProperties.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XProperties.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScreenType.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScreenType.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnCmap.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnCmap.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnCrsr.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnCrsr.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnFont.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnFont.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnPntOp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnPntOp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnPxmp.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnPxmp.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnTpRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrnTpRep.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrollQueue.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XScrollQueue.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XSharedFree.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XSharedMem.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XSharedMem.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/XShm.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/src/xvbt/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Argus/src/Argus.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Argus/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Argus/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/BadBricks/src/BadBricks.1#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/BadBricks/src/BadBricks.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/BadBricks/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/BadBricks/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ButtonTest/src/ButtonTest.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ButtonTest/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ButtonTest/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/BurmaShave.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/BurmaShave.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/Cards.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/PlaidVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/PlaidVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Cards/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ColorMonster/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ColorMonster/src/ColorMonster.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/ColorMonster/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Draw/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Draw/src/Draw.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Draw/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/EyesVBT/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/EyesVBT/src/EyesVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/EyesVBT/src/EyesVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/EyesVBT/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Hello/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Hello/src/Hello.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Hello/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/MODEL#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Monster/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Monster/src/Monster.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Monster/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Sketch.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Sketch2/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Sketch2/src/Sketch2.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Sketch2/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/.gdbinit#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/README#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/src/R2.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/src/R2.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/src/StarAnim.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/StarAnim/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Track/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Track/src/Track.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/Track/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/TypeInTest/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/TypeInTest/src/TypeInTest.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/ui/test/TypeInTest/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/Color.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/Color.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/ColorName.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/ColorName.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/ColorNameF.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/ColorNameTable.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/color/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/EmacsModel.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/EmacsModel.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/ISOChar.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/ISOChar.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/IvyModel.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/IvyModel.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/Key.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/Key.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/KeyFilter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/KeyFilter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/KeyTrans.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/KeyTrans.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/MTextUnit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/MTextUnit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/MacModel.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/MacModel.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextEditVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextEditVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextPort.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextPort.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextPortClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TextPortClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TypeinVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TypeinVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TypescriptVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/TypescriptVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/XtermModel.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/XtermModel.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/etext/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorHelpSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorHelpSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorHelpVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorHelpVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorSwitchVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/AnchorSwitchVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BiFeedbackVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BiFeedbackVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BooleanVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BooleanVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BorderedFeedbackVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/BorderedFeedbackVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ChoiceVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ChoiceVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FeedbackVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FeedbackVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FileBrowserVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FileBrowserVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FlexVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/FlexVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/GuardedBtnVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/GuardedBtnVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/Image.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/Image.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ListVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ListVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MarginFeedbackVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MarginFeedbackVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MenuSwitchVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MenuSwitchVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiFilter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiFilter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiSplit.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/MultiSplit.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/NumericVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/NumericVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/OffsetVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/OffsetVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/PixmapVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/PixmapVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/QuickSwitchVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/QuickSwitchVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ReactivityVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ReactivityVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScaleFilter.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScaleFilter.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScrollerVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScrollerVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScrollerVBTClass.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ScrollerVBTClass.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/Shadow.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/Shadow.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowPaint.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowPaint.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedBarVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedBarVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedFeedbackVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedFeedbackVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ShadowedVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SourceVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SourceVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SplitterVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SplitterVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SwitchVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/SwitchVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/TrillSwitchVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/TrillSwitchVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/VBTKitResources.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/VBTKitResources.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/VBTList.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/VBTList.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ViewportVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ViewportVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZBackgroundVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZBackgroundVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZChassisVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZChassisVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZChildVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZChildVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZGrowVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZGrowVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZMoveVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZMoveVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZSplitUtils.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZSplitUtils.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZTilps.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/ZTilps.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/oldOffsetVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/oldOffsetVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/oldViewportVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/lego/oldViewportVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MText.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MText.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextDebug.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextDebug.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextDs.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextDs.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextPrivate.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextRd.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/MTextRd.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/mtext/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/Close.pbm#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/Digital.pbm#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/Grid#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/Grow.pbm#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/IvyScrollH#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/IvyScrollV#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/NEDiagonal#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/NWDiagonal#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkMarkOff#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkMarkOffExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkMarkOn#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkMarkOnExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkOff#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkOffExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkOn#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/checkOnExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/minusOff#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/plusOff#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/radioOff#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/radioOffExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/radioOn#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitresources/radioOnExcited#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/AnyEvent.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/AnyEvent.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/AutoRepeat.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/AutoRepeat.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/LargeCursor.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/LargeCursor.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/Pts.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/Pts.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/Rsrc.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/Rsrc.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/UnixUtils.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/UnixUtils.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/VBTColors.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/VBTColors.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/VBTKitEnv.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/VBTKitEnv.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/XParam.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/XParam.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/XTrestle.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/XTrestle.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vbtkitutils/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTBase.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTBase.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTCaret.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTCaret.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTDef.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTInterval.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTInterval.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTMarker.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTMarker.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTPounce.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTPounce.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTRd.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTRd.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTReal.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTReal.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTTexture.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTTexture.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTView.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTView.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTVirtual.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTVirtual.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VText.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VText.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTextDef.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTextRegion.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/VTextRegion.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/notes.04.30.1988#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/release.notes.06.08.1989#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/testing/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/testing/VTPhony.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/testing/VTReal.new.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/testing/VTReal.semi.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/testing/VTReal.toofar#1 add .. //depot/projects/ezm3/graphics/gr-libs/vbtkit/src/vtext/to.do.11.15.1987#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/AudioVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/AudioVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/VideoVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/VideoVBT.m3.hold#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/VideoVBTRep.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/POSIX/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/VideoVBT.i3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/WIN32/AudioVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/WIN32/COPYRIGHT#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/WIN32/VideoVBT.m3#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/WIN32/m3makefile#1 add .. //depot/projects/ezm3/graphics/gr-libs/videovbt/src/m3makefile#1 add .. //depot/projects/ezm3/language/m3quake/src/COPYRIGHT#1 add .. //depot/projects/ezm3/language/m3quake/src/QCode.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QCode.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QCompiler.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QCompiler.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QMachRep.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QMachine.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QMachine.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QScanner.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QScanner.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QToken.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QToken.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QVal.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QVal.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/QValue.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/QValue.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/Quake.i3#1 add .. //depot/projects/ezm3/language/m3quake/src/Quake.m3#1 add .. //depot/projects/ezm3/language/m3quake/src/m3makefile#1 add .. //depot/projects/ezm3/language/m3quake/src/quake.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3bootstrap/src/m3makefile#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/COPYRIGHT#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/Main.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/build-generics.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/compiler.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/emacs.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/errors.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/example.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/exports.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/foreign.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/generics.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/hiding.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/imports.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/m3buildsteps.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/m3makefile#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/m3makefile.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/m3options.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/machine.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/manpage.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/misc.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/netobj.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/options.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/overrides.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/packages.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/profiling.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/progs.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/resources.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/sources.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/html/zeus.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/index.html#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3build/src/m3makefile#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/README#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/ChangeLog#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.0#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.2#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.3#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.4#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.5#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.6#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ChangeLog.lib#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog.10#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/FSFChangeLog.11#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/NEWS#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ONEWS#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtins.c#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.c#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.y#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/calls.c#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config.gcc#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/openbsd.h#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info-1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info-2#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info-3#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info-4#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cpp.info-5#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/cppinternals.info#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/fsf-funding.7#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-10#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-11#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-12#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-13#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-14#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-15#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-16#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-17#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-18#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-19#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-2#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-20#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-21#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-22#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-23#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-3#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-4#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-5#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-6#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-7#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-8#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.info-9#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-10#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-11#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-12#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-13#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-14#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-15#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-16#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-17#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-18#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-19#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-2#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-20#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-21#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-22#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-23#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-3#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-4#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-5#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-6#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-7#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-8#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gccint.info-9#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcov.1#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gfdl.7#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gpl.7#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.h#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/Make-lang.in#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/config-lang.in#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/decl.c#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/lang-specs.h#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/lang.c#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/m3-parse.h#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/m3-tree.h#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/m3.def#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/parse.c#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/m3cg/tree.c#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tradcif.c#2 delete .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree-dump.c#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree.def#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree.h#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/src/COPYRIGHT#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/src/m3makefile#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/TODO#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Arg.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Arg.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/COPYRIGHT#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Lib.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Lib.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3BackLinux.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3BackPosix.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3BackWin32.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3Backend.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3Driver.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3Driver.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3DriverRep.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3Path.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/M3Path.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Msg.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Msg.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Unit.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Unit.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Utils.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/Utils.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/WebFile.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/WebFile.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3driver/src/m3makefile#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/enquire/enquire43.c#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/COPYRIGHT#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Abs.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Abs.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Adr.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Adr.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/AdrSize.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/AdrSize.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/BitSize.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/BitSize.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/BuiltinOps.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/BuiltinOps.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/ByteSize.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/ByteSize.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/COPYRIGHT#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Ceiling.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Ceiling.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Dec.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Dec.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Dispose.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Dispose.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/First.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/First.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Floatt.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Floatt.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Floor.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Floor.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Inc.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Inc.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/IsType.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/IsType.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Last.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Last.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Loophole.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Loophole.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Max.i3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Max.m3#1 add .. //depot/projects/ezm3/language/modula3/m3compiler/m3front/src/builtinOps/Min.i3#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:37:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9E3C16A4C1; Fri, 5 Sep 2003 14:36:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C6AD16A4BF for ; Fri, 5 Sep 2003 14:36:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BE2D43FD7 for ; Fri, 5 Sep 2003 14:36:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Law0U062479 for ; Fri, 5 Sep 2003 14:36:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LawGu062476 for perforce@freebsd.org; Fri, 5 Sep 2003 14:36:58 -0700 (PDT) Date: Fri, 5 Sep 2003 14:36:58 -0700 (PDT) Message-Id: <200309052136.h85LawGu062476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=37589 Change 37589 by peter@peter_daintree on 2003/09/05 14:36:45 Check in jdp's patches in the 1.1 port. I believe these are ezm3-1.1a Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 (text+ko) ==== @@ -690,8 +690,8 @@ -e 's|%% *|../|g' \ -e 's|%||g' SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \ - "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \ - "STAGE_PREFIX=`echo @quoted_stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" + "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" + # # Lists of files for various purposes. ==== //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 (text+ko) ==== @@ -303,9 +303,10 @@ m3_template := Env.Get("M3_TEMPLATE_DIR"); path : TEXT; subpath : TEXT; - nextsep : INTEGER := 0; - prevsep : INTEGER := 0; + nextsep : INTEGER; + prevsep : INTEGER := -1; sep : CHAR; + filename : TEXT; BEGIN IF m3_template # NIL THEN template_dir := m3_template; @@ -322,13 +323,17 @@ REPEAT nextsep := Text.FindChar(path, sep, prevsep + 1); IF nextsep # -1 THEN - subpath := Text.Sub(path, prevsep, nextsep - prevsep - 1); + subpath := Text.Sub(path, prevsep + 1, nextsep - prevsep - 1); ELSE - subpath := Text.Sub(path, prevsep); + subpath := Text.Sub(path, prevsep + 1); END; - IF M3File.IsReadable(subpath & template) THEN - template_dir := subpath; - RETURN; + IF Text.Length(subpath) > 0 THEN + filename := subpath & SL & template; + IF M3File.IsReadable(filename) AND + NOT M3File.IsDirectory(filename) THEN + template_dir := subpath; + RETURN; + END; END; prevsep := nextsep; UNTIL prevsep = -1; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:39:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC69616A4C1; Fri, 5 Sep 2003 14:39:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE99A16A4BF for ; Fri, 5 Sep 2003 14:39:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A6EB43FDF for ; Fri, 5 Sep 2003 14:39:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Ld20U062555 for ; Fri, 5 Sep 2003 14:39:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Ld1Xv062552 for perforce@freebsd.org; Fri, 5 Sep 2003 14:39:01 -0700 (PDT) Date: Fri, 5 Sep 2003 14:39:01 -0700 (PDT) Message-Id: <200309052139.h85Ld1Xv062552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:39:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=37590 Change 37590 by peter@peter_daintree on 2003/09/05 14:38:45 check in an amd64 fix from gcc-3.2.2 while it was in -current Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#2 (text+ko) ==== @@ -6760,7 +6760,7 @@ int value, rel; { if (TARGET_64BIT) - fprintf (file, "%s%s%d-.+(.-%s%d)\n", + fprintf (file, "%s%s%d-%s%d\n", ASM_LONG, LPREFIX, value, LPREFIX, rel); else if (HAVE_AS_GOTOFF_IN_DATA) fprintf (file, "%s%s%d@GOTOFF\n", ASM_LONG, LPREFIX, value); @@ -8819,15 +8819,24 @@ Do an lea to the last part and use only one colliding move. */ else if (collisions > 1) { + rtx base; + collisions = 1; - emit_insn (gen_rtx_SET (VOIDmode, part[0][nparts - 1], - XEXP (part[1][0], 0))); - part[1][0] = change_address (part[1][0], - TARGET_64BIT ? DImode : SImode, - part[0][nparts - 1]); - part[1][1] = adjust_address (part[1][0], VOIDmode, UNITS_PER_WORD); + + base = part[0][nparts - 1]; + + /* Handle the case when the last part isn't valid for lea. + Happens in 64-bit mode storing the 12-byte XFmode. */ + if (GET_MODE (base) != Pmode) + base = gen_rtx_REG (Pmode, REGNO (base)); + + emit_insn (gen_rtx_SET (VOIDmode, base, XEXP (part[1][0], 0))); + part[1][0] = replace_equiv_address (part[1][0], base); + part[1][1] = replace_equiv_address (part[1][1], + plus_constant (base, UNITS_PER_WORD)); if (nparts == 3) - part[1][2] = adjust_address (part[1][0], VOIDmode, 8); + part[1][2] = replace_equiv_address (part[1][2], + plus_constant (base, 8)); } } From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:48:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46E4A16A4C1; Fri, 5 Sep 2003 14:48:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD9F416A4BF for ; Fri, 5 Sep 2003 14:48:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70ACE4400B for ; Fri, 5 Sep 2003 14:48:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85LmE0U062926 for ; Fri, 5 Sep 2003 14:48:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LmDjU062923 for perforce@freebsd.org; Fri, 5 Sep 2003 14:48:13 -0700 (PDT) Date: Fri, 5 Sep 2003 14:48:13 -0700 (PDT) Message-Id: <200309052148.h85LmDjU062923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=37591 Change 37591 by peter@peter_daintree on 2003/09/05 14:48:10 add AMD64 bits and configuration etc. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#2 edit .. //depot/projects/ezm3/libs/libm3/src/random/m3makefile#2 edit .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/COPYRIGHT#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csignal.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Cstdio.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Cstdio.m3#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/CstdioC.c#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Cstring.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/m3makefile#1 add .. //depot/projects/ezm3/libs/m3core/src/Csupport/FBSD_AMD64/COPYRIGHT#1 add .. //depot/projects/ezm3/libs/m3core/src/Csupport/FBSD_AMD64/dtoa.c#1 add .. //depot/projects/ezm3/libs/m3core/src/Csupport/FBSD_AMD64/m3makefile#1 add .. //depot/projects/ezm3/libs/m3core/src/float/m3makefile#2 edit .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/COPYRIGHT#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTHeapDep.m3#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTHeapDepC.c#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTMachine.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTSignal.m3#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThreadC.c#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/m3makefile#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/malloc.c#1 add .. //depot/projects/ezm3/libs/m3core/src/runtime/m3makefile#2 edit .. //depot/projects/ezm3/libs/m3core/src/time/POSIX/m3makefile#2 edit .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Umman.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Unix.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Ustat.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Utypes.i3#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/m3makefile#1 add .. //depot/projects/ezm3/libs/m3core/src/unix/m3makefile#2 edit .. //depot/projects/ezm3/m3config/src/COMMON#2 edit .. //depot/projects/ezm3/m3config/src/FBSD_AMD64#1 add Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#2 (text+ko) ==== @@ -15,7 +15,7 @@ TYPE Systems = { AIX386, ALPHA_OSF, AP3000, ARM, BSDI4, DS3100, - FBSD_ALPHA, FBSD_SPARC64, FreeBSD, FreeBSD2, FreeBSD3, + FBSD_ALPHA, FBSD_AMD64, FBSD_SPARC64, FreeBSD, FreeBSD2, FreeBSD3, FreeBSD4, HP300, HPPA, IBMR2, IBMRT, IRIX5, LINUX, LINUXELF, LINUXLIBC6, NetBSDarm, NetBSDi386, NetBSDsparc, @@ -27,7 +27,7 @@ CONST SystemNames = ARRAY Systems OF TEXT { "AIX386", "ALPHA_OSF", "AP3000", "ARM", "BSDI4", "DS3100", - "FBSD_ALPHA", "FBSD_SPARC64", "FreeBSD", "FreeBSD2", "FreeBSD3", + "FBSD_ALPHA", "FBSD_AMD64", "FBSD_SPARC64", "FreeBSD", "FreeBSD2", "FreeBSD3", "FreeBSD4", "HP300", "HPPA", "IBMR2", "IBMRT", "IRIX5", "LINUX", "LINUXELF", "LINUXLIBC6", "NetBSDarm", "NetBSDi386", "NetBSDsparc", @@ -310,6 +310,45 @@ Aligned_procedures := FALSE; EOL := "\n"; + | Systems.FBSD_AMD64 => + Int_C.cg_type := CGType.Int_C; + Word_C.cg_type := CGType.Word_C; + Word_C.max.x[1] := FF; + + Int_D.cg_type := CGType.Int_D; + Int_D.size := 64; + Int_D.align := 64; + Int_D.min.x := IChunks { 00, 00, 00, 16_8000 }; + Int_D.max.x := IChunks { FF, FF, FF, 16_7fff }; + + Word_D.cg_type := CGType.Word_D; + Word_D.size := 64; + Word_D.align := 64; + Word_D.min.x := IChunks { 00, 00, 00, 00 }; + Word_D.max.x := IChunks { FF, FF, FF, FF }; + + Integer := Int_D; + Address := Word_D; + Address.cg_type := CGType.Addr; + + max_align := 64; + Little_endian := TRUE; + PCC_bitfield_type_matters := TRUE; + Structure_size_boundary := 8; + Bitfield_can_overlap := FALSE; + First_readable_addr := 4096 * Char.size; + Jumpbuf_size := 72 * Address.size; + Jumpbuf_align := Address.align; + Fixed_frame_size := 4 * Address.size; + Guard_page_size := 4096 * Char.size; + All_floats_legal := TRUE; + Has_stack_walker := FALSE; + Setjmp := "_setjmp"; + Checks_integer_ops := FALSE; + Global_handler_stack := TRUE; + Aligned_procedures := TRUE; + EOL := "\n"; + | Systems.FBSD_SPARC64 => Int_C.cg_type := CGType.Int_C; Word_C.cg_type := CGType.Word_C; ==== //depot/projects/ezm3/libs/libm3/src/random/m3makefile#2 (text+ko) ==== @@ -19,6 +19,7 @@ "DS3100" : [ _LittleEndian ], "DS3100_OSF" : [ _LittleEndian ], "FBSD_ALPHA" : [ _LittleEndian ], + "FBSD_AMD64" : [ _LittleEndian ], "FBSD_SPARC64" : [ _BigEndian ], "FreeBSD" : [ _LittleEndian ], "FreeBSD2" : [ _LittleEndian ], ==== //depot/projects/ezm3/libs/m3core/src/float/m3makefile#2 (text+ko) ==== @@ -19,6 +19,7 @@ "DS3100" : [ "IEEE", "IEEE-le", "DS3100" ], "DS3100_OSF" : [ "IEEE", "IEEE-le", "DS3100" ], "FBSD_ALPHA" : _float_le, + "FBSD_AMD64" : _float_le, "FBSD_SPARC64" : _float_be, "FreeBSD" : _float_le, "FreeBSD2" : _float_le, ==== //depot/projects/ezm3/libs/m3core/src/runtime/m3makefile#2 (text+ko) ==== @@ -13,6 +13,7 @@ "BSDI4" : "ex_frame", "DS3100" : "ex_frame", % working stack walker disabled: gcc-3.2.1 issues "FBSD_ALPHA" : "ex_frame", + "FBSD_AMD64" : "ex_frame", "FBSD_SPARC64" : "ex_frame", "FreeBSD" : "ex_frame", "FreeBSD2" : "ex_frame", ==== //depot/projects/ezm3/libs/m3core/src/time/POSIX/m3makefile#2 (text+ko) ==== @@ -16,6 +16,7 @@ "DS3100" : "DateBsd", "DS3100_OSF" : "DateBsd", "FBSD_ALPHA" : "DateBsd", + "FBSD_AMD64" : "DateBsd", "FBSD_SPARC64" : "DateBsd", "FreeBSD" : "DateBsd", "FreeBSD2" : "DateBsd", ==== //depot/projects/ezm3/libs/m3core/src/unix/m3makefile#2 (text+ko) ==== @@ -20,6 +20,7 @@ "DS3100" : [ "ultrix-3-1.generic", "ultrix-3-1.DS3100" ], "DS3100_OSF" : [ "osf-1.generic", "osf-1.DS3100" ], "FBSD_ALPHA" : [ "freebsd-4.generic", "freebsd-4.alpha" ], + "FBSD_AMD64" : [ "freebsd-4.generic", "freebsd-4.amd64" ], "FBSD_SPARC64" : [ "freebsd-4.generic", "freebsd-4.sparc64" ], "FreeBSD" : [ "freebsd-1" ], "FreeBSD2" : [ "freebsd-2" ], ==== //depot/projects/ezm3/m3config/src/COMMON#2 (text+ko) ==== @@ -587,6 +587,7 @@ "BSDI4" : [ "POSIX", "32BITS", "i386-unknown-bsdos4", "T" ], "DS3100" : [ "POSIX", "32BITS", "decstation", "T" ], "FBSD_ALPHA": [ "POSIX", "64BITS", "alpha-unknown-freebsd4", "T" ], + "FBSD_AMD64": [ "POSIX", "64BITS", "x86_64-unknown-freebsd5", "T" ], "FBSD_SPARC64": [ "POSIX", "64BITS", "sparc64-unknown-freebsd4", "T" ], "FreeBSD" : [ "POSIX", "32BITS", "i486-unknown-bsd", "" ], "FreeBSD2" : [ "POSIX", "32BITS", "i386-unknown-freebsd2", "T" ], @@ -676,5 +677,5 @@ } % Redefined in released versions -M3_VERSION="ezm3-1.1" +M3_VERSION="ezm3-1.1b" M3_VERSION_DATE="Thu Apr 10 18:25:22 UTC 2003" From owner-p4-projects@FreeBSD.ORG Fri Sep 5 14:51:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F5A16A4C1; Fri, 5 Sep 2003 14:51:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F00916A4BF for ; Fri, 5 Sep 2003 14:51:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17C2A43FE0 for ; Fri, 5 Sep 2003 14:51:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85LpM0U063124 for ; Fri, 5 Sep 2003 14:51:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LpIO2063121 for perforce@freebsd.org; Fri, 5 Sep 2003 14:51:18 -0700 (PDT) Date: Fri, 5 Sep 2003 14:51:18 -0700 (PDT) Message-Id: <200309052151.h85LpIO2063121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 21:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=37592 Change 37592 by peter@peter_daintree on 2003/09/05 14:50:38 update embedded gcc within ezm3 from 3.2.1 to 3.2.2 Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/.brik#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/BUGS#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/FAQ#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/GNATS#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/binaries.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/build.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/configure.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/download.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/finalinstall.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/gfdl.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/index.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/old.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/specific.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/INSTALL/test.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/Makefile.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/bugs.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config.guess#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config.sub#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/config/mpw/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/gcc_update#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/contrib/regression/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/faq.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/alias.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/basic-block.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtin-types.def#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/builtins.c#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-common.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-common.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-decl.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-format.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-parse.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-semantics.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/c-typeck.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/calls.c#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfganal.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgbuild.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cfgcleanup.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/combine.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config.gcc#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/alpha/t-osf4#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arc/t-arc#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/avr/avr.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/fr30/fr30.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68hc11/m68hc11.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/apollo68.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/coff.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/linux.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68k.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/m68kelf.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/mot3300.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/netbsd-elf.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/pbb.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/m68k/t-crtstuff#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/rtems.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/mips/t-iris6#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa-linux.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/pa64-hpux.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/rtems.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/som.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/pa/t-hpux-shlib#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/rs6000/t-rtems#1 branch .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/sh/sh.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/xtensa/xtensa-protos.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/xtensa/xtensa.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/xtensa/xtensa.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/xtensa/xtensa.md#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/configure#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/configure.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/cpplib.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/dbxout.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcc.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/gcov.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/install.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/invoke.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/passes.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doc/tm.texi#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/doloop.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/emit-rtl.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.h#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/fixfixes.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/assert.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/math.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/stdio.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/strings.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/sys/mman.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fixinc/tests/base/time.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/fold-const.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/function.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/gcc.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/ginclude/stddef.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/global.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/gthr-rtems.h#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/integrate.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/intl/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/jump.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/loop.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/mklibgcc.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/optabs.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/po/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/print-rtl.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/recog.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/rtlanal.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/stmt.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tradcpp.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree.def#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/tree.h#3 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/unwind-dw2.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/version.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gnats.html#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/include/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/libiberty/ChangeLog#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/libiberty/Makefile.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/libiberty/configure#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/libiberty/configure.in#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/libiberty/hashtab.c#2 integrate .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/maintainer-scripts/ChangeLog#2 integrate Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/.brik#2 (text+ko) ==== @@ -3,41 +3,80 @@ # CRC-32 filename # ------ -------- +3205162104b ./.cvsignore +2801352305b ./BUGS +2171125041b ./COPYING + 508743035b ./COPYING.LIB +3927827037b ./ChangeLog +2859733475b ./FAQ +4190923194b ./GNATS +2229468985b ./INSTALL/README +2594642159b ./INSTALL/binaries.html +1150299172b ./INSTALL/build.html +2138152758b ./INSTALL/configure.html +1908954708b ./INSTALL/download.html + 827688179b ./INSTALL/finalinstall.html +2784342709b ./INSTALL/gfdl.html + 686439052b ./INSTALL/index.html + 798593089b ./INSTALL/old.html +1770994652b ./INSTALL/specific.html + 379139745b ./INSTALL/test.html +4287295648b ./MAINTAINERS +3313742257b ./Makefile.in +3697693037b ./README + 655018850b ./boehm-gc/AmigaOS.c +2411687152b ./boehm-gc/BCC_MAKEFILE +1277390130b ./boehm-gc/ChangeLog +3428452570b ./boehm-gc/EMX_MAKEFILE + 145946109b ./boehm-gc/MacOS.c + 591574792b ./boehm-gc/MacProjects.sit.hqx +3338272940b ./boehm-gc/Mac_files/MacOS_Test_config.h + 537693184b ./boehm-gc/Mac_files/MacOS_config.h + 789649079b ./boehm-gc/Mac_files/dataend.c +3520138091b ./boehm-gc/Mac_files/datastart.c +2647418481b ./boehm-gc/Makefile.DLLs +2938168783b ./boehm-gc/Makefile.am +3148936110b ./boehm-gc/Makefile.direct +3806813747b ./boehm-gc/Makefile.dist + 87051491b ./boehm-gc/Makefile.dj +3291187154b ./boehm-gc/Makefile.in +3941839401b ./boehm-gc/NT_MAKEFILE +3607948475b ./boehm-gc/NT_THREADS_MAKEFILE +3289014202b ./boehm-gc/OS2_MAKEFILE +2438519321b ./boehm-gc/PCR-Makefile +2956367466b ./boehm-gc/SMakefile.amiga + 205379550b ./boehm-gc/WCC_MAKEFILE 643045998b ./boehm-gc/acinclude.m4 2700729979b ./boehm-gc/aclocal.m4 971051254b ./boehm-gc/add_gc_prefix.c 2056900000b ./boehm-gc/allchblk.c 182725132b ./boehm-gc/alloc.c 1198071641b ./boehm-gc/alpha_mach_dep.s - 655018850b ./boehm-gc/AmigaOS.c 3099799990b ./boehm-gc/backgraph.c -2411687152b ./boehm-gc/BCC_MAKEFILE 394605993b ./boehm-gc/blacklst.c 971406525b ./boehm-gc/callprocs -2840737175b ./boehm-gc/ChangeLog 2542310219b ./boehm-gc/checksums.c 1272640704b ./boehm-gc/config.guess 4182969326b ./boehm-gc/config.sub -1543515895b ./boehm-gc/configure +3736558677b ./boehm-gc/configure 2331870630b ./boehm-gc/configure.host -2767393649b ./boehm-gc/configure.in +1394793554b ./boehm-gc/configure.in 3430717956b ./boehm-gc/cord/cordbscs.c 473686535b ./boehm-gc/cord/cordprnt.c 1796537586b ./boehm-gc/cord/cordtest.c 3610557498b ./boehm-gc/cord/cordxtra.c 1399512076b ./boehm-gc/cord/de.c 3493089115b ./boehm-gc/cord/de_cmds.h +2226183422b ./boehm-gc/cord/de_win.ICO +2296745137b ./boehm-gc/cord/de_win.RC 1274913051b ./boehm-gc/cord/de_win.c 1969645283b ./boehm-gc/cord/de_win.h -2226183422b ./boehm-gc/cord/de_win.ICO -2296745137b ./boehm-gc/cord/de_win.RC 3479570773b ./boehm-gc/dbg_mlc.c 4155306217b ./boehm-gc/digimars.mak - 602673483b ./boehm-gc/doc/barrett_diagram -2134574438b ./boehm-gc/doc/debugging.html -4112273729b ./boehm-gc/doc/gcdescr.html -2587456343b ./boehm-gc/doc/gc.man 1852147885b ./boehm-gc/doc/README +2912965872b ./boehm-gc/doc/README.Mac +3192387476b ./boehm-gc/doc/README.MacOSX +1009764294b ./boehm-gc/doc/README.OS2 1398938057b ./boehm-gc/doc/README.amiga 3968038895b ./boehm-gc/doc/README.autoconf 609394135b ./boehm-gc/doc/README.changes @@ -48,39 +87,41 @@ 1544667036b ./boehm-gc/doc/README.ews4800 2032435380b ./boehm-gc/doc/README.hp 261398962b ./boehm-gc/doc/README.linux -2912965872b ./boehm-gc/doc/README.Mac -3192387476b ./boehm-gc/doc/README.MacOSX 3651372180b ./boehm-gc/doc/README.macros -1009764294b ./boehm-gc/doc/README.OS2 3249391671b ./boehm-gc/doc/README.rs6000 2157435131b ./boehm-gc/doc/README.sgi 2210572734b ./boehm-gc/doc/README.solaris2 1044770375b ./boehm-gc/doc/README.uts 3162142981b ./boehm-gc/doc/README.win32 + 602673483b ./boehm-gc/doc/barrett_diagram +2134574438b ./boehm-gc/doc/debugging.html +2587456343b ./boehm-gc/doc/gc.man +4112273729b ./boehm-gc/doc/gcdescr.html 1244216301b ./boehm-gc/doc/tree.html 1267269518b ./boehm-gc/dyn_load.c -3428452570b ./boehm-gc/EMX_MAKEFILE 110360283b ./boehm-gc/finalize.c +3607948475b ./boehm-gc/gc.mak 3449835837b ./boehm-gc/gc_cpp.cc 231223753b ./boehm-gc/gc_cpp.cpp + 145159317b ./boehm-gc/gc_dlopen.c 3458300802b ./boehm-gc/gcc_support.c - 145159317b ./boehm-gc/gc_dlopen.c 4111426693b ./boehm-gc/gcj_mlc.c -3607948475b ./boehm-gc/gc.mak 3106502053b ./boehm-gc/gcname.c 1644234138b ./boehm-gc/headers.c 1596485799b ./boehm-gc/hpux_test_and_clear.s 1676909184b ./boehm-gc/ia64_save_regs_in_stack.s 3582080946b ./boehm-gc/if_mach.c 387600055b ./boehm-gc/if_not_there.c + 695561534b ./boehm-gc/include/Makefile.am +3142769731b ./boehm-gc/include/Makefile.in 3897882033b ./boehm-gc/include/cord.h 214150158b ./boehm-gc/include/ec.h + 61666144b ./boehm-gc/include/gc.h 2874534410b ./boehm-gc/include/gc_alloc.h 1922524680b ./boehm-gc/include/gc_amiga_redirects.h 3531915622b ./boehm-gc/include/gc_backptr.h 1564499082b ./boehm-gc/include/gc_cpp.h 2080667503b ./boehm-gc/include/gc_gcj.h - 61666144b ./boehm-gc/include/gc.h 30043067b ./boehm-gc/include/gc_inl.h 601682422b ./boehm-gc/include/gc_inline.h 2851726125b ./boehm-gc/include/gc_local_alloc.h @@ -89,16 +130,14 @@ 3286861254b ./boehm-gc/include/gc_typed.h 2246764458b ./boehm-gc/include/javaxfc.h 4237951566b ./boehm-gc/include/leak_detector.h - 695561534b ./boehm-gc/include/Makefile.am -3142769731b ./boehm-gc/include/Makefile.in 3792791209b ./boehm-gc/include/new_gc_alloc.h 1547838704b ./boehm-gc/include/private/cord_pos.h 902196938b ./boehm-gc/include/private/dbg_mlc.h -1218966353b ./boehm-gc/include/private/gcconfig.h 1215170430b ./boehm-gc/include/private/gc_hdrs.h 687589575b ./boehm-gc/include/private/gc_locks.h 583510369b ./boehm-gc/include/private/gc_pmark.h 2936482199b ./boehm-gc/include/private/gc_priv.h +1218966353b ./boehm-gc/include/private/gcconfig.h 2686914147b ./boehm-gc/include/private/solaris_threads.h 3935909412b ./boehm-gc/include/private/specific.h 2262051120b ./boehm-gc/include/weakpointer.h @@ -108,19 +147,7 @@ 3750760998b ./boehm-gc/linux_threads.c 3535854335b ./boehm-gc/ltconfig 2828184627b ./boehm-gc/ltmain.sh - 789649079b ./boehm-gc/Mac_files/dataend.c -3520138091b ./boehm-gc/Mac_files/datastart.c - 537693184b ./boehm-gc/Mac_files/MacOS_config.h -3338272940b ./boehm-gc/Mac_files/MacOS_Test_config.h 2932074179b ./boehm-gc/mach_dep.c - 145946109b ./boehm-gc/MacOS.c - 591574792b ./boehm-gc/MacProjects.sit.hqx -3930151010b ./boehm-gc/Makefile.am -3148936110b ./boehm-gc/Makefile.direct -3806813747b ./boehm-gc/Makefile.dist - 87051491b ./boehm-gc/Makefile.dj -2647418481b ./boehm-gc/Makefile.DLLs -1617270503b ./boehm-gc/Makefile.in 4270565414b ./boehm-gc/malloc.c 3656007348b ./boehm-gc/mallocx.c 2488176063b ./boehm-gc/mark.c @@ -130,21 +157,16 @@ 1352116856b ./boehm-gc/misc.c 4236112450b ./boehm-gc/mkinstalldirs 2583630088b ./boehm-gc/new_hblk.c -3941839401b ./boehm-gc/NT_MAKEFILE -3607948475b ./boehm-gc/NT_THREADS_MAKEFILE 1361724709b ./boehm-gc/obj_map.c -3289014202b ./boehm-gc/OS2_MAKEFILE 3844001122b ./boehm-gc/os_dep.c 600864111b ./boehm-gc/pc_excludes 735852084b ./boehm-gc/pcr_interface.c -2438519321b ./boehm-gc/PCR-Makefile 811834911b ./boehm-gc/powerpc_macosx_mach_dep.s 105828241b ./boehm-gc/ptr_chck.c 3988382907b ./boehm-gc/real_malloc.c 2946495074b ./boehm-gc/reclaim.c 2737439630b ./boehm-gc/rs6000_mach_dep.s 636267038b ./boehm-gc/setjmp_t.c -2956367466b ./boehm-gc/SMakefile.amiga 751650501b ./boehm-gc/solaris_pthreads.c 275051372b ./boehm-gc/solaris_threads.c 1425695416b ./boehm-gc/sparc_mach_dep.S @@ -160,15 +182,14 @@ 3287937987b ./boehm-gc/threadlibs.c 2467355438b ./boehm-gc/typd_mlc.c 332085760b ./boehm-gc/version.h - 205379550b ./boehm-gc/WCC_MAKEFILE 3326583566b ./boehm-gc/win32_threads.c -1610170592b ./BUGS -3809269006b ./bugs.html -3781032226b ./ChangeLog +2509440942b ./bugs.html +3139906847b ./config-ml.in +3794184949b ./config.guess +1864899138b ./config.if + 537897852b ./config.sub +3400028451b ./config/ChangeLog 3004978457b ./config/acinclude.m4 -3317944764b ./config/ChangeLog -1242784498b ./config.guess -1864899138b ./config.if 3007349820b ./config/mh-a68bsd 1442196770b ./config/mh-aix386 3054121875b ./config/mh-apollo68 @@ -210,17 +231,16 @@ 2519884023b ./config/mh-sysv5 456622165b ./config/mh-vaxult2 3265825290b ./config/mh-x86pic -3139906847b ./config-ml.in -2319412792b ./config/mpw/ChangeLog + 198559626b ./config/mpw-mh-mpw +1384213553b ./config/mpw/ChangeLog +3145098931b ./config/mpw/MoveIfChange +1476422091b ./config/mpw/README 4005879853b ./config/mpw/forward-include 439409833b ./config/mpw/g-mpw-make.sed - 198559626b ./config/mpw-mh-mpw -3145098931b ./config/mpw/MoveIfChange 2800114792b ./config/mpw/mpw-touch 3832565257b ./config/mpw/mpw-true 792347706b ./config/mpw/null-command 3439853311b ./config/mpw/open-brace -1476422091b ./config/mpw/README 779160003b ./config/mpw/tr-7to8-src 3832565257b ./config/mpw/true 2474610656b ./config/mt-aix43 @@ -240,66 +260,83 @@ 787786243b ./config/mt-v810 2659154290b ./config/mt-wince 771382916b ./config/mt-x86pic -3897683520b ./config.sub 2416042097b ./configure 3230279174b ./configure.in +2762145970b ./contrib/ChangeLog 1948950130b ./contrib/analyze_brprob -3428325838b ./contrib/ChangeLog 550196746b ./contrib/compare_tests 2828387446b ./contrib/convert_to_f2c 2929939770b ./contrib/convert_to_g2c 2025073358b ./contrib/download_f2c +2292355102b ./contrib/gcc_build +1246833311b ./contrib/gcc_update 1336632236b ./contrib/gccbug.el -2292355102b ./contrib/gcc_build -2687391969b ./contrib/gcc_update 109296376b ./contrib/gennews 4256039795b ./contrib/index-prop 3683285493b ./contrib/newcvsroot +1731874216b ./contrib/regression/ChangeLog +1757898889b ./contrib/regression/README 1596938872b ./contrib/regression/btest-gcc.sh -2896767265b ./contrib/regression/ChangeLog 4208566980b ./contrib/regression/objs-gcc.sh -1757898889b ./contrib/regression/README 1865505596b ./contrib/regression/site.exp 1623905231b ./contrib/test_installed 2523431553b ./contrib/test_summary 3362750683b ./contrib/texi2pod.pl 4228623080b ./contrib/warn_summary -2171125041b ./COPYING - 508743035b ./COPYING.LIB -3205162104b ./.cvsignore -3112237745b ./FAQ - 118439247b ./faq.html -3513702948b ./fastjar/aclocal.m4 +3102205468b ./faq.html 1005262133b ./fastjar/AUTHORS - 640599037b ./fastjar/ChangeLog 1745615150b ./fastjar/CHANGES +1396100520b ./fastjar/COPYING +1593465022b ./fastjar/ChangeLog +2770615802b ./fastjar/INSTALL +3714739366b ./fastjar/Makefile.am + 39617579b ./fastjar/Makefile.in +4038493440b ./fastjar/NEWS +3780741064b ./fastjar/README +3513702948b ./fastjar/aclocal.m4 3743222129b ./fastjar/compress.c 1169302702b ./fastjar/compress.h 754715889b ./fastjar/config.h.in 1796406241b ./fastjar/configure 1220094724b ./fastjar/configure.in -1396100520b ./fastjar/COPYING 3353116274b ./fastjar/dostime.c 446939748b ./fastjar/dostime.h -2770615802b ./fastjar/INSTALL 2331671736b ./fastjar/install-defs.sh.in 1178077958b ./fastjar/install-sh 1960714715b ./fastjar/jargrep.c 4062871816b ./fastjar/jargrep.h 2153374785b ./fastjar/jartool.c 2754304773b ./fastjar/jartool.h -3714739366b ./fastjar/Makefile.am - 39617579b ./fastjar/Makefile.in 990942143b ./fastjar/missing 1455437353b ./fastjar/mkinstalldirs -4038493440b ./fastjar/NEWS 1315168235b ./fastjar/pushback.c 302085493b ./fastjar/pushback.h -3780741064b ./fastjar/README 216805921b ./fastjar/stamp-h.in 3071504729b ./fastjar/zipfile.h +4208197548b ./gcc/.cvsignore 2539671184b ./gcc/ABOUT-GCC-NLS 1758308615b ./gcc/ABOUT-NLS +2171125041b ./gcc/COPYING + 508743035b ./gcc/COPYING.LIB +4098147965b ./gcc/ChangeLog +1398127668b ./gcc/ChangeLog.0 +2827765101b ./gcc/ChangeLog.1 +1199055802b ./gcc/ChangeLog.2 +2924329613b ./gcc/ChangeLog.3 + 164761891b ./gcc/ChangeLog.4 +1481898300b ./gcc/ChangeLog.5 +2613464808b ./gcc/ChangeLog.6 +3235050590b ./gcc/ChangeLog.lib +2146007539b ./gcc/FSFChangeLog +4184732518b ./gcc/FSFChangeLog.10 +3797967515b ./gcc/FSFChangeLog.11 +4134111346b ./gcc/LANGUAGES + 214390302b ./gcc/Makefile.in + 435752999b ./gcc/NEWS + 538471119b ./gcc/ONEWS +2799003008b ./gcc/README-fixinc +2741038711b ./gcc/README.Portability +1084935625b ./gcc/SERVICE 3729933059b ./gcc/acconfig.h 3650551157b ./gcc/aclocal.m4 4242669380b ./gcc/ada/1aexcept.adb @@ -429,8 +466,9 @@ 3425306326b ./gcc/ada/5qtaspri.ads 3925078434b ./gcc/ada/5qvxwork.ads 3811279815b ./gcc/ada/5rosinte.adb -4146733644b ./gcc/ada/5rosinte.ads +1423354446b ./gcc/ada/5rosinte.ads 341619696b ./gcc/ada/5rparame.adb +2774640451b ./gcc/ada/5rtpopsp.adb 3395974413b ./gcc/ada/5sintman.adb 2666853386b ./gcc/ada/5smastop.adb 946915847b ./gcc/ada/5sosinte.adb @@ -494,6 +532,10 @@ 1989930650b ./gcc/ada/86numaux.adb 4223067829b ./gcc/ada/86numaux.ads 176063031b ./gcc/ada/9drpc.adb +1702217023b ./gcc/ada/ChangeLog +3231195932b ./gcc/ada/Make-lang.in + 82447397b ./gcc/ada/Makefile.adalib +3584028360b ./gcc/ada/Makefile.in 1238937539b ./gcc/ada/a-astaco.adb 4160306902b ./gcc/ada/a-astaco.ads 1228169839b ./gcc/ada/a-caldel.adb @@ -511,12 +553,6 @@ 4188471995b ./gcc/ada/a-comlin.adb 1346248274b ./gcc/ada/a-comlin.ads 3629140421b ./gcc/ada/a-cwila1.ads - 307313649b ./gcc/ada/ada.ads -4047226521b ./gcc/ada/ada.h - 885231182b ./gcc/ada/adaint.c -2846678559b ./gcc/ada/adaint.h - 512963659b ./gcc/ada/ada-tree.def - 804772500b ./gcc/ada/ada-tree.h 3138793590b ./gcc/ada/a-decima.adb 1463764551b ./gcc/ada/a-decima.ads 2965106267b ./gcc/ada/a-diocst.adb @@ -548,17 +584,12 @@ 2820771598b ./gcc/ada/a-iwteio.ads 2695025338b ./gcc/ada/a-lfteio.ads 68898824b ./gcc/ada/a-lfwtio.ads -1582815074b ./gcc/ada/ali.adb -1110656306b ./gcc/ada/ali.ads 3958947062b ./gcc/ada/a-liteio.ads -3701505690b ./gcc/ada/ali-util.adb - 534404399b ./gcc/ada/ali-util.ads 3989352502b ./gcc/ada/a-liwtio.ads 706064852b ./gcc/ada/a-llftio.ads 1760483522b ./gcc/ada/a-llfwti.ads 1685529166b ./gcc/ada/a-llitio.ads 1092110807b ./gcc/ada/a-lliwti.ads -1648510288b ./gcc/ada/alloc.ads 3751218976b ./gcc/ada/a-ncelfu.ads 3307386742b ./gcc/ada/a-ngcefu.adb 3410028763b ./gcc/ada/a-ngcefu.ads @@ -587,7 +618,6 @@ 2826402039b ./gcc/ada/a-reatim.ads 4184054556b ./gcc/ada/a-retide.adb 1321308146b ./gcc/ada/a-retide.ads - 151152579b ./gcc/ada/argv.c 4225555660b ./gcc/ada/a-sequio.adb 3093499209b ./gcc/ada/a-sequio.ads 201813662b ./gcc/ada/a-sfteio.ads @@ -678,9 +708,6 @@ 1562031680b ./gcc/ada/a-tiocst.ads 622798727b ./gcc/ada/a-titest.adb 1725647162b ./gcc/ada/a-titest.ads -2460925843b ./gcc/ada/atree.adb -1541614871b ./gcc/ada/atree.ads -1078226318b ./gcc/ada/atree.h 278716747b ./gcc/ada/a-unccon.ads 1157859592b ./gcc/ada/a-uncdea.ads 3576417048b ./gcc/ada/a-witeio.adb @@ -719,6 +746,22 @@ 994042627b ./gcc/ada/a-wtmoio.ads 10193259b ./gcc/ada/a-wttest.adb 3792433389b ./gcc/ada/a-wttest.ads + 512963659b ./gcc/ada/ada-tree.def + 804772500b ./gcc/ada/ada-tree.h + 307313649b ./gcc/ada/ada.ads +4047226521b ./gcc/ada/ada.h +2708993726b ./gcc/ada/adafinal.c + 885231182b ./gcc/ada/adaint.c + 756054851b ./gcc/ada/adaint.h +3701505690b ./gcc/ada/ali-util.adb + 534404399b ./gcc/ada/ali-util.ads +1582815074b ./gcc/ada/ali.adb +1110656306b ./gcc/ada/ali.ads +1648510288b ./gcc/ada/alloc.ads + 151152579b ./gcc/ada/argv.c +2460925843b ./gcc/ada/atree.adb +1541614871b ./gcc/ada/atree.ads +1078226318b ./gcc/ada/atree.h 3092527849b ./gcc/ada/back_end.adb 477747165b ./gcc/ada/back_end.ads 554760143b ./gcc/ada/bcheck.adb @@ -738,7 +781,6 @@ 3825818772b ./gcc/ada/casing.adb 2190810584b ./gcc/ada/casing.ads 3750437973b ./gcc/ada/ceinfo.adb -2529867828b ./gcc/ada/ChangeLog 869185536b ./gcc/ada/checks.adb 440073759b ./gcc/ada/checks.ads 401488734b ./gcc/ada/cio.c @@ -752,13 +794,13 @@ 276146343b ./gcc/ada/cstand.ads 1520807724b ./gcc/ada/cstreams.c 1822736202b ./gcc/ada/cuintp.c +2435692819b ./gcc/ada/debug.adb + 638126818b ./gcc/ada/debug.ads 579009580b ./gcc/ada/debug_a.adb 799315376b ./gcc/ada/debug_a.ads -2435692819b ./gcc/ada/debug.adb - 638126818b ./gcc/ada/debug.ads -1459266024b ./gcc/ada/dec.ads 3565371015b ./gcc/ada/dec-io.adb 2106947862b ./gcc/ada/dec-io.ads +1459266024b ./gcc/ada/dec.ads 2132162623b ./gcc/ada/decl.c 1390338918b ./gcc/ada/deftarg.c 1749835375b ./gcc/ada/directio.ads @@ -776,8 +818,6 @@ 3517544739b ./gcc/ada/exit.c 2311141325b ./gcc/ada/exp_aggr.adb 2860900195b ./gcc/ada/exp_aggr.ads -2681017510b ./gcc/ada/expander.adb -2575484225b ./gcc/ada/expander.ads 2455995554b ./gcc/ada/exp_attr.adb 2274665870b ./gcc/ada/exp_attr.ads 3788438274b ./gcc/ada/exp_ch10.ads @@ -811,7 +851,6 @@ 1460989777b ./gcc/ada/exp_disp.ads 4152673151b ./gcc/ada/exp_dist.adb 2224744101b ./gcc/ada/exp_dist.ads - 196370175b ./gcc/ada/expect.c 2380394819b ./gcc/ada/exp_fixd.adb 2971633787b ./gcc/ada/exp_fixd.ads 383808865b ./gcc/ada/exp_imgv.adb @@ -832,16 +871,18 @@ 2588841819b ./gcc/ada/exp_util.ads 732650724b ./gcc/ada/exp_vfpt.adb 3158703166b ./gcc/ada/exp_vfpt.ads +2681017510b ./gcc/ada/expander.adb +2575484225b ./gcc/ada/expander.ads + 196370175b ./gcc/ada/expect.c 3730235790b ./gcc/ada/fe.h - 742167588b ./gcc/ada/final.c 2410826795b ./gcc/ada/fmap.adb 1989849769b ./gcc/ada/fmap.ads -4193711832b ./gcc/ada/fname.adb -3581054847b ./gcc/ada/fname.ads 2554721004b ./gcc/ada/fname-sf.adb 3385587425b ./gcc/ada/fname-sf.ads 152433494b ./gcc/ada/fname-uf.adb 2869979673b ./gcc/ada/fname-uf.ads +4193711832b ./gcc/ada/fname.adb +3581054847b ./gcc/ada/fname.ads 165073793b ./gcc/ada/freeze.adb 286956192b ./gcc/ada/freeze.ads 146613934b ./gcc/ada/frontend.adb @@ -879,8 +920,6 @@ 1843551212b ./gcc/ada/g-dirope.ads 2129456205b ./gcc/ada/g-dyntab.adb 2301313958b ./gcc/ada/g-dyntab.ads -2000619828b ./gcc/ada/get_targ.adb -4235434426b ./gcc/ada/get_targ.ads 240250153b ./gcc/ada/g-except.ads 311327188b ./gcc/ada/g-exctra.adb 696104010b ./gcc/ada/g-exctra.ads @@ -893,48 +932,14 @@ 1899093730b ./gcc/ada/g-hesorg.ads 615231546b ./gcc/ada/g-htable.adb 1147404231b ./gcc/ada/g-htable.ads -3771528129b ./gcc/ada/gigi.h 4074378557b ./gcc/ada/g-io.adb 2059397144b ./gcc/ada/g-io.ads 3075502902b ./gcc/ada/g-io_aux.adb 2987271187b ./gcc/ada/g-io_aux.ads 2315560945b ./gcc/ada/g-locfil.adb 3845793000b ./gcc/ada/g-locfil.ads -3781796779b ./gcc/ada/gmem.c 2382601227b ./gcc/ada/g-moreex.adb 1324668450b ./gcc/ada/g-moreex.ads -3331018174b ./gcc/ada/gnat1drv.adb -1236781124b ./gcc/ada/gnat1drv.ads -3338432106b ./gcc/ada/gnat.ads -2299667202b ./gcc/ada/gnatbind.adb - 104731427b ./gcc/ada/gnatbind.ads -4059170038b ./gcc/ada/gnatbl.c -3226234054b ./gcc/ada/gnatchop.adb -3118972477b ./gcc/ada/gnatcmd.adb -3908617844b ./gcc/ada/gnatcmd.ads -2796597452b ./gcc/ada/gnatdll.adb -1086468102b ./gcc/ada/gnatfind.adb -3373987329b ./gcc/ada/gnatkr.adb -3373093353b ./gcc/ada/gnatkr.ads - 616714676b ./gcc/ada/gnatlbr.adb -2504670692b ./gcc/ada/gnatlink.adb -2544717462b ./gcc/ada/gnatlink.ads -4282914717b ./gcc/ada/gnatls.adb -1758666063b ./gcc/ada/gnatls.ads -1542183559b ./gcc/ada/gnatmain.adb -3283765307b ./gcc/ada/gnatmain.ads -2033004516b ./gcc/ada/gnatmake.adb - 145840748b ./gcc/ada/gnatmake.ads -1758767486b ./gcc/ada/gnatmem.adb -2813528580b ./gcc/ada/gnatprep.adb -2835105488b ./gcc/ada/gnatprep.ads -3865862564b ./gcc/ada/gnatpsta.adb -3829654473b ./gcc/ada/gnatpsys.adb -2787179765b ./gcc/ada/gnat_rm.texi -1099903949b ./gcc/ada/gnat-style.texi -3866519797b ./gcc/ada/gnat_ug.texi -2880471508b ./gcc/ada/gnatvsn.ads -2692053620b ./gcc/ada/gnatxref.adb 1804647254b ./gcc/ada/g-os_lib.adb 3221085683b ./gcc/ada/g-os_lib.ads 1185528967b ./gcc/ada/g-regexp.adb @@ -969,6 +974,42 @@ 3641101501b ./gcc/ada/g-traceb.ads 4093206552b ./gcc/ada/g-trasym.adb 344030511b ./gcc/ada/g-trasym.ads +2000619828b ./gcc/ada/get_targ.adb +4235434426b ./gcc/ada/get_targ.ads +3771528129b ./gcc/ada/gigi.h +3781796779b ./gcc/ada/gmem.c +1099903949b ./gcc/ada/gnat-style.texi +3338432106b ./gcc/ada/gnat.ads +3331018174b ./gcc/ada/gnat1drv.adb +1236781124b ./gcc/ada/gnat1drv.ads +2787179765b ./gcc/ada/gnat_rm.texi +3866519797b ./gcc/ada/gnat_ug.texi +2299667202b ./gcc/ada/gnatbind.adb + 104731427b ./gcc/ada/gnatbind.ads +4059170038b ./gcc/ada/gnatbl.c +3226234054b ./gcc/ada/gnatchop.adb +3118972477b ./gcc/ada/gnatcmd.adb +3908617844b ./gcc/ada/gnatcmd.ads +2796597452b ./gcc/ada/gnatdll.adb +1086468102b ./gcc/ada/gnatfind.adb +3373987329b ./gcc/ada/gnatkr.adb +3373093353b ./gcc/ada/gnatkr.ads + 616714676b ./gcc/ada/gnatlbr.adb +2504670692b ./gcc/ada/gnatlink.adb +2544717462b ./gcc/ada/gnatlink.ads +4282914717b ./gcc/ada/gnatls.adb +1758666063b ./gcc/ada/gnatls.ads +1542183559b ./gcc/ada/gnatmain.adb +3283765307b ./gcc/ada/gnatmain.ads +2033004516b ./gcc/ada/gnatmake.adb + 145840748b ./gcc/ada/gnatmake.ads +1758767486b ./gcc/ada/gnatmem.adb +2813528580b ./gcc/ada/gnatprep.adb +2835105488b ./gcc/ada/gnatprep.ads +3865862564b ./gcc/ada/gnatpsta.adb +3829654473b ./gcc/ada/gnatpsys.adb +1670534955b ./gcc/ada/gnatvsn.ads +2692053620b ./gcc/ada/gnatxref.adb 577038397b ./gcc/ada/hlo.adb 991320325b ./gcc/ada/hlo.ads 1962035170b ./gcc/ada/hostparm.ads @@ -987,32 +1028,30 @@ 3630365631b ./gcc/ada/i-cstrin.ads 3233154322b ./gcc/ada/i-fortra.adb 3862297824b ./gcc/ada/i-fortra.ads +2660299838b ./gcc/ada/i-os2err.ads +1001031450b ./gcc/ada/i-os2lib.adb +3863909326b ./gcc/ada/i-os2lib.ads +2629699505b ./gcc/ada/i-os2syn.ads +2757162007b ./gcc/ada/i-os2thr.ads + 10095810b ./gcc/ada/i-pacdec.adb +4204365106b ./gcc/ada/i-pacdec.ads +2079820695b ./gcc/ada/i-vxwork.ads 2205213686b ./gcc/ada/impunit.adb 3867557683b ./gcc/ada/impunit.ads -1455106367b ./gcc/ada/init.c + 249803696b ./gcc/ada/init.c 2729724075b ./gcc/ada/inline.adb 409617942b ./gcc/ada/inline.ads 2710275605b ./gcc/ada/interfac.ads 304019218b ./gcc/ada/io-aux.c 182695114b ./gcc/ada/ioexcept.ads -2660299838b ./gcc/ada/i-os2err.ads -1001031450b ./gcc/ada/i-os2lib.adb -3863909326b ./gcc/ada/i-os2lib.ads -2629699505b ./gcc/ada/i-os2syn.ads -2757162007b ./gcc/ada/i-os2thr.ads - 10095810b ./gcc/ada/i-pacdec.adb -4204365106b ./gcc/ada/i-pacdec.ads 3730121014b ./gcc/ada/itypes.adb 1791965281b ./gcc/ada/itypes.ads -2079820695b ./gcc/ada/i-vxwork.ads 1636222037b ./gcc/ada/krunch.adb 3193149413b ./gcc/ada/krunch.ads 3877739435b ./gcc/ada/lang-options.h 2419758820b ./gcc/ada/lang-specs.h 731292528b ./gcc/ada/layout.adb 2930468142b ./gcc/ada/layout.ads -1029825782b ./gcc/ada/lib.adb -1122008701b ./gcc/ada/lib.ads 3615838165b ./gcc/ada/lib-list.adb 13730108b ./gcc/ada/lib-load.adb 2583052213b ./gcc/ada/lib-load.ads @@ -1023,15 +1062,14 @@ 3384492892b ./gcc/ada/lib-writ.ads 1654030036b ./gcc/ada/lib-xref.adb 2167962937b ./gcc/ada/lib-xref.ads +1029825782b ./gcc/ada/lib.adb +1122008701b ./gcc/ada/lib.ads 3576767122b ./gcc/ada/link.c 1382287720b ./gcc/ada/live.adb 241788297b ./gcc/ada/live.ads 2349274909b ./gcc/ada/machcode.ads 1702260548b ./gcc/ada/make.adb 3505443302b ./gcc/ada/make.ads - 82447397b ./gcc/ada/Makefile.adalib -2651233511b ./gcc/ada/Makefile.in -1732491936b ./gcc/ada/Make-lang.in 2073972201b ./gcc/ada/makeusg.adb 2946385998b ./gcc/ada/makeusg.ads 1369191481b ./gcc/ada/math_lib.adb @@ -1045,8 +1083,6 @@ 3394187078b ./gcc/ada/memroot.ads 3285031453b ./gcc/ada/memtrack.adb 2151760376b ./gcc/ada/misc.c -2389340576b ./gcc/ada/mlib.adb -3760284379b ./gcc/ada/mlib.ads 3038778953b ./gcc/ada/mlib-fil.adb 1806810212b ./gcc/ada/mlib-fil.ads 222091384b ./gcc/ada/mlib-prj.adb @@ -1055,6 +1091,8 @@ 3995257659b ./gcc/ada/mlib-tgt.ads 557486163b ./gcc/ada/mlib-utl.adb 3132611148b ./gcc/ada/mlib-utl.ads +2389340576b ./gcc/ada/mlib.adb +3760284379b ./gcc/ada/mlib.ads 2192832241b ./gcc/ada/namet.adb 4115408171b ./gcc/ada/namet.ads 1021113274b ./gcc/ada/namet.h @@ -1070,8 +1108,6 @@ 124998996b ./gcc/ada/osint.ads 1444051127b ./gcc/ada/output.adb 4192286483b ./gcc/ada/output.ads - 667325059b ./gcc/ada/par.adb - 890918457b ./gcc/ada/par.ads 286171607b ./gcc/ada/par-ch10.adb 82263454b ./gcc/ada/par-ch11.adb 977429014b ./gcc/ada/par-ch12.adb @@ -1091,8 +1127,8 @@ 2061902000b ./gcc/ada/par-sync.adb 3034220935b ./gcc/ada/par-tchk.adb 435842982b ./gcc/ada/par-util.adb -2681846287b ./gcc/ada/prj.adb -2159508649b ./gcc/ada/prj.ads + 667325059b ./gcc/ada/par.adb + 890918457b ./gcc/ada/par.ads 769972278b ./gcc/ada/prj-attr.adb 1517107046b ./gcc/ada/prj-attr.ads 2579476649b ./gcc/ada/prj-com.adb @@ -1117,6 +1153,8 @@ 4172539515b ./gcc/ada/prj-tree.ads 195833379b ./gcc/ada/prj-util.adb 2190751868b ./gcc/ada/prj-util.ads +2681846287b ./gcc/ada/prj.adb +2159508649b ./gcc/ada/prj.ads 1173868787b ./gcc/ada/raise.c 137228817b ./gcc/ada/raise.h 2480259783b ./gcc/ada/repinfo.adb @@ -1141,83 +1179,11 @@ 3265586513b ./gcc/ada/s-auxdec.ads 1722353021b ./gcc/ada/s-bitops.adb 2501304200b ./gcc/ada/s-bitops.ads - 468056045b ./gcc/ada/scans.adb - 815846534b ./gcc/ada/scans.ads 368971619b ./gcc/ada/s-chepoo.ads -2107362337b ./gcc/ada/scn.adb - 643548576b ./gcc/ada/scn.ads -3089102575b ./gcc/ada/scn-nlit.adb -4137585658b ./gcc/ada/scn-slit.adb 2083911466b ./gcc/ada/s-crc32.adb 3182978663b ./gcc/ada/s-crc32.ads -1550561834b ./gcc/ada/sdefault.ads 353869099b ./gcc/ada/s-direio.adb 309988644b ./gcc/ada/s-direio.ads -3951057432b ./gcc/ada/sem.adb -1409686204b ./gcc/ada/sem.ads - 666790856b ./gcc/ada/sem_aggr.adb - 526541988b ./gcc/ada/sem_aggr.ads -3591099921b ./gcc/ada/sem_attr.adb -2192022517b ./gcc/ada/sem_attr.ads -2483089446b ./gcc/ada/sem_case.adb -1285698743b ./gcc/ada/sem_case.ads -3650211808b ./gcc/ada/sem_cat.adb -2960627583b ./gcc/ada/sem_cat.ads -3310159843b ./gcc/ada/sem_ch10.adb -1481985747b ./gcc/ada/sem_ch10.ads -4010667392b ./gcc/ada/sem_ch11.adb -1735222025b ./gcc/ada/sem_ch11.ads - 248848194b ./gcc/ada/sem_ch12.adb - 997879767b ./gcc/ada/sem_ch12.ads -2493455042b ./gcc/ada/sem_ch13.adb -3760013065b ./gcc/ada/sem_ch13.ads -1035453033b ./gcc/ada/sem_ch2.adb -2925796260b ./gcc/ada/sem_ch2.ads - 256651025b ./gcc/ada/sem_ch3.adb -3506394288b ./gcc/ada/sem_ch3.ads -3342506445b ./gcc/ada/sem_ch4.adb -3161721114b ./gcc/ada/sem_ch4.ads - 425430463b ./gcc/ada/sem_ch5.adb - 921448714b ./gcc/ada/sem_ch5.ads -3940967835b ./gcc/ada/sem_ch6.adb -3617379945b ./gcc/ada/sem_ch6.ads - 806087534b ./gcc/ada/sem_ch7.adb -2229285886b ./gcc/ada/sem_ch7.ads -2675641382b ./gcc/ada/sem_ch8.adb - 414296948b ./gcc/ada/sem_ch8.ads -2226149000b ./gcc/ada/sem_ch9.adb -2313393680b ./gcc/ada/sem_ch9.ads -2789952266b ./gcc/ada/sem_disp.adb -1522627489b ./gcc/ada/sem_disp.ads - 705974316b ./gcc/ada/sem_dist.adb -1442557709b ./gcc/ada/sem_dist.ads -2065925155b ./gcc/ada/sem_elab.adb - 618332011b ./gcc/ada/sem_elab.ads -2796522258b ./gcc/ada/sem_elim.adb -4083559357b ./gcc/ada/sem_elim.ads -2582716150b ./gcc/ada/sem_eval.adb -1067144441b ./gcc/ada/sem_eval.ads -2566870177b ./gcc/ada/sem_intr.adb -4270264978b ./gcc/ada/sem_intr.ads - 626970173b ./gcc/ada/sem_maps.adb -2624950393b ./gcc/ada/sem_maps.ads -2004945865b ./gcc/ada/sem_mech.adb - 727986888b ./gcc/ada/sem_mech.ads - 211861215b ./gcc/ada/sem_prag.adb - 692139933b ./gcc/ada/sem_prag.ads -1680274646b ./gcc/ada/sem_res.adb -4223338214b ./gcc/ada/sem_res.ads -1966095667b ./gcc/ada/sem_smem.adb -3543394119b ./gcc/ada/sem_smem.ads - 54838574b ./gcc/ada/sem_type.adb -1083645285b ./gcc/ada/sem_type.ads -3315098834b ./gcc/ada/sem_util.adb -3071381257b ./gcc/ada/sem_util.ads - 512361512b ./gcc/ada/sem_vfpt.adb -2796693707b ./gcc/ada/sem_vfpt.ads -4155489467b ./gcc/ada/sem_warn.adb -2670991982b ./gcc/ada/sem_warn.ads -1802605744b ./gcc/ada/sequenio.ads 2211683422b ./gcc/ada/s-errrep.adb 1186812435b ./gcc/ada/s-errrep.ads 561621508b ./gcc/ada/s-except.ads @@ -1264,8 +1230,6 @@ 348300428b ./gcc/ada/s-finimp.ads 3256667434b ./gcc/ada/s-finroo.adb 3539088082b ./gcc/ada/s-finroo.ads -2389974990b ./gcc/ada/sfn_scan.adb -2382113394b ./gcc/ada/sfn_scan.ads 1543367984b ./gcc/ada/s-fore.adb 2136160505b ./gcc/ada/s-fore.ads 1724896850b ./gcc/ada/s-gloloc.adb @@ -1300,18 +1264,7 @@ 306032126b ./gcc/ada/s-imgwch.ads 1632744438b ./gcc/ada/s-imgwiu.adb 3186715504b ./gcc/ada/s-imgwiu.ads -1405497043b ./gcc/ada/sinfo.adb - 267608903b ./gcc/ada/sinfo.ads -2547960021b ./gcc/ada/sinfo-cn.adb - 528396316b ./gcc/ada/sinfo-cn.ads -4211174202b ./gcc/ada/sinfo.h 2491143860b ./gcc/ada/s-inmaop.ads -3969757742b ./gcc/ada/sinput.adb -2051669844b ./gcc/ada/sinput.ads - 318075408b ./gcc/ada/sinput-l.adb -4161724197b ./gcc/ada/sinput-l.ads -2486137427b ./gcc/ada/sinput-p.adb -4179659691b ./gcc/ada/sinput-p.ads 642329874b ./gcc/ada/s-interr.adb 2363118667b ./gcc/ada/s-interr.ads 3439464760b ./gcc/ada/s-intman.ads @@ -1324,9 +1277,6 @@ 412040989b ./gcc/ada/s-mastop.ads 4056300803b ./gcc/ada/s-memory.adb 436917678b ./gcc/ada/s-memory.ads -3972943832b ./gcc/ada/snames.adb -2711732664b ./gcc/ada/snames.ads - 95357118b ./gcc/ada/snames.h 915988587b ./gcc/ada/s-osprim.ads 1785995040b ./gcc/ada/s-pack03.adb 1159696143b ./gcc/ada/s-pack03.ads @@ -1453,8 +1403,6 @@ 1276581093b ./gcc/ada/s-poosiz.adb 2771854951b ./gcc/ada/s-poosiz.ads 2369419157b ./gcc/ada/s-powtab.ads -3261788857b ./gcc/ada/sprint.adb -1590570499b ./gcc/ada/sprint.ads 4071092937b ./gcc/ada/s-proinf.adb 416511513b ./gcc/ada/s-proinf.ads 2266850977b ./gcc/ada/s-rpc.adb @@ -1493,8 +1441,6 @@ 789036441b ./gcc/ada/s-tadert.ads 630027435b ./gcc/ada/s-taenca.adb 2587539578b ./gcc/ada/s-taenca.ads >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:01:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D442B16A4C1; Fri, 5 Sep 2003 15:01:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D04216A4BF for ; Fri, 5 Sep 2003 15:01:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3EE543FF5 for ; Fri, 5 Sep 2003 15:01:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M1Z0U063519 for ; Fri, 5 Sep 2003 15:01:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M1Zf8063516 for perforce@freebsd.org; Fri, 5 Sep 2003 15:01:35 -0700 (PDT) Date: Fri, 5 Sep 2003 15:01:35 -0700 (PDT) Message-Id: <200309052201.h85M1Zf8063516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:01:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=37593 Change 37593 by peter@peter_daintree on 2003/09/05 15:01:12 use brute force to make damn sure the backend is compiled with -g and -static to get the best chance of gdb making sense of the gcc coredumps Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#4 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#4 (text+ko) ==== @@ -65,9 +65,9 @@ # TCFLAGS is used for compilations with the GCC just built. XCFLAGS = TCFLAGS = -CFLAGS = -g +CFLAGS = -g -static STAGE1_CFLAGS = -g @stage1_cflags@ -BOOT_CFLAGS = -g -O2 +BOOT_CFLAGS = -g -static # The warning flags are separate from BOOT_CFLAGS because people tend to # override optimization flags and we'd like them to still have warnings @@ -102,7 +102,7 @@ T_CPPFLAGS = AWK = @AWK@ -CC = @CC@ +CC = @CC@ -g -static BISON = @BISON@ BISONFLAGS = FLEX = @FLEX@ @@ -582,13 +582,13 @@ # IN_GCC distinguishes between code compiled into GCC itself and other # programs built during a bootstrap. # autoconf inserts -DCROSS_COMPILE if we are building a cross compiler. -INTERNAL_CFLAGS = -DIN_GCC @CROSS@ +INTERNAL_CFLAGS = -DIN_GCC @CROSS@ -g -static # This is the variable actually used when we compile. # If you change this line, you probably also need to change the definition # of HOST_CFLAGS in build-make to match. ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) \ - $(CFLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@ + $(CFLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@ -g -static # Likewise. ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) @@ -630,7 +630,7 @@ # Always use -I$(srcdir)/config when compiling. .c.o: - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) -g $(INCLUDES) $< $(OUTPUT_OPTION) # This tells GNU make version 3 not to export all the variables # defined in this file into the environment. @@ -962,7 +962,7 @@ cp xgcc$(exeext) gcc-cross$(exeext) cc1$(exeext): $(C_OBJS) $(BACKEND) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cc1$(exeext) \ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -g -static -o cc1$(exeext) \ $(C_OBJS) $(BACKEND) $(LIBS) # Build the version of limits.h that we will install. From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:02:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACE0D16A4C1; Fri, 5 Sep 2003 15:02:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DE6516A4BF for ; Fri, 5 Sep 2003 15:02:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0229544001 for ; Fri, 5 Sep 2003 15:02:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M2b0U063540 for ; Fri, 5 Sep 2003 15:02:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M2bsH063537 for perforce@freebsd.org; Fri, 5 Sep 2003 15:02:37 -0700 (PDT) Date: Fri, 5 Sep 2003 15:02:37 -0700 (PDT) Message-Id: <200309052202.h85M2bsH063537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:02:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37594 Change 37594 by peter@peter_daintree on 2003/09/05 15:02:11 change a conditional to avoid a compiler crash. This is likely a m3cg/ bug. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#4 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c#4 (text+ko) ==== @@ -10737,13 +10737,13 @@ { if (TREE_CODE (exp) == REAL_CST) { - if (TYPE_MODE (TREE_TYPE (exp)) == DFmode && align < 64) + if (align < 64 && TYPE_MODE (TREE_TYPE (exp)) == DFmode) return 64; - else if (ALIGN_MODE_128 (TYPE_MODE (TREE_TYPE (exp))) && align < 128) + else if (align < 128 && ALIGN_MODE_128 (TYPE_MODE (TREE_TYPE (exp)))) return 128; } - else if (TREE_CODE (exp) == STRING_CST && TREE_STRING_LENGTH (exp) >= 31 - && align < 256) + else if (align < 256 && TREE_CODE (exp) == STRING_CST && + TREE_STRING_LENGTH (exp) >= 31) return 256; return align; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:03:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3A4116A4C1; Fri, 5 Sep 2003 15:03:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7764016A4BF for ; Fri, 5 Sep 2003 15:03:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03A0D43FBD for ; Fri, 5 Sep 2003 15:03:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M3d0U064489 for ; Fri, 5 Sep 2003 15:03:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M3d1M064486 for perforce@freebsd.org; Fri, 5 Sep 2003 15:03:39 -0700 (PDT) Date: Fri, 5 Sep 2003 15:03:39 -0700 (PDT) Message-Id: <200309052203.h85M3d1M064486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:03:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=37595 Change 37595 by peter@peter_daintree on 2003/09/05 15:02:43 dont catch fatal signals in order to ensure a better coredump Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/toplev.c#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/toplev.c#2 (text+ko) ==== @@ -4601,6 +4601,7 @@ gcc_init_libintl (); +#if 0 /* Install handler for SIGFPE, which may be received while we do compile-time floating point arithmetic. */ signal (SIGFPE, float_signal); @@ -4621,6 +4622,7 @@ #if defined SIGIOT && (!defined SIGABRT || SIGABRT != SIGIOT) signal (SIGIOT, crash_signal); #endif +#endif /* Initialize the diagnostics reporting machinery, so option parsing can give warnings and errors. */ From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:05:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AAC116A4C1; Fri, 5 Sep 2003 15:05:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D1A316A4BF for ; Fri, 5 Sep 2003 15:05:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6310043FF9 for ; Fri, 5 Sep 2003 15:05:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M5h0U064602 for ; Fri, 5 Sep 2003 15:05:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M5gGs064599 for perforce@freebsd.org; Fri, 5 Sep 2003 15:05:42 -0700 (PDT) Date: Fri, 5 Sep 2003 15:05:42 -0700 (PDT) Message-Id: <200309052205.h85M5gGs064599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:05:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=37596 Change 37596 by peter@peter_daintree on 2003/09/05 15:04:52 XVECEXP() returns NULL for some reason, causing XEXP() to segfault. I'd love to know why. Presumably m3cg/ isn't setting something that the regular C frontend does. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.c#3 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.c#3 (text+ko) ==== @@ -2066,7 +2066,7 @@ /* Check for a NULL entry, used to indicate that the parameter goes both on the stack and in registers. */ - if (XEXP (XVECEXP (src, 0, 0), 0)) + if (XVECEXP (src, 0, 0) && XEXP (XVECEXP (src, 0, 0), 0)) start = 0; else start = 1; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:06:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5D0016A4C2; Fri, 5 Sep 2003 15:06:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5185B16A4BF for ; Fri, 5 Sep 2003 15:06:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC82844003 for ; Fri, 5 Sep 2003 15:06:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M6j0U064662 for ; Fri, 5 Sep 2003 15:06:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M6jhR064659 for perforce@freebsd.org; Fri, 5 Sep 2003 15:06:45 -0700 (PDT) Date: Fri, 5 Sep 2003 15:06:45 -0700 (PDT) Message-Id: <200309052206.h85M6jhR064659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:06:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=37598 Change 37598 by peter@peter_daintree on 2003/09/05 15:06:05 Another XVECEXP() == NULL workaround. I'm sure this is wrong. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/function.c#3 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/function.c#3 (text+ko) ==== @@ -4616,7 +4616,8 @@ if (entry_parm == stack_parm || (GET_CODE (entry_parm) == PARALLEL - && XEXP (XVECEXP (entry_parm, 0, 0), 0) == NULL_RTX) + && XVECEXP (entry_parm, 0, 0) != NULL + && XEXP (XVECEXP (entry_parm, 0, 0), 0) == NULL_RTX) #if defined (REG_PARM_STACK_SPACE) && ! defined (MAYBE_REG_PARM_STACK_SPACE) /* On some machines, even if a parm value arrives in a register there is still an (uninitialized) stack slot allocated for it. From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:06:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2B3E16A4BF; Fri, 5 Sep 2003 15:06:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 633D516A4C2 for ; Fri, 5 Sep 2003 15:06:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68C4A43FE1 for ; Fri, 5 Sep 2003 15:06:46 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M6k0U064668 for ; Fri, 5 Sep 2003 15:06:46 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M6jDa064665 for perforce@freebsd.org; Fri, 5 Sep 2003 15:06:45 -0700 (PDT) Date: Fri, 5 Sep 2003 15:06:45 -0700 (PDT) Message-Id: <200309052206.h85M6jDa064665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=37599 Change 37599 by sam@sam_ebb on 2003/09/05 15:06:20 IFC Affected files ... .. //depot/projects/netperf/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/netperf/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/netperf/sys/dev/awi/awi_wep.c#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/netperf/sys/i386/isa/isa.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/netperf/sys/i386/isa/isa_device.h#2 integrate .. //depot/projects/netperf/sys/isa/fd.c#2 integrate .. //depot/projects/netperf/sys/isa/isareg.h#2 integrate .. //depot/projects/netperf/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/netperf/sys/net/bpf.c#6 integrate .. //depot/projects/netperf/sys/net/if_vlan.c#4 integrate .. //depot/projects/netperf/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/netperf/sys/netinet/ip_input.c#4 integrate .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#4 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/include/ucontext.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.13 2003/05/12 18:33:19 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.14 2003/09/05 20:47:27 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -70,11 +70,11 @@ #define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */ #define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */ long mc_ownedfp; - long mc_spare1[1]; /* align next field to 16 bytes */ + long mc_spare1[1]; /* align mc_fpstate to 16 bytes */ /* * See for the internals of mc_fpstate[]. */ - long mc_fpstate[128] __aligned(16); + long mc_fpstate[64] __aligned(16); long mc_spare2[8]; } mcontext_t; ==== //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.81 2003/09/03 04:46:28 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $"); #include "opt_cd.h" @@ -152,7 +152,9 @@ int bufs_left; struct cam_periph *periph; dev_t dev; +#ifndef BURN_BRIDGES eventhandler_tag clonetag; +#endif int minimum_command_size; int outstanding_cmds; struct task sysctl_task; @@ -341,6 +343,7 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; +#ifndef BURN_BRIDGES static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -360,6 +363,7 @@ *dev = softc->dev; return; } +#endif static void cdinit(void) @@ -531,7 +535,9 @@ } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); +#ifndef BURN_BRIDGES EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); +#endif free(softc, M_DEVBUF); splx(s); } @@ -776,8 +782,10 @@ softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; +#ifndef BURN_BRIDGES softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); +#endif /* * Add an async callback so that we get ==== //depot/projects/netperf/sys/dev/adlink/adlink.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.4 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.5 2003/09/05 11:05:41 phk Exp $"); #ifdef _KERNEL #include @@ -274,7 +274,7 @@ /* Sample CH0 only */ bus_space_write_4(sc->t1, sc->h1, 0x00, 1); - /* Divide clock by ten */ + /* Divide clock by four */ bus_space_write_4(sc->t1, sc->h1, 0x04, 4); /* Software trigger mode: software */ ==== //depot/projects/netperf/sys/dev/ata/atapi-cd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.141 2003/09/02 15:53:01 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $"); #include "opt_ata.h" #include @@ -242,7 +242,9 @@ free(entry, M_ACD); } destroy_dev(cdp->dev); +#ifndef BURN_BRIDGES EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); +#endif devstat_remove_entry(cdp->stats); ata_prtdev(atadev, "WARNING - removed from configuration\n"); ata_free_name(atadev); @@ -273,6 +275,7 @@ return cdp; } +#ifndef BURN_BRIDGES static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -289,6 +292,7 @@ if (unit == cdp->lun) *dev = makedev(acd_cdevsw.d_maj, cdp->lun); } +#endif static void acd_make_dev(struct acd_softc *cdp) @@ -300,7 +304,9 @@ dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; +#ifndef BURN_BRIDGES cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); +#endif acd_set_ioparm(cdp); } ==== //depot/projects/netperf/sys/dev/ata/atapi-cd.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.36 2003/08/24 09:22:26 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $ */ /* CDROM Table Of Contents */ @@ -322,5 +322,7 @@ int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ +#ifndef BURN_BRIDGES eventhandler_tag clone_evh; +#endif }; ==== //depot/projects/netperf/sys/dev/awi/awi_wep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.14 2003/08/24 17:48:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.15 2003/09/05 11:09:26 phk Exp $"); /* * WEP support framework for the awi driver. @@ -240,7 +240,7 @@ int ctxlen; awi_crc_init(); /* XXX: not belongs here */ - if (algo < 0 || algo > sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0])) + if (algo < 0 || algo >= sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0])) return EINVAL; awa = &awi_wep_algo[algo]; if (awa->awa_name == NULL) ==== //depot/projects/netperf/sys/dev/pccard/pccard.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.83 2003/08/25 18:20:03 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.84 2003/09/05 03:08:08 imp Exp $"); #include #include @@ -284,14 +284,16 @@ struct pccard_softc *sc = PCCARD_SOFTC(dev); struct pccard_function *pf; struct pccard_config_entry *cfe; + int state; /* * We are running on either the PCCARD socket's event thread * or in user context detaching a device by user request. */ STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) { - int state = device_get_state(pf->dev); - + if (pf->dev == NULL) + continue; + state = device_get_state(pf->dev); if (state == DS_ATTACHED || state == DS_BUSY) device_detach(pf->dev); if (pf->cfe != NULL) ==== //depot/projects/netperf/sys/i386/isa/isa.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $ + * $FreeBSD: src/sys/i386/isa/isa.h,v 1.24 2003/09/05 14:54:26 peter Exp $ */ #ifdef PC98 @@ -187,14 +187,4 @@ #define RAM_SIZE (RAM_END - RAM_BEGIN) #endif /* !RAM_BEGIN */ -/* - * Oddball Physical Memory Addresses - */ -#ifndef COMPAQ_RAMRELOC -#define COMPAQ_RAMRELOC 0x80C00000 /* Compaq RAM relocation/diag */ -#define COMPAQ_RAMSETUP 0x80C00002 /* Compaq RAM setup */ -#define WEITEK_FPU 0xC0000000 /* WTL 2167 */ -#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */ -#endif /* !COMPAQ_RAMRELOC */ - #endif /* !_I386_ISA_ISA_H_ */ ==== //depot/projects/netperf/sys/i386/isa/isa_compat.c#2 (text+ko) ==== @@ -24,8 +24,10 @@ * SUCH DAMAGE. */ +#ifndef BURN_BRIDGES + #include -__FBSDID("$FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.27 2003/06/02 16:32:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.28 2003/09/05 14:55:11 peter Exp $"); #include #include @@ -295,3 +297,7 @@ } return 0; } + +#else +#error "cvs rm sys/i386/isa/isa_compat.c" +#endif ==== //depot/projects/netperf/sys/i386/isa/isa_device.h#2 (text+ko) ==== @@ -31,12 +31,14 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.76 2002/07/09 01:16:18 mike Exp $ + * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.77 2003/09/05 14:55:11 peter Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ #define _I386_ISA_ISA_DEVICE_H_ +#ifndef BURN_BRIDGES + #ifdef _KERNEL #include #include @@ -109,4 +111,8 @@ #endif /* COMPAT_OLDISA */ +#else /* BURN_BRIDGES */ +#error "cvs rm sys/i386/isa/isa_device.h" +#endif /* BURN_BRIDGES */ + #endif /* !_I386_ISA_ISA_DEVICE_H_ */ ==== //depot/projects/netperf/sys/isa/fd.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.256 2003/07/02 16:09:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.257 2003/09/05 10:40:16 phk Exp $"); #include "opt_fdc.h" #include "card.h" @@ -316,9 +316,11 @@ struct callout_handle toffhandle; struct callout_handle tohandle; struct devstat *device_stats; + dev_t masterdev; +#ifndef BURN_BRIDGES eventhandler_tag clonetag; - dev_t masterdev; dev_t clonedevs[NUMDENS - 1]; +#endif device_t dev; fdu_t fdu; }; @@ -386,7 +388,9 @@ static void fdc_add_child(device_t, const char *, int); static int fdc_attach(device_t); static int fdc_print_child(device_t, device_t); +#ifndef BURN_BRIDGES static void fd_clone (void *, char *, int, dev_t *); +#endif static int fd_probe(device_t); static int fd_attach(device_t); static int fd_detach(device_t); @@ -1117,6 +1121,7 @@ #endif /* NCARD > 0 */ +#ifndef BURN_BRIDGES /* * Create a clone device upon request by devfs. */ @@ -1170,6 +1175,7 @@ } } } +#endif /* * Configuration/initialization, per drive. @@ -1323,14 +1329,20 @@ fd_attach(device_t dev) { struct fd_data *fd; - int i; fd = device_get_softc(dev); +#ifndef BURN_BRIDGES fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000); +#endif fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu); +#ifndef BURN_BRIDGES + { + int i; for (i = 0; i < NUMDENS - 1; i++) fd->clonedevs[i] = NODEV; + } +#endif fd->device_stats = devstat_new_entry(device_get_name(dev), device_get_unit(dev), 0, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_FLOPPY | DEVSTAT_TYPE_IF_OTHER, @@ -1342,16 +1354,20 @@ fd_detach(device_t dev) { struct fd_data *fd; - int i; fd = device_get_softc(dev); untimeout(fd_turnoff, fd, fd->toffhandle); devstat_remove_entry(fd->device_stats); destroy_dev(fd->masterdev); +#ifndef BURN_BRIDGES + { + int i; for (i = 0; i < NUMDENS - 1; i++) if (fd->clonedevs[i] != NODEV) destroy_dev(fd->clonedevs[i]); EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag); + } +#endif return (0); } ==== //depot/projects/netperf/sys/isa/isareg.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/isa/isareg.h,v 1.8 2003/02/02 13:06:18 nyan Exp $ + * $FreeBSD: src/sys/isa/isareg.h,v 1.9 2003/09/05 14:54:26 peter Exp $ */ #ifdef PC98 @@ -195,14 +195,4 @@ #define RAM_SIZE (RAM_END - RAM_BEGIN) #endif /* !RAM_BEGIN */ -/* - * Oddball Physical Memory Addresses - */ -#ifndef COMPAQ_RAMRELOC -#define COMPAQ_RAMRELOC 0x80C00000 /* Compaq RAM relocation/diag */ -#define COMPAQ_RAMSETUP 0x80C00002 /* Compaq RAM setup */ -#define WEITEK_FPU 0xC0000000 /* WTL 2167 */ -#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */ -#endif /* !COMPAQ_RAMRELOC */ - #endif /* !_ISA_ISA_H_ */ ==== //depot/projects/netperf/sys/kern/subr_msgbuf.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.1 2003/06/22 02:18:31 iedowse Exp $ + * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.2 2003/09/05 11:12:00 phk Exp $ */ /* @@ -73,8 +73,11 @@ mbp->msg_ptr = ptr; cksum = msgbuf_cksum(mbp); if (cksum != mbp->msg_cksum) { - printf("msgbuf cksum mismatch (read %x, calc %x)\n", - mbp->msg_cksum, cksum); + if (bootverbose) { + printf("msgbuf cksum mismatch (read %x, calc %x)\n", + mbp->msg_cksum, cksum); + printf("Old msgbuf not recovered\n"); + } msgbuf_clear(mbp); } } ==== //depot/projects/netperf/sys/net/bpf.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.114 2003/08/19 17:51:09 sam Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.115 2003/09/04 22:27:45 sam Exp $ */ #include "opt_bpf.h" ==== //depot/projects/netperf/sys/net/if_vlan.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.51 2003/07/08 21:54:20 wpaul Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.52 2003/09/05 20:58:59 sam Exp $ */ /* ==== //depot/projects/netperf/sys/netinet/ip_divert.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.74 2003/04/08 14:25:45 des Exp $ + * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.75 2003/09/05 00:00:51 sam Exp $ */ #include "opt_inet.h" ==== //depot/projects/netperf/sys/netinet/ip_input.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.240 2003/07/22 18:58:34 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.241 2003/09/05 00:10:33 sam Exp $ */ #include "opt_bootp.h" ==== //depot/projects/netperf/sys/nfsclient/bootp_subr.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.51 2003/08/15 12:04:02 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.52 2003/09/05 11:12:55 phk Exp $"); #include "opt_bootp.h" @@ -191,10 +191,7 @@ #define OVERLOAD_SNAME 2 /* Site specific tags: */ -#define TAG_SWAP 128 -#define TAG_SWAPSIZE 129 #define TAG_ROOTOPTS 130 -#define TAG_SWAPOPTS 131 #define TAG_COOKIE 134 /* ascii info for userland, via sysctl */ #define TAG_DHCP_MSGTYPE 53 From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:07:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5719C16A4C1; Fri, 5 Sep 2003 15:07:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A93E16A4BF for ; Fri, 5 Sep 2003 15:07:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D23343FA3 for ; Fri, 5 Sep 2003 15:07:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M7m0U064737 for ; Fri, 5 Sep 2003 15:07:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M7lXH064734 for perforce@freebsd.org; Fri, 5 Sep 2003 15:07:47 -0700 (PDT) Date: Fri, 5 Sep 2003 15:07:47 -0700 (PDT) Message-Id: <200309052207.h85M7lXH064734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:07:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=37600 Change 37600 by peter@peter_daintree on 2003/09/05 15:07:05 manually sort the exceptions to match the declaration order. The m3 sort function isn't working in the compiler. Affected files ... .. //depot/projects/ezm3/libs/libm3/src/formatter/Formatter.m3#2 edit Differences ... ==== //depot/projects/ezm3/libs/libm3/src/formatter/Formatter.m3#2 (text+ko) ==== @@ -136,7 +136,7 @@ TYPE OpProc = PROCEDURE (t: T; m: Mode; VAR p: Position; i, x: CARDINAL): BOOLEAN - RAISES {Wr.Failure, Thread.Alerted}; + RAISES {Thread.Alerted, Wr.Failure}; Op = REF RECORD proc: OpProc; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:08:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFC0816A4C1; Fri, 5 Sep 2003 15:08:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 862D616A4BF for ; Fri, 5 Sep 2003 15:08:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A91243F75 for ; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M8o0U064756 for ; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M8o7h064753 for perforce@freebsd.org; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) Date: Fri, 5 Sep 2003 15:08:50 -0700 (PDT) Message-Id: <200309052208.h85M8o7h064753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=37601 Change 37601 by peter@peter_daintree on 2003/09/05 15:07:48 comment out the sort calls in the linker. This causes an exception when an array gets trashed/overflowed/something bad. This is a sign of a more serious problem. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#2 (text+ko) ==== @@ -8,7 +8,7 @@ MODULE MxGen; -IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio, IntArraySort; +IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio (*, IntArraySort *); IMPORT Mx, MxRep, MxMap, M3ID, M3RT, Target; <*FATAL Wr.Failure, Thread.Alerted*> @@ -311,6 +311,7 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); +(* PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -319,6 +320,7 @@ ELSE RETURN +1; END; END CmpUnit; +*) BEGIN ui := all_ui; @@ -330,7 +332,7 @@ END; <*ASSERT cnt = n_units*> - IntArraySort.Sort (map^, CmpUnit); + (* IntArraySort.Sort (map^, CmpUnit); *) (* rebuild the linked list *) ui := NIL; ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#2 (text+ko) ==== @@ -10,7 +10,7 @@ (* Modified On Fri Jul 2 19:33:09 PDT 1993 By muller *) MODULE MxGenRep; -IMPORT IntRefTbl, Wr, IntArraySort, Fmt, Thread; +IMPORT IntRefTbl, Wr, (* IntArraySort,*) Fmt, Thread; IMPORT Mx, MxRep, M3ID, MxMap; <* FATAL Thread.Alerted, Wr.Failure *> @@ -109,6 +109,7 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); +(* PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -117,6 +118,7 @@ ELSE RETURN +1; END; END CmpUnit; +*) BEGIN ui := all_ui; @@ -128,7 +130,7 @@ END; <*ASSERT cnt = n_units*> - IntArraySort.Sort (map^, CmpUnit); + (*IntArraySort.Sort (map^, CmpUnit); *) (* rebuild the linked list *) ui := NIL; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:21:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63A9816A4C1; Fri, 5 Sep 2003 15:21:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 265BD16A4BF for ; Fri, 5 Sep 2003 15:21:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE38143FBD for ; Fri, 5 Sep 2003 15:21:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85ML70U065605 for ; Fri, 5 Sep 2003 15:21:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85ML7J5065602 for perforce@freebsd.org; Fri, 5 Sep 2003 15:21:07 -0700 (PDT) Date: Fri, 5 Sep 2003 15:21:07 -0700 (PDT) Message-Id: <200309052221.h85ML7J5065602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=37604 Change 37604 by peter@peter_hammer on 2003/09/05 15:20:30 increase size of fpjmp_buf for safety Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#2 (text+ko) ==== @@ -14,7 +14,7 @@ jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, just in case *) - fpjmp_buf = ARRAY [0..71] OF long; (* this is needed to hold the + fpjmp_buf = ARRAY [0..79] OF long; (* this is needed to hold the fpu state, which the ordinary versions of setjmp/longjmp do not save and restore *) From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:23:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19CE16A4C0; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A88816A4C1 for ; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A10043FB1 for ; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85MNB0U065745 for ; Fri, 5 Sep 2003 15:23:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MNB0Q065740 for perforce@freebsd.org; Fri, 5 Sep 2003 15:23:11 -0700 (PDT) Date: Fri, 5 Sep 2003 15:23:11 -0700 (PDT) Message-Id: <200309052223.h85MNB0Q065740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=37607 Change 37607 by peter@peter_hammer on 2003/09/05 15:22:27 checkpoint the fp save/restore stuff. this isn't enough because m3 doesn't know how to align it to 16 bytes and copies it around. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#2 (text+ko) ==== @@ -68,7 +68,9 @@ movq %r13,40(%rax) /* 5; r13 */ movq %r14,48(%rax) /* 6; r14 */ movq %r15,56(%rax) /* 7; r15 */ - fxsave 64(%rax) /* 8 - 71; fp state */ + addq $(64+15),%rax + andq $(~15),%rax + fxsave (%rax) /* 8:10 - 71:73; fp state */ xorq %rax,%rax ret @@ -89,7 +91,10 @@ movq 40(%rdx),%r13 movq 48(%rdx),%r14 movq 56(%rdx),%r15 - fxrstor 64(%rdx) + addq $(64+15),%rdx + andq $(~15),%rdx + movl $0xffbf,0x1c(%rdx) + fxrstor (%rdx) testq %rax,%rax jnz 1f incq %rax From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:23:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98CC716A4D8; Fri, 5 Sep 2003 15:23:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2905916A4F1 for ; Fri, 5 Sep 2003 15:23:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 933CA43FB1 for ; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85MNC0U065751 for ; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MNCYh065748 for perforce@freebsd.org; Fri, 5 Sep 2003 15:23:12 -0700 (PDT) Date: Fri, 5 Sep 2003 15:23:12 -0700 (PDT) Message-Id: <200309052223.h85MNCYh065748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:23:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=37608 Change 37608 by peter@peter_hammer on 2003/09/05 15:22:47 manually sort some exception lists Affected files ... .. //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromSource.m3#2 edit .. //depot/projects/ezm3/network/tcplibs/tcp/src/POSIX/TCP.m3#2 edit Differences ... ==== //depot/projects/ezm3/graphics/gr-libs/jvideo/src/POSIX/JVFromSource.m3#2 (text+ko) ==== @@ -39,7 +39,7 @@ END NewBuf; PROCEDURE Make (f: Factory; wait := TRUE; subtype: CARDINAL): JvsBuffer.T - RAISES {OSError.E, Thread.Alerted} = + RAISES {Thread.Alerted, OSError.E} = VAR res, ptr: T; BEGIN LOCK fmu DO ==== //depot/projects/ezm3/network/tcplibs/tcp/src/POSIX/TCP.m3#2 (text+ko) ==== @@ -288,7 +288,7 @@ PROCEDURE GetBytesFD( t: T; VAR arr: ARRAY OF CHAR; timeout: LONGREAL) : CARDINAL - RAISES {Rd.Failure, ConnFD.TimedOut, Thread.Alerted} = + RAISES {Rd.Failure, Thread.Alerted, ConnFD.TimedOut} = VAR len: INTEGER; BEGIN From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:24:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 538AC16A4C1; Fri, 5 Sep 2003 15:24:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16FA216A4BF for ; Fri, 5 Sep 2003 15:24:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B1E043FBD for ; Fri, 5 Sep 2003 15:24:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85MOE0U065795 for ; Fri, 5 Sep 2003 15:24:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MOEST065792 for perforce@freebsd.org; Fri, 5 Sep 2003 15:24:14 -0700 (PDT) Date: Fri, 5 Sep 2003 15:24:14 -0700 (PDT) Message-Id: <200309052224.h85MOEST065792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37609 Change 37609 by peter@peter_hammer on 2003/09/05 15:24:05 guard against XVECEXP returning null. This is wrong. I think it should be (XVECEXP() == 0 || XEXP(XVECEXP() == 0). Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/calls.c#4 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/calls.c#4 (text+ko) ==== @@ -1342,7 +1342,7 @@ it means that we are to pass this arg in the register(s) designated by the PARALLEL, but also to pass it in the stack. */ if (args[i].reg && GET_CODE (args[i].reg) == PARALLEL - && XEXP (XVECEXP (args[i].reg, 0, 0), 0) == 0) + && XVECEXP (args[i].reg, 0, 0) && XEXP (XVECEXP (args[i].reg, 0, 0), 0) == 0) args[i].pass_on_stack = 1; /* If this is an addressable type, we must preallocate the stack From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:26:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 946DB16A4C1; Fri, 5 Sep 2003 15:26:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58ED916A4BF for ; Fri, 5 Sep 2003 15:26:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C76BE43FBD for ; Fri, 5 Sep 2003 15:26:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85MQH0U065927 for ; Fri, 5 Sep 2003 15:26:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MQHL2065924 for perforce@freebsd.org; Fri, 5 Sep 2003 15:26:17 -0700 (PDT) Date: Fri, 5 Sep 2003 15:26:17 -0700 (PDT) Message-Id: <200309052226.h85MQHL2065924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=37610 Change 37610 by peter@peter_hammer on 2003/09/05 15:25:27 one last XVECEXP() workaround Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.c#4 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/expr.c#4 (text+ko) ==== @@ -1956,7 +1956,7 @@ /* Check for a NULL entry, used to indicate that the parameter goes both on the stack and in registers. */ - if (XEXP (XVECEXP (dst, 0, 0), 0)) + if (XVECEXP (dst, 0, 0) && XEXP (XVECEXP (dst, 0, 0), 0)) start = 0; else start = 1; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:34:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E89E716A4C1; Fri, 5 Sep 2003 15:34:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC02F16A4BF for ; Fri, 5 Sep 2003 15:34:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BE2E43FE1 for ; Fri, 5 Sep 2003 15:34:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85MYV0U066490 for ; Fri, 5 Sep 2003 15:34:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MYUdT066487 for perforce@freebsd.org; Fri, 5 Sep 2003 15:34:30 -0700 (PDT) Date: Fri, 5 Sep 2003 15:34:30 -0700 (PDT) Message-Id: <200309052234.h85MYUdT066487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:34:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=37615 Change 37615 by peter@peter_hammer on 2003/09/05 15:33:57 add initial support for 128 bit alignment Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.i3#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#3 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.i3#2 (text+ko) ==== @@ -124,7 +124,7 @@ VAR (*CONST*) (* sorted list of supported machine alignments *) - Alignments: ARRAY [0..3] OF CARDINAL; + Alignments: ARRAY [0..4] OF CARDINAL; (*------------------------------------------------------- procedure calls ---*) ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#3 (text+ko) ==== @@ -132,6 +132,7 @@ Alignments[1] := 16; Alignments[2] := 32; Alignments[3] := 64; + Alignments[4] := 128; CCs := NIL; @@ -331,7 +332,7 @@ Address := Word_D; Address.cg_type := CGType.Addr; - max_align := 64; + max_align := 128; Little_endian := TRUE; PCC_bitfield_type_matters := TRUE; Structure_size_boundary := 8; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:43:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C6F816A4C1; Fri, 5 Sep 2003 15:43:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C430A16A4BF for ; Fri, 5 Sep 2003 15:43:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F8BA43FDD for ; Fri, 5 Sep 2003 15:43:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Mhj0U067019 for ; Fri, 5 Sep 2003 15:43:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MhipM067016 for perforce@freebsd.org; Fri, 5 Sep 2003 15:43:44 -0700 (PDT) Date: Fri, 5 Sep 2003 15:43:44 -0700 (PDT) Message-Id: <200309052243.h85MhipM067016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:43:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=37619 Change 37619 by peter@peter_hammer on 2003/09/05 15:43:21 Teach the compiler about 128 bit alignment Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#4 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#4 (text+ko) ==== @@ -312,6 +312,11 @@ EOL := "\n"; | Systems.FBSD_AMD64 => + Extended.size := 80; + Extended.align := 128; + Extended.min := Float{Precision.Extended, 0,-1.1897314953572317650E+4932L}; + Extended.max := Float{Precision.Extended, 0, 1.1897314953572317650E+4932L}; + Int_C.cg_type := CGType.Int_C; Word_C.cg_type := CGType.Word_C; Word_C.max.x[1] := FF; @@ -338,7 +343,7 @@ Structure_size_boundary := 8; Bitfield_can_overlap := FALSE; First_readable_addr := 4096 * Char.size; - Jumpbuf_size := 72 * Address.size; + Jumpbuf_size := 74 * Address.size; Jumpbuf_align := Address.align; Fixed_frame_size := 4 * Address.size; Guard_page_size := 4096 * Char.size; @@ -347,7 +352,7 @@ Setjmp := "_setjmp"; Checks_integer_ops := FALSE; Global_handler_stack := TRUE; - Aligned_procedures := TRUE; + Aligned_procedures := FALSE; EOL := "\n"; | Systems.FBSD_SPARC64 => From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:51:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B85516A4C4; Fri, 5 Sep 2003 15:51:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3953016A4ED for ; Fri, 5 Sep 2003 15:51:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A392440E2 for ; Fri, 5 Sep 2003 15:50:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Mou0U067394 for ; Fri, 5 Sep 2003 15:50:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Mot8d067389 for perforce@freebsd.org; Fri, 5 Sep 2003 15:50:55 -0700 (PDT) Date: Fri, 5 Sep 2003 15:50:55 -0700 (PDT) Message-Id: <200309052250.h85Mot8d067389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:51:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=37621 Change 37621 by peter@peter_hammer on 2003/09/05 15:50:52 use long_double for the 16 byte alignment Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#3 (text+ko) ==== @@ -14,10 +14,10 @@ jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, just in case *) - fpjmp_buf = ARRAY [0..79] OF long; (* this is needed to hold the - fpu state, which the ordinary - versions of setjmp/longjmp - do not save and restore *) + fpjmp_buf = RECORD + int_stuff: ARRAY [0..79] OF long; + fp_stuff: ARRAY [xx .. yy] OF long_double; + END; <*EXTERNAL "setjmp" *> PROCEDURE setjmp (VAR env: jmp_buf): int; <*EXTERNAL "longjmp" *> PROCEDURE longjmp (VAR env: jmp_buf; val: int); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:53:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1143B16A4C1; Fri, 5 Sep 2003 15:53:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C865216A4BF for ; Fri, 5 Sep 2003 15:53:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3655D4400F for ; Fri, 5 Sep 2003 15:53:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Mqx0U067479 for ; Fri, 5 Sep 2003 15:52:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Mqx5d067476 for perforce@freebsd.org; Fri, 5 Sep 2003 15:52:59 -0700 (PDT) Date: Fri, 5 Sep 2003 15:52:59 -0700 (PDT) Message-Id: <200309052252.h85Mqx5d067476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=37622 Change 37622 by peter@peter_hammer on 2003/09/05 15:52:01 depend on long_double alignment Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#3 (text+ko) ==== @@ -68,9 +68,7 @@ movq %r13,40(%rax) /* 5; r13 */ movq %r14,48(%rax) /* 6; r14 */ movq %r15,56(%rax) /* 7; r15 */ - addq $(64+15),%rax - andq $(~15),%rax - fxsave (%rax) /* 8:10 - 71:73; fp state */ + fxsave 64(%rax) /* 8 - 71; fp state */ xorq %rax,%rax ret @@ -91,10 +89,7 @@ movq 40(%rdx),%r13 movq 48(%rdx),%r14 movq 56(%rdx),%r15 - addq $(64+15),%rdx - andq $(~15),%rdx - movl $0xffbf,0x1c(%rdx) - fxrstor (%rdx) + fxrstor 64(%rdx) testq %rax,%rax jnz 1f incq %rax From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:55:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C75A616A4C1; Fri, 5 Sep 2003 15:55:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B99D16A4BF for ; Fri, 5 Sep 2003 15:55:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ABF743FF2 for ; Fri, 5 Sep 2003 15:55:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Mt30U067538 for ; Fri, 5 Sep 2003 15:55:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Mt24P067535 for perforce@freebsd.org; Fri, 5 Sep 2003 15:55:02 -0700 (PDT) Date: Fri, 5 Sep 2003 15:55:02 -0700 (PDT) Message-Id: <200309052255.h85Mt24P067535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:55:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=37623 Change 37623 by peter@peter_hammer on 2003/09/05 15:54:13 update fpjmp_buf with real offsets Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#4 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#4 (text+ko) ==== @@ -14,9 +14,11 @@ jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, just in case *) + (* We use a special state for context switching due to floating point, + which setjmp/longjmp do not deal with. Record length = 72 longs. *) fpjmp_buf = RECORD - int_stuff: ARRAY [0..79] OF long; - fp_stuff: ARRAY [xx .. yy] OF long_double; + int_stuff: ARRAY [0..7] OF long; (* integer registers *) + fp_stuff: ARRAY [0..31] OF long_double; (* floating point fxsave *) END; <*EXTERNAL "setjmp" *> PROCEDURE setjmp (VAR env: jmp_buf): int; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:57:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3D6B16A4C1; Fri, 5 Sep 2003 15:57:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8689416A4BF for ; Fri, 5 Sep 2003 15:57:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1769944001 for ; Fri, 5 Sep 2003 15:57:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Mv70U067685 for ; Fri, 5 Sep 2003 15:57:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Mv7IO067682 for perforce@freebsd.org; Fri, 5 Sep 2003 15:57:07 -0700 (PDT) Date: Fri, 5 Sep 2003 15:57:07 -0700 (PDT) Message-Id: <200309052257.h85Mv7IO067682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:57:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=37625 Change 37625 by peter@peter_hammer on 2003/09/05 15:56:46 guess at what the M3 syntax would be like for the record member of SaveState Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#2 (text+ko) ==== @@ -16,7 +16,7 @@ PROCEDURE SP (READONLY s: State): ADDRESS = BEGIN - RETURN LOOPHOLE (s [SP_pos], ADDRESS); + RETURN LOOPHOLE (s.int_stuff [SP_pos], ADDRESS); END SP; (*--------------------------------------------------------- thread stacks ---*) @@ -70,7 +70,7 @@ PROCEDURE UpdateStateForNewSP (VAR s: State; offset: INTEGER) = BEGIN - INC (s [SP_pos], offset); + INC (s.int_stuff [SP_pos], offset); END UpdateStateForNewSP; PROCEDURE UpdateFrameForNewSP (<*UNUSED*> a: ADDRESS; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 16:15:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B7DC16A4C1; Fri, 5 Sep 2003 16:15:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBDFE16A4BF for ; Fri, 5 Sep 2003 16:15:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ACC743FCB for ; Fri, 5 Sep 2003 16:15:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85NFW0U069416 for ; Fri, 5 Sep 2003 16:15:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85NFV5R069413 for perforce@freebsd.org; Fri, 5 Sep 2003 16:15:31 -0700 (PDT) Date: Fri, 5 Sep 2003 16:15:31 -0700 (PDT) Message-Id: <200309052315.h85NFV5R069413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 23:15:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=37628 Change 37628 by peter@peter_daintree on 2003/09/05 16:14:34 OK, so I suppose conventional notation is too good, lets use the M3 mutation so that it compiles. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#5 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#5 (text+ko) ==== @@ -314,8 +314,8 @@ | Systems.FBSD_AMD64 => Extended.size := 80; Extended.align := 128; - Extended.min := Float{Precision.Extended, 0,-1.1897314953572317650E+4932L}; - Extended.max := Float{Precision.Extended, 0, 1.1897314953572317650E+4932L}; + Extended.min := Float{Precision.Extended, 0,-1.1897314953572317650x+4932}; + Extended.max := Float{Precision.Extended, 0, 1.1897314953572317650x+4932}; Int_C.cg_type := CGType.Int_C; Word_C.cg_type := CGType.Word_C; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 16:31:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E915916A4C1; Fri, 5 Sep 2003 16:31:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAEEF16A4BF for ; Fri, 5 Sep 2003 16:31:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D49543FDD for ; Fri, 5 Sep 2003 16:31:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85NVr0U069936 for ; Fri, 5 Sep 2003 16:31:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85NVqDx069933 for perforce@freebsd.org; Fri, 5 Sep 2003 16:31:52 -0700 (PDT) Date: Fri, 5 Sep 2003 16:31:52 -0700 (PDT) Message-Id: <200309052331.h85NVqDx069933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 23:31:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=37629 Change 37629 by marcel@marcel_nfs on 2003/09/05 16:31:41 IFC @37627 Affected files ... .. //depot/projects/ia64/bin/sh/arith.h#4 integrate .. //depot/projects/ia64/bin/sh/arith.y#5 integrate .. //depot/projects/ia64/bin/sh/arith_lex.l#5 integrate .. //depot/projects/ia64/bin/sh/shell.h#5 integrate .. //depot/projects/ia64/contrib/amd/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/amd/amd/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/amq/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/doc/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/doc/version.texi#3 integrate .. //depot/projects/ia64/contrib/amd/fixmount/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/fsinfo/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/hlfsd/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/libamu/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/mk-amd-map/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/scripts/.cvsignore#2 delete .. //depot/projects/ia64/contrib/amd/wire-test/.cvsignore#2 delete .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#10 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/config.h#3 integrate .. //depot/projects/ia64/include/pthread.h#6 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/vfork.S#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/ia64/lib/libc/locale/table.c#4 integrate .. //depot/projects/ia64/lib/libc/string/index.3#5 integrate .. //depot/projects/ia64/lib/libc/string/strchr.3#4 integrate .. //depot/projects/ia64/lib/libc/sys/accept.2#7 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#4 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.c#5 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.h#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_barrier.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_barrierattr.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_creat.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#33 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_pause.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#22 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sleep.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_system.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_tcdrain.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_wait.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_wait4.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_waitpid.c#3 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#26 integrate .. //depot/projects/ia64/sbin/savecore/savecore.8#6 integrate .. //depot/projects/ia64/sbin/savecore/savecore.c#17 integrate .. //depot/projects/ia64/share/doc/papers/timecounter/Makefile#2 integrate .. //depot/projects/ia64/share/doc/papers/timecounter/timecounter.ms#2 integrate .. //depot/projects/ia64/share/man/Makefile#6 integrate .. //depot/projects/ia64/share/man/man4/aue.4#3 integrate .. //depot/projects/ia64/share/man/man4/cd.4#5 integrate .. //depot/projects/ia64/share/man/man4/da.4#6 integrate .. //depot/projects/ia64/share/man/man4/kue.4#3 integrate .. //depot/projects/ia64/share/man/man4/mtio.4#4 integrate .. //depot/projects/ia64/share/man/man4/syscons.4#7 integrate .. //depot/projects/ia64/share/man/man4/tl.4#4 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#45 integrate .. //depot/projects/ia64/share/man/man9/cd.9#3 integrate .. //depot/projects/ia64/share/man/man9/taskqueue.9#4 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#26 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/ia64/sys/amd64/include/ucontext.h#3 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/pxeldr.s#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#19 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#52 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#38 integrate .. //depot/projects/ia64/sys/dev/adlink/adlink.c#5 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#28 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.h#10 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/ia64/sys/dev/awi/awi_wep.c#11 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#45 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#10 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#24 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#32 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#47 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#30 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/wi/if_wireg.h#15 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#16 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#43 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#12 integrate .. //depot/projects/ia64/sys/i386/isa/isa.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/isa_compat.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/isa_device.h#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#31 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#7 integrate .. //depot/projects/ia64/sys/isa/fd.c#20 integrate .. //depot/projects/ia64/sys/isa/isareg.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#36 integrate .. //depot/projects/ia64/sys/net/bpf.c#23 integrate .. //depot/projects/ia64/sys/net/if_vlan.c#15 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_radiotap.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_divert.c#19 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#33 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#17 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#44 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#29 integrate .. //depot/projects/ia64/sys/pci/if_sisreg.h#10 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#31 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychoreg.h#7 integrate .. //depot/projects/ia64/sys/sys/interrupt.h#5 integrate .. //depot/projects/ia64/sys/sys/ioctl_bt848.h#1 branch .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#1 branch .. //depot/projects/ia64/sys/sys/taskqueue.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#30 integrate .. //depot/projects/ia64/usr.bin/Makefile#53 integrate .. //depot/projects/ia64/usr.bin/mklocale/lex.l#4 integrate .. //depot/projects/ia64/usr.bin/mt/mt.1#9 integrate .. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#6 integrate .. //depot/projects/ia64/usr.bin/tsort/tsort.c#6 integrate .. //depot/projects/ia64/usr.sbin/rmt/rmt.c#4 integrate Differences ... ==== //depot/projects/ia64/bin/sh/arith.h#4 (text+ko) ==== @@ -31,9 +31,9 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.7 2003/08/30 12:31:44 schweikh Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.8 2003/09/04 18:28:42 schweikh Exp $ */ +int arith(char *); int arith_assign(char *, arith_t); -int arith(char *); -int expcmd(int , char **); +int expcmd(int, char **); ==== //depot/projects/ia64/bin/sh/arith.y#5 (text+ko) ==== @@ -35,13 +35,14 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95"; #endif #endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.15 2003/08/30 12:31:44 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.16 2003/09/04 18:28:42 schweikh Exp $"); #include #include "shell.h" @@ -73,152 +74,187 @@ %left ARITH_UNARYMINUS ARITH_UNARYPLUS ARITH_NOT ARITH_BNOT %% -exp: expr = { - return ($1); - } +exp: + expr + { return ($1); } ; -expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; } - | expr ARITH_OR expr = { $$ = $1 ? $1 : $3 ? $3 : 0; } - | expr ARITH_AND expr = { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } - | expr ARITH_BOR expr = { $$ = $1 | $3; } - | expr ARITH_BXOR expr = { $$ = $1 ^ $3; } - | expr ARITH_BAND expr = { $$ = $1 & $3; } - | expr ARITH_EQ expr = { $$ = $1 == $3; } - | expr ARITH_GT expr = { $$ = $1 > $3; } - | expr ARITH_GE expr = { $$ = $1 >= $3; } - | expr ARITH_LT expr = { $$ = $1 < $3; } - | expr ARITH_LE expr = { $$ = $1 <= $3; } - | expr ARITH_NE expr = { $$ = $1 != $3; } - | expr ARITH_LSHIFT expr = { $$ = $1 << $3; } - | expr ARITH_RSHIFT expr = { $$ = $1 >> $3; } - | expr ARITH_ADD expr = { $$ = $1 + $3; } - | expr ARITH_SUB expr = { $$ = $1 - $3; } - | expr ARITH_MUL expr = { $$ = $1 * $3; } - | expr ARITH_DIV expr = { - if ($3 == 0) - yyerror("division by zero"); - $$ = $1 / $3; - } - | expr ARITH_REM expr = { - if ($3 == 0) - yyerror("division by zero"); - $$ = $1 % $3; - } - | ARITH_NOT expr = { $$ = !($2); } - | ARITH_BNOT expr = { $$ = ~($2); } - | ARITH_SUB expr %prec ARITH_UNARYMINUS = { $$ = -($2); } - | ARITH_ADD expr %prec ARITH_UNARYPLUS = { $$ = $2; } - | ARITH_NUM - | ARITH_VAR { - char *p; - arith_t arith_val; - char *str_val; +expr: + ARITH_LPAREN expr ARITH_RPAREN + { $$ = $2; } | + expr ARITH_OR expr + { $$ = $1 ? $1 : $3 ? $3 : 0; } | + expr ARITH_AND expr + { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } | + expr ARITH_BOR expr + { $$ = $1 | $3; } | + expr ARITH_BXOR expr + { $$ = $1 ^ $3; } | + expr ARITH_BAND expr + { $$ = $1 & $3; } | + expr ARITH_EQ expr + { $$ = $1 == $3; } | + expr ARITH_GT expr + { $$ = $1 > $3; } | + expr ARITH_GE expr + { $$ = $1 >= $3; } | + expr ARITH_LT expr + { $$ = $1 < $3; } | + expr ARITH_LE expr + { $$ = $1 <= $3; } | + expr ARITH_NE expr + { $$ = $1 != $3; } | + expr ARITH_LSHIFT expr + { $$ = $1 << $3; } | + expr ARITH_RSHIFT expr + { $$ = $1 >> $3; } | + expr ARITH_ADD expr + { $$ = $1 + $3; } | + expr ARITH_SUB expr + { $$ = $1 - $3; } | + expr ARITH_MUL expr + { $$ = $1 * $3; } | + expr ARITH_DIV expr + { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 / $3; + } | + expr ARITH_REM expr + { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 % $3; + } | + ARITH_NOT expr + { $$ = !($2); } | + ARITH_BNOT expr + { $$ = ~($2); } | + ARITH_SUB expr %prec ARITH_UNARYMINUS + { $$ = -($2); } | + ARITH_ADD expr %prec ARITH_UNARYPLUS + { $$ = $2; } | + ARITH_NUM | + ARITH_VAR + { + char *p; + arith_t arith_val; + char *str_val; - if (lookupvar($1) == NULL) - setvarsafe($1, "0", 0); - str_val = lookupvar($1); - arith_val = strtoarith_t(str_val, &p, 0); - /* - * Conversion is successful only in case - * we've converted _all_ characters. - */ - if (*p != '\0') - yyerror("variable conversion error"); - $$ = arith_val; - } - | ARITH_VAR ARITH_ASSIGN expr { - if (arith_assign($1, $3) != 1) - yyerror("variable assignment error"); - $$ = $3; - } - | ARITH_VAR ARITH_ADDASSIGN expr { - arith_t value; + if (lookupvar($1) == NULL) + setvarsafe($1, "0", 0); + str_val = lookupvar($1); + arith_val = strtoarith_t(str_val, &p, 0); + /* + * Conversion is successful only in case + * we've converted _all_ characters. + */ + if (*p != '\0') + yyerror("variable conversion error"); + $$ = arith_val; + } | + ARITH_VAR ARITH_ASSIGN expr + { + if (arith_assign($1, $3) != 1) + yyerror("variable assignment error"); + $$ = $3; + } | + ARITH_VAR ARITH_ADDASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) + $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_SUBASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) + $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_SUBASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) - $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_MULASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) - $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_MULASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) * $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_DIVASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) * $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_DIVASSIGN expr + { + arith_t value; - if ($3 == 0) - yyerror("division by zero"); + if ($3 == 0) + yyerror("division by zero"); - value = atoarith_t(lookupvar($1)) / $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_REMASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) / $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_REMASSIGN expr + { + arith_t value; - if ($3 == 0) - yyerror("division by zero"); + if ($3 == 0) + yyerror("division by zero"); - value = atoarith_t(lookupvar($1)) % $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_RSHASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) % $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_RSHASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) >> $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_LSHASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) >> $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_LSHASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) << $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BANDASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) << $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BANDASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) & $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BXORASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) & $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BXORASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) ^ $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BORASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) ^ $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BORASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) | $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - ; + value = atoarith_t(lookupvar($1)) | $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } ; %% #include "error.h" #include "output.h" @@ -233,7 +269,8 @@ int yyparse(void); int -arith_assign(char *name, arith_t value) { +arith_assign(char *name, arith_t value) +{ char *str; int ret; @@ -253,10 +290,10 @@ INTOFF; result = yyparse(); - arith_lex_reset(); /* reprime lex */ + arith_lex_reset(); /* Reprime lex. */ INTON; - return (result); + return result; } void @@ -265,7 +302,7 @@ yyerrok; yyclearin; - arith_lex_reset(); /* reprime lex */ + arith_lex_reset(); /* Reprime lex. */ error("arithmetic expression: %s: \"%s\"", s, arith_startbuf); } @@ -284,7 +321,7 @@ p = argv[1]; if (argc > 2) { /* - * concatenate arguments + * Concatenate arguments. */ STARTSTACKSTR(concat); ap = argv + 2; @@ -304,7 +341,7 @@ i = arith(p); out1fmt("%ld\n", i); - return (! i); + return !i; } /*************************/ ==== //depot/projects/ia64/bin/sh/arith_lex.l#5 (text+ko) ==== @@ -35,19 +35,20 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95"; #endif #endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.19 2003/08/30 12:31:44 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.20 2003/09/04 18:28:42 schweikh Exp $"); #include "shell.h" #include "y.tab.h" #include "error.h" +#include "memalloc.h" #include "var.h" -#include "memalloc.h" extern char *arith_buf, *arith_startbuf; #undef YY_INPUT @@ -60,24 +61,23 @@ [ \t\n] { ; } 0x[a-fA-F0-9]+ { - yylval.l_value = strtoarith_t(yytext, NULL, 16); - return(ARITH_NUM); + yylval.l_value = strtoarith_t(yytext, NULL, 16); + return ARITH_NUM; } -0[0-7]+ { - yylval.l_value = strtoarith_t(yytext, NULL, 8); - return(ARITH_NUM); +0[0-7]+ { + yylval.l_value = strtoarith_t(yytext, NULL, 8); + return ARITH_NUM; } [0-9]+ { - yylval.l_value = strtoarith_t(yytext, NULL, 10); - return(ARITH_NUM); + yylval.l_value = strtoarith_t(yytext, NULL, 10); + return ARITH_NUM; } - [A-Za-z][A-Za-z0-9_]* { /* - * If variable doesn't exist, we should initialize + * If variable doesn't exist, we should initialize * it to zero. */ char *temp; @@ -86,46 +86,49 @@ temp = (char *)ckmalloc(strlen(yytext) + 1); yylval.s_value = strcpy(temp, yytext); - return(ARITH_VAR); + return ARITH_VAR; + } + +"(" { return ARITH_LPAREN; } +")" { return ARITH_RPAREN; } +"||" { return ARITH_OR; } +"&&" { return ARITH_AND; } +"|" { return ARITH_BOR; } +"^" { return ARITH_BXOR; } +"&" { return ARITH_BAND; } +"==" { return ARITH_EQ; } +"!=" { return ARITH_NE; } +">" { return ARITH_GT; } +">=" { return ARITH_GE; } +"<" { return ARITH_LT; } +"<=" { return ARITH_LE; } +"<<" { return ARITH_LSHIFT; } +">>" { return ARITH_RSHIFT; } +"*" { return ARITH_MUL; } +"/" { return ARITH_DIV; } +"%" { return ARITH_REM; } +"+" { return ARITH_ADD; } +"-" { return ARITH_SUB; } +"~" { return ARITH_BNOT; } +"!" { return ARITH_NOT; } +"=" { return ARITH_ASSIGN; } +"+=" { return ARITH_ADDASSIGN; } +"-=" { return ARITH_SUBASSIGN; } +"*=" { return ARITH_MULASSIGN; } +"/=" { return ARITH_DIVASSIGN; } +"%=" { return ARITH_REMASSIGN; } +">>=" { return ARITH_RSHASSIGN; } +"<<=" { return ARITH_LSHASSIGN; } +"&=" { return ARITH_BANDASSIGN; } +"^=" { return ARITH_BXORASSIGN; } +"|=" { return ARITH_BORASSIGN; } +. { + error("arith: syntax error: \"%s\"\n", arith_startbuf); } -"(" { return(ARITH_LPAREN); } -")" { return(ARITH_RPAREN); } -"||" { return(ARITH_OR); } -"&&" { return(ARITH_AND); } -"|" { return(ARITH_BOR); } -"^" { return(ARITH_BXOR); } -"&" { return(ARITH_BAND); } -"==" { return(ARITH_EQ); } -"!=" { return(ARITH_NE); } -">" { return(ARITH_GT); } -">=" { return(ARITH_GE); } -"<" { return(ARITH_LT); } -"<=" { return(ARITH_LE); } -"<<" { return(ARITH_LSHIFT); } -">>" { return(ARITH_RSHIFT); } -"*" { return(ARITH_MUL); } -"/" { return(ARITH_DIV); } -"%" { return(ARITH_REM); } -"+" { return(ARITH_ADD); } -"-" { return(ARITH_SUB); } -"~" { return(ARITH_BNOT); } -"!" { return(ARITH_NOT); } -"=" { return(ARITH_ASSIGN); } -"+=" { return(ARITH_ADDASSIGN); } -"-=" { return(ARITH_SUBASSIGN); } -"*=" { return(ARITH_MULASSIGN); } -"/=" { return(ARITH_DIVASSIGN); } -"%=" { return(ARITH_REMASSIGN); } -">>=" { return(ARITH_RSHASSIGN); } -"<<=" { return(ARITH_LSHASSIGN); } -"&=" { return(ARITH_BANDASSIGN); } -"^=" { return(ARITH_BXORASSIGN); } -"|=" { return(ARITH_BORASSIGN); } -. { error("arith: syntax error: \"%s\"\n", arith_startbuf); } %% void -arith_lex_reset() +arith_lex_reset(void) { YY_NEW_FILE; } ==== //depot/projects/ia64/bin/sh/shell.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)shell.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/shell.h,v 1.15 2003/08/30 12:31:44 schweikh Exp $ + * $FreeBSD: src/bin/sh/shell.h,v 1.16 2003/09/04 18:28:42 schweikh Exp $ */ /* @@ -48,28 +48,27 @@ */ -#define JOBS 1 +#define JOBS 1 /* #define DEBUG 1 */ /* * Type of used arithmetics. SUSv3 requires us to have at least signed long. */ typedef long arith_t; -#define strtoarith_t(nptr, endptr, base) strtol(nptr, endptr, base) -#define atoarith_t(arg) strtol(arg, NULL, 0) -#define ARITH_FORMAT_STR "%ld" +#define ARITH_FORMAT_STR "%ld" +#define atoarith_t(arg) strtol(arg, NULL, 0) +#define strtoarith_t(nptr, endptr, base) strtol(nptr, endptr, base) typedef void *pointer; #define STATIC static -#define MKINIT /* empty */ +#define MKINIT /* empty */ #include extern char nullstr[1]; /* null string */ - #ifdef DEBUG -#define TRACE(param) sh_trace param +#define TRACE(param) sh_trace param #else #define TRACE(param) #endif ==== //depot/projects/ia64/contrib/amd/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.13 2003/09/02 20:09:55 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.14 2003/09/03 00:46:21 mbr Exp $ AMD (am-utils) 6.0.9 originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ @@ -10,6 +10,8 @@ tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz +and `find . -name '.cvsignore' -delete` + Then imported by: cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ ==== //depot/projects/ia64/contrib/amd/doc/version.texi#3 (text+ko) ==== @@ -1,3 +1,3 @@ -@set UPDATED 3 July 2001 -@set EDITION 6.0.7 -@set VERSION 6.0.7 +@set UPDATED 28 August 2003 +@set EDITION 6.0.9 +@set VERSION 6.0.9 ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#10 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.11 2003/09/01 05:31:33 deischen Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.12 2003/09/03 15:44:34 deischen Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -131,15 +131,17 @@ required by the user-land thread model. Before __FreeBSD_version 500016, select the appropriate libc, depending on whether we're doing profiling or need threads support. At __FreeBSD_version - 500016 and later, when threads support is requested include both - -lc and -lc_r instead of only -lc_r. To make matters interesting, - we can't actually use __FreeBSD_version provided by - directly since it breaks cross-compiling. As a final twist, make - it a hard error if -pthread is provided on the command line and gcc - was configured with --disable-threads (this will help avoid bug - reports from users complaining about threading when they - misconfigured the gcc bootstrap but are later consulting FreeBSD - manual pages that refer to the mythical -pthread option). */ + 500016 and later, threads libraries can be linked with libc. + Because of this, and because different (not multiple) threading + libraries may be selected in the link option, the -pthread option + is no longer supported. To make matters interesting, we can't + actually use __FreeBSD_version provided by directly + since it breaks cross-compiling. As a final twist, make it a hard + error if -pthread is provided on the command line and gcc was + configured with --disable-threads (this will help avoid bug reports + from users complaining about threading when they misconfigured the + gcc bootstrap but are later consulting FreeBSD manual pages that + refer to the mythical -pthread option). */ /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate libc, depending on whether we're doing profiling or need threads support. @@ -157,9 +159,10 @@ #include #if __FreeBSD_version >= 500016 #define FBSD_LIB_SPEC " \ + %{pthread: %eThe -pthread option is deprecated.} \ %{!shared: \ - %{!pg: %{pthread:-lc_r} -lc} \ - %{pg: %{pthread:-lc_r_p} -lc_p} \ + %{!pg: -lc} \ + %{pg: -lc_p} \ }" #else #define FBSD_LIB_SPEC " \ ==== //depot/projects/ia64/gnu/usr.bin/tar/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/tar/config.h,v 1.2 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/tar/config.h,v 1.3 2003/09/04 01:29:11 peter Exp $ */ #include @@ -273,7 +273,7 @@ #define HAVE_SETLOCALE 1 /* Define if you have the header file. */ -#define HAVE_SGTTY_H 1 +/* #define HAVE_SGTTY_H 1 */ /* Define if you have the header file. */ #define HAVE_STDBOOL_H 1 ==== //depot/projects/ia64/include/pthread.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.28 2003/04/20 01:53:12 jdp Exp $ + * $FreeBSD: src/include/pthread.h,v 1.29 2003/09/04 14:06:42 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -52,6 +52,7 @@ #define PTHREAD_KEYS_MAX 256 #define PTHREAD_STACK_MIN 1024 #define PTHREAD_THREADS_MAX ULONG_MAX +#define PTHREAD_BARRIER_SERIAL_THREAD -1 /* * Flags for threads and thread attributes. @@ -95,6 +96,8 @@ struct pthread_once; struct pthread_rwlock; struct pthread_rwlockattr; +struct pthread_barrier; +struct pthread_barrier_attr; /* * Primitive system data type definitions required by P1003.1c. @@ -113,6 +116,8 @@ typedef struct pthread_once pthread_once_t; typedef struct pthread_rwlock *pthread_rwlock_t; typedef struct pthread_rwlockattr *pthread_rwlockattr_t; +typedef struct pthread_barrier *pthread_barrier_t; +typedef struct pthread_barrierattr *pthread_barrierattr_t; /* * Additional type definitions: @@ -203,6 +208,15 @@ int pthread_attr_setstack(pthread_attr_t *, void *, size_t); int pthread_attr_setstackaddr(pthread_attr_t *, void *); int pthread_attr_setdetachstate(pthread_attr_t *, int); +int pthread_barrier_destroy(pthread_barrier_t *); +int pthread_barrier_init(pthread_barrier_t *, + const pthread_barrierattr_t *, unsigned); +int pthread_barrier_wait(pthread_barrier_t *); +int pthread_barrierattr_destroy(pthread_barrierattr_t *); +int pthread_barrierattr_getpshared(const pthread_barrierattr_t *, + int *); +int pthread_barrierattr_init(pthread_barrierattr_t *); +int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); void pthread_cleanup_pop(int); void pthread_cleanup_push(void (*) (void *), void *routine_arg); int pthread_condattr_destroy(pthread_condattr_t *); @@ -236,6 +250,8 @@ const pthread_mutexattr_t *); int pthread_mutex_lock(pthread_mutex_t *); int pthread_mutex_trylock(pthread_mutex_t *); +int pthread_mutex_timedlock(pthread_mutex_t *, + const struct timespec *); int pthread_mutex_unlock(pthread_mutex_t *); int pthread_once(pthread_once_t *, void (*) (void)); int pthread_rwlock_destroy(pthread_rwlock_t *); ==== //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.27 2003/08/11 07:14:06 bms Exp $ +# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.28 2003/09/04 00:29:12 peter Exp $ -MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ - setlogin.S sigreturn.S +MDASM= vfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \ + reboot.S sbrk.S setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/ia64/lib/libc/amd64/sys/vfork.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.21 2003/05/24 17:35:23 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.22 2003/09/04 00:26:40 peter Exp $"); #include "SYS.h" @@ -58,5 +58,5 @@ movq PIC_GOT(HIDENAME(cerror)),%rdx jmp *%rdx #else - jmp HIDENAME(cerror) + jmp HIDENAME(cerror) #endif ==== //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#6 (text+ko) ==== @@ -1,11 +1,11 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.26 2003/08/11 07:14:06 bms Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.27 2003/09/04 00:20:40 peter Exp $ SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c -MDASM= Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ - setlogin.S sigreturn.S syscall.S +MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \ + reboot.S sbrk.S setlogin.S sigreturn.S syscall.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/ia64/lib/libc/locale/table.c#4 (text+ko) ==== @@ -38,14 +38,13 @@ static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.17 2003/06/25 22:34:13 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.18 2003/09/05 09:01:31 tjr Exp $"); #include #include extern rune_t _none_sgetrune(const char *, size_t, char const **); extern int _none_sputrune(rune_t, char *, size_t, char **); -extern int _none_init(char *, char **); _RuneLocale _DefaultRuneLocale = { _RUNE_MAGIC_1, ==== //depot/projects/ia64/lib/libc/string/index.3#5 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)index.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/index.3,v 1.9 2003/07/28 22:50:42 simon Exp $ +.\" $FreeBSD: src/lib/libc/string/index.3,v 1.10 2003/09/04 20:36:54 simon Exp $ .\" .Dd June 4, 1993 .Dt INDEX 3 @@ -58,7 +58,13 @@ .Vt char ) in the string pointed to by .Fa s . -The terminating null character is considered part of the string. +The terminating null character is considered part of the string; +therefore if +.Fa c +is +.Ql \e0 , +the functions locate the terminating +.Ql \e0 . .Pp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 16:38:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78BDC16A4C1; Fri, 5 Sep 2003 16:38:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BEF416A4BF for ; Fri, 5 Sep 2003 16:38:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEA2743FF9 for ; Fri, 5 Sep 2003 16:38:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Nc10U071592 for ; Fri, 5 Sep 2003 16:38:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85Nc0KZ071589 for perforce@freebsd.org; Fri, 5 Sep 2003 16:38:00 -0700 (PDT) Date: Fri, 5 Sep 2003 16:38:00 -0700 (PDT) Message-Id: <200309052338.h85Nc0KZ071589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 23:38:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=37630 Change 37630 by marcel@marcel_nfs on 2003/09/05 16:37:29 IFC @37627 Affected files ... .. //depot/projects/uart/amd64/conf/GENERIC#2 integrate .. //depot/projects/uart/amd64/include/ucontext.h#2 integrate .. //depot/projects/uart/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/uart/boot/i386/pxeldr/pxeldr.s#2 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/uart/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi.c#8 integrate .. //depot/projects/uart/dev/adlink/adlink.c#4 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/uart/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/uart/dev/ath/if_ath.c#9 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#5 integrate .. //depot/projects/uart/dev/awi/awi_wep.c#3 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/uart/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/uart/dev/pccard/pccard.c#5 integrate .. //depot/projects/uart/dev/pci/pci.c#9 integrate .. //depot/projects/uart/dev/pci/pcireg.h#5 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#8 integrate .. //depot/projects/uart/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/uart/dev/wi/if_wi.c#8 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#9 integrate .. //depot/projects/uart/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/uart/dev/wi/if_wireg.h#2 integrate .. //depot/projects/uart/dev/wi/if_wivar.h#3 integrate .. //depot/projects/uart/geom/geom_dev.c#6 integrate .. //depot/projects/uart/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/uart/i386/isa/isa.h#2 integrate .. //depot/projects/uart/i386/isa/isa_compat.c#2 integrate .. //depot/projects/uart/i386/isa/isa_device.h#2 integrate .. //depot/projects/uart/ia64/ia64/exception.S#5 integrate .. //depot/projects/uart/ia64/ia64/genassym.c#3 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/uart/ia64/include/md_var.h#3 integrate .. //depot/projects/uart/isa/fd.c#3 integrate .. //depot/projects/uart/isa/isareg.h#2 integrate .. //depot/projects/uart/kern/kern_tc.c#7 integrate .. //depot/projects/uart/kern/subr_bus.c#2 integrate .. //depot/projects/uart/kern/subr_msgbuf.c#2 integrate .. //depot/projects/uart/kern/subr_taskqueue.c#2 integrate .. //depot/projects/uart/kern/subr_trap.c#4 integrate .. //depot/projects/uart/net/bpf.c#4 integrate .. //depot/projects/uart/net/if_vlan.c#4 integrate .. //depot/projects/uart/net80211/ieee80211_radiotap.h#1 branch .. //depot/projects/uart/netinet/ip_divert.c#2 integrate .. //depot/projects/uart/netinet/ip_input.c#3 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#4 integrate .. //depot/projects/uart/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/uart/pci/if_rl.c#12 integrate .. //depot/projects/uart/pci/if_rlreg.h#5 integrate .. //depot/projects/uart/pci/if_sis.c#8 integrate .. //depot/projects/uart/pci/if_sisreg.h#3 integrate .. //depot/projects/uart/sparc64/pci/psycho.c#5 integrate .. //depot/projects/uart/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/uart/sys/interrupt.h#2 integrate .. //depot/projects/uart/sys/ioctl_bt848.h#1 branch .. //depot/projects/uart/sys/ioctl_meteor.h#1 branch .. //depot/projects/uart/sys/taskqueue.h#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#4 integrate Differences ... ==== //depot/projects/uart/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.390 2003/06/27 23:11:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.391 2003/09/03 01:24:47 obrien Exp $ machine amd64 cpu HAMMER @@ -76,6 +76,7 @@ # ATA and ATAPI devices device ata device atadisk # ATA disk drives +device ataraid # ATA RAID drives device atapicd # ATAPI CDROM drives device atapifd # ATAPI floppy drives device atapist # ATAPI tape drives ==== //depot/projects/uart/amd64/include/ucontext.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.13 2003/05/12 18:33:19 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.14 2003/09/05 20:47:27 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -70,11 +70,11 @@ #define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */ #define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */ long mc_ownedfp; - long mc_spare1[1]; /* align next field to 16 bytes */ + long mc_spare1[1]; /* align mc_fpstate to 16 bytes */ /* * See for the internals of mc_fpstate[]. */ - long mc_fpstate[128] __aligned(16); + long mc_fpstate[64] __aligned(16); long mc_spare2[8]; } mcontext_t; ==== //depot/projects/uart/boot/i386/pxeldr/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.8 2002/09/17 01:48:56 peter Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.9 2003/09/03 08:12:20 phk Exp $ MAINTAINER=jhb@FreeBSD.org @@ -17,6 +17,11 @@ M4FLAGS+= -DPROBE_KEYBOARD .endif +.if defined(BOOT_PXELDR_ALWAYS_SERIAL) +M4FLAGS+= -DALWAYS_SERIAL +.endif + + .if exists(${.OBJDIR}/../loader) LOADERBIN= ${.OBJDIR}/../loader/loader.bin .else ==== //depot/projects/uart/boot/i386/pxeldr/pxeldr.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.s,v 1.8 2001/08/09 20:47:58 mp Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.s,v 1.9 2003/09/03 08:12:20 phk Exp $ # # This simple program is a preloader for the normal boot3 loader. It is simply @@ -110,6 +110,11 @@ orb $KARGS_FLAGS_PXE, 0x8(%bx) # kargs->bootflags |= # KARGS_FLAGS_PXE popl 0xc(%bx) # kargs->pxeinfo = *PXENV+ +ifdef(`ALWAYS_SERIAL',` +# +# set the RBX_SERIAL bit in the howto byte. + orl $RB_SERIAL, (%bx) # enable serial console +') ifdef(`PROBE_KEYBOARD',` # # Look at the BIOS data area to see if we have an enhanced keyboard. If not, ==== //depot/projects/uart/cam/scsi/scsi_cd.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.80 2003/07/28 06:15:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $"); #include "opt_cd.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -151,9 +152,12 @@ int bufs_left; struct cam_periph *periph; dev_t dev; +#ifndef BURN_BRIDGES eventhandler_tag clonetag; +#endif int minimum_command_size; int outstanding_cmds; + struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; @@ -339,6 +343,7 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; +#ifndef BURN_BRIDGES static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -358,6 +363,7 @@ *dev = softc->dev; return; } +#endif static void cdinit(void) @@ -529,7 +535,9 @@ } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); +#ifndef BURN_BRIDGES EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); +#endif free(softc, M_DEVBUF); splx(s); } @@ -598,6 +606,43 @@ } } +static void +cdsysctlinit(void *context, int pending) +{ + struct cam_periph *periph; + struct cd_softc *softc; + char tmpstr[80], tmpstr2[80]; + + periph = (struct cam_periph *)context; + softc = (struct cd_softc *)periph->softc; + + snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); + snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + + mtx_lock(&Giant); + + sysctl_ctx_init(&softc->sysctl_ctx); + softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, + tmpstr2, CTLFLAG_RD, 0, tmpstr); + + if (softc->sysctl_tree == NULL) { + printf("cdsysctlinit: unable to allocate sysctl tree\n"); + return; + } + + /* + * Now register the sysctl handler, so the user can the value on + * the fly. + */ + SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, + &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", + "Minimum CDB size"); + + mtx_unlock(&Giant); +} + /* * We have a handler function for this so we can check the values when the * user sets them, instead of every time we look at them. @@ -642,7 +687,7 @@ struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; - char tmpstr[80], tmpstr2[80]; + char tmpstr[80]; caddr_t match; cgd = (struct ccb_getdev *)arg; @@ -696,17 +741,7 @@ if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE)) softc->quirks |= CD_Q_10_BYTE_ONLY; - snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); - snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); - sysctl_ctx_init(&softc->sysctl_ctx); - softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, - tmpstr2, CTLFLAG_RD, 0, tmpstr); - if (softc->sysctl_tree == NULL) { - printf("cdregister: unable to allocate sysctl tree\n"); - free(softc, M_DEVBUF); - return (CAM_REQ_CMP_ERR); - } + TASK_INIT(&softc->sysctl_task, 0, cdsysctlinit, periph); /* The default is 6 byte commands, unless quirked otherwise */ if (softc->quirks & CD_Q_10_BYTE_ONLY) @@ -728,15 +763,6 @@ softc->minimum_command_size = 10; /* - * Now register the sysctl handler, so the user can the value on - * the fly. - */ - SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, - &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", - "Minimum CDB size"); - - /* * We need to register the statistics structure for this device, * but we don't have the blocksize yet for it. So, we register * the structure and indicate that we don't have the blocksize @@ -756,8 +782,10 @@ softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; +#ifndef BURN_BRIDGES softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); +#endif /* * Add an async callback so that we get @@ -1847,6 +1875,11 @@ xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); + /* + * Create our sysctl variables, now that we know + * we have successfully attached. + */ + taskqueue_enqueue(taskqueue_thread,&softc->sysctl_task); } softc->state = CD_STATE_NORMAL; /* ==== //depot/projects/uart/cam/scsi/scsi_da.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.156 2003/08/25 18:48:45 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.159 2003/09/04 01:01:20 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -41,6 +41,7 @@ #include #include #include +#include #endif /* _KERNEL */ #include @@ -133,6 +134,7 @@ struct disk_params params; struct disk disk; union ccb saved_ccb; + struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; }; @@ -325,14 +327,6 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "NO BRAND", "PEN DRIVE", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, - { - /* - * FujiFilm Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", - "USB-DRIVEUNIT", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, { /* * Minolta Dimage E203 @@ -388,6 +382,7 @@ static periph_init_t dainit; static void daasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg); +static void dasysctlinit(void *context, int pending); static int dacmdsizesysctl(SYSCTL_HANDLER_ARGS); static periph_ctor_t daregister; static periph_dtor_t dacleanup; @@ -915,6 +910,41 @@ } } +static void +dasysctlinit(void *context, int pending) +{ + struct cam_periph *periph; + struct da_softc *softc; + char tmpstr[80], tmpstr2[80]; + + periph = (struct cam_periph *)context; + softc = (struct da_softc *)periph->softc; + + snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); + snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + + mtx_lock(&Giant); + sysctl_ctx_init(&softc->sysctl_ctx); + softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2, + CTLFLAG_RD, 0, tmpstr); + if (softc->sysctl_tree == NULL) { + printf("dasysctlinit: unable to allocate sysctl tree\n"); + return; + } + + /* + * Now register the sysctl handler, so the user can the value on + * the fly. + */ + SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, + &softc->minimum_cmd_size, 0, dacmdsizesysctl, "I", + "Minimum CDB size"); + + mtx_unlock(&Giant); +} + static int dacmdsizesysctl(SYSCTL_HANDLER_ARGS) { @@ -955,7 +985,7 @@ struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; - char tmpstr[80], tmpstr2[80]; + char tmpstr[80]; caddr_t match; cgd = (struct ccb_getdev *)arg; @@ -1008,17 +1038,7 @@ if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE)) softc->quirks |= DA_Q_NO_6_BYTE; - snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); - snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); - sysctl_ctx_init(&softc->sysctl_ctx); - softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2, - CTLFLAG_RD, 0, tmpstr); - if (softc->sysctl_tree == NULL) { - printf("daregister: unable to allocate sysctl tree\n"); - free(softc, M_DEVBUF); - return (CAM_REQ_CMP_ERR); - } + TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph); /* * RBC devices don't have to support READ(6), only READ(10). @@ -1050,15 +1070,6 @@ softc->minimum_cmd_size = 16; /* - * Now register the sysctl handler, so the user can the value on - * the fly. - */ - SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, - &softc->minimum_cmd_size, 0, dacmdsizesysctl, "I", - "Minimum CDB size"); - - /* * Block our timeout handler while we * add this softc to the dev list. */ @@ -1539,8 +1550,14 @@ } } free(csio->data_ptr, M_TEMP); - if (announce_buf[0] != '\0') + if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); + /* + * Create our sysctl variables, now that we know + * we have successfully attached. + */ + taskqueue_enqueue(taskqueue_thread,&softc->sysctl_task); + } softc->state = DA_STATE_NORMAL; /* * Since our peripheral may be invalidated by an error ==== //depot/projects/uart/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.54 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.56 2003/09/04 16:30:03 njl Exp $"); #include #include @@ -809,6 +809,7 @@ /* If we're no longer enabled, throw away CCB */ if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { targfreeccb(softc, done_ccb); + TARG_UNLOCK(softc); return; } /* abort_all_pending() waits for pending queue to be empty */ @@ -822,6 +823,7 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); + TARG_UNLOCK(softc); notify_user(softc); break; default: @@ -829,7 +831,6 @@ done_ccb->ccb_h.func_code); /* NOTREACHED */ } - TARG_UNLOCK(softc); } /* Return CCBs to the user from the user queue and abort queue */ @@ -1095,8 +1096,19 @@ /* If we aborted anything from the work queue, wakeup user. */ if (!TAILQ_EMPTY(&softc->user_ccb_queue) - || !TAILQ_EMPTY(&softc->abort_queue)) + || !TAILQ_EMPTY(&softc->abort_queue)) { + /* + * XXX KNOTE calls back into targreadfilt, causing a + * lock recursion. So unlock around calls to it although + * this may open up a race allowing a user to submit + * another CCB after we have aborted all pending ones + * A better approach is to mark the softc as dying + * under lock and check for this in targstart(). + */ + TARG_UNLOCK(softc); notify_user(softc); + TARG_LOCK(softc); + } } /* Notify the user that data is ready */ ==== //depot/projects/uart/dev/acpica/acpi.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.97 2003/08/29 04:02:19 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.98 2003/09/04 15:55:41 njl Exp $ */ #include "opt_acpi.h" @@ -1232,8 +1232,8 @@ status = AcpiEvaluateObject(handle, path, NULL, &buf); if (ACPI_SUCCESS(status)) status = acpi_ConvertBufferToInteger(&buf, number); + AcpiOsFree(buf.Pointer); } - AcpiOsFree(buf.Pointer); } return (status); } ==== //depot/projects/uart/dev/adlink/adlink.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.4 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.5 2003/09/05 11:05:41 phk Exp $"); #ifdef _KERNEL #include @@ -274,7 +274,7 @@ /* Sample CH0 only */ bus_space_write_4(sc->t1, sc->h1, 0x00, 1); - /* Divide clock by ten */ + /* Divide clock by four */ bus_space_write_4(sc->t1, sc->h1, 0x04, 4); /* Software trigger mode: software */ ==== //depot/projects/uart/dev/ata/atapi-cd.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.141 2003/09/02 15:53:01 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $"); #include "opt_ata.h" #include @@ -242,7 +242,9 @@ free(entry, M_ACD); } destroy_dev(cdp->dev); +#ifndef BURN_BRIDGES EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); +#endif devstat_remove_entry(cdp->stats); ata_prtdev(atadev, "WARNING - removed from configuration\n"); ata_free_name(atadev); @@ -273,6 +275,7 @@ return cdp; } +#ifndef BURN_BRIDGES static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -289,6 +292,7 @@ if (unit == cdp->lun) *dev = makedev(acd_cdevsw.d_maj, cdp->lun); } +#endif static void acd_make_dev(struct acd_softc *cdp) @@ -300,7 +304,9 @@ dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; +#ifndef BURN_BRIDGES cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); +#endif acd_set_ioparm(cdp); } ==== //depot/projects/uart/dev/ata/atapi-cd.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.36 2003/08/24 09:22:26 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $ */ /* CDROM Table Of Contents */ @@ -322,5 +322,7 @@ int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ +#ifndef BURN_BRIDGES eventhandler_tag clone_evh; +#endif }; ==== //depot/projects/uart/dev/ath/if_ath.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.13 2003/09/01 03:12:19 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.14 2003/09/05 22:22:49 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -298,6 +298,21 @@ /* complete initialization */ ieee80211_media_init(ifp, ath_media_change, ieee80211_media_status); + bpfattach2(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th), + &sc->sc_drvbpf); + /* + * Initialize constant fields. + * + * NB: the channel is setup each time we transition to the + * RUN state to avoid filling it in for each frame. + */ + sc->sc_tx_th.wt_ihdr.it_len = sizeof(sc->sc_tx_th); + sc->sc_tx_th.wt_ihdr.it_present = ATH_TX_RADIOTAP_PRESENT; + + sc->sc_rx_th.wr_ihdr.it_len = sizeof(sc->sc_rx_th); + sc->sc_rx_th.wr_ihdr.it_present = ATH_RX_RADIOTAP_PRESENT; + if_printf(ifp, "802.11 address: %s\n", ether_sprintf(ic->ic_myaddr)); return 0; @@ -317,6 +332,7 @@ mtx_lock(&sc->sc_mtx); ath_stop(ifp); + bpfdetach(ifp); ath_desc_free(sc); ath_hal_detach(sc->sc_ah); ieee80211_ifdetach(ifp); @@ -732,6 +748,23 @@ if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m); + if (sc->sc_drvbpf) { + struct mbuf *mb; + + MGETHDR(mb, M_DONTWAIT, m->m_type); + if (mb != NULL) { + sc->sc_tx_th.wt_rate = + ni->ni_rates.rs_rates[ni->ni_txrate]; + + mb->m_next = m; + mb->m_data = (caddr_t)&sc->sc_tx_th; + mb->m_len = sizeof(sc->sc_tx_th); + mb->m_pkthdr.len += mb->m_len; + bpf_mtap(sc->sc_drvbpf, mb); + m_free(mb); + } + } + /* * TODO: * The duration field of 802.11 header should be filled. @@ -739,12 +772,6 @@ * doesn't know the detail of parameters such as IFS * for now.. */ - - if (IFF_DUMPPKTS(ifp)) - ieee80211_dump_pkt(mtod(m, u_int8_t *), m->m_len, - ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL, - -1); - if (ath_tx_start(sc, ni, bf, m)) { bad: mtx_lock(&sc->sc_txbuflock); @@ -1526,11 +1553,29 @@ bf->bf_m = NULL; m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len; - if (IFF_DUMPPKTS(ifp)) { - ieee80211_dump_pkt(mtod(m, u_int8_t *), len, - sc->sc_hwmap[ds->ds_rxstat.rs_rate] & - IEEE80211_RATE_VAL, - ds->ds_rxstat.rs_rssi); + + if (sc->sc_drvbpf) { + struct mbuf *mb; + + /* XXX pre-allocate space when setting up recv's */ + MGETHDR(mb, M_DONTWAIT, m->m_type); + if (mb != NULL) { + sc->sc_rx_th.wr_rate = + sc->sc_hwmap[ds->ds_rxstat.rs_rate]; + sc->sc_rx_th.wr_antsignal = + ds->ds_rxstat.rs_rssi; + sc->sc_rx_th.wr_antenna = + ds->ds_rxstat.rs_antenna; + /* XXX TSF */ + + (void) m_dup_pkthdr(mb, m, M_DONTWAIT); + mb->m_next = m; + mb->m_data = (caddr_t)&sc->sc_rx_th; + mb->m_len = sizeof(sc->sc_rx_th); + mb->m_pkthdr.len += mb->m_len; + bpf_mtap(sc->sc_drvbpf, mb); + m_free(mb); + } } m_adj(m, -IEEE80211_CRC_LEN); @@ -2128,6 +2173,14 @@ } /* + * Update BPF state. + */ + sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = + htole16(chan->ic_freq); + sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = + htole16(chan->ic_flags); + + /* * Change channels and update the h/w rate map * if we're switching; e.g. 11a to 11b/g. */ ==== //depot/projects/uart/dev/ath/if_athioctl.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.2 2003/08/19 21:35:08 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.3 2003/09/05 22:22:49 sam Exp $ */ /* @@ -91,4 +91,39 @@ #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) +/* + * Radio capture format. + */ +#define ATH_RX_RADIOTAP_PRESENT ( \ + (1 << IEEE80211_RADIOTAP_FLAGS) | \ + (1 << IEEE80211_RADIOTAP_RATE) | \ + (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \ + (1 << IEEE80211_RADIOTAP_ANTENNA) | \ + 0) + +struct ath_rx_radiotap_header { + struct ieee80211_radiotap_header wr_ihdr; + u_int8_t wr_flags; /* XXX for padding */ + u_int8_t wr_rate; + u_int16_t wr_chan_freq; + u_int16_t wr_chan_flags; + u_int8_t wr_antsignal; + u_int8_t wr_antenna; +}; + +#define ATH_TX_RADIOTAP_PRESENT ( \ + (1 << IEEE80211_RADIOTAP_FLAGS) | \ + (1 << IEEE80211_RADIOTAP_RATE) | \ + (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + 0) + +struct ath_tx_radiotap_header { + struct ieee80211_radiotap_header wt_ihdr; + u_int8_t wt_flags; /* XXX for padding */ + u_int8_t wt_rate; + u_int16_t wt_chan_freq; + u_int16_t wt_chan_flags; +}; + #endif /* _DEV_ATH_ATHIOCTL_H */ ==== //depot/projects/uart/dev/ath/if_athvar.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.5 2003/08/19 22:17:04 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.6 2003/09/05 22:22:49 sam Exp $ */ /* @@ -45,6 +45,7 @@ #include #include +#include #include #define ATH_TIMEOUT 1000 @@ -100,6 +101,16 @@ u_int8_t sc_hwmap[32]; /* h/w rate ix to IEEE table */ HAL_INT sc_imask; /* interrupt mask copy */ + struct bpf_if *sc_drvbpf; + union { + struct ath_tx_radiotap_header th; + u_int8_t pad[64]; + } u_tx_rt; + union { + struct ath_rx_radiotap_header th; + u_int8_t pad[64]; + } u_rx_rt; + struct ath_desc *sc_desc; /* TX/RX descriptors */ bus_dma_segment_t sc_dseg; bus_dmamap_t sc_ddmamap; /* DMA map for descriptors */ @@ -132,6 +143,8 @@ struct callout sc_scan_ch; /* callout handle for scan */ struct ath_stats sc_stats; /* interface statistics */ }; +#define sc_tx_th u_tx_rt.th +#define sc_rx_th u_rx_rt.th int ath_attach(u_int16_t, struct ath_softc *); int ath_detach(struct ath_softc *); ==== //depot/projects/uart/dev/awi/awi_wep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.14 2003/08/24 17:48:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.15 2003/09/05 11:09:26 phk Exp $"); /* * WEP support framework for the awi driver. @@ -240,7 +240,7 @@ int ctxlen; awi_crc_init(); /* XXX: not belongs here */ - if (algo < 0 || algo > sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0])) + if (algo < 0 || algo >= sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0])) return EINVAL; awa = &awi_wep_algo[algo]; if (awa->awa_name == NULL) ==== //depot/projects/uart/dev/fxp/if_fxp.c#11 (text+ko) ==== @@ -28,14 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.193 2003/09/02 17:30:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.194 2003/09/05 22:37:31 sam Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.193 2003/09/02 17:30:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.194 2003/09/05 22:37:31 sam Exp $"); #include #include @@ -412,7 +412,7 @@ int s, ipcbxmit_disable; sc->dev = dev; - callout_handle_init(&sc->stat_ch); + callout_init(&sc->stat_ch, CALLOUT_MPSAFE); sysctl_ctx_init(&sc->sysctl_ctx); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); @@ -1883,7 +1883,7 @@ /* * Schedule another timeout one second from now. */ - sc->stat_ch = timeout(fxp_tick, sc, hz); + callout_reset(&sc->stat_ch, hz, fxp_tick, sc); FXP_UNLOCK(sc); splx(s); } @@ -1908,7 +1908,7 @@ /* * Cancel stats updater. */ - untimeout(fxp_tick, sc, sc->stat_ch); + callout_stop(&sc->stat_ch); /* * Issue software reset, which also unloads the microcode. @@ -2239,7 +2239,7 @@ /* * Start stats updater. */ - sc->stat_ch = timeout(fxp_tick, sc, hz); + callout_reset(&sc->stat_ch, hz, fxp_tick, sc); splx(s); } ==== //depot/projects/uart/dev/fxp/if_fxpvar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.27 2003/04/30 01:54:38 imp Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.28 2003/09/05 22:37:31 sam Exp $ */ /* @@ -174,7 +174,7 @@ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ u_int32_t stats_addr; /* DMA address of the stats structure */ int rx_idle_secs; /* # of seconds RX has been idle */ - struct callout_handle stat_ch; /* Handle for canceling our stat timeout */ + struct callout stat_ch; /* stat callout */ struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ u_int32_t mcs_addr; /* DMA address of the multicast cmd */ struct ifmedia sc_media; /* media information */ ==== //depot/projects/uart/dev/pccard/pccard.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.83 2003/08/25 18:20:03 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.84 2003/09/05 03:08:08 imp Exp $"); #include #include @@ -284,14 +284,16 @@ struct pccard_softc *sc = PCCARD_SOFTC(dev); struct pccard_function *pf; struct pccard_config_entry *cfe; + int state; /* * We are running on either the PCCARD socket's event thread * or in user context detaching a device by user request. */ STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 17:57:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E792916A4C1; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3A7F16A4BF for ; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34CBE4400E for ; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h860vd0U080874 for ; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h860vcpe080871 for perforce@freebsd.org; Fri, 5 Sep 2003 17:57:38 -0700 (PDT) Date: Fri, 5 Sep 2003 17:57:38 -0700 (PDT) Message-Id: <200309060057.h860vcpe080871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 00:57:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=37632 Change 37632 by peter@peter_daintree on 2003/09/05 17:57:03 OK, that was more painful than I thought. Instead, lets just pretend that a long double is just a specially aligned double. Too much of the extended precision support is missing from the runtime and libraries. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#6 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#6 (text+ko) ==== @@ -312,10 +312,7 @@ EOL := "\n"; | Systems.FBSD_AMD64 => - Extended.size := 80; Extended.align := 128; - Extended.min := Float{Precision.Extended, 0,-1.1897314953572317650x+4932}; - Extended.max := Float{Precision.Extended, 0, 1.1897314953572317650x+4932}; Int_C.cg_type := CGType.Int_C; Word_C.cg_type := CGType.Word_C; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 17:57:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A58316A4D6; Fri, 5 Sep 2003 17:57:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44B4616A4FC for ; Fri, 5 Sep 2003 17:57:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AADC243FF7 for ; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h860vd0U080880 for ; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h860vdGb080877 for perforce@freebsd.org; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Date: Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Message-Id: <200309060057.h860vdGb080877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 00:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=37633 Change 37633 by peter@peter_daintree on 2003/09/05 17:57:22 fix apparently genuine bug Affected files ... .. //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#2 edit Differences ... ==== //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#2 (text+ko) ==== @@ -88,7 +88,7 @@ PROCEDURE Extended (r: Random.T): EXTENDED = BEGIN - RETURN LOOPHOLE (Longreal (r), EXTENDED); + RETURN LOOPHOLE (Extended (r), EXTENDED); END Extended; BEGIN From owner-p4-projects@FreeBSD.ORG Fri Sep 5 17:57:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D52C16A4E8; Fri, 5 Sep 2003 17:57:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E35E16A4BF for ; Fri, 5 Sep 2003 17:57:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FD0543FF7 for ; Fri, 5 Sep 2003 17:57:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h860ve0U080887 for ; Fri, 5 Sep 2003 17:57:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h860vdOZ080883 for perforce@freebsd.org; Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Date: Fri, 5 Sep 2003 17:57:39 -0700 (PDT) Message-Id: <200309060057.h860vdOZ080883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 00:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=37634 Change 37634 by peter@peter_daintree on 2003/09/05 17:57:37 import the long_double type Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#5 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#5 (text+ko) ==== @@ -8,7 +8,7 @@ INTERFACE Csetjmp; (* for FreeBSD *) -FROM Ctypes IMPORT int, long; +FROM Ctypes IMPORT int, long, long_double; TYPE jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, From owner-p4-projects@FreeBSD.ORG Fri Sep 5 17:58:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E224516A4C1; Fri, 5 Sep 2003 17:58:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CF7D16A4BF for ; Fri, 5 Sep 2003 17:58:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF0643FF3 for ; Fri, 5 Sep 2003 17:58:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h860wf0U080987 for ; Fri, 5 Sep 2003 17:58:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h860wfSh080984 for perforce@freebsd.org; Fri, 5 Sep 2003 17:58:41 -0700 (PDT) Date: Fri, 5 Sep 2003 17:58:41 -0700 (PDT) Message-Id: <200309060058.h860wfSh080984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 00:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=37635 Change 37635 by peter@peter_daintree on 2003/09/05 17:57:48 Get A Bigger Hammer. Affected files ... .. //depot/projects/ezm3/libs/libm3/src/pickle/PickleStubs.m3#2 edit .. //depot/projects/ezm3/libs/m3core/src/float/Common/IEEESpecial.m3#2 edit Differences ... ==== //depot/projects/ezm3/libs/libm3/src/pickle/PickleStubs.m3#2 (text+ko) ==== @@ -287,11 +287,13 @@ writer.wr.putString(LOOPHOLE(i, ARRAY [0..BYTESIZE(LONGREAL)-1] OF CHAR)); END OutLongreal; +(* PROCEDURE InExtended(reader: Pickle.Reader): EXTENDED RAISES {Pickle.Error, Rd.Failure, Thread.Alerted} = BEGIN RETURN LOOPHOLE(InLongreal(reader), EXTENDED); END InExtended; +*) PROCEDURE OutExtended(writer: Pickle.Writer; i: EXTENDED) RAISES {Wr.Failure, Thread.Alerted} = ==== //depot/projects/ezm3/libs/m3core/src/float/Common/IEEESpecial.m3#2 (text+ko) ==== @@ -18,7 +18,9 @@ LOOPHOLE (LongPosInf, LongRealRep.T) := LongRealRep.PosInf; LOOPHOLE (LongNan, LongRealRep.T) := LongRealRep.Nan; +(* LOOPHOLE (ExtdNegInf, LongRealRep.T) := LongRealRep.NegInf; LOOPHOLE (ExtdPosInf, LongRealRep.T) := LongRealRep.PosInf; LOOPHOLE (ExtdNan, LongRealRep.T) := LongRealRep.Nan; +*) END IEEESpecial. From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:06:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65EE216A4C1; Fri, 5 Sep 2003 19:06:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C3B316A4BF for ; Fri, 5 Sep 2003 19:06:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E39C43F85 for ; Fri, 5 Sep 2003 19:06:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862640U085442 for ; Fri, 5 Sep 2003 19:06:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86263dd085439 for perforce@freebsd.org; Fri, 5 Sep 2003 19:06:03 -0700 (PDT) Date: Fri, 5 Sep 2003 19:06:03 -0700 (PDT) Message-Id: <200309060206.h86263dd085439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:06:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=37636 Change 37636 by peter@peter_daintree on 2003/09/05 19:05:31 undo magic 128 bit alignment support. its not needed after all. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.i3#3 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#7 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.i3#3 (text+ko) ==== @@ -124,7 +124,7 @@ VAR (*CONST*) (* sorted list of supported machine alignments *) - Alignments: ARRAY [0..4] OF CARDINAL; + Alignments: ARRAY [0..3] OF CARDINAL; (*------------------------------------------------------- procedure calls ---*) ==== //depot/projects/ezm3/language/modula3/m3compiler/m3middle/src/Target.m3#7 (text+ko) ==== @@ -132,7 +132,6 @@ Alignments[1] := 16; Alignments[2] := 32; Alignments[3] := 64; - Alignments[4] := 128; CCs := NIL; @@ -312,8 +311,6 @@ EOL := "\n"; | Systems.FBSD_AMD64 => - Extended.align := 128; - Int_C.cg_type := CGType.Int_C; Word_C.cg_type := CGType.Word_C; Word_C.max.x[1] := FF; @@ -334,7 +331,7 @@ Address := Word_D; Address.cg_type := CGType.Addr; - max_align := 128; + max_align := 64; Little_endian := TRUE; PCC_bitfield_type_matters := TRUE; Structure_size_boundary := 8; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:07:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C93F16A4C1; Fri, 5 Sep 2003 19:07:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50CC516A4BF for ; Fri, 5 Sep 2003 19:07:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C11E443FB1 for ; Fri, 5 Sep 2003 19:07:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862760U085493 for ; Fri, 5 Sep 2003 19:07:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86275WI085490 for perforce@freebsd.org; Fri, 5 Sep 2003 19:07:05 -0700 (PDT) Date: Fri, 5 Sep 2003 19:07:05 -0700 (PDT) Message-Id: <200309060207.h86275WI085490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:07:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=37637 Change 37637 by peter@peter_daintree on 2003/09/05 19:06:48 back out Affected files ... .. //depot/projects/ezm3/libs/m3core/src/float/Common/IEEESpecial.m3#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/float/Common/IEEESpecial.m3#3 (text+ko) ==== @@ -18,9 +18,7 @@ LOOPHOLE (LongPosInf, LongRealRep.T) := LongRealRep.PosInf; LOOPHOLE (LongNan, LongRealRep.T) := LongRealRep.Nan; -(* LOOPHOLE (ExtdNegInf, LongRealRep.T) := LongRealRep.NegInf; LOOPHOLE (ExtdPosInf, LongRealRep.T) := LongRealRep.PosInf; LOOPHOLE (ExtdNan, LongRealRep.T) := LongRealRep.Nan; -*) END IEEESpecial. From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:09:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D73C516A4C1; Fri, 5 Sep 2003 19:09:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B5E316A4C0 for ; Fri, 5 Sep 2003 19:09:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C6BB43FFB for ; Fri, 5 Sep 2003 19:09:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862990U085552 for ; Fri, 5 Sep 2003 19:09:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862992N085549 for perforce@freebsd.org; Fri, 5 Sep 2003 19:09:09 -0700 (PDT) Date: Fri, 5 Sep 2003 19:09:09 -0700 (PDT) Message-Id: <200309060209.h862992N085549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:09:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=37638 Change 37638 by peter@peter_daintree on 2003/09/05 19:08:30 back out Affected files ... .. //depot/projects/ezm3/libs/libm3/src/pickle/PickleStubs.m3#3 edit .. //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#3 edit Differences ... ==== //depot/projects/ezm3/libs/libm3/src/pickle/PickleStubs.m3#3 (text+ko) ==== @@ -287,13 +287,11 @@ writer.wr.putString(LOOPHOLE(i, ARRAY [0..BYTESIZE(LONGREAL)-1] OF CHAR)); END OutLongreal; -(* PROCEDURE InExtended(reader: Pickle.Reader): EXTENDED RAISES {Pickle.Error, Rd.Failure, Thread.Alerted} = BEGIN RETURN LOOPHOLE(InLongreal(reader), EXTENDED); END InExtended; -*) PROCEDURE OutExtended(writer: Pickle.Writer; i: EXTENDED) RAISES {Wr.Failure, Thread.Alerted} = ==== //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#3 (text+ko) ==== @@ -88,7 +88,7 @@ PROCEDURE Extended (r: Random.T): EXTENDED = BEGIN - RETURN LOOPHOLE (Extended (r), EXTENDED); + RETURN LOOPHOLE (LongReal (r), EXTENDED); END Extended; BEGIN From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:09:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF1C016A4D5; Fri, 5 Sep 2003 19:09:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8227D16A4C1 for ; Fri, 5 Sep 2003 19:09:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01A7F43FB1 for ; Fri, 5 Sep 2003 19:09:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8629A0U085559 for ; Fri, 5 Sep 2003 19:09:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8629Ax1085555 for perforce@freebsd.org; Fri, 5 Sep 2003 19:09:10 -0700 (PDT) Date: Fri, 5 Sep 2003 19:09:10 -0700 (PDT) Message-Id: <200309060209.h8629Ax1085555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=37639 Change 37639 by peter@peter_daintree on 2003/09/05 19:09:01 really back out Affected files ... .. //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#4 edit Differences ... ==== //depot/projects/ezm3/libs/libm3/src/random/IEEE/RandomReal.m3#4 (text+ko) ==== @@ -88,7 +88,7 @@ PROCEDURE Extended (r: Random.T): EXTENDED = BEGIN - RETURN LOOPHOLE (LongReal (r), EXTENDED); + RETURN LOOPHOLE (Longreal (r), EXTENDED); END Extended; BEGIN From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:11:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1D2A16A4C1; Fri, 5 Sep 2003 19:11:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 958F416A4BF for ; Fri, 5 Sep 2003 19:11:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20CB843FF2 for ; Fri, 5 Sep 2003 19:11:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862BD0U085717 for ; Fri, 5 Sep 2003 19:11:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862BDD2085714 for perforce@freebsd.org; Fri, 5 Sep 2003 19:11:13 -0700 (PDT) Date: Fri, 5 Sep 2003 19:11:13 -0700 (PDT) Message-Id: <200309060211.h862BDD2085714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:11:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37640 Change 37640 by peter@peter_daintree on 2003/09/05 19:10:50 back out Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#6 edit .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#6 (text+ko) ==== @@ -14,12 +14,11 @@ jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, just in case *) - (* We use a special state for context switching due to floating point, - which setjmp/longjmp do not deal with. Record length = 72 longs. *) - fpjmp_buf = RECORD - int_stuff: ARRAY [0..7] OF long; (* integer registers *) - fp_stuff: ARRAY [0..31] OF long_double; (* floating point fxsave *) - END; + fpjmp_buf = ARRAY [0..71] OF long; (* this is needed to hold the + fpu state, which the ordinary + versions of setjmp/longjmp + do not save and restore *) + <*EXTERNAL "setjmp" *> PROCEDURE setjmp (VAR env: jmp_buf): int; <*EXTERNAL "longjmp" *> PROCEDURE longjmp (VAR env: jmp_buf; val: int); ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#3 (text+ko) ==== @@ -16,7 +16,7 @@ PROCEDURE SP (READONLY s: State): ADDRESS = BEGIN - RETURN LOOPHOLE (s.int_stuff [SP_pos], ADDRESS); + RETURN LOOPHOLE (s [SP_pos], ADDRESS); END SP; (*--------------------------------------------------------- thread stacks ---*) @@ -70,7 +70,7 @@ PROCEDURE UpdateStateForNewSP (VAR s: State; offset: INTEGER) = BEGIN - INC (s.int_stuff [SP_pos], offset); + INC (s [SP_pos], offset); END UpdateStateForNewSP; PROCEDURE UpdateFrameForNewSP (<*UNUSED*> a: ADDRESS; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:12:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA30A16A4C1; Fri, 5 Sep 2003 19:12:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7634916A4BF for ; Fri, 5 Sep 2003 19:12:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A39543FF5 for ; Fri, 5 Sep 2003 19:12:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862CF0U085756 for ; Fri, 5 Sep 2003 19:12:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862CFnW085753 for perforce@freebsd.org; Fri, 5 Sep 2003 19:12:15 -0700 (PDT) Date: Fri, 5 Sep 2003 19:12:15 -0700 (PDT) Message-Id: <200309060212.h862CFnW085753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=37641 Change 37641 by peter@peter_daintree on 2003/09/05 19:11:33 go go gadget backout! Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#7 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#7 (text+ko) ==== @@ -8,7 +8,7 @@ INTERFACE Csetjmp; (* for FreeBSD *) -FROM Ctypes IMPORT int, long, long_double; +FROM Ctypes IMPORT int, long; TYPE jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, @@ -19,7 +19,6 @@ versions of setjmp/longjmp do not save and restore *) - <*EXTERNAL "setjmp" *> PROCEDURE setjmp (VAR env: jmp_buf): int; <*EXTERNAL "longjmp" *> PROCEDURE longjmp (VAR env: jmp_buf; val: int); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:13:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2F5A16A4C1; Fri, 5 Sep 2003 19:13:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76EDE16A4BF for ; Fri, 5 Sep 2003 19:13:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC05843FEA for ; Fri, 5 Sep 2003 19:13:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862DH0U085814 for ; Fri, 5 Sep 2003 19:13:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862DHLS085811 for perforce@freebsd.org; Fri, 5 Sep 2003 19:13:17 -0700 (PDT) Date: Fri, 5 Sep 2003 19:13:17 -0700 (PDT) Message-Id: <200309060213.h862DHLS085811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:13:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=37642 Change 37642 by peter@peter_daintree on 2003/09/05 19:13:11 suck in ucontext.h descriptor from solaris Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:44:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA65816A4C2; Fri, 5 Sep 2003 19:44:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E3C516A4BF for ; Fri, 5 Sep 2003 19:44:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E82F843FD7 for ; Fri, 5 Sep 2003 19:44:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862iv0U087155 for ; Fri, 5 Sep 2003 19:44:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862ivnL087152 for perforce@freebsd.org; Fri, 5 Sep 2003 19:44:57 -0700 (PDT) Date: Fri, 5 Sep 2003 19:44:57 -0700 (PDT) Message-Id: <200309060244.h862ivnL087152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=37645 Change 37645 by peter@peter_daintree on 2003/09/05 19:44:24 terminate with extreme prejudice Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#4 delete .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/m3makefile#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/m3makefile#2 (text+ko) ==== @@ -12,5 +12,4 @@ implementation ("RTThread") c_source ("RTThreadC") c_source ("RTHeapDepC") -s_source ("_fpsetjmp") c_source ("malloc") From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:44:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 089C116A4FE; Fri, 5 Sep 2003 19:44:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A1F916A4C0 for ; Fri, 5 Sep 2003 19:44:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AECF43FBF for ; Fri, 5 Sep 2003 19:44:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862iv0U087149 for ; Fri, 5 Sep 2003 19:44:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862iu5T087146 for perforce@freebsd.org; Fri, 5 Sep 2003 19:44:56 -0700 (PDT) Date: Fri, 5 Sep 2003 19:44:56 -0700 (PDT) Message-Id: <200309060244.h862iu5T087146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=37644 Change 37644 by peter@peter_daintree on 2003/09/05 19:43:58 Initial switchover to use getcontext()/setcontext() instead of the evil fpsetjmp etc. This has the advantage of doing a copyin() into the kernel on a properly aligned buffer, so all the alignment evilness goes completely away. I should have thought of this before. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTMachine.i3#2 edit .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#4 edit .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThreadC.c#2 edit .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#2 edit .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTMachine.i3#2 (text+ko) ==== @@ -9,16 +9,16 @@ INTERFACE RTMachine; -IMPORT Csetjmp; +IMPORT Uucontext; (*--------------------------------------------------------- thread state ---*) TYPE - State = Csetjmp.fpjmp_buf; + State = Uucontext.ucontext_t; (* The machine state is saved in a "State". This type is really opaque to the client, i.e. it does not need to be an array. *) -<*EXTERNAL "_fpsetjmp" *> +<*EXTERNAL "getcontext" *> PROCEDURE SaveState (VAR s: State): INTEGER; (* Capture the currently running thread's state *) ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#4 (text+ko) ==== @@ -11,12 +11,9 @@ IMPORT Usignal, Unix, Umman, RTMisc; -CONST - SP_pos = 2; (* Index of stack pointer in jmp_buf array *) - PROCEDURE SP (READONLY s: State): ADDRESS = BEGIN - RETURN LOOPHOLE (s [SP_pos], ADDRESS); + RETURN LOOPHOLE (s.uc_mcontext.mc_rsp, ADDRESS); END SP; (*--------------------------------------------------------- thread stacks ---*) @@ -70,7 +67,7 @@ PROCEDURE UpdateStateForNewSP (VAR s: State; offset: INTEGER) = BEGIN - INC (s [SP_pos], offset); + INC (s.uc_mcontext.mc_rsp, offset); END UpdateStateForNewSP; PROCEDURE UpdateFrameForNewSP (<*UNUSED*> a: ADDRESS; ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThreadC.c#2 (text+ko) ==== @@ -7,13 +7,14 @@ /* This file implements the coroutine transfer: RTThread.Transfer */ -#include +#include - -RTThread__Transfer (from, to) -jmp_buf *from, *to; +void RTThread__Transfer (ucontext_t *from, ucontext_t *to) { - if (_fpsetjmp(*from) == 0) _fplongjmp (*to, 1); + if (getcontext(from) == 0) { + to->uc_mcontext.mc_rax = 1; /* emulate longjmp return */ + setcontext(to); /* fire it up */ + } } ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#2 (text+ko) ==== @@ -9,6 +9,7 @@ INTERFACE Usignal; FROM Ctypes IMPORT int, unsigned_int, long, unsigned_long; +FROM Uucontext IMPORT sigset_t; (*** ***) @@ -65,9 +66,6 @@ SignalHandler = PROCEDURE (sig, code: int; scp: UNTRACED REF struct_sigcontext); - sigset_t = ARRAY [0..3] OF unsigned_int; - sigset_t_star = UNTRACED REF sigset_t; - struct_sigvec = RECORD sv_handler: SignalHandler; (* signal handler *) sv_mask: int; (* signal mask to apply *) ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#2 (text+ko) ==== @@ -1,74 +1,62 @@ INTERFACE Uucontext; -FROM Ctypes IMPORT int, long, char_star, unsigned_int, unsigned_char, double; +FROM Ctypes IMPORT int, long, char_star, unsigned_int, unsigned_char, double, size_t; FROM Utypes IMPORT u_long, caddr_t; (* ucontext.h *) TYPE - sigset_t = RECORD - sigbits : ARRAY [0..3] OF u_long; - END; + + sigset_t = ARRAY [0..3] OF unsigned_int; struct_sigaltstack = RECORD ss_sp : char_star; - ss_size : int; + ss_size : size_t; ss_flags : int; END; stack_t = struct_sigaltstack; - greg_t = int; - gregset_t = RECORD - psr : greg_t; - pc : greg_t; - npc : greg_t; - y : greg_t; - g1 : greg_t; - g2 : greg_t; - g3 : greg_t; - g4 : greg_t; - g5 : greg_t; - g6 : greg_t; - g7 : greg_t; - o0 : greg_t; - o1 : greg_t; - o2 : greg_t; - o3 : greg_t; - o4 : greg_t; - o5 : greg_t; - (*o6*) sp : greg_t; - o7 : greg_t; - END; - - fpregset_t = RECORD - fpu_regs : ARRAY[0..15] OF double; (* 16 doubles *) - fpu_q : ADDRESS; (* ptr to array of FQ entries *) - fpu_fsr : unsigned_int; (* FPU status register *) - fpu_qcnt : unsigned_char; (* # of entries in saved FQ *) - fpu_q_entrysize: unsigned_char; (* # of bytes per FQ entry *) - fpu_en : unsigned_char; (* flag signifying FPU in use *) - END; - - xrs_t = RECORD - xrs_id : unsigned_int; (* indicates xrs_ptr validity *) - xrs_ptr : caddr_t; (* ptr to extra reg state *) - END; - + register_t = long; mcontext_t = RECORD - gregs : gregset_t; - gwins : ADDRESS; (* POSSIBLE ptr to reg windows *) - fpregs : fpregset_t; (* floating point register set *) - xrs : xrs_t; (* POSSIBLE extra reg state assoc *) - filler : ARRAY[1..19] OF long; + mc_onstack : register_t; + mc_rdi : register_t; + mc_rsi : register_t; + mc_rdx : register_t; + mc_rcx : register_t; + mc_r8 : register_t; + mc_r9 : register_t; + mc_rax : register_t; + mc_rbx : register_t; + mc_rbp : register_t; + mc_r10 : register_t; + mc_r11 : register_t; + mc_r12 : register_t; + mc_r13 : register_t; + mc_r14 : register_t; + mc_r15 : register_t; + mc_trapno : register_t; + mc_addr : register_t; + mc_err : register_t; + mc_rip : register_t; + mc_cs : register_t; + mc_rflags : register_t; + mc_rsp : register_t; + mc_ss : register_t; + mc_len : long; + mc_fpformat : long; + mc_ownedfp : long; + mc_spare1 : ARRAY[1..1] OF long; + mc_fpstate : ARRAY[0..63] OF long; + mc_spare2 : ARRAY[1..8] OF long; END; struct_ucontext = RECORD - uc_flags : u_long; + uc_sigmask : sigset_t; + uc_mcontext: mcontext_t; uc_link : UNTRACED REF struct_ucontext; - uc_sigmask : sigset_t; uc_stack : stack_t; - uc_mcontext: mcontext_t; - uc_filler : ARRAY [1..23] OF long; + uc_flags : int; + uc_spare : ARRAY [1..4] OF int; END; ucontext_t = struct_ucontext; ucontext_t_star = UNTRACED REF ucontext_t; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:46:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB40316A4C0; Fri, 5 Sep 2003 19:46:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EA0216A4BF for ; Fri, 5 Sep 2003 19:46:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2D1F43FEA for ; Fri, 5 Sep 2003 19:45:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862jx0U087264 for ; Fri, 5 Sep 2003 19:45:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862jxKD087261 for perforce@freebsd.org; Fri, 5 Sep 2003 19:45:59 -0700 (PDT) Date: Fri, 5 Sep 2003 19:45:59 -0700 (PDT) Message-Id: <200309060245.h862jxKD087261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=37646 Change 37646 by peter@peter_daintree on 2003/09/05 19:45:19 terminate fpsetjmp and fpjmp_buf with extreme prejudice Affected files ... .. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#8 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#8 (text+ko) ==== @@ -14,19 +14,11 @@ jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf, just in case *) - fpjmp_buf = ARRAY [0..71] OF long; (* this is needed to hold the - fpu state, which the ordinary - versions of setjmp/longjmp - do not save and restore *) - <*EXTERNAL "setjmp" *> PROCEDURE setjmp (VAR env: jmp_buf): int; <*EXTERNAL "longjmp" *> PROCEDURE longjmp (VAR env: jmp_buf; val: int); <*EXTERNAL "_setjmp" *> PROCEDURE usetjmp (VAR env: jmp_buf): int; <*EXTERNAL "_longjmp" *> PROCEDURE ulongjmp (VAR env: jmp_buf; val: int); -<*EXTERNAL "_fpsetjmp" *> PROCEDURE fpsetjmp (VAR env: fpjmp_buf): int; -<*EXTERNAL "_fplongjmp" *> PROCEDURE fplongjmp (VAR env: fpjmp_buf; val: int); - END Csetjmp. From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:49:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BADD16A4C1; Fri, 5 Sep 2003 19:49:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F004F16A4BF for ; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4752543FE9 for ; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862n40U087334 for ; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862n354087331 for perforce@freebsd.org; Fri, 5 Sep 2003 19:49:03 -0700 (PDT) Date: Fri, 5 Sep 2003 19:49:03 -0700 (PDT) Message-Id: <200309060249.h862n354087331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=37647 Change 37647 by peter@peter_daintree on 2003/09/05 19:48:32 note to self to make sure I fix this. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#3 (text+ko) ==== @@ -121,6 +121,7 @@ * a non-standard exit is performed. *) +THIS IS ALL A LIE! THIS STRUCTURE IS 100% WRONG! TYPE struct_sigcontext = RECORD sc_mask: sigset_t; (* signal mask to restore *) From owner-p4-projects@FreeBSD.ORG Fri Sep 5 19:49:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E774316A4DB; Fri, 5 Sep 2003 19:49:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A655E16A4D8 for ; Fri, 5 Sep 2003 19:49:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F108544005 for ; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h862n40U087340 for ; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862n43q087337 for perforce@freebsd.org; Fri, 5 Sep 2003 19:49:04 -0700 (PDT) Date: Fri, 5 Sep 2003 19:49:04 -0700 (PDT) Message-Id: <200309060249.h862n43q087337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 02:49:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=37648 Change 37648 by peter@peter_daintree on 2003/09/05 19:48:56 add Uucontext.i3 to the interface list Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/m3makefile#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/m3makefile#2 (text+ko) ==== @@ -11,3 +11,4 @@ Interface ("Usignal") Interface ("Ustat") Interface ("Utypes") +Interface ("Uucontext") From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:22:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60D1F16A4C1; Fri, 5 Sep 2003 21:22:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BC6216A4BF for ; Fri, 5 Sep 2003 21:22:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 800AB43FE1 for ; Fri, 5 Sep 2003 21:22:58 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h864Mw0U098377 for ; Fri, 5 Sep 2003 21:22:58 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h864MwRl098374 for perforce@freebsd.org; Fri, 5 Sep 2003 21:22:58 -0700 (PDT) Date: Fri, 5 Sep 2003 21:22:58 -0700 (PDT) Message-Id: <200309060422.h864MwRl098374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 04:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=37649 Change 37649 by sam@sam_ebb on 2003/09/05 21:21:59 more locking fixups from Pavlin Radoslavov Affected files ... .. //depot/projects/netperf/sys/netinet/ip_mroute.c#10 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_mroute.c#10 (text+ko) ==== @@ -549,14 +549,15 @@ MFC_LOCK(); rt = mfc_find(req->src.s_addr, req->grp.s_addr); - MFC_UNLOCK(); if (rt == NULL) { + MFC_UNLOCK(); req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff; return EADDRNOTAVAIL; } req->pktcnt = rt->mfc_pkt_cnt; req->bytecnt = rt->mfc_byte_cnt; req->wrong_if = rt->mfc_wrong_if; + MFC_UNLOCK(); return 0; } @@ -568,13 +569,17 @@ { vifi_t vifi = req->vifi; - if (vifi >= numvifs) + VIF_LOCK(); + if (vifi >= numvifs) { + VIF_UNLOCK(); return EINVAL; + } req->icount = viftable[vifi].v_pkt_in; req->ocount = viftable[vifi].v_pkt_out; req->ibytes = viftable[vifi].v_bytes_in; req->obytes = viftable[vifi].v_bytes_out; + VIF_UNLOCK(); return 0; } @@ -894,8 +899,10 @@ { sin.sin_addr = vifcp->vifc_lcl_addr; ifa = ifa_ifwithaddr((struct sockaddr *)&sin); - if (ifa == NULL) + if (ifa == NULL) { + VIF_UNLOCK(); return EADDRNOTAVAIL; + } ifp = ifa->ifa_ifp; } @@ -1114,7 +1121,6 @@ u_long hash; struct rtdetq *rte; u_short nstl; - int s; VIF_LOCK(); MFC_LOCK(); @@ -1199,7 +1205,8 @@ if (rt == NULL) { /* no upcall, so make a new entry */ rt = (struct mfc *)malloc(sizeof(*rt), M_MRTABLE, M_NOWAIT); if (rt == NULL) { - splx(s); + MFC_UNLOCK(); + VIF_UNLOCK(); return ENOBUFS; } @@ -1253,8 +1260,6 @@ *nptr = rt->mfc_next; - MFC_UNLOCK(); - /* * free the bw_meter entries */ @@ -1265,6 +1270,8 @@ free_bw_list(list); + MFC_UNLOCK(); + return 0; } @@ -2439,8 +2446,8 @@ list = mfc->mfc_bw_meter; mfc->mfc_bw_meter = NULL; + free_bw_list(list); MFC_UNLOCK(); - free_bw_list(list); return 0; } else { /* Delete a single bw_meter entry */ struct bw_meter *prev; @@ -2463,9 +2470,9 @@ prev->bm_mfc_next = x->bm_mfc_next; /* remove from middle*/ else x->bm_mfc->mfc_bw_meter = x->bm_mfc_next;/* new head of list */ - MFC_UNLOCK(); unschedule_bw_meter(x); + MFC_UNLOCK(); /* Free the bw_meter entry */ free(x, M_BWMETER); return 0; From owner-p4-projects@FreeBSD.ORG Sat Sep 6 00:15:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A7EC16A4C1; Sat, 6 Sep 2003 00:15:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D990C16A4BF for ; Sat, 6 Sep 2003 00:15:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7E1B43F85 for ; Sat, 6 Sep 2003 00:15:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h867FR0U007358 for ; Sat, 6 Sep 2003 00:15:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h867FRA0007355 for perforce@freebsd.org; Sat, 6 Sep 2003 00:15:27 -0700 (PDT) Date: Sat, 6 Sep 2003 00:15:27 -0700 (PDT) Message-Id: <200309060715.h867FRA0007355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 07:15:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=37652 Change 37652 by marcel@marcel_nfs on 2003/09/06 00:15:16 Fix the receive logic. The flow control testing exposed serious data corruption and hangs. After digging into the matter I found out that: 1. The RBCL register does not hold the number of bytes in the FIFO. It is in fact a running counter (as the datasheet mentions rather casually). A very nice feature of the counter is that a completely filled FIFO will always re- align the counter to a multiple of the threshold. Thus, we can always read RBCL, mask the lower X bits and if the result is 0, we have a completely filled FIFO. Yay! 2. It is vitally important to check if there's any data in the FIFO before we use the counter in RBCL. A receive FIFO reset will cause an interrupt without there being any new data. Not only is the RBCL unchanged by this, but we also interpret 0 as a full. If we do not check in STAR first, we'll be reading junk. 3. It is also important to send the RMC command to the chip if there's no data. Otherwise the FIFO will lock up, only to be released by a FIFO reset. It is possible that I can enable input flow control again... Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#25 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#25 (text+ko) ==== @@ -580,28 +580,28 @@ sab82532_bus_receive(struct uart_softc *sc) { struct uart_bas *bas; - int count, xc; + int i, rbcl, xc; uint8_t s; bas = &sc->sc_bas; - count = uart_getreg(bas, SAB_RBCL); - while (count && !uart_rx_full(sc)) { - xc = uart_getreg(bas, SAB_RFIFO); - s = uart_getreg(bas, SAB_RFIFO); - if (s & SAB_RSTAT_FE) - xc |= UART_STAT_FRAMERR; - if (s & SAB_RSTAT_PE) - xc |= UART_STAT_PARERR; - uart_rx_put(sc, xc); - count -= 2; + if (uart_getreg(bas, SAB_STAR) & SAB_STAR_RFNE) { + rbcl = uart_getreg(bas, SAB_RBCL) & 31; + if (rbcl == 0) + rbcl = 32; + for (i = 0; i < rbcl; i += 2) { + if (uart_rx_full(sc)) { + sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; + break; + } + xc = uart_getreg(bas, SAB_RFIFO); + s = uart_getreg(bas, SAB_RFIFO + 1); + if (s & SAB_RSTAT_FE) + xc |= UART_STAT_FRAMERR; + if (s & SAB_RSTAT_PE) + xc |= UART_STAT_PARERR; + uart_rx_put(sc, xc); + } } - /* - * Oops, we couldn't get all data from the FIFO. Mark an overflow - * condition and let upper layers deal with this. We need to free - * the Rx FIFO. Sorry... - */ - if (count) - sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; while (uart_getreg(bas, SAB_STAR) & SAB_STAR_CEC) ; From owner-p4-projects@FreeBSD.ORG Sat Sep 6 13:56:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C50516A4C1; Sat, 6 Sep 2003 13:56:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2190C16A4BF for ; Sat, 6 Sep 2003 13:56:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7E8C44013 for ; Sat, 6 Sep 2003 13:56:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h86KuR0U073932 for ; Sat, 6 Sep 2003 13:56:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86KuRxc073929 for perforce@freebsd.org; Sat, 6 Sep 2003 13:56:27 -0700 (PDT) Date: Sat, 6 Sep 2003 13:56:27 -0700 (PDT) Message-Id: <200309062056.h86KuRxc073929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 20:56:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=37683 Change 37683 by marcel@marcel_nfs on 2003/09/06 13:56:01 Add the necessary bits to compile on amd64. The MD code is identical to i386 (except of course for s/I386/AMD64/g) but I expect that ACPI will have SPCR and DBGP tables. If not now, then maybe in the near future... Affected files ... .. //depot/projects/uart/conf/files.amd64#5 edit .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#1 add Differences ... ==== //depot/projects/uart/conf/files.amd64#5 (text+ko) ==== @@ -42,6 +42,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_amd64.c optional uart isa/atkbd_isa.c optional atkbd amd64/acpica/OsdEnvironment.c optional acpi From owner-p4-projects@FreeBSD.ORG Sat Sep 6 14:04:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFF1A16A4C1; Sat, 6 Sep 2003 14:04:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E2F516A4BF for ; Sat, 6 Sep 2003 14:04:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20AE743FDD for ; Sat, 6 Sep 2003 14:04:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h86L4b0U075273 for ; Sat, 6 Sep 2003 14:04:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86L4buk075270 for perforce@freebsd.org; Sat, 6 Sep 2003 14:04:37 -0700 (PDT) Date: Sat, 6 Sep 2003 14:04:37 -0700 (PDT) Message-Id: <200309062104.h86L4buk075270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 21:04:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37684 Change 37684 by marcel@marcel_nfs on 2003/09/06 14:03:48 Add support for pc98. We simply use the i386 MD code. This is wrong because there are different flavors of UARTs we need to deal with, but I don't have PC98 so there's nothing more sensible I can do than what I'm doing now. Affected files ... .. //depot/projects/uart/conf/files.pc98#6 edit Differences ... ==== //depot/projects/uart/conf/files.pc98#6 (text+ko) ==== @@ -131,6 +131,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard From owner-p4-projects@FreeBSD.ORG Sat Sep 6 16:33:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 585EC16A4C1; Sat, 6 Sep 2003 16:33:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED40516A4BF for ; Sat, 6 Sep 2003 16:33:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F4C43FF9 for ; Sat, 6 Sep 2003 16:33:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h86NXA0U083154 for ; Sat, 6 Sep 2003 16:33:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86NX93i083151 for perforce@freebsd.org; Sat, 6 Sep 2003 16:33:09 -0700 (PDT) Date: Sat, 6 Sep 2003 16:33:09 -0700 (PDT) Message-Id: <200309062333.h86NX93i083151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 23:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=37692 Change 37692 by marcel@marcel_nfs on 2003/09/06 16:32:13 IFC @37691 Affected files ... .. //depot/projects/uart/conf/files#21 integrate .. //depot/projects/uart/conf/files.alpha#6 integrate .. //depot/projects/uart/conf/files.amd64#6 integrate .. //depot/projects/uart/conf/files.i386#9 integrate .. //depot/projects/uart/conf/files.ia64#8 integrate .. //depot/projects/uart/conf/files.pc98#7 integrate .. //depot/projects/uart/conf/files.sparc64#5 integrate .. //depot/projects/uart/conf/kmod.mk#6 integrate .. //depot/projects/uart/conf/ldscript.ia64#2 integrate .. //depot/projects/uart/dev/puc/puc.c#9 integrate .. //depot/projects/uart/dev/puc/puc_ebus.c#4 integrate .. //depot/projects/uart/dev/puc/puc_pci.c#5 integrate .. //depot/projects/uart/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/uart/dev/puc/pucdata.c#7 integrate .. //depot/projects/uart/dev/puc/pucvar.h#7 integrate .. //depot/projects/uart/dev/smbus/smbus.c#3 integrate .. //depot/projects/uart/dev/uart/uart.h#3 integrate .. //depot/projects/uart/dev/uart/uart_bus.h#27 integrate .. //depot/projects/uart/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/uart/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/uart/dev/uart/uart_bus_puc.c#6 integrate .. //depot/projects/uart/dev/uart/uart_core.c#27 integrate .. //depot/projects/uart/dev/uart/uart_cpu.h#8 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#4 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#11 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#26 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.h#3 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#26 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.h#2 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#12 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.h#6 integrate .. //depot/projects/uart/dev/uart/uart_if.m#10 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#15 integrate .. //depot/projects/uart/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/uart/kern/subr_taskqueue.c#3 integrate .. //depot/projects/uart/kern/subr_witness.c#5 integrate .. //depot/projects/uart/kern/sys_pipe.c#7 integrate .. //depot/projects/uart/modules/Makefile#7 integrate .. //depot/projects/uart/modules/uart/Makefile#5 integrate .. //depot/projects/uart/netinet/ip_mroute.c#5 integrate .. //depot/projects/uart/pci/amdpm.c#4 integrate Differences ... ==== //depot/projects/uart/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.817 2003/08/29 04:02:18 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.alpha#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.105 2003/08/04 02:39:14 imp Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.106 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.amd64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.22 2003/08/23 00:59:26 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.23 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.453 2003/08/31 16:20:34 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.454 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.ia64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.57 2003/08/23 02:33:36 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.58 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.pc98#7 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.277 2003/08/25 07:52:10 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.45 2003/08/24 01:54:06 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.46 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.140 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.141 2003/09/06 23:23:25 marcel Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). ==== //depot/projects/uart/conf/ldscript.ia64#2 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.9 2003/05/16 06:03:45 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) SEARCH_DIR(/usr/lib); -kernel_text = 0xe000000000500000; +kernel_text = 0xe000000004000000; SECTIONS { /* Read-only sections, merged into text segment: */ ==== //depot/projects/uart/dev/puc/puc.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * Copyright (c) 1996, 1998, 1999 @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, ==== //depot/projects/uart/dev/puc/puc_ebus.c#4 (text+ko) ==== ==== //depot/projects/uart/dev/puc/puc_pci.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.6 2003/08/28 21:22:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.7 2003/09/06 21:48:50 marcel Exp $"); /* * Copyright (c) 1996, 1998, 1999 @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.6 2003/08/28 21:22:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.7 2003/09/06 21:48:50 marcel Exp $"); #include "opt_puc.h" ==== //depot/projects/uart/dev/puc/puc_sbus.c#4 (text+ko) ==== ==== //depot/projects/uart/dev/puc/pucdata.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.24 2003/08/21 03:54:20 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.25 2003/09/06 21:48:50 marcel Exp $"); /* * PCI "universal" communications card driver configuration data (used to ==== //depot/projects/uart/dev/puc/pucvar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $ */ -/* $FreeBSD: src/sys/dev/puc/pucvar.h,v 1.10 2003/03/15 16:25:40 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/puc/pucvar.h,v 1.11 2003/09/06 21:48:50 marcel Exp $ */ /*- * Copyright (c) 2002 JF Hay. All rights reserved. ==== //depot/projects/uart/dev/smbus/smbus.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/smbus/smbus.c,v 1.17 2003/08/24 18:03:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smbus/smbus.c,v 1.18 2003/09/06 13:58:06 dfr Exp $"); #include #include #include @@ -116,5 +116,4 @@ DRIVER_MODULE(smbus, ichsmb, smbus_driver, smbus_devclass, 0, 0); DRIVER_MODULE(smbus, amdpm, smbus_driver, smbus_devclass, 0, 0); DRIVER_MODULE(smbus, viapropm, smbus_driver, smbus_devclass, 0, 0); -DRIVER_MODULE(smbus, nfpm, smbus_driver, smbus_devclass, 0, 0); MODULE_VERSION(smbus, SMBUS_MODVER); ==== //depot/projects/uart/dev/uart/uart.h#3 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus.h#27 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_acpi.c#2 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#4 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#2 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#4 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#6 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_core.c#27 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu.h#8 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu_alpha.c#4 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu_amd64.c#2 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu_i386.c#3 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu_ia64.c#3 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#11 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#26 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.h#3 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#26 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.h#2 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#12 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_dev_z8530.h#6 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_if.m#10 (text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_tty.c#15 (text+ko) ==== ==== //depot/projects/uart/geom/bde/g_bde_crypt.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.16 2003/05/31 19:23:11 phk Exp $ + * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.17 2003/09/06 18:37:17 phk Exp $ * * This source file contains the functions responsible for the crypto, keying * and mapping operations on the I/O requests. @@ -159,7 +159,7 @@ } bzero(skey, sizeof skey); bzero(&ci, sizeof ci); - bzero(&ki, sizeof ci); + bzero(&ki, sizeof ki); } /* ==== //depot/projects/uart/kern/subr_taskqueue.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.18 2003/09/05 23:09:22 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.19 2003/09/06 21:05:18 sam Exp $"); #include #include @@ -379,7 +379,7 @@ STAILQ_INIT(&taskqueue_fast->tq_queue); taskqueue_fast->tq_name = "fast"; taskqueue_fast->tq_enqueue = taskqueue_fast_schedule; - mtx_init(&taskqueue_fast->tq_mutex, "taskqueue", NULL, MTX_SPIN); + mtx_init(&taskqueue_fast->tq_mutex, "taskqueue_fast", NULL, MTX_SPIN); mtx_lock(&taskqueue_queues_mutex); STAILQ_INSERT_TAIL(&taskqueue_queues, taskqueue_fast, tq_link); ==== //depot/projects/uart/kern/subr_witness.c#5 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.158 2003/08/04 19:24:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.159 2003/09/06 21:06:08 sam Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -284,6 +284,7 @@ { "zstty", &lock_class_mtx_spin }, { "ng_node", &lock_class_mtx_spin }, { "ng_worklist", &lock_class_mtx_spin }, + { "taskqueue_fast", &lock_class_mtx_spin }, { "ithread table lock", &lock_class_mtx_spin }, { "sched lock", &lock_class_mtx_spin }, { "callout", &lock_class_mtx_spin }, ==== //depot/projects/uart/kern/sys_pipe.c#7 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.148 2003/08/15 04:31:01 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.149 2003/09/06 21:02:10 alc Exp $"); #include "opt_mac.h" @@ -743,9 +743,7 @@ { int i; - GIANT_REQUIRED; PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); - if (wpipe->pipe_map.kva) { pmap_qremove(wpipe->pipe_map.kva, wpipe->pipe_map.npages); @@ -754,7 +752,7 @@ vm_offset_t kva = wpipe->pipe_map.kva; wpipe->pipe_map.kva = 0; kmem_free(kernel_map, kva, - wpipe->pipe_buffer.size + PAGE_SIZE); + wpipe->pipe_buffer.size + PAGE_SIZE); atomic_subtract_int(&amountpipekvawired, wpipe->pipe_buffer.size + PAGE_SIZE); } @@ -788,11 +786,11 @@ wpipe->pipe_buffer.cnt = size; wpipe->pipe_state &= ~PIPE_DIRECTW; - PIPE_GET_GIANT(wpipe); + PIPE_UNLOCK(wpipe); bcopy((caddr_t) wpipe->pipe_map.kva + pos, wpipe->pipe_buffer.buffer, size); pipe_destroy_write_buffer(wpipe); - PIPE_DROP_GIANT(wpipe); + PIPE_LOCK(wpipe); } /* @@ -861,9 +859,9 @@ while (!error && (wpipe->pipe_state & PIPE_DIRECTW)) { if (wpipe->pipe_state & PIPE_EOF) { pipelock(wpipe, 0); - PIPE_GET_GIANT(wpipe); + PIPE_UNLOCK(wpipe); pipe_destroy_write_buffer(wpipe); - PIPE_DROP_GIANT(wpipe); + PIPE_LOCK(wpipe); pipeselwakeup(wpipe); pipeunlock(wpipe); error = EPIPE; @@ -886,9 +884,9 @@ */ pipe_clone_write_buffer(wpipe); } else { - PIPE_GET_GIANT(wpipe); + PIPE_UNLOCK(wpipe); pipe_destroy_write_buffer(wpipe); - PIPE_DROP_GIANT(wpipe); + PIPE_LOCK(wpipe); } pipeunlock(wpipe); return (error); ==== //depot/projects/uart/modules/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.346 2003/08/30 08:01:05 sos Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.347 2003/09/06 23:23:26 marcel Exp $ .if !defined(NOCRYPT) || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) @@ -123,6 +123,7 @@ twe \ tx \ txp \ + uart \ ubsa \ ubsec \ ucom \ @@ -241,7 +242,7 @@ mly \ s3 \ vesa - + .elif ${MACHINE} == "pc98" SUBDIR+=canbepm \ canbus \ ==== //depot/projects/uart/modules/uart/Makefile#5 (text+ko) ==== ==== //depot/projects/uart/netinet/ip_mroute.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.91 2003/08/24 08:27:57 hsu Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.92 2003/09/06 04:53:43 sam Exp $ */ #include "opt_mac.h" @@ -81,6 +81,15 @@ static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast routing tables"); +/* + * Locking. We use two locks: one for the virtual interface table and + * one for the forwarding table. These locks may be nested in which case + * the VIF lock must always be taken first. Note that each lock is used + * to cover not only the specific data structure but also related data + * structures. It may be better to add more fine-grained locking later; + * it's not clear how performance-critical this code is. + */ + static struct mrtstat mrtstat; SYSCTL_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW, &mrtstat, mrtstat, @@ -91,14 +100,28 @@ &mfctable, sizeof(mfctable), "S,*mfc[MFCTBLSIZ]", "Multicast Forwarding Table (struct *mfc[MFCTBLSIZ], netinet/ip_mroute.h)"); +static struct mtx mfc_mtx; +#define MFC_LOCK() mtx_lock(&mfc_mtx) +#define MFC_UNLOCK() mtx_unlock(&mfc_mtx) +#define MFC_LOCK_ASSERT() mtx_assert(&mfc_mtx, MA_OWNED) +#define MFC_LOCK_INIT() mtx_init(&mfc_mtx, "mroute mfc table", NULL, MTX_DEF) +#define MFC_LOCK_DESTROY() mtx_destroy(&mfc_mtx) + static struct vif viftable[MAXVIFS]; SYSCTL_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_RD, &viftable, sizeof(viftable), "S,vif[MAXVIFS]", "Multicast Virtual Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)"); +static struct mtx vif_mtx; +#define VIF_LOCK() mtx_lock(&vif_mtx) +#define VIF_UNLOCK() mtx_unlock(&vif_mtx) +#define VIF_LOCK_ASSERT() mtx_assert(&vif_mtx, MA_OWNED) +#define VIF_LOCK_INIT() mtx_init(&vif_mtx, "mroute vif table", NULL, MTX_DEF) +#define VIF_LOCK_DESTROY() mtx_destroy(&vif_mtx) + static u_char nexpire[MFCTBLSIZ]; -static struct callout_handle expire_upcalls_ch; +static struct callout expire_upcalls_ch; #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ @@ -149,7 +172,7 @@ */ #define BW_METER_BUCKETS 1024 static struct bw_meter *bw_meter_timers[BW_METER_BUCKETS]; -static struct callout_handle bw_meter_ch; +static struct callout bw_meter_ch; #define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ /* @@ -158,7 +181,7 @@ */ static struct bw_upcall bw_upcalls[BW_UPCALLS_MAX]; static u_int bw_upcalls_n; /* # of pending upcalls */ -static struct callout_handle bw_upcalls_ch; +static struct callout bw_upcalls_ch; #define BW_UPCALLS_PERIOD (hz) /* periodical flush of bw upcalls */ #ifdef PIM @@ -226,6 +249,11 @@ static u_long last_encap_src; static struct vif *last_encap_vif; +/* + * Callout for queue processing. + */ +static struct callout tbf_reprocess_ch; + static u_long X_ip_mcast_src(int vifi); static int X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo); @@ -321,6 +349,8 @@ { struct mfc *rt; + MFC_LOCK_ASSERT(); + for (rt = mfctable[MFCHASH(o,g)]; rt; rt = rt->mfc_next) if ((rt->mfc_origin.s_addr == o) && (rt->mfc_mcastgrp.s_addr == g) && (rt->mfc_stall == NULL)) @@ -515,19 +545,19 @@ static int get_sg_cnt(struct sioc_sg_req *req) { - int s; struct mfc *rt; - s = splnet(); + MFC_LOCK(); rt = mfc_find(req->src.s_addr, req->grp.s_addr); - splx(s); if (rt == NULL) { + MFC_UNLOCK(); req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff; return EADDRNOTAVAIL; } req->pktcnt = rt->mfc_pkt_cnt; req->bytecnt = rt->mfc_byte_cnt; req->wrong_if = rt->mfc_wrong_if; + MFC_UNLOCK(); return 0; } @@ -539,13 +569,17 @@ { vifi_t vifi = req->vifi; - if (vifi >= numvifs) + VIF_LOCK(); + if (vifi >= numvifs) { + VIF_UNLOCK(); return EINVAL; + } req->icount = viftable[vifi].v_pkt_in; req->ocount = viftable[vifi].v_pkt_out; req->ibytes = viftable[vifi].v_bytes_in; req->obytes = viftable[vifi].v_bytes_out; + VIF_UNLOCK(); return 0; } @@ -572,16 +606,24 @@ ip_mrouter = so; bzero((caddr_t)mfctable, sizeof(mfctable)); + MFC_LOCK_INIT(); + VIF_LOCK_INIT(); bzero((caddr_t)nexpire, sizeof(nexpire)); pim_assert = 0; - expire_upcalls_ch = timeout(expire_upcalls, NULL, EXPIRE_TIMEOUT); + callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE); + callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, NULL); bw_upcalls_n = 0; bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers)); - bw_upcalls_ch = timeout(expire_bw_upcalls_send, NULL, BW_UPCALLS_PERIOD); - bw_meter_ch = timeout(expire_bw_meter_process, NULL, BW_METER_PERIOD); + callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE); + callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD, + expire_bw_upcalls_send, NULL); + callout_init(&bw_meter_ch, CALLOUT_MPSAFE); + callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, NULL); + + callout_init(&tbf_reprocess_ch, CALLOUT_MPSAFE); mrt_api_config = 0; @@ -603,9 +645,19 @@ struct ifreq ifr; struct mfc *rt; struct rtdetq *rte; - int s; + + /* + * Detach/disable hooks to the reset of the system. + */ + ip_mrouter = NULL; + mrt_api_config = 0; - s = splnet(); + VIF_LOCK(); + if (encap_cookie) { + encap_detach(encap_cookie); + encap_cookie = NULL; + } + callout_stop(&tbf_reprocess_ch); /* * For each phyint in use, disable promiscuous reception of all IP @@ -627,17 +679,17 @@ bzero((caddr_t)viftable, sizeof(viftable)); numvifs = 0; pim_assert = 0; + VIF_UNLOCK(); + VIF_LOCK_DESTROY(); - untimeout(expire_upcalls, NULL, expire_upcalls_ch); - - mrt_api_config = 0; - bw_upcalls_n = 0; - untimeout(expire_bw_upcalls_send, NULL, bw_upcalls_ch); - untimeout(expire_bw_meter_process, NULL, bw_meter_ch); - /* * Free all multicast forwarding cache entries. */ + MFC_LOCK(); + callout_stop(&expire_upcalls_ch); + callout_stop(&bw_upcalls_ch); + callout_stop(&bw_meter_ch); + for (i = 0; i < MFCTBLSIZ; i++) { for (rt = mfctable[i]; rt != NULL; ) { struct mfc *nr = rt->mfc_next; @@ -654,10 +706,11 @@ rt = nr; } } - bzero((caddr_t)mfctable, sizeof(mfctable)); - + bw_upcalls_n = 0; bzero(bw_meter_timers, sizeof(bw_meter_timers)); + MFC_UNLOCK(); + MFC_LOCK_DESTROY(); /* * Reset de-encapsulation cache @@ -668,15 +721,6 @@ reg_vif_num = VIFI_INVALID; #endif - if (encap_cookie) { - encap_detach(encap_cookie); - encap_cookie = NULL; - } - - ip_mrouter = NULL; - - splx(s); - if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_done\n"); @@ -824,15 +868,22 @@ struct sockaddr_in sin = {sizeof sin, AF_INET}; struct ifaddr *ifa; struct ifnet *ifp; - int error, s; + int error; struct tbf *v_tbf = tbftable + vifcp->vifc_vifi; - if (vifcp->vifc_vifi >= MAXVIFS) + VIF_LOCK(); + if (vifcp->vifc_vifi >= MAXVIFS) { + VIF_UNLOCK(); return EINVAL; - if (vifp->v_lcl_addr.s_addr != INADDR_ANY) + } + if (vifp->v_lcl_addr.s_addr != INADDR_ANY) { + VIF_UNLOCK(); return EADDRINUSE; - if (vifcp->vifc_lcl_addr.s_addr == INADDR_ANY) + } + if (vifcp->vifc_lcl_addr.s_addr == INADDR_ANY) { + VIF_UNLOCK(); return EADDRNOTAVAIL; + } /* Find the interface with an address in AF_INET family */ #ifdef PIM @@ -848,8 +899,10 @@ { sin.sin_addr = vifcp->vifc_lcl_addr; ifa = ifa_ifwithaddr((struct sockaddr *)&sin); - if (ifa == NULL) + if (ifa == NULL) { + VIF_UNLOCK(); return EADDRNOTAVAIL; + } ifp = ifa->ifa_ifp; } @@ -861,17 +914,20 @@ * to encapsulated packets. */ if (encap_cookie == NULL) { + int i; + encap_cookie = encap_attach_func(AF_INET, IPPROTO_IPV4, mroute_encapcheck, (struct protosw *)&mroute_encap_protosw, NULL); if (encap_cookie == NULL) { printf("ip_mroute: unable to attach encap\n"); + VIF_UNLOCK(); return EIO; /* XXX */ } - for (s = 0; s < MAXVIFS; ++s) { - multicast_decap_if[s].if_name = "mdecap"; - multicast_decap_if[s].if_unit = s; + for (i = 0; i < MAXVIFS; ++i) { + multicast_decap_if[i].if_name = "mdecap"; + multicast_decap_if[i].if_unit = i; } } /* @@ -884,6 +940,7 @@ bzero(&vifp->v_route, sizeof(vifp->v_route)); } else { log(LOG_ERR, "source routed tunnels not supported\n"); + VIF_UNLOCK(); return EOPNOTSUPP; } #ifdef PIM @@ -901,18 +958,19 @@ } #endif } else { /* Make sure the interface supports multicast */ - if ((ifp->if_flags & IFF_MULTICAST) == 0) + if ((ifp->if_flags & IFF_MULTICAST) == 0) { + VIF_UNLOCK(); return EOPNOTSUPP; + } /* Enable promiscuous reception of all IP multicasts from the if */ - s = splnet(); error = if_allmulti(ifp, 1); - splx(s); - if (error) + if (error) { + VIF_UNLOCK(); return error; + } } - s = splnet(); /* define parameters for the tbf structure */ vifp->v_tbf = v_tbf; GET_TIME(vifp->v_tbf->tbf_last_pkt_t); @@ -935,11 +993,12 @@ vifp->v_pkt_out = 0; vifp->v_bytes_in = 0; vifp->v_bytes_out = 0; - splx(s); /* Adjust numvifs up if the vifi is higher than numvifs */ if (numvifs <= vifcp->vifc_vifi) numvifs = vifcp->vifc_vifi + 1; + VIF_UNLOCK(); + if (mrtdebug) log(LOG_DEBUG, "add_vif #%d, lcladdr %lx, %s %lx, thresh %x, rate %d\n", vifcp->vifc_vifi, @@ -959,15 +1018,18 @@ del_vif(vifi_t vifi) { struct vif *vifp; - int s; + + VIF_LOCK(); - if (vifi >= numvifs) + if (vifi >= numvifs) { + VIF_UNLOCK(); return EINVAL; + } vifp = &viftable[vifi]; - if (vifp->v_lcl_addr.s_addr == INADDR_ANY) + if (vifp->v_lcl_addr.s_addr == INADDR_ANY) { + VIF_UNLOCK(); return EADDRNOTAVAIL; - - s = splnet(); + } if (!(vifp->v_flags & (VIFF_TUNNEL | VIFF_REGISTER))) if_allmulti(vifp->v_ifp, 0); @@ -1004,7 +1066,7 @@ break; numvifs = vifi; - splx(s); + VIF_UNLOCK(); return 0; } @@ -1059,7 +1121,9 @@ u_long hash; struct rtdetq *rte; u_short nstl; - int s; + + VIF_LOCK(); + MFC_LOCK(); rt = mfc_find(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr); @@ -1071,16 +1135,15 @@ (u_long)ntohl(mfccp->mfcc_mcastgrp.s_addr), mfccp->mfcc_parent); - s = splnet(); update_mfc_params(rt, mfccp); - splx(s); + MFC_UNLOCK(); + VIF_UNLOCK(); return 0; } /* * Find the entry for which the upcall was made and update */ - s = splnet(); hash = MFCHASH(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr); for (rt = mfctable[hash], nstl = 0; rt; rt = rt->mfc_next) { @@ -1142,7 +1205,8 @@ if (rt == NULL) { /* no upcall, so make a new entry */ rt = (struct mfc *)malloc(sizeof(*rt), M_MRTABLE, M_NOWAIT); if (rt == NULL) { - splx(s); + MFC_UNLOCK(); + VIF_UNLOCK(); return ENOBUFS; } @@ -1156,7 +1220,8 @@ mfctable[hash] = rt; } } - splx(s); + MFC_UNLOCK(); + VIF_UNLOCK(); return 0; } @@ -1171,7 +1236,6 @@ struct mfc *rt; struct mfc **nptr; u_long hash; - int s; struct bw_meter *list; origin = mfccp->mfcc_origin; @@ -1181,7 +1245,7 @@ log(LOG_DEBUG,"del_mfc orig %lx mcastgrp %lx\n", (u_long)ntohl(origin.s_addr), (u_long)ntohl(mcastgrp.s_addr)); - s = splnet(); + MFC_LOCK(); hash = MFCHASH(origin.s_addr, mcastgrp.s_addr); for (nptr = &mfctable[hash]; (rt = *nptr) != NULL; nptr = &rt->mfc_next) @@ -1190,7 +1254,7 @@ rt->mfc_stall == NULL) break; if (rt == NULL) { - splx(s); + MFC_UNLOCK(); return EADDRNOTAVAIL; } @@ -1204,9 +1268,9 @@ free(rt, M_MRTABLE); - splx(s); + free_bw_list(list); - free_bw_list(list); + MFC_UNLOCK(); return 0; } @@ -1245,7 +1309,7 @@ struct ip_moptions *imo) { struct mfc *rt; - int s; + int error; vifi_t vifi; if (mrtdebug & DEBUG_FORWARD) @@ -1274,6 +1338,8 @@ return 1; } + VIF_LOCK(); + MFC_LOCK(); if (imo && ((vifi = imo->imo_multicast_vif) < numvifs)) { if (ip->ip_ttl < 255) ip->ip_ttl++; /* compensate for -1 in *_send routines */ @@ -1286,7 +1352,10 @@ (vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "", vifp->v_ifp->if_name, vifp->v_ifp->if_unit); } - return ip_mdq(m, ifp, NULL, vifi); + error = ip_mdq(m, ifp, NULL, vifi); + MFC_UNLOCK(); + VIF_UNLOCK(); + return error; } if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) { printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n", @@ -1299,20 +1368,24 @@ * Don't forward a packet with time-to-live of zero or one, * or a packet destined to a local-only group. */ - if (ip->ip_ttl <= 1 || ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP) + if (ip->ip_ttl <= 1 || ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP) { + MFC_UNLOCK(); + VIF_UNLOCK(); return 0; + } /* * Determine forwarding vifs from the forwarding cache table */ - s = splnet(); ++mrtstat.mrts_mfc_lookups; rt = mfc_find(ip->ip_src.s_addr, ip->ip_dst.s_addr); /* Entry exists, so forward if necessary */ if (rt != NULL) { - splx(s); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 16:37:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFFF16A4C1; Sat, 6 Sep 2003 16:37:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F43816A4BF for ; Sat, 6 Sep 2003 16:37:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7C2C43FAF for ; Sat, 6 Sep 2003 16:37:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h86NbG0U083316 for ; Sat, 6 Sep 2003 16:37:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h86NbF4U083312 for perforce@freebsd.org; Sat, 6 Sep 2003 16:37:15 -0700 (PDT) Date: Sat, 6 Sep 2003 16:37:15 -0700 (PDT) Message-Id: <200309062337.h86NbF4U083312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2003 23:37:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=37693 Change 37693 by marcel@marcel_nfs on 2003/09/06 16:36:59 IFC @37691 Affected files ... .. //depot/projects/ia64/bin/sh/arith_lex.l#6 integrate .. //depot/projects/ia64/include/pthread.h#7 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#121 integrate .. //depot/projects/ia64/share/man/man4/Makefile#57 integrate .. //depot/projects/ia64/share/man/man4/isp.4#4 integrate .. //depot/projects/ia64/share/man/man4/stg.4#1 branch .. //depot/projects/ia64/share/man/man4/worm.4#3 integrate .. //depot/projects/ia64/sys/conf/files#97 integrate .. //depot/projects/ia64/sys/conf/files.alpha#24 integrate .. //depot/projects/ia64/sys/conf/files.amd64#11 integrate .. //depot/projects/ia64/sys/conf/files.i386#46 integrate .. //depot/projects/ia64/sys/conf/files.ia64#46 integrate .. //depot/projects/ia64/sys/conf/files.pc98#37 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#34 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#26 integrate .. //depot/projects/ia64/sys/conf/ldscript.ia64#9 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#20 integrate .. //depot/projects/ia64/sys/dev/puc/puc_ebus.c#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/puc/puc_sbus.c#1 branch .. //depot/projects/ia64/sys/dev/puc/pucdata.c#19 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#11 integrate .. //depot/projects/ia64/sys/dev/smbus/smbus.c#5 integrate .. //depot/projects/ia64/sys/dev/uart/uart.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_acpi.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_ebus.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_isa.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_pci.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_puc.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_core.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_amd64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_i386.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_ia64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_if.m#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#1 branch .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#39 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#40 integrate .. //depot/projects/ia64/sys/modules/Makefile#61 integrate .. //depot/projects/ia64/sys/modules/uart/Makefile#1 branch .. //depot/projects/ia64/sys/netinet/ip_mroute.c#24 integrate .. //depot/projects/ia64/sys/pci/amdpm.c#10 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#6 integrate .. //depot/projects/ia64/usr.bin/ranlib/Makefile#2 delete .. //depot/projects/ia64/usr.bin/ranlib/build.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/extern.h#2 delete .. //depot/projects/ia64/usr.bin/ranlib/misc.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/pathnames.h#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.1#3 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.1aout#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.5#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/touch.c#4 delete .. //depot/projects/ia64/usr.bin/tip/tip/tip.1#8 integrate Differences ... ==== //depot/projects/ia64/bin/sh/arith_lex.l#6 (text+ko) ==== @@ -42,7 +42,9 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.20 2003/09/04 18:28:42 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.21 2003/09/06 16:33:55 tjr Exp $"); + +#include #include "shell.h" #include "y.tab.h" ==== //depot/projects/ia64/include/pthread.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.29 2003/09/04 14:06:42 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.30 2003/09/06 00:07:51 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -258,6 +258,10 @@ int pthread_rwlock_init(pthread_rwlock_t *, const pthread_rwlockattr_t *); int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_timedrdlock(pthread_rwlock_t *, + const struct timespec *); +int pthread_rwlock_timedrwlock(pthread_rwlock_t *, + const struct timespec *); int pthread_rwlock_tryrdlock(pthread_rwlock_t *); int pthread_rwlock_trywrlock(pthread_rwlock_t *); int pthread_rwlock_unlock(pthread_rwlock_t *); ==== //depot/projects/ia64/lib/libpthread/pthread.map#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.4 2003/09/04 14:06:42 davidxu Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.5 2003/09/06 00:07:51 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -108,6 +108,8 @@ _pthread_rwlock_destroy; _pthread_rwlock_init; _pthread_rwlock_rdlock; + _pthread_rwlock_timedrdlock; + _pthread_rwlock_timedwrlock; _pthread_rwlock_tryrdlock; _pthread_rwlock_trywrlock; _pthread_rwlock_unlock; @@ -249,6 +251,8 @@ pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; + pthread_rwlock_timedrdlock; + pthread_rwlock_timedwrlock; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; ==== //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.12 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.13 2003/09/06 00:07:52 davidxu Exp $ */ #include @@ -41,10 +41,12 @@ __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); __weak_reference(_pthread_rwlock_init, pthread_rwlock_init); __weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); +__weak_reference(_pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock); __weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock); __weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock); __weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock); __weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock); +__weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); /* * Prototypes @@ -137,8 +139,8 @@ return (ret); } -int -_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +static int +rwlock_rdlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime) { pthread_rwlock_t prwlock; int ret; @@ -162,8 +164,12 @@ /* give writers priority over readers */ while (prwlock->blocked_writers || prwlock->state < 0) { - ret = _thr_cond_wait(&prwlock->read_signal, &prwlock->lock); - + if (abstime) + ret = _pthread_cond_timedwait(&prwlock->read_signal, + &prwlock->lock, abstime); + else + ret = _thr_cond_wait(&prwlock->read_signal, + &prwlock->lock); if (ret != 0) { /* can't do a whole lot if this fails */ _thr_mutex_unlock(&prwlock->lock); @@ -188,9 +194,22 @@ return (ret); } +int +_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +{ + return rwlock_rdlock_common (rwlock, NULL); +} + __strong_reference(_pthread_rwlock_rdlock, _thr_rwlock_rdlock); int +_pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) +{ + return rwlock_rdlock_common(rwlock, abstime); +} + +int _pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) { pthread_rwlock_t prwlock; @@ -301,8 +320,8 @@ __strong_reference(_pthread_rwlock_unlock, _thr_rwlock_unlock); -int -_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +static int +rwlock_wrlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime) { pthread_rwlock_t prwlock; int ret; @@ -327,8 +346,12 @@ while (prwlock->state != 0) { ++prwlock->blocked_writers; - ret = _thr_cond_wait(&prwlock->write_signal, &prwlock->lock); - + if (abstime != NULL) + ret = _pthread_cond_timedwait(&prwlock->write_signal, + &prwlock->lock, abstime); + else + ret = _thr_cond_wait(&prwlock->write_signal, + &prwlock->lock); if (ret != 0) { --prwlock->blocked_writers; _thr_mutex_unlock(&prwlock->lock); @@ -347,4 +370,16 @@ return (ret); } +int +_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +{ + return rwlock_wrlock_common (rwlock, NULL); +} __strong_reference(_pthread_rwlock_wrlock, _thr_rwlock_wrlock); + +int +_pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) +{ + return rwlock_wrlock_common (rwlock, abstime); +} ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.177 2003/08/25 04:31:26 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.180 2003/09/06 20:03:09 simon Exp $ Supported Devices @@ -404,19 +404,6 @@ 3ware Escalade ATA RAID controllers (&man.twe.4; driver) - - - 5000 series - - - - 6000 series - - - - 7000 series - - LSI/SymBios (formerly NCR) 53C810, 53C810a, 53C815, 53C825, @@ -490,73 +477,10 @@ TMC 18C30, 18C50 and 36C70 (AIC-6820) based ISA/PC-Card SCSI host - adapters (stg driver) - - - Adaptec 2920/A - - - Future Domain SCSI2GO - - - Future Domain TMC-18XX/3260 - - - IBM SCSI PCMCIA Card - - - ICM PSC-2401 SCSI - - - MELCO IFC-SC - - - RATOC REX-5536, REX-5536AM, REX-5536M, - REX-9836A - - + adapters (&man.stg.4; driver) Qlogic controllers and variants (&man.isp.4; driver) - - - Qlogic 1020, 1040 SCSI and Ultra SCSI host - adapters - - - Qlogic 1240 dual Ultra SCSI controllers - - - Qlogic 1080 Ultra2 LVD and 1280 Dual Ultra2 LVD - controllers - - - Qlogic 12160 Ultra3 LVD controllers - - - Qlogic 2100 and Qlogic 2200 Fibre Channel SCSI - controllers - - - Qlogic 2300 and Qlogic 2312 2-Gigabit Fibre Channel SCSI - controllers - - - Performance Technology SBS440 ISP1000 variants - - - Performance Technology SBS450 ISP1040 variants - - - Performance Technology SBS470 ISP2100 variants - - - Antares Microsystems P-0033 ISP2100 variants - - - Qlogic SCSI interface - - DTC 3290 EISA SCSI controller in 1542 emulation mode. @@ -1269,34 +1193,7 @@ - Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) - - - Compaq Netelligent 10, 10/100, 10/100 - Dual-Port - - - Compaq Netelligent 10/100 Proliant - - - Compaq Netelligent 10/100 TX Embedded UTP, 10 T PCI - UTP/Coax, 10/100 TX UTP - - - Compaq NetFlex 3P, 3P Integrated, 3P w/BNC - - - Olicom OC-2135/2138, OC-2325, OC-2326 10/100 TX UTP - - - Racore 8165 10/100baseTX - - - Racore 8148 10baseT/100baseTX/100baseFX - multi-personality - - - + Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) ADMtek Inc. AL981-based PCI Fast Ethernet NICs (&man.dc.4; driver) @@ -1310,143 +1207,19 @@ - ADMtek Inc. AN986-based USB Ethernet NICs (&man.aue.4; driver) - - - Abocom UFE1000, DSB650TX_NA - - - Accton USB320-EC, SpeedStream - - - ADMtek AN986, AN8511 - - - Billionton USB100, USB100LP, USB100EL, USBE100 - - - Corega Ether FEther USB-T, FEther USB-TX, FEther USB-TXS - - - D-Link DSB-650, DSB-650TX, DSB-650TX-PNA - - - Elecom LD-USBL/TX - - - Elsa Microlink USB2Ethernet - - - I-O Data USB ETTX - - - Kingston KNU101TX - - - LinkSys USB10T, USB10TA, USB10TX, USB100TX, USB100H1 - - - MELCO LUA-TX, LUA2-TX - - - Planex UE-200TX - - - Siemens Speedstream - - - SmartBridges smartNIC - - - SMC 2202USB - - - SOHOware NUB100 - - - + ADMtek Inc. AN986-based USB Ethernet NICs (&man.aue.4; driver) CATC USB-EL1210A-based USB Ethernet NICs (&man.cue.4; driver) Kawasaki LSI KU5KUSB101B-based USB Ethernet NICs - (&man.kue.4; driver) - - - 3Com 3c19250 - - - AOX USB101 - - - Abocom URE 450 - - - ADS Technologies USB-10BT - - - ATen UC10T - - - Corega USB-T - - - D-Link DSB-650C - - - Entrega NET-USB-E45 - - - I/O Data USB ETT - - - Kawasaki DU-H3E - - - LinkSys USB10T - - - Netgear EA101 - - - Peracom USB Ethernet Adapter - - - SMC 2102USB, 2104USB - - - + (&man.kue.4; driver) ASIX Electronics AX88172-based USB Ethernet NICs - (&man.axe.4; driver) + (&man.axe.4; driver) - - - D-Link DUBE100 - - - Linksys USB200M - - - Netgear FA120 - - - - - RealTek RTL8150-based USB Ethernet NICs - (&man.rue.4; driver) + (&man.rue.4; driver) - - - GREEN HOUSE GH-USB100B - - - MELCO LUA-KTX - - - - - ASIX Electronics AX88140A PCI NICs (&man.dc.4; driver) @@ -1647,17 +1420,6 @@ 3Com 3C59X series NICs (&man.vx.4; driver) - - - 3C590 Etherlink III (PCI) - - - 3C595 Fast Etherlink III (PCI) - - - 3C592/3C597 (EISA) - - Crystal Semiconductor CS89x0-based NICs ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#121 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.619 2003/08/23 05:42:03 nyan Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.620 2003/09/06 18:15:11 bmah Exp $ 2000 @@ -275,6 +275,9 @@ It emulates a HARP physical interface, and allows one to run the HARP ATM stack without real hardware. + Kernel support has been added for Protocol Independent + Multicast routing. &merged; + To reduce information leakage, IPv4 packets no longer have a ip_id field set unless fragmentation is being done. @@ -444,6 +447,9 @@ The ACPI-CA code has been updated from the 20030228 snapshot to the 20030619 snapshot. + amd has been updated from 6.0.7 + to 6.0.9. + awk from Bell Labs has been updated from a 14 March 2003 snapshot to a 29 July 2003 snapshot. @@ -463,6 +469,16 @@ + GNU Readline has been updated + from 4.2 to 4.3. + + GNU Sort has been updated from + the version in textutils 2.0.21 to the version in textutils + 2.1. + + The ISC DHCP client has been + updated from 3.0.1rc11 to 3.0.1rc12. + lukemftp has been updated from 1.6beta2 to a 30 June 2003 snapshot from NetBSD. ==== //depot/projects/ia64/share/man/man4/Makefile#57 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.219 2003/08/21 16:53:06 rwatson Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.220 2003/09/06 17:31:50 bmah Exp $ MAN= aac.4 \ acpi.4 \ @@ -229,6 +229,7 @@ st.4 \ ste.4 \ stf.4 \ + stg.4 \ sym.4 \ syncache.4 \ syncer.4 \ ==== //depot/projects/ia64/share/man/man4/isp.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/isp.4,v 1.15 2003/04/20 22:10:13 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/isp.4,v 1.16 2003/09/06 17:47:25 bmah Exp $ .\" $NetBSD: isp.4,v 1.5 1999/12/18 18:33:05 mjacob Exp $ .\" .\" Copyright (c) 1998, 1999, 2001 @@ -92,6 +92,10 @@ .It Qlogic 1240 Qlogic 1240 Dual Bus Ultra Wide and Differential Ultra Wide PCI cards. +.It Qlogic 1020 +Qlogic 1020 SCSI cards. +.It Qlogic 1040 +Qlogic 1040 Ultra SCSI cards. .It Qlogic 1080 Qlogic 1280 LVD Ultra2 Wide PCI cards. .It Qlogic 1280 ==== //depot/projects/ia64/share/man/man4/worm.4#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/worm.4,v 1.26 2002/12/24 13:41:46 ru Exp $ +.\" $FreeBSD: src/share/man/man4/worm.4,v 1.27 2003/09/06 17:46:16 hmp Exp $ .\" " .Dd October 15, 1998 .Dt WORM 4 @@ -57,16 +57,17 @@ .Fx 3.0 by a CAM-compliant .Tn SCSI -layer. The new +layer. +The new .Tn SCSI layer doesn't include a .Nm -driver, and isn't likely to include one in the future. Future in-kernel +driver, and isn't likely to include one in the future. +Future in-kernel support for CD-R/CD-RW/DVD drives will likely be implemented through the .Xr cd 4 -driver. Users who wish -to write CDs on a WORM, CD-R, or CD-RW drive -should use +driver. +Users who wish to write CDs on a WORM, CD-R, or CD-RW drive should use .Nm cdrtools , which is in the .Fx @@ -75,8 +76,8 @@ The .Xr cd 4 driver provides read-only access to CD, CD-R, and CD-RW drives, as well as -WORM drives that support the CDROM command set. Therefore, users wishing -to mount CDs in a WORM drive should use the +WORM drives that support the CDROM command set. +Therefore, users wishing to mount CDs in a WORM drive should use the .Xr cd 4 driver instead. .Sh SEE ALSO @@ -93,8 +94,8 @@ .Nm driver has been written by .An Peter Dufault -in May, 1995. The driver has -then been improved and made actually usable at all by +in May, 1995. +The driver has then been improved and made actually usable at all by .An J\(:org Wunsch in January, 1996. .Sh HISTORY ==== //depot/projects/ia64/sys/conf/files#97 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.817 2003/08/29 04:02:18 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -587,8 +587,10 @@ dev/pst/pst-iop.c optional pst dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc +dev/puc/puc_ebus.c optional puc ebus dev/puc/puc_pci.c optional puc pci dev/puc/puc_pccard.c optional puc pccard +dev/puc/puc_sbus.c optional puc sbus dev/puc/pucdata.c optional puc pci dev/raidframe/rf_acctrace.c optional raidframe dev/raidframe/rf_alloclist.c optional raidframe @@ -779,6 +781,18 @@ dev/twe/twe_freebsd.c optional twe dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp +dev/uart/uart_if.m optional uart +dev/uart/uart_bus_acpi.c optional uart acpi +dev/uart/uart_bus_ebus.c optional uart ebus +dev/uart/uart_bus_isa.c optional uart isa +dev/uart/uart_bus_pci.c optional uart cardbus +dev/uart/uart_bus_pci.c optional uart pci +dev/uart/uart_bus_puc.c optional uart puc +dev/uart/uart_core.c optional uart +dev/uart/uart_dev_ns8250.c optional uart +dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_dev_z8530.c optional uart +dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support ==== //depot/projects/ia64/sys/conf/files.alpha#24 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.105 2003/08/04 02:39:14 imp Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.106 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -192,6 +192,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_alpha.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd ==== //depot/projects/ia64/sys/conf/files.amd64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.22 2003/08/23 00:59:26 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.23 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -42,6 +42,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_amd64.c optional uart isa/atkbd_isa.c optional atkbd amd64/acpica/OsdEnvironment.c optional acpi ==== //depot/projects/ia64/sys/conf/files.i386#46 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.453 2003/08/31 16:20:34 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.454 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -153,6 +153,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard ==== //depot/projects/ia64/sys/conf/files.ia64#46 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.57 2003/08/23 02:33:36 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.58 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,6 +69,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_ia64.c optional uart dev/vga/vga.c optional vga dev/vga/vga_isa.c optional vga isa dev/vga/vga_pci.c optional vga pci ==== //depot/projects/ia64/sys/conf/files.pc98#37 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.277 2003/08/25 07:52:10 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -131,6 +131,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard ==== //depot/projects/ia64/sys/conf/files.sparc64#34 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.45 2003/08/24 01:54:06 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.46 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,6 +32,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_sparc64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard ==== //depot/projects/ia64/sys/conf/kmod.mk#26 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.140 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.141 2003/09/06 23:23:25 marcel Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -257,7 +257,7 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m \ - opencrypto/crypto_if.m pc98/pc98/canbus_if.m + opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m .for _srcsrc in ${MFILES} .for _ext in c h ==== //depot/projects/ia64/sys/conf/ldscript.ia64#9 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.9 2003/05/16 06:03:45 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) SEARCH_DIR(/usr/lib); -kernel_text = 0xe000000000500000; +kernel_text = 0xe000000004000000; SECTIONS { /* Read-only sections, merged into text segment: */ ==== //depot/projects/ia64/sys/dev/puc/puc.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * Copyright (c) 1996, 1998, 1999 @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, @@ -105,7 +105,9 @@ struct puc_device { struct resource_list resources; - u_int serialfreq; + u_int serialfreq; + u_int subtype; + int regshft; }; static void puc_intr(void *arg); @@ -139,18 +141,18 @@ u_char t1, t2; int i; - switch (sc->sc_desc->ilr_type) { + switch (sc->sc_desc.ilr_type) { case PUC_ILR_TYPE_DIGI: sc->ilr_st = rman_get_bustag(res); sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2 && sc->sc_desc->ilr_offset[i] != 0; i++) { + for (i = 0; i < 2 && sc->sc_desc.ilr_offset[i] != 0; i++) { t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); t1 = ~t1; bus_space_write_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i], t1); + sc->sc_desc.ilr_offset[i], t1); t2 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); if (t2 == t1) return (0); } @@ -166,22 +168,23 @@ puc_attach(device_t dev, const struct puc_device_description *desc) { char *typestr; - int bidx, childunit, i, irq_setup, rid, type; + int bidx, childunit, i, irq_setup, ressz, rid, type; struct puc_softc *sc; struct puc_device *pdev; struct resource *res; struct resource_list_entry *rle; + if (desc == NULL) + return (ENXIO); + sc = (struct puc_softc *)device_get_softc(dev); bzero(sc, sizeof(*sc)); - sc->sc_desc = desc; - if (sc->sc_desc == NULL) - return (ENXIO); + sc->sc_desc = *desc; #ifdef PUC_DEBUG bootverbose = 1; - printf("puc: name: %s\n", sc->sc_desc->name); + printf("puc: name: %s\n", sc->sc_desc.name); #endif rid = 0; res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, @@ -208,27 +211,34 @@ rid = 0; for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (i > 0 && rid == sc->sc_desc->ports[i].bar) + if (i > 0 && rid == sc->sc_desc.ports[i].bar) sc->barmuxed = 1; - rid = sc->sc_desc->ports[i].bar; + rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); if (sc->sc_bar_mappings[bidx].res != NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:25:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B274D16A4C1; Sat, 6 Sep 2003 18:25:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E86B16A4BF for ; Sat, 6 Sep 2003 18:25:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32E6C43FD7 for ; Sat, 6 Sep 2003 18:25:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h871PT0U095621 for ; Sat, 6 Sep 2003 18:25:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h871PSTR095618 for perforce@freebsd.org; Sat, 6 Sep 2003 18:25:28 -0700 (PDT) Date: Sat, 6 Sep 2003 18:25:28 -0700 (PDT) Message-Id: <200309070125.h871PSTR095618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 01:25:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=37696 Change 37696 by marcel@marcel_nfs on 2003/09/06 18:25:18 Revert the SIO/ng from this branch (with extreme prejudice). Affected files ... .. //depot/projects/ia64/sys/conf/files#98 edit .. //depot/projects/ia64/sys/conf/files.ia64#47 edit .. //depot/projects/ia64/sys/dev/sio/sio.c#50 edit .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#14 delete .. //depot/projects/ia64/sys/dev/sio/sio_ebus.c#8 edit .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#18 edit .. //depot/projects/ia64/sys/dev/sio/sio_pccard.c#12 edit .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#19 edit .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#10 edit .. //depot/projects/ia64/sys/dev/sio/sioreg.h#8 edit .. //depot/projects/ia64/sys/dev/sio/siovar.h#16 edit .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#10 delete Differences ... ==== //depot/projects/ia64/sys/conf/files#98 (text+ko) ==== @@ -677,8 +677,6 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci -dev/sio/sio.c optional sio -dev/sio/sio_cons.c optional sio dev/sio/sio_ebus.c optional sio ebus dev/sio/sio_pccard.c optional sio card dev/sio/sio_pccard.c optional sio pccard ==== //depot/projects/ia64/sys/conf/files.ia64#47 (text+ko) ==== @@ -57,7 +57,7 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc isa -dev/sio/sio_isa.c optional sio acpi +dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc @@ -115,7 +115,6 @@ ia64/ia64/sal.c standard ia64/ia64/sapic.c standard ia64/ia64/setjmp.S standard -ia64/ia64/sio_machdep.c optional sio ia64/ia64/ssc.c optional ski ia64/ia64/sscdisk.c optional ski ia64/ia64/support.S standard @@ -129,8 +128,8 @@ ia64/isa/isa.c optional isa ia64/isa/isa_dma.c optional isa ia64/pci/pci_cfgreg.c optional pci -isa/atkbd_isa.c optional isa atkbd -isa/atkbdc_isa.c optional isa atkbdc +isa/atkbd_isa.c optional atkbd isa +isa/atkbdc_isa.c optional atkbdc isa isa/fd.c optional fdc isa isa/psm.c optional psm isa isa/syscons_isa.c optional sc ==== //depot/projects/ia64/sys/dev/sio/sio.c#50 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.404 2003/08/28 03:54:49 njl Exp $"); #include "opt_comconsole.h" +#include "opt_compat.h" #include "opt_ddb.h" #include "opt_sio.h" @@ -67,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -76,12 +78,18 @@ #include #endif +#include + #include -#include #include #include +#ifdef COM_ESP +#include +#endif +#include + #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define CALLOUT_MASK 0x80 @@ -94,6 +102,19 @@ #define UNIT_TO_MINOR(unit) ((((unit) & ~0x1fU) << (8 + 3)) \ | ((unit) & 0x1f)) +#ifdef COM_MULTIPORT +/* checks in flags for multiport and which is multiport "master chip" + * for a given card + */ +#define COM_ISMULTIPORT(flags) ((flags) & 0x01) +#define COM_MPMASTER(flags) (((flags) >> 8) & 0x0ff) +#define COM_NOTAST4(flags) ((flags) & 0x04) +#else +#define COM_ISMULTIPORT(flags) (0) +#endif /* COM_MULTIPORT */ + +#define COM_CONSOLE(flags) ((flags) & 0x10) +#define COM_FORCECONSOLE(flags) ((flags) & 0x20) #define COM_LLCONSOLE(flags) ((flags) & 0x40) #define COM_DEBUGGER(flags) ((flags) & 0x80) #define COM_LOSESOUTINTS(flags) ((flags) & 0x08) @@ -108,6 +129,11 @@ #define COM_TI16754(flags) ((flags) & 0x200000) #define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24) +#define sio_getreg(com, off) \ + (bus_space_read_1((com)->bst, (com)->bsh, (off))) +#define sio_setreg(com, off, value) \ + (bus_space_write_1((com)->bst, (com)->bsh, (off), (value))) + /* * com state bits. * (CS_BUSY | CS_TTGO) and (CS_BUSY | CS_TTGO | CS_ODEVREADY) must be higher @@ -143,9 +169,129 @@ "tty-level buffer overflow", }; +#define CE_NTYPES 3 #define CE_RECORD(com, errnum) (++(com)->delta_error_counts[errnum]) +/* types. XXX - should be elsewhere */ +typedef u_int Port_t; /* hardware port */ +typedef u_char bool_t; /* boolean */ + +/* queue of linear buffers */ +struct lbq { + u_char *l_head; /* next char to process */ + u_char *l_tail; /* one past the last char to process */ + struct lbq *l_next; /* next in queue */ + bool_t l_queued; /* nonzero if queued */ +}; + +/* com device structure */ +struct com_s { + u_int flags; /* Copy isa device flags */ + u_char state; /* miscellaneous flag bits */ + bool_t active_out; /* nonzero if the callout device is open */ + u_char cfcr_image; /* copy of value written to CFCR */ +#ifdef COM_ESP + bool_t esp; /* is this unit a hayes esp board? */ +#endif + u_char extra_state; /* more flag bits, separate for order trick */ + u_char fifo_image; /* copy of value written to FIFO */ + bool_t hasfifo; /* nonzero for 16550 UARTs */ + bool_t st16650a; /* Is a Startech 16650A or RTS/CTS compat */ + bool_t loses_outints; /* nonzero if device loses output interrupts */ + u_char mcr_image; /* copy of value written to MCR */ +#ifdef COM_MULTIPORT + bool_t multiport; /* is this unit part of a multiport device? */ +#endif /* COM_MULTIPORT */ + bool_t no_irq; /* nonzero if irq is not attached */ + bool_t gone; /* hardware disappeared */ + bool_t poll; /* nonzero if polling is required */ + bool_t poll_output; /* nonzero if polling for output is required */ + int unit; /* unit number */ + int dtr_wait; /* time to hold DTR down on close (* 1/hz) */ + u_int tx_fifo_size; + u_int wopeners; /* # processes waiting for DCD in open() */ + + /* + * The high level of the driver never reads status registers directly + * because there would be too many side effects to handle conveniently. + * Instead, it reads copies of the registers stored here by the + * interrupt handler. + */ + u_char last_modem_status; /* last MSR read by intr handler */ + u_char prev_modem_status; /* last MSR handled by high level */ + + u_char hotchar; /* ldisc-specific char to be handled ASAP */ + u_char *ibuf; /* start of input buffer */ + u_char *ibufend; /* end of input buffer */ + u_char *ibufold; /* old input buffer, to be freed */ + u_char *ihighwater; /* threshold in input buffer */ + u_char *iptr; /* next free spot in input buffer */ + int ibufsize; /* size of ibuf (not include error bytes) */ + int ierroff; /* offset of error bytes in ibuf */ + + struct lbq obufq; /* head of queue of output buffers */ + struct lbq obufs[2]; /* output buffers */ + + bus_space_tag_t bst; + bus_space_handle_t bsh; + + Port_t data_port; /* i/o ports */ +#ifdef COM_ESP + Port_t esp_port; +#endif + Port_t int_id_port; + Port_t modem_ctl_port; + Port_t line_status_port; + Port_t modem_status_port; + Port_t intr_ctl_port; /* Ports of IIR register */ + + struct tty *tp; /* cross reference */ + + /* Initial state. */ + struct termios it_in; /* should be in struct tty */ + struct termios it_out; + + /* Lock state. */ + struct termios lt_in; /* should be in struct tty */ + struct termios lt_out; + + bool_t do_timestamp; + bool_t do_dcd_timestamp; + struct timeval timestamp; + struct timeval dcd_timestamp; + struct pps_state pps; + int pps_bit; +#ifdef ALT_BREAK_TO_DEBUGGER + int alt_brk_state; +#endif + + u_long bytes_in; /* statistics */ + u_long bytes_out; + u_int delta_error_counts[CE_NTYPES]; + u_long error_counts[CE_NTYPES]; + + u_long rclk; + + struct resource *irqres; + struct resource *ioportres; + int ioportrid; + void *cookie; + dev_t devs[6]; + + /* + * Data area for output buffers. Someday we should build the output + * buffer queue without copying data. + */ + u_char obuf1[256]; + u_char obuf2[256]; +}; + +#ifdef COM_ESP +static int espattach(struct com_s *com, Port_t esp_port); +#endif + static timeout_t siobusycheck; +static u_int siodivisor(u_long rclk, speed_t speed); static timeout_t siodtrwakeup; static void comhardclose(struct com_s *com); static void sioinput(struct com_s *com); @@ -191,16 +337,18 @@ .d_kqfilter = ttykqfilter, }; -speed_t comdefaultrate = CONSPEED; - -u_long comdefaultrclk = DEFAULT_RCLK; +int comconsole = -1; +static volatile speed_t comdefaultrate = CONSPEED; +static u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); - -static speed_t gdbdefaultrate = GDBSPEED; -SYSCTL_ULONG(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, &gdbdefaultrate, - GDBSPEED, ""); - +static speed_t gdbdefaultrate = GDBSPEED; +SYSCTL_UINT(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, + &gdbdefaultrate, GDBSPEED, ""); static u_int com_events; /* input chars + weighted output completions */ +static Port_t siocniobase; +static int siocnunit = -1; +static Port_t siogdbiobase; +static int siogdbunit = -1; static void *sio_slow_ih; static void *sio_fast_ih; static int sio_timeout; @@ -209,6 +357,13 @@ = CALLOUT_HANDLE_INITIALIZER(&sio_timeout_handle); static int sio_numunits; +#ifdef COM_ESP +/* XXX configure this properly. */ +/* XXX quite broken for new-bus. */ +static Port_t likely_com_ports[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, }; +static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; +#endif + /* * handle sysctl read/write requests for console speed * @@ -235,10 +390,13 @@ comdefaultrate = newspeed; - com = &sio_console; - if (com->consdev == NULL) + if (comconsole < 0) /* serial console not selected? */ return (0); + com = com_addr(comconsole); + if (com == NULL) + return (ENXIO); + /* * set the initial and lock rates for /dev/ttydXX and /dev/cuaXX * (note, the lock rates really are boolean -- if non-zero, disallow @@ -267,497 +425,545 @@ 0, 0, sysctl_machdep_comdefaultrate, "I", ""); /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ -#ifdef SIO_DEBUG -static void -siodebug(struct com_s *com, const char *fmt, ...) -{ - va_list ap; +#define SET_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) | (bit)) +#define CLR_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) & ~(bit)) - va_start(ap, fmt); - if (com != NULL) - device_print_prettyname(com->dev); - vprintf(fmt, ap); - va_end(ap); -} -#else -static __inline void -siodebug(struct com_s *com, const char *fmt, ...) -{ -} -#endif - /* - * Flush the UART. Flush the transmitter FIFO and shift register first, then - * flush the receiver FIFO. In this order flushing works correctly even when - * the UART is in loopback mode. Bad timing may cause at most one character - * to remain in the receiver FIFO/buffer after we're done flushing. This - * would be the character that is (partly) in the receiver shift register. + * Unload the driver and clear the table. + * XXX this is mostly wrong. + * XXX TODO: + * This is usually called when the card is ejected, but + * can be caused by a kldunload of a controller driver. + * The idea is to reset the driver's view of the device + * and ensure that any driver entry points such as + * read and write do not hang. */ -static int -sioflush(struct com_s *com) +int +siodetach(dev) + device_t dev; { - int delay, limit; + struct com_s *com; + int i; - /* 1/10th the time to transmit 1 character (estimate). */ - delay = 16000000 * com->reg_dl / com->rclk; - - /* Flush the transmitter. */ - limit = (com->fifosize) ? com->fifosize : 1; - limit = (limit + 2) * 10; - while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) - DELAY(delay); - if (limit == 0) { - siodebug(NULL, "transmitter appears stuck... "); - return (EIO); + com = (struct com_s *) device_get_softc(dev); + if (com == NULL) { + device_printf(dev, "NULL com in siounload\n"); + return (0); } - - DELAY(10*delay); - - /* - * Flush the receiver. Pick an arbitrary high limit to avoid - * getting stuck in an infinite loop when the hardware is - * broken. - */ - limit=32768; - while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { - (void)sio_getreg(com, com_data); - /* XXX barrier */ - DELAY(5*delay); + com->gone = 1; + for (i = 0 ; i < 6; i++) + destroy_dev(com->devs[i]); + if (com->irqres) { + bus_teardown_intr(dev, com->irqres, com->cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); } - if (limit == 0) { - siodebug(NULL, "receiver appears broken... "); - return (EIO); + if (com->ioportres) + bus_release_resource(dev, SYS_RES_IOPORT, com->ioportrid, + com->ioportres); + if (com->tp && (com->tp->t_state & TS_ISOPEN)) { + device_printf(dev, "still open, forcing close\n"); + (*linesw[com->tp->t_line].l_close)(com->tp, 0); + com->tp->t_gen++; + ttyclose(com->tp); + ttwakeup(com->tp); + ttwwakeup(com->tp); + } else { + if (com->ibuf != NULL) + free(com->ibuf, M_DEVBUF); + device_set_softc(dev, NULL); + free(com, M_DEVBUF); } - return (0); } -/* - * Initialize the FIFOs and determine the size of the receiver FIFO. We - * assume that the transmitter FIFO has the same size. First we set DMA - * mode (mode 1) with the highest trigger level. In combination with - * loopback this allows us to determine the size of the receiver FIFO. - * After that we re-initialize with a medium high trigger level. This - * function is expected to be called with FIFOs disabled. - */ -static int -sioinitfifo(struct com_s *com) +int +sioprobe(dev, xrid, rclk, noprobe) + device_t dev; + int xrid; + u_long rclk; + int noprobe; { - int count, delay, limit; +#if 0 + static bool_t already_init; + device_t xdev; +#endif + struct com_s *com; + u_int divisor; + bool_t failures[10]; + int fn; + device_t idev; + Port_t iobase; + intrmask_t irqmap[4]; + intrmask_t irqs; + u_char mcr_image; + int result; + u_long xirq; + u_int flags = device_get_flags(dev); + int rid; + struct resource *port; + + rid = xrid; + port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, + 0, ~0, IO_COMSIZE, RF_ACTIVE); + if (!port) + return (ENXIO); - com->hasfifo = 0; - com->fifosize = 0; + com = malloc(sizeof(*com), M_DEVBUF, M_NOWAIT | M_ZERO); + if (com == NULL) + return (ENOMEM); + device_set_softc(dev, com); + com->bst = rman_get_bustag(port); + com->bsh = rman_get_bushandle(port); + if (rclk == 0) + rclk = DEFAULT_RCLK; + com->rclk = rclk; - /* 1/10th the time to transmit 1 character (estimate). */ - delay = 16000000 * com->reg_dl / com->rclk; + while (sio_inited != 2) + if (atomic_cmpset_int(&sio_inited, 0, 1)) { + mtx_init(&sio_lock, sio_driver_name, NULL, + (comconsole != -1) ? + MTX_SPIN | MTX_QUIET : MTX_SPIN); + atomic_store_rel_int(&sio_inited, 2); + } +#if 0 /* - * Make sure the transmitter is idle before we play with the - * FIFOs. We don't wait more than roughly three times as long - * as needed to send a single character. Given that we may need - * to wait for both the THR and the TSR to clear, this leaves - * us roughly 1 character time slack. + * XXX this is broken - when we are first called, there are no + * previously configured IO ports. We could hard code + * 0x3f8, 0x2f8, 0x3e8, 0x2e8 etc but that's probably worse. + * This code has been doing nothing since the conversion since + * "count" is zero the first time around. */ - limit = 30; - while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { - if (delay) - DELAY(delay); + if (!already_init) { + /* + * Turn off MCR_IENABLE for all likely serial ports. An unused + * port with its MCR_IENABLE gate open will inhibit interrupts + * from any used port that shares the interrupt vector. + * XXX the gate enable is elsewhere for some multiports. + */ + device_t *devs; + int count, i, xioport; + + devclass_get_devices(sio_devclass, &devs, &count); + for (i = 0; i < count; i++) { + xdev = devs[i]; + if (device_is_enabled(xdev) && + bus_get_resource(xdev, SYS_RES_IOPORT, 0, &xioport, + NULL) == 0) + outb(xioport + com_mcr, 0); + } + free(devs, M_TEMP); + already_init = TRUE; } - if (limit == 0) { - siodebug(NULL, "transmitter appears stuck"); - return (EIO); +#endif + + if (COM_LLCONSOLE(flags)) { + printf("sio%d: reserved for low-level i/o\n", + device_get_unit(dev)); + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + device_set_softc(dev, NULL); + free(com, M_DEVBUF); + return (ENXIO); } /* - * Set loopback mode. This avoids having garbage on the wire and - * also allows us send and receive data. We set DTR and RTS to - * avoid the possibility that automatic flow-control prevents - * any data from being sent. + * If the device is on a multiport card and has an AST/4 + * compatible interrupt control register, initialize this + * register and prepare to leave MCR_IENABLE clear in the mcr. + * Otherwise, prepare to set MCR_IENABLE in the mcr. + * Point idev to the device struct giving the correct id_irq. + * This is the struct for the master device if there is one. */ - sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK|MCR_DTR|MCR_RTS); - /* XXX barrier */ + idev = dev; + mcr_image = MCR_IENABLE; +#ifdef COM_MULTIPORT + if (COM_ISMULTIPORT(flags)) { + Port_t xiobase; + u_long io; + + idev = devclass_get_device(sio_devclass, COM_MPMASTER(flags)); + if (idev == NULL) { + printf("sio%d: master device %d not configured\n", + device_get_unit(dev), COM_MPMASTER(flags)); + idev = dev; + } + if (!COM_NOTAST4(flags)) { + if (bus_get_resource(idev, SYS_RES_IOPORT, 0, &io, + NULL) == 0) { + xiobase = io; + if (bus_get_resource(idev, SYS_RES_IRQ, 0, + NULL, NULL) == 0) + outb(xiobase + com_scr, 0x80); + else + outb(xiobase + com_scr, 0); + } + mcr_image = 0; + } + } +#endif /* COM_MULTIPORT */ + if (bus_get_resource(idev, SYS_RES_IRQ, 0, NULL, NULL) != 0) + mcr_image = 0; + + bzero(failures, sizeof failures); + iobase = rman_get_start(port); /* - * Enable FIFOs. Set DMA mode with the highest trigger level so - * that we can determine the FIFO size. Since this is the first - * time we enable the FIFOs, reset them. + * We don't want to get actual interrupts, just masked ones. + * Interrupts from this line should already be masked in the ICU, + * but mask them in the processor as well in case there are some + * (misconfigured) shared interrupts. */ - com->reg_fcr = FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH; - sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); - /* XXX barrier */ + mtx_lock_spin(&sio_lock); +/* EXTRA DELAY? */ - /* Check if the UART has FIFOs. If not, we're done. */ - com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; - if (!com->hasfifo) { - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ - siodebug(NULL, "no FIFOs... "); - return (0); - } + /* + * For the TI16754 chips, set prescaler to 1 (4 is often the + * default after-reset value) as otherwise it's impossible to + * get highest baudrates. + */ + if (COM_TI16754(flags)) { + u_char cfcr, efr; - /* We have FIFOs. Flush the transmitter and receiver. */ - if (sioflush(com)) { - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ - goto fallback; + cfcr = sio_getreg(com, com_cfcr); + sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE); + efr = sio_getreg(com, com_efr); + /* Unlock extended features to turn off prescaler. */ + sio_setreg(com, com_efr, efr | EFR_EFE); + /* Disable EFR. */ + sio_setreg(com, com_cfcr, (cfcr != CFCR_EFR_ENABLE) ? cfcr : 0); + /* Turn off prescaler. */ + sio_setreg(com, com_mcr, + sio_getreg(com, com_mcr) & ~MCR_PRESCALE); + sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE); + sio_setreg(com, com_efr, efr); + sio_setreg(com, com_cfcr, cfcr); } - sio_setreg(com, com_ier, IER_ERXRDY); - /* XXX barrier */ - /* - * We should have a sufficiently clean "pipe" to determine the - * size of the FIFOs. We send as much characters as is reasonable - * and wait for the the RX interrupt to be asserted, counting the - * characters as we send them. Based on that count we know the - * FIFO size. + * Initialize the speed and the word size and wait long enough to + * drain the maximum of 16 bytes of junk in device output queues. + * The speed is undefined after a master reset and must be set + * before relying on anything related to output. There may be + * junk after a (very fast) soft reboot and (apparently) after + * master reset. + * XXX what about the UART bug avoided by waiting in comparam()? + * We don't want to to wait long enough to drain at 2 bps. */ - count = 0; - while ((sio_getreg(com, com_iir) & IIR_RXRDY) == 0 && count < 1030) { - sio_setreg(com, com_data, 0); - /* XXX barrier */ - count++; - - limit = 30; - while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { - if (delay) - DELAY(delay); - } - if (limit == 0) { - sio_setreg(com, com_ier, 0); - /* XXX barrier */ - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ - siodebug(NULL, "can't determine FIFO size... "); - goto fallback; - } + if (iobase == siocniobase) + DELAY((16 + 1) * 1000000 / (comdefaultrate / 10)); + else { + sio_setreg(com, com_cfcr, CFCR_DLAB | CFCR_8BITS); + divisor = siodivisor(rclk, SIO_TEST_SPEED); + sio_setreg(com, com_dlbl, divisor & 0xff); + sio_setreg(com, com_dlbh, divisor >> 8); + sio_setreg(com, com_cfcr, CFCR_8BITS); + DELAY((16 + 1) * 1000000 / (SIO_TEST_SPEED / 10)); } + /* + * Enable the interrupt gate and disable device interupts. This + * should leave the device driving the interrupt line low and + * guarantee an edge trigger if an interrupt can be generated. + */ +/* EXTRA DELAY? */ + sio_setreg(com, com_mcr, mcr_image); sio_setreg(com, com_ier, 0); - /* XXX barrier */ + DELAY(1000); /* XXX */ + irqmap[0] = isa_irq_pending(); - /* Reset FIFOs. */ - com->reg_fcr = FCR_ENABLE; - sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); - /* XXX barrier */ + /* + * Attempt to set loopback mode so that we can send a null byte + * without annoying any external device. + */ +/* EXTRA DELAY? */ + sio_setreg(com, com_mcr, mcr_image | MCR_LOOPBACK); - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + /* + * Attempt to generate an output interrupt. On 8250's, setting + * IER_ETXRDY generates an interrupt independent of the current + * setting and independent of whether the THR is empty. On 16450's, + * setting IER_ETXRDY generates an interrupt independent of the + * current setting. On 16550A's, setting IER_ETXRDY only + * generates an interrupt when IER_ETXRDY is not already set. + */ + sio_setreg(com, com_ier, IER_ETXRDY); - if (count >= 14 && count < 16) - com->fifosize = 16; /* 16550 */ - else if (count >= 28 && count < 32) - com->fifosize = 32; /* 16650 */ - else if (count >= 56 && count < 64) - com->fifosize = 64; /* 16750 */ - else if (count >= 112 && count < 128) - com->fifosize = 128; /* 16950 */ - else - com->fifosize = 1; /* XXX */ + /* + * On some 16x50 incompatibles, setting IER_ETXRDY doesn't generate + * an interrupt. They'd better generate one for actually doing + * output. Loopback may be broken on the same incompatibles but + * it's unlikely to do more than allow the null byte out. + */ + sio_setreg(com, com_data, 0); + DELAY((1 + 2) * 1000000 / (SIO_TEST_SPEED / 10)); - siodebug(NULL, "count=%d; FIFO=%d... ", count, com->fifosize); - return (0); + /* + * Turn off loopback mode so that the interrupt gate works again + * (MCR_IENABLE was hidden). This should leave the device driving + * an interrupt line high. It doesn't matter if the interrupt + * line oscillates while we are not looking at it, since interrupts + * are disabled. + */ +/* EXTRA DELAY? */ + sio_setreg(com, com_mcr, mcr_image); + + /* + * It seems my Xircom CBEM56G Cardbus modem wants to be reset + * to 8 bits *again*, or else probe test 0 will fail. + * gwk@sgi.com, 4/19/2001 + */ + sio_setreg(com, com_cfcr, CFCR_8BITS); -fallback: - siodebug(NULL, "disabling FIFOs... "); - com->hasfifo = 0; - return (0); -} - -static void -siodescribe(struct com_s *com) -{ - int has_spr; - u_char spr; - - if (com->hasfifo) { - /* - * NS16550 or higher. The minimum FIFO size is 16 bytes for - * the NS16550. The ST16C650 has 32 bytes FIFOs and the - * NS16750 has 64 bytes FIFOs. - */ - switch (com->fifosize) { - case 16: - /* - * XXX Should we try to see if we have a broken - * 16550 or a fixed 16550A? - */ - device_set_desc(com->dev, "16550 or compatible"); - break; - case 32: - /* XXX Should we check features? */ - device_set_desc(com->dev, "16650 or compatible"); - break; - case 64: - /* XXX Should we check features? */ - device_set_desc(com->dev, "16750 or compatible"); - break; - case 128: - /* XXX Should we check features? */ - device_set_desc(com->dev, "16950 or compatible"); - break; - default: - /* XXX Probably not right. */ - device_set_desc(com->dev, - "Non-standard or broken UART with FIFO"); - break; + /* + * Some pcmcia cards have the "TXRDY bug", so we check everyone + * for IIR_TXRDY implementation ( Palido 321s, DC-1S... ) + */ + if (noprobe) { + /* Reading IIR register twice */ + for (fn = 0; fn < 2; fn ++) { + DELAY(10000); + failures[6] = sio_getreg(com, com_iir); + } + /* Check IIR_TXRDY clear ? */ + result = 0; + if (failures[6] & IIR_TXRDY) { + /* No, Double check with clearing IER */ + sio_setreg(com, com_ier, 0); + if (sio_getreg(com, com_iir) & IIR_NOPEND) { + /* Ok. We discovered TXRDY bug! */ + SET_FLAG(dev, COM_C_IIR_TXRDYBUG); + } else { + /* Unknown, Just omit this chip.. XXX */ + result = ENXIO; + sio_setreg(com, com_mcr, 0); + } + } else { + /* OK. this is well-known guys */ + CLR_FLAG(dev, COM_C_IIR_TXRDYBUG); + } + sio_setreg(com, com_ier, 0); + sio_setreg(com, com_cfcr, CFCR_8BITS); + mtx_unlock_spin(&sio_lock); + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + if (iobase == siocniobase) + result = 0; + if (result != 0) { + device_set_softc(dev, NULL); + free(com, M_DEVBUF); } - } else { - /* - * NS16450 or lower. Use the Scratch Pad Register (SPR) to - * differentiate the NS16450 from the INS8250. - */ - spr = sio_getreg(com, com_scr); - sio_setreg(com, com_scr, ~spr); - /* XXX barrier */ - has_spr = (sio_getreg(com, com_scr) == ~spr) ? 1 : 0; - /* XXX barrier */ - sio_setreg(com, com_scr, spr); - /* XXX barrier */ - if (!has_spr) - device_set_desc(com->dev, "8250 or compatible"); - else - device_set_desc(com->dev, "16450 or compatible"); + return (result); } -} -u_int -siodivisor(u_long rclk, u_long speed) -{ - long actual_speed; - u_int divisor; - int error; + /* + * Check that + * o the CFCR, IER and MCR in UART hold the values written to them + * (the values happen to be all distinct - this is good for + * avoiding false positive tests from bus echoes). + * o an output interrupt is generated and its vector is correct. + * o the interrupt goes away when the IIR in the UART is read. + */ +/* EXTRA DELAY? */ + failures[0] = sio_getreg(com, com_cfcr) - CFCR_8BITS; + failures[1] = sio_getreg(com, com_ier) - IER_ETXRDY; + failures[2] = sio_getreg(com, com_mcr) - mcr_image; + DELAY(10000); /* Some internal modems need this time */ + irqmap[1] = isa_irq_pending(); + failures[4] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_TXRDY; + DELAY(1000); /* XXX */ + irqmap[2] = isa_irq_pending(); + failures[6] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; - if (speed == 0) - return (0); -#if UINT_MAX > (ULONG_MAX - 1) / 8 - if (speed > (ULONG_MAX - 1) / 8) - return (0); -#endif - divisor = (rclk / (8UL * speed) + 1) / 2; - if (divisor == 0 || divisor >= 65536) - return (0); - actual_speed = rclk / (16UL * divisor); - - /* 10 times error in percent: */ - error = ((actual_speed - (long)speed) * 2000 / (long)speed + 1) / 2; - - /* 3.0% maximum error tolerance: */ - if (error < -30 || error > 30) - return (0); - - return (divisor); -} - -/* - * Do some non-destructive (for this device that is) tests - * to make sure we have something that looks like an UART. - */ -int sioprobe1(struct com_s *com) -{ - u_char lcr, val; - - lcr = sio_getreg(com, com_lcr); - sio_setreg(com, com_lcr, lcr & ~LCR_DLAB); - - /* Check known 0 bits that don't depend on DLAB. */ - val = sio_getreg(com, com_iir); - if (val & 0x30) - goto fail; - val = sio_getreg(com, com_mcr); - if (val & 0xe0) - goto fail; - - /* Check known 0 bits that depend on !DLAB. */ - val = sio_getreg(com, com_ier); - if (val & 0xf0) - goto fail; - - /* XXX we can do more. */ - + /* + * Turn off all device interrupts and check that they go off properly. + * Leave MCR_IENABLE alone. For ports without a master port, it gates + * the OUT2 output of the UART to + * the ICU input. Closing the gate would give a floating ICU input + * (unless there is another device driving it) and spurious interrupts. + * (On the system that this was first tested on, the input floats high + * and gives a (masked) interrupt as soon as the gate is closed.) + */ sio_setreg(com, com_ier, 0); - /* XXX barrier */ - sio_setreg(com, com_lcr, lcr); - /* XXX barrier */ - return (0); + sio_setreg(com, com_cfcr, CFCR_8BITS); /* dummy to avoid bus echo */ + failures[7] = sio_getreg(com, com_ier); + DELAY(1000); /* XXX */ + irqmap[3] = isa_irq_pending(); + failures[9] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; - fail: - sio_setreg(com, com_lcr, lcr); - /* XXX barrier */ - return (ENXIO); -} + mtx_unlock_spin(&sio_lock); -/* - * Unload the driver and clear the table. - * XXX this is mostly wrong. - * XXX TODO: - * This is usually called when the card is ejected, but - * can be caused by a kldunload of a controller driver. - * The idea is to reset the driver's view of the device - * and ensure that any driver entry points such as - * read and write do not hang. - */ -int -siodetach(device_t dev) -{ - struct com_s *com; - int i; + irqs = irqmap[1] & ~irqmap[0]; + if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 && + ((1 << xirq) & irqs) == 0) { + printf( + "sio%d: configured irq %ld not in bitmap of probed irqs %#x\n", + device_get_unit(dev), xirq, irqs); + printf( + "sio%d: port may not be enabled\n", + device_get_unit(dev)); + } + if (bootverbose) + printf("sio%d: irq maps: %#x %#x %#x %#x\n", + device_get_unit(dev), + irqmap[0], irqmap[1], irqmap[2], irqmap[3]); - com = (struct com_s *)device_get_softc(dev); - com->gone = 1; - - if (com->tp && (com->tp->t_state & TS_ISOPEN)) { - device_printf(dev, "still open, forcing close\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:38:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0DE416A4C1; Sat, 6 Sep 2003 18:38:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A295416A4BF for ; Sat, 6 Sep 2003 18:38:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBB7943FE5 for ; Sat, 6 Sep 2003 18:38:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h871cj0U096125 for ; Sat, 6 Sep 2003 18:38:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h871cjnR096122 for perforce@freebsd.org; Sat, 6 Sep 2003 18:38:45 -0700 (PDT) Date: Sat, 6 Sep 2003 18:38:45 -0700 (PDT) Message-Id: <200309070138.h871cjnR096122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 01:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=37697 Change 37697 by marcel@marcel_nfs on 2003/09/06 18:37:49 Replace sio(4) with uart(4). Affected files ... .. //depot/projects/ia64/sys/ia64/conf/GENERIC#33 edit .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#10 edit .. //depot/projects/ia64/sys/ia64/conf/I2#5 edit .. //depot/projects/ia64/sys/ia64/conf/I2.hints#2 edit .. //depot/projects/ia64/sys/ia64/conf/I3#6 edit .. //depot/projects/ia64/sys/ia64/conf/SMALL#13 edit .. //depot/projects/ia64/sys/ia64/conf/SMALL.hints#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#33 (text+ko) ==== @@ -141,8 +141,8 @@ device pty # Pseudo-ttys (telnet etc) device random # Entropy device device sc # System console -device sio # Serial port (UART) device tun # Packet tunnel. +device uart # Serial port (UART) device vga # VGA video card driver # The `bpf' device enables the Berkeley Packet Filter. ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#10 (text+ko) ==== @@ -51,7 +51,7 @@ device random device sc device scbus -device sio +device uart device ukbd device usb device vga ==== //depot/projects/ia64/sys/ia64/conf/I2#5 (text+ko) ==== @@ -62,7 +62,7 @@ device sc # Serial (COM) ports -device sio +device uart # Pseudo devices - the number indicates how many units to allocated. device random # Entropy device ==== //depot/projects/ia64/sys/ia64/conf/I2.hints#2 (text+ko) ==== @@ -1,4 +1,3 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.2 2001/09/29 11:45:07 dfr Exp $ -hint.sio.0.at="isa" -hint.sio.0.port="0x2F8" -hint.sio.0.flags="0x10" +# $FreeBSD$ +hint.uart.0.port="0x2F8" +hint.uart.0.flags="0x10" ==== //depot/projects/ia64/sys/ia64/conf/I3#6 (text+ko) ==== @@ -64,7 +64,7 @@ device sc # Serial (COM) ports -device sio +device uart # Pseudo devices - the number indicates how many units to allocated. device random # Entropy device ==== //depot/projects/ia64/sys/ia64/conf/SMALL#13 (text+ko) ==== @@ -91,7 +91,7 @@ device sc 1 # Serial (COM) ports -device sio +device uart # Parallel port #device ppc ==== //depot/projects/ia64/sys/ia64/conf/SMALL.hints#3 (text+ko) ==== @@ -1,6 +1,5 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.2 2001/09/29 11:45:07 dfr Exp $ -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" +# $FreeBSD$ +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" hint.vga.0.at="isa" hint.sc.0.at="isa" From owner-p4-projects@FreeBSD.ORG Sat Sep 6 21:47:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C675516A4C1; Sat, 6 Sep 2003 21:47:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8799E16A4BF for ; Sat, 6 Sep 2003 21:47:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C57843FF3 for ; Sat, 6 Sep 2003 21:47:41 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h874lf0U011111 for ; Sat, 6 Sep 2003 21:47:41 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h874le8V011108 for perforce@freebsd.org; Sat, 6 Sep 2003 21:47:40 -0700 (PDT) Date: Sat, 6 Sep 2003 21:47:40 -0700 (PDT) Message-Id: <200309070447.h874le8V011108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 04:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=37704 Change 37704 by sam@sam_ebb on 2003/09/06 21:46:49 minor cleanups to make locks less mutex-specific Affected files ... .. //depot/projects/netperf/sys/net/bridge.c#6 edit .. //depot/projects/netperf/sys/net/if.c#3 edit .. //depot/projects/netperf/sys/net/if_disc.c#3 edit .. //depot/projects/netperf/sys/net/if_faith.c#3 edit .. //depot/projects/netperf/sys/net/if_loop.c#4 edit .. //depot/projects/netperf/sys/net/if_stf.c#3 edit .. //depot/projects/netperf/sys/net/route.c#9 edit .. //depot/projects/netperf/sys/net/route.h#4 edit .. //depot/projects/netperf/sys/netinet/if_ether.c#6 edit .. //depot/projects/netperf/sys/netinet/in_rmx.c#5 edit .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#7 edit .. //depot/projects/netperf/sys/netinet/ip_fw2.c#6 edit .. //depot/projects/netperf/sys/netinet6/in6_rmx.c#5 edit .. //depot/projects/netperf/sys/netinet6/nd6.c#4 edit Differences ... ==== //depot/projects/netperf/sys/net/bridge.c#6 (text+ko) ==== @@ -166,9 +166,11 @@ static struct cluster_softc *clusters; static struct mtx bdg_mtx; -#define BDG_LOCK() mtx_lock(&bdg_mtx); -#define BDG_UNLOCK() mtx_unlock(&bdg_mtx); -#define BDG_LOCK_ASSERT(_what) mtx_assert(&bdg_mtx, _what); +#define BDG_LOCK_INIT() mtx_init(&bdg_mtx, "bridge", NULL, MTX_DEF) +#define BDG_LOCK_DESTROY() mtx_destroy(&bdg_mtx) +#define BDG_LOCK() mtx_lock(&bdg_mtx) +#define BDG_UNLOCK() mtx_unlock(&bdg_mtx) +#define BDG_LOCK_ASSERT() mtx_assert(&bdg_mtx, MA_OWNED) #define BDG_MUTED(ifp) (ifp2sc[ifp->if_index].flags & IFF_MUTE) #define BDG_MUTE(ifp) ifp2sc[ifp->if_index].flags |= IFF_MUTE @@ -298,7 +300,7 @@ struct cluster_softc *c = NULL; int i; - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); for (i = 0; i < n_clusters ; i++) if (clusters[i].cluster_id == cluster_id) @@ -369,7 +371,7 @@ struct ifnet *ifp ; int i; - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); DPRINTF(("%s: n_clusters %d\n", __func__, n_clusters)); @@ -413,7 +415,7 @@ { struct ifnet *ifp ; - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { @@ -452,7 +454,7 @@ static void reconfigure_bridge_locked(void) { - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); bridge_off(); if (do_bridge) { @@ -490,7 +492,7 @@ int l, cluster; static const char *sep = ", \t"; - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); for (p = bridge_cfg; *p ; p++) { struct ifnet *ifp; @@ -705,7 +707,7 @@ { bdg_hash_table *bt; /* pointer to entry in hash table */ - BDG_LOCK_ASSERT(MA_OWNED); + BDG_LOCK_ASSERT(); if (ETHER_IS_MULTICAST(eh->ether_dhost)) return IS_ETHER_BROADCAST(eh->ether_dhost) ? BDG_BCAST : BDG_MCAST; @@ -1192,7 +1194,7 @@ if (ifp2sc == NULL) return ENOMEM; - mtx_init(&bdg_mtx, "bridge", NULL, MTX_DEF); + BDG_LOCK_INIT(); n_clusters = 0; clusters = NULL; @@ -1228,7 +1230,7 @@ free(ifp2sc, M_IFADDR); ifp2sc = NULL; } - mtx_destroy(&bdg_mtx); + BDG_LOCK_DESTROY(); } #endif /* KLD_MODULE */ ==== //depot/projects/netperf/sys/net/if.c#3 (text+ko) ==== @@ -1052,7 +1052,7 @@ struct sockaddr *dst; struct ifnet *ifp; - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) || ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0)) ==== //depot/projects/netperf/sys/net/if_disc.c#3 (text+ko) ==== @@ -194,7 +194,7 @@ static void discrtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info) { - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (rt) rt->rt_rmx.rmx_mtu = DSMTU; ==== //depot/projects/netperf/sys/net/if_faith.c#3 (text+ko) ==== @@ -270,7 +270,7 @@ struct rtentry *rt; struct rt_addrinfo *info; { - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (rt) { rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu; /* for ISO */ ==== //depot/projects/netperf/sys/net/if_loop.c#4 (text+ko) ==== @@ -355,7 +355,7 @@ struct rtentry *rt; struct rt_addrinfo *info; { - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (rt) { rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu; /* for ISO */ ==== //depot/projects/netperf/sys/net/if_stf.c#3 (text+ko) ==== @@ -718,7 +718,7 @@ struct rtentry *rt; struct rt_addrinfo *info; { - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (rt) rt->rt_rmx.rmx_mtu = IPV6_MMTU; ==== //depot/projects/netperf/sys/net/route.c#9 (text+ko) ==== @@ -204,7 +204,7 @@ } } if (newrt) - RT_LOCK_ASSERT(newrt, MA_OWNED); + RT_LOCK_ASSERT(newrt); return (newrt); } @@ -223,7 +223,7 @@ if (rt == 0 || rnh == 0) panic("rtfree"); - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); /* * decrement the reference count by one and if it reaches 0, @@ -920,7 +920,7 @@ caddr_t new, old; int dlen = ROUNDUP(dst->sa_len), glen = ROUNDUP(gate->sa_len); - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); /* * A host route with the destination equal to the gateway ==== //depot/projects/netperf/sys/net/route.h#4 (text+ko) ==== @@ -271,7 +271,7 @@ #define RT_LOCK(_rt) mtx_lock(&(_rt)->rt_mtx) #define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) #define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) -#define RT_LOCK_ASSERT(_rt, _what) mtx_assert(&(_rt)->rt_mtx, _what) +#define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) #define RTFREE_LOCKED(_rt) do { \ if ((_rt)->rt_refcnt <= 1) \ ==== //depot/projects/netperf/sys/netinet/if_ether.c#6 (text+ko) ==== @@ -170,7 +170,7 @@ register struct llinfo_arp *la; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (!arpinit_done) { arpinit_done = 1; ==== //depot/projects/netperf/sys/netinet/in_rmx.c#5 (text+ko) ==== @@ -195,7 +195,7 @@ { struct rtentry *rt = (struct rtentry *)rn; - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (!(rt->rt_flags & RTF_UP)) return; /* prophylactic measures */ ==== //depot/projects/netperf/sys/netinet/ip_dummynet.c#7 (text+ko) ==== @@ -165,9 +165,12 @@ #endif static struct mtx dummynet_mtx; -#define DUMMYNET_LOCK() mtx_lock(&dummynet_mtx); -#define DUMMYNET_UNLOCK() mtx_unlock(&dummynet_mtx); -#define DUMMYNET_LOCK_ASSERT(_what) mtx_assert(&dummynet_mtx, _what); +#define DUMMYNET_LOCK_INIT() \ + mtx_init(&dummynet_mtx, "dummynet", NULL, MTX_DEF) +#define DUMMYNET_LOCK_DESTROY() mtx_destroy(&dummynet_mtx) +#define DUMMYNET_LOCK() mtx_lock(&dummynet_mtx) +#define DUMMYNET_UNLOCK() mtx_unlock(&dummynet_mtx) +#define DUMMYNET_LOCK_ASSERT() mtx_assert(&dummynet_mtx, MA_OWNED) static int config_pipe(struct dn_pipe *p); static int ip_dn_ctl(struct sockopt *sopt); @@ -542,7 +545,7 @@ struct dn_pipe *p = q->fs->pipe ; int p_was_empty ; - DUMMYNET_LOCK_ASSERT(MA_OWNED); + DUMMYNET_LOCK_ASSERT(); if (p == NULL) { printf("dummynet: ready_event- pipe is gone\n"); @@ -608,7 +611,7 @@ struct dn_heap *sch = &(p->scheduler_heap); struct dn_heap *neh = &(p->not_eligible_heap) ; - DUMMYNET_LOCK_ASSERT(MA_OWNED); + DUMMYNET_LOCK_ASSERT(); if (p->if_name[0] == 0) /* tx clock is simulated */ p->numbytes += ( curr_time - p->sched_time ) * p->bandwidth; @@ -1310,7 +1313,7 @@ struct dn_flow_queue *q, *qn ; int i ; - DUMMYNET_LOCK_ASSERT(MA_OWNED); + DUMMYNET_LOCK_ASSERT(); for (i = 0 ; i <= fs->rq_size ; i++ ) { for (q = fs->rq[i] ; q ; q = qn ) { @@ -1710,7 +1713,7 @@ struct dn_pipe *p; struct dn_pkt *pkt; - DUMMYNET_LOCK_ASSERT(MA_OWNED); + DUMMYNET_LOCK_ASSERT(); heap_free(&ready_heap); heap_free(&wfq_ready_heap); @@ -1817,7 +1820,7 @@ int i, copied = 0 ; struct dn_flow_queue *q, *qp = (struct dn_flow_queue *)bp; - DUMMYNET_LOCK_ASSERT(MA_OWNED); + DUMMYNET_LOCK_ASSERT(); for (i = 0 ; i <= set->rq_size ; i++) for (q = set->rq[i] ; q ; q = q->next, qp++ ) { @@ -1968,7 +1971,7 @@ if (bootverbose) printf("DUMMYNET initialized (011031)\n"); - mtx_init(&dummynet_mtx, "dummynet", NULL, MTX_DEF); + DUMMYNET_LOCK_INIT(); all_pipes = NULL ; all_flow_sets = NULL ; @@ -2000,7 +2003,7 @@ callout_stop(&dn_timeout); dummynet_flush(); - mtx_destroy(&dummynet_mtx); + DUMMYNET_LOCK_DESTROY(); } #endif /* KLD_MODULE */ ==== //depot/projects/netperf/sys/netinet/ip_fw2.c#6 (text+ko) ==== @@ -109,9 +109,12 @@ struct ip_fw *rules; /* list of rules */ struct mtx mtx; /* lock guarding rule list */ }; +#define IPFW_LOCK_INIT(_chain) \ + mtx_init(&(_chain)->mtx, "IPFW static rules", NULL, MTX_DEF) +#define IPFW_LOCK_DESTROY(_chain) mtx_destroy(&(_chain)->mtx) #define IPFW_LOCK(_chain) mtx_lock(&(_chain)->mtx) #define IPFW_UNLOCK(_chain) mtx_unlock(&(_chain)->mtx) -#define IPFW_LOCK_ASSERT(_chain, _what) mtx_assert(&(_chain)->mtx, _what) +#define IPFW_LOCK_ASSERT(_chain) mtx_assert(&(_chain)->mtx, MA_OWNED) /* * list of rules for layer 3 @@ -183,9 +186,12 @@ static u_int32_t curr_dyn_buckets = 256; /* must be power of 2 */ static struct mtx ipfw_dyn_mtx; /* mutex guarding dynamic rules */ +#define IPFW_DYN_LOCK_INIT() \ + mtx_init(&ipfw_dyn_mtx, "IPFW dynamic rules", NULL, MTX_DEF) +#define IPFW_DYN_LOCK_DESTROY() mtx_destroy(&ipfw_dyn_mtx) #define IPFW_DYN_LOCK() mtx_lock(&ipfw_dyn_mtx) #define IPFW_DYN_UNLOCK() mtx_unlock(&ipfw_dyn_mtx) -#define IPFW_DYN_LOCK_ASSERT(_what) mtx_assert(&ipfw_dyn_mtx, _what) +#define IPFW_DYN_LOCK_ASSERT() mtx_assert(&ipfw_dyn_mtx, MA_OWNED) /* * Timeouts for various events in handing dynamic rules. @@ -718,7 +724,7 @@ ipfw_dyn_rule *prev, *q; int i, pass = 0, max_pass = 0; - IPFW_DYN_LOCK_ASSERT(MA_OWNED); + IPFW_DYN_LOCK_ASSERT(); if (ipfw_dyn_v == NULL || dyn_count == 0) return; @@ -790,7 +796,7 @@ int i, dir = MATCH_NONE; ipfw_dyn_rule *prev, *q=NULL; - IPFW_DYN_LOCK_ASSERT(MA_OWNED); + IPFW_DYN_LOCK_ASSERT(); if (ipfw_dyn_v == NULL) goto done; /* not found */ @@ -913,7 +919,7 @@ static void realloc_dynamic_table(void) { - IPFW_DYN_LOCK_ASSERT(MA_OWNED); + IPFW_DYN_LOCK_ASSERT(); /* * Try reallocation, make sure we have a power of 2 and do @@ -955,7 +961,7 @@ ipfw_dyn_rule *r; int i; - IPFW_DYN_LOCK_ASSERT(MA_OWNED); + IPFW_DYN_LOCK_ASSERT(); if (ipfw_dyn_v == NULL || (dyn_count == 0 && dyn_buckets != curr_dyn_buckets)) { @@ -1010,7 +1016,7 @@ ipfw_dyn_rule *q; int i; - IPFW_DYN_LOCK_ASSERT(MA_OWNED); + IPFW_DYN_LOCK_ASSERT(); if (ipfw_dyn_v) { i = hash_packet( pkt ); @@ -2087,7 +2093,7 @@ { struct ip_fw *rule; - IPFW_LOCK_ASSERT(chain, MA_OWNED); + IPFW_LOCK_ASSERT(chain); for (rule = chain->rules; rule; rule = rule->next) rule->next_rule = NULL; @@ -2216,7 +2222,7 @@ struct ip_fw *n; int l = RULESIZE(rule); - IPFW_LOCK_ASSERT(chain, MA_OWNED); + IPFW_LOCK_ASSERT(chain); n = rule->next; IPFW_DYN_LOCK(); @@ -2244,7 +2250,7 @@ { struct ip_fw *prev, *rule; - IPFW_LOCK_ASSERT(chain, MA_OWNED); + IPFW_LOCK_ASSERT(chain); flush_rule_ptrs(chain); /* more efficient to do outside the loop */ for (prev = NULL, rule = chain->rules; rule ; ) @@ -2860,8 +2866,8 @@ int error; layer3_chain.rules = NULL; - mtx_init(&layer3_chain.mtx, "IPFW static rules", NULL, MTX_DEF); - mtx_init(&ipfw_dyn_mtx, "IPFW dynamic rules", NULL, MTX_DEF); + IPFW_LOCK_INIT(&layer3_chain); + IPFW_DYN_LOCK_INIT(); callout_init(&ipfw_timeout, CALLOUT_MPSAFE); bzero(&default_rule, sizeof default_rule); @@ -2882,8 +2888,8 @@ if (error != 0) { printf("ipfw2: error %u initializing default rule " "(support disabled)\n", error); - mtx_destroy(&ipfw_dyn_mtx); - mtx_destroy(&layer3_chain.mtx); + IPFW_DYN_LOCK_DESTROY(); + IPFW_LOCK_DESTROY(&layer3_chain); return (error); } @@ -2944,10 +2950,8 @@ ip_fw_chk_ptr = NULL; ip_fw_ctl_ptr = NULL; free_chain(&layer3_chain, 1 /* kill default rule */); - IPFW_DYN_UNLOCK(); - IPFW_UNLOCK(&layer3_chain); - mtx_destroy(&ipfw_dyn_mtx); - mtx_destroy(&layer3_chain.mtx); + IPFW_DYN_LOCK_DESTROY(); + IPFW_LOCK_DESTROY(&layer3_chain); printf("IP firewall unloaded\n"); err = 0; #endif ==== //depot/projects/netperf/sys/netinet6/in6_rmx.c#5 (text+ko) ==== @@ -255,7 +255,7 @@ { struct rtentry *rt = (struct rtentry *)rn; - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if (!(rt->rt_flags & RTF_UP)) return; /* prophylactic measures */ ==== //depot/projects/netperf/sys/netinet6/nd6.c#4 (text+ko) ==== @@ -1100,7 +1100,7 @@ struct ifnet *ifp = rt->rt_ifp; struct ifaddr *ifa; - RT_LOCK_ASSERT(rt, MA_OWNED); + RT_LOCK_ASSERT(rt); if ((rt->rt_flags & RTF_GATEWAY)) return; From owner-p4-projects@FreeBSD.ORG Sat Sep 6 23:22:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C48716A4C1; Sat, 6 Sep 2003 23:22:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C085516A4BF for ; Sat, 6 Sep 2003 23:22:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E28FB43FCB for ; Sat, 6 Sep 2003 23:22:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h876Mf0U016607 for ; Sat, 6 Sep 2003 23:22:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h876MfSt016604 for perforce@freebsd.org; Sat, 6 Sep 2003 23:22:41 -0700 (PDT) Date: Sat, 6 Sep 2003 23:22:41 -0700 (PDT) Message-Id: <200309070622.h876MfSt016604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 06:22:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=37712 Change 37712 by marcel@marcel_nfs on 2003/09/06 23:22:06 IFC @37710 Affected files ... .. //depot/projects/uart/alpha/include/db_machdep.h#2 integrate .. //depot/projects/uart/conf/NOTES#11 integrate .. //depot/projects/uart/conf/files#22 integrate .. //depot/projects/uart/conf/files.pc98#8 integrate .. //depot/projects/uart/dev/uart/uart_cpu.h#9 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#1 branch .. //depot/projects/uart/dev/uart/uart_dev_i8251.c#1 branch .. //depot/projects/uart/dev/uart/uart_dev_i8251.h#1 branch .. //depot/projects/uart/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/uart/ia64/conf/GENERIC#2 integrate .. //depot/projects/uart/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/uart/kern/init_sysent.c#3 integrate .. //depot/projects/uart/kern/syscalls.c#3 integrate .. //depot/projects/uart/kern/syscalls.master#3 integrate .. //depot/projects/uart/modules/uart/Makefile#6 integrate .. //depot/projects/uart/sys/syscall.h#3 integrate .. //depot/projects/uart/sys/syscall.mk#3 integrate .. //depot/projects/uart/sys/sysproto.h#3 integrate Differences ... ==== //depot/projects/uart/alpha/include/db_machdep.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.7 2003/02/25 00:42:39 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.8 2003/09/07 05:33:46 marcel Exp $ */ /* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */ /* @@ -34,8 +34,9 @@ /* * Machine-dependent defines for new kernel debugger. */ - +#ifndef KLD_MODULE #include "opt_ddb.h" +#endif #include #include ==== //depot/projects/uart/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1171 2003/08/24 09:22:25 sos Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1172 2003/09/07 03:45:48 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1437,8 +1437,45 @@ hint.sio.0.flags="0x10" hint.sio.0.irq="4" +# Options for sio: +options CONSPEED=115200 # speed for serial console + # (default 9600) +options COM_ESP #code for Hayes ESP +options COM_MULTIPORT #code for some cards with shared IRQs + +# `flags' specific to sio(4). See below for flags used by both sio(4) and +# uart(4). +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + # -# `flags' for serial drivers that support consoles (only for sio now): +# uart: newbusified driver for serial interfaces. It consolidates the sio(4), +# sab(4) and zs(4) drivers. + +device uart + +# The following hint should only be used for pure ISA devices. It is not +# needed otherwise. Use of hints is strongly discouraged. +hint.uart.0.at="isa" + +# The following 3 hints are used when the UART is a system device (ie console +# or debug port), but only on platforms that don't have any other means to +# pass the information to the kernel. The unit number of the hint is only used +# to bundle the hints together. There's no relation to the unit number of the +# probed UART. +hint.uart.0.port="0x3f8" +hint.uart.0.flags="0x10" +hint.uart.0.baud="115200" + +# `flags' for serial drivers that support consoles like sio(4) and uart(4): # 0x10 enable console support for this unit. The other console flags # are ignored unless this is set. Enabling console support does # not make the unit the preferred console - boot with -h or set @@ -1446,36 +1483,18 @@ # console support; the first one (in config file order) with # this flag set is preferred. Setting this flag for sio0 gives # the old behaviour. -# 0x20 force this unit to be the console (unless there is another -# higher priority console). This replaces the COMCONSOLE option. -# 0x40 reserve this unit for low level console operations. Do not -# access the device in any normal way. # 0x80 use this port for serial line gdb support in ddb. # -# PnP `flags' -# 0x1 disable probing of this device. Used to prevent your modem -# from being attached as a PnP modem. -# -# Options for serial drivers that support consoles (only for sio now): +# Options for serial drivers that support consoles: options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to #DDB, if available. -options CONSPEED=115200 # speed for serial console - # (default 9600) # Solaris implements a new BREAK which is initiated by a character # sequence CR ~ ^b which is similar to a familiar pattern used on # Sun servers by the Remote Console. options ALT_BREAK_TO_DEBUGGER -# Options for sio: -options COM_ESP #code for Hayes ESP -options COM_MULTIPORT #code for some cards with shared IRQs - -# Other flags for sio that aren't documented in the man page. -# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for -# ST16650A-compatible UARTs. - # PCI Universal Communications driver # Supports various single and multi port PCI serial cards. Maybe later # also the parallel ports on combination serial/parallel cards. New cards ==== //depot/projects/uart/conf/files#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.820 2003/09/07 05:05:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -783,10 +783,12 @@ dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus dev/uart/uart_bus_isa.c optional uart isa +#dev/uart/uart_bus_cbus.c optional uart cbus dev/uart/uart_bus_pci.c optional uart cardbus dev/uart/uart_bus_pci.c optional uart pci dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_core.c optional uart +dev/uart/uart_dev_i8251.c optional uart dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart dev/uart/uart_dev_z8530.c optional uart ==== //depot/projects/uart/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.279 2003/09/07 05:05:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -131,7 +131,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -dev/uart/uart_cpu_i386.c optional uart +dev/uart/uart_cpu_pc98.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard ==== //depot/projects/uart/dev/uart/uart_cpu.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.2 2003/09/07 04:59:15 imp Exp $ */ #ifndef _DEV_UART_CPU_H_ @@ -41,6 +41,7 @@ int (*getc)(struct uart_bas *); }; +extern struct uart_ops uart_i8251_ops; extern struct uart_ops uart_ns8250_ops; extern struct uart_ops uart_sab82532_ops; extern struct uart_ops uart_z8530_ops; ==== //depot/projects/uart/i386/i386/sys_machdep.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.90 2003/08/25 09:48:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.91 2003/09/07 05:23:28 davidxu Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -409,10 +409,8 @@ return(error); } -#ifdef DEBUG static int ldt_warnings; #define NUM_LDT_WARNINGS 10 -#endif static int i386_set_ldt(td, args) @@ -464,14 +462,12 @@ } if (!(uap->start == LDT_AUTO_ALLOC && uap->num == 1)) { -#ifdef DEBUG /* complain a for a while if using old methods */ if (ldt_warnings++ < NUM_LDT_WARNINGS) { printf("Warning: pid %d used static ldt allocation.\n", td->td_proc->p_pid); printf("See the i386_set_ldt man page for more info\n"); } -#endif /* verify range of descriptors to modify */ largest_ld = uap->start + uap->num; if (uap->start >= MAX_LD || ==== //depot/projects/uart/ia64/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.54 2003/06/08 02:03:01 jmallett Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.55 2003/09/07 05:47:10 marcel Exp $ machine ia64 cpu ITANIUM @@ -120,8 +120,8 @@ #device agp # support several AGP chipsets -# Serial (COM) ports -device sio +# Serial ports (UARTs). +device uart # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') ==== //depot/projects/uart/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.3 2002/11/05 08:23:26 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.4 2003/09/07 05:47:10 marcel Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -13,12 +13,8 @@ hint.psm.0.irq="12" hint.vga.0.at="isa" hint.sc.0.at="isa" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" +hint.uart.0.baud="115200" hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/uart/kern/init_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.155 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.156 2003/09/07 05:42:06 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #include "opt_compat.h" @@ -93,7 +93,7 @@ { compat(SYF_MPSAFE | AS(ofstat_args),fstat) }, /* 62 = old fstat */ { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo) }, /* 63 = old getkerninfo */ { compat(SYF_MPSAFE | 0,getpagesize) }, /* 64 = old getpagesize */ - { AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */ { SYF_MPSAFE | 0, (sy_call_t *)vfork }, /* 66 = vfork */ { 0, (sy_call_t *)nosys }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys }, /* 68 = obsolete vwrite */ ==== //depot/projects/uart/kern/syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.141 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.142 2003/09/07 05:42:06 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ const char *syscallnames[] = { ==== //depot/projects/uart/kern/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.153 2003/09/07 05:42:06 alc Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -128,7 +128,7 @@ int arg); } getkerninfo getkerninfo_args int 64 MCOMPAT BSD { int getpagesize(void); } \ getpagesize getpagesize_args int -65 STD BSD { int msync(void *addr, size_t len, int flags); } +65 MSTD BSD { int msync(void *addr, size_t len, int flags); } 66 MSTD BSD { int vfork(void); } 67 OBSOL NOHIDE vread 68 OBSOL NOHIDE vwrite ==== //depot/projects/uart/modules/uart/Makefile#6 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/modules/uart/Makefile,v 1.2 2003/09/07 05:00:32 imp Exp $ .PATH: ${.CURDIR}/../../dev/uart KMOD= uart SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \ uart_bus_puc.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \ + uart_dev_i8251.c \ uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \ uart_tty.c SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h ==== //depot/projects/uart/sys/syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.139 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.140 2003/09/07 05:42:07 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #define SYS_syscall 0 ==== //depot/projects/uart/sys/syscall.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.94 2003/07/17 22:45:33 davidxu Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.95 2003/09/07 05:42:07 alc Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/uart/sys/sysproto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.135 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.136 2003/09/07 05:42:07 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #ifndef _SYS_SYSPROTO_H_ From owner-p4-projects@FreeBSD.ORG Sat Sep 6 23:27:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2606316A4C1; Sat, 6 Sep 2003 23:27:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F417416A4BF for ; Sat, 6 Sep 2003 23:27:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9A0943F93 for ; Sat, 6 Sep 2003 23:27:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h876Rm0U016755 for ; Sat, 6 Sep 2003 23:27:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h876Rmqa016752 for perforce@freebsd.org; Sat, 6 Sep 2003 23:27:48 -0700 (PDT) Date: Sat, 6 Sep 2003 23:27:48 -0700 (PDT) Message-Id: <200309070627.h876Rmqa016752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37713 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 06:27:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=37713 Change 37713 by marcel@marcel_nfs on 2003/09/06 23:26:51 IFC @37710 Affected files ... .. //depot/projects/ia64/share/man/man4/Makefile#58 integrate .. //depot/projects/ia64/share/man/man4/uart.4#1 branch .. //depot/projects/ia64/share/man/man5/device.hints.5#7 integrate .. //depot/projects/ia64/sys/alpha/include/db_machdep.h#5 integrate .. //depot/projects/ia64/sys/conf/NOTES#66 integrate .. //depot/projects/ia64/sys/conf/files#99 integrate .. //depot/projects/ia64/sys/conf/files.pc98#38 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_pc98.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_i8251.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_i8251.h#1 branch .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#23 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#7 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#30 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#31 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#32 integrate .. //depot/projects/ia64/sys/modules/uart/Makefile#2 integrate .. //depot/projects/ia64/sys/sys/syscall.h#30 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#30 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#33 integrate .. //depot/projects/ia64/usr.bin/make/cond.c#10 integrate Differences ... ==== //depot/projects/ia64/share/man/man4/Makefile#58 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.220 2003/09/06 17:31:50 bmah Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.221 2003/09/07 02:52:25 marcel Exp $ MAN= aac.4 \ acpi.4 \ @@ -248,6 +248,7 @@ tun.4 \ twe.4 \ txp.4 \ + uart.4 \ ubsa.4 \ ubsec.4 \ ubtbcmfw.4 \ ==== //depot/projects/ia64/share/man/man5/device.hints.5#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.8 2002/12/19 18:26:26 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.9 2003/09/07 04:18:17 jb Exp $ .\" .Dd October 7, 2001 .Dt DEVICE.HINTS 5 @@ -99,6 +99,8 @@ is the DMA channel number. .It Li maddr specifies the physical memory address used by the device. +.It Li msize +specifies the physical memory size used by the device. .It Li flags sets various flag bits for the device. .It Li disabled ==== //depot/projects/ia64/sys/alpha/include/db_machdep.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.7 2003/02/25 00:42:39 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.8 2003/09/07 05:33:46 marcel Exp $ */ /* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */ /* @@ -34,8 +34,9 @@ /* * Machine-dependent defines for new kernel debugger. */ - +#ifndef KLD_MODULE #include "opt_ddb.h" +#endif #include #include ==== //depot/projects/ia64/sys/conf/NOTES#66 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1171 2003/08/24 09:22:25 sos Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1172 2003/09/07 03:45:48 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1437,8 +1437,45 @@ hint.sio.0.flags="0x10" hint.sio.0.irq="4" +# Options for sio: +options CONSPEED=115200 # speed for serial console + # (default 9600) +options COM_ESP #code for Hayes ESP +options COM_MULTIPORT #code for some cards with shared IRQs + +# `flags' specific to sio(4). See below for flags used by both sio(4) and +# uart(4). +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + # -# `flags' for serial drivers that support consoles (only for sio now): +# uart: newbusified driver for serial interfaces. It consolidates the sio(4), +# sab(4) and zs(4) drivers. + +device uart + +# The following hint should only be used for pure ISA devices. It is not +# needed otherwise. Use of hints is strongly discouraged. +hint.uart.0.at="isa" + +# The following 3 hints are used when the UART is a system device (ie console +# or debug port), but only on platforms that don't have any other means to +# pass the information to the kernel. The unit number of the hint is only used +# to bundle the hints together. There's no relation to the unit number of the +# probed UART. +hint.uart.0.port="0x3f8" +hint.uart.0.flags="0x10" +hint.uart.0.baud="115200" + +# `flags' for serial drivers that support consoles like sio(4) and uart(4): # 0x10 enable console support for this unit. The other console flags # are ignored unless this is set. Enabling console support does # not make the unit the preferred console - boot with -h or set @@ -1446,36 +1483,18 @@ # console support; the first one (in config file order) with # this flag set is preferred. Setting this flag for sio0 gives # the old behaviour. -# 0x20 force this unit to be the console (unless there is another -# higher priority console). This replaces the COMCONSOLE option. -# 0x40 reserve this unit for low level console operations. Do not -# access the device in any normal way. # 0x80 use this port for serial line gdb support in ddb. # -# PnP `flags' -# 0x1 disable probing of this device. Used to prevent your modem -# from being attached as a PnP modem. -# -# Options for serial drivers that support consoles (only for sio now): +# Options for serial drivers that support consoles: options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to #DDB, if available. -options CONSPEED=115200 # speed for serial console - # (default 9600) # Solaris implements a new BREAK which is initiated by a character # sequence CR ~ ^b which is similar to a familiar pattern used on # Sun servers by the Remote Console. options ALT_BREAK_TO_DEBUGGER -# Options for sio: -options COM_ESP #code for Hayes ESP -options COM_MULTIPORT #code for some cards with shared IRQs - -# Other flags for sio that aren't documented in the man page. -# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for -# ST16650A-compatible UARTs. - # PCI Universal Communications driver # Supports various single and multi port PCI serial cards. Maybe later # also the parallel ports on combination serial/parallel cards. New cards ==== //depot/projects/ia64/sys/conf/files#99 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.820 2003/09/07 05:05:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -783,10 +783,12 @@ dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus dev/uart/uart_bus_isa.c optional uart isa +#dev/uart/uart_bus_cbus.c optional uart cbus dev/uart/uart_bus_pci.c optional uart cardbus dev/uart/uart_bus_pci.c optional uart pci dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_core.c optional uart +dev/uart/uart_dev_i8251.c optional uart dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart dev/uart/uart_dev_z8530.c optional uart ==== //depot/projects/ia64/sys/conf/files.pc98#38 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.279 2003/09/07 05:05:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -131,7 +131,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -dev/uart/uart_cpu_i386.c optional uart +dev/uart/uart_cpu_pc98.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard ==== //depot/projects/ia64/sys/dev/uart/uart_cpu.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.1 2003/09/06 23:13:47 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.2 2003/09/07 04:59:15 imp Exp $ */ #ifndef _DEV_UART_CPU_H_ @@ -41,6 +41,7 @@ int (*getc)(struct uart_bas *); }; +extern struct uart_ops uart_i8251_ops; extern struct uart_ops uart_ns8250_ops; extern struct uart_ops uart_sab82532_ops; extern struct uart_ops uart_z8530_ops; ==== //depot/projects/ia64/sys/i386/i386/sys_machdep.c#23 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.90 2003/08/25 09:48:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.91 2003/09/07 05:23:28 davidxu Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -409,10 +409,8 @@ return(error); } -#ifdef DEBUG static int ldt_warnings; #define NUM_LDT_WARNINGS 10 -#endif static int i386_set_ldt(td, args) @@ -464,14 +462,12 @@ } if (!(uap->start == LDT_AUTO_ALLOC && uap->num == 1)) { -#ifdef DEBUG /* complain a for a while if using old methods */ if (ldt_warnings++ < NUM_LDT_WARNINGS) { printf("Warning: pid %d used static ldt allocation.\n", td->td_proc->p_pid); printf("See the i386_set_ldt man page for more info\n"); } -#endif /* verify range of descriptors to modify */ largest_ld = uap->start + uap->num; if (uap->start >= MAX_LD || ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#34 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#7 (text+ko) ==== ==== //depot/projects/ia64/sys/kern/init_sysent.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.155 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.156 2003/09/07 05:42:06 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #include "opt_compat.h" @@ -93,7 +93,7 @@ { compat(SYF_MPSAFE | AS(ofstat_args),fstat) }, /* 62 = old fstat */ { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo) }, /* 63 = old getkerninfo */ { compat(SYF_MPSAFE | 0,getpagesize) }, /* 64 = old getpagesize */ - { AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */ { SYF_MPSAFE | 0, (sy_call_t *)vfork }, /* 66 = vfork */ { 0, (sy_call_t *)nosys }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys }, /* 68 = obsolete vwrite */ ==== //depot/projects/ia64/sys/kern/syscalls.c#31 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.141 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.142 2003/09/07 05:42:06 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ const char *syscallnames[] = { ==== //depot/projects/ia64/sys/kern/syscalls.master#32 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.153 2003/09/07 05:42:06 alc Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -128,7 +128,7 @@ int arg); } getkerninfo getkerninfo_args int 64 MCOMPAT BSD { int getpagesize(void); } \ getpagesize getpagesize_args int -65 STD BSD { int msync(void *addr, size_t len, int flags); } +65 MSTD BSD { int msync(void *addr, size_t len, int flags); } 66 MSTD BSD { int vfork(void); } 67 OBSOL NOHIDE vread 68 OBSOL NOHIDE vwrite ==== //depot/projects/ia64/sys/modules/uart/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/modules/uart/Makefile,v 1.1 2003/09/06 23:23:26 marcel Exp $ +# $FreeBSD: src/sys/modules/uart/Makefile,v 1.2 2003/09/07 05:00:32 imp Exp $ .PATH: ${.CURDIR}/../../dev/uart KMOD= uart SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \ uart_bus_puc.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \ + uart_dev_i8251.c \ uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \ uart_tty.c SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h ==== //depot/projects/ia64/sys/sys/syscall.h#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.139 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.140 2003/09/07 05:42:07 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #define SYS_syscall 0 ==== //depot/projects/ia64/sys/sys/syscall.mk#30 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.94 2003/07/17 22:45:33 davidxu Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.95 2003/09/07 05:42:07 alc Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/ia64/sys/sys/sysproto.h#33 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.135 2003/07/17 22:45:33 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.136 2003/09/07 05:42:07 alc Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp */ #ifndef _SYS_SYSPROTO_H_ ==== //depot/projects/ia64/usr.bin/make/cond.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.26 2003/07/04 13:33:48 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.27 2003/09/07 02:16:10 imp Exp $"); /*- * cond.c -- @@ -803,7 +803,7 @@ if (condExpr[arglen] != '\0') { val = Var_Parse(&condExpr[arglen - 1], VAR_CMD, - doEval, &length, &doFree); + FALSE, &length, &doFree); if (val == var_Error) { t = Err; } else { From owner-p4-projects@FreeBSD.ORG Sat Sep 6 23:37:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFAD316A4C1; Sat, 6 Sep 2003 23:37:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAC4216A4BF for ; Sat, 6 Sep 2003 23:37:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C69043FBF for ; Sat, 6 Sep 2003 23:37:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h876b10U017401 for ; Sat, 6 Sep 2003 23:37:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h876b04b017398 for perforce@freebsd.org; Sat, 6 Sep 2003 23:37:00 -0700 (PDT) Date: Sat, 6 Sep 2003 23:37:00 -0700 (PDT) Message-Id: <200309070637.h876b04b017398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 06:37:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=37715 Change 37715 by marcel@marcel_nfs on 2003/09/06 23:36:27 o Sync $FreeBSD$ (skipped in previous integ), o Add ataraid(4) and puc(4), o Start the comments 1 tabstop earlier. o Add uart(4) hints for console support. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/GENERIC#35 edit .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#35 (text+ko) ==== @@ -18,133 +18,135 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.54 2003/06/08 02:03:01 jmallett Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.55 2003/09/07 05:47:10 marcel Exp $ machine ia64 cpu ITANIUM ident GENERIC -makeoptions DEBUG=-g # Build kernel with debug information. +makeoptions DEBUG=-g # Build kernel with debug information. -options CD9660 # ISO 9660 Filesystem -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options DDB # Enable the kernel debugger -options FFS # Berkeley Fast Filesystem -options INET # InterNETworking -options INET6 # IPv6 communications protocols -options KTRACE # ktrace(1) syscall trace support -options MD_ROOT # MD usable as root device -options MSDOSFS # MSDOS Filesystem -options NFSCLIENT # Network Filesystem Client -options NFSSERVER # Network Filesystem Server -options NFS_ROOT # NFS usable as root device -options PROCFS # Process filesystem (/proc) -options PSEUDOFS # Pseudo-filesystem framework -options SCHED_4BSD # 4BSD scheduler -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI -#options SMP # SMP support -options SOFTUPDATES # Enable FFS soft updates support -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options SYSVSHM # SYSV-style shared memory -options UFS_ACL # Support for access control lists -options UFS_DIRHASH # Hash-based directory lookup scheme +options CD9660 # ISO 9660 Filesystem +options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options DDB # Enable the kernel debugger +options FFS # Berkeley Fast Filesystem +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options KTRACE # ktrace(1) syscall trace support +options MD_ROOT # MD usable as root device +options MSDOSFS # MSDOS Filesystem +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFS_ROOT # NFS usable as root device +options PROCFS # Process filesystem (/proc) +options PSEUDOFS # Pseudo-filesystem framework +options SCHED_4BSD # 4BSD scheduler +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +#options SMP # SMP support +options SOFTUPDATES # Enable FFS soft updates support +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options SYSVSHM # SYSV-style shared memory +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Hash-based directory lookup scheme options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions # Various "busses" -device acpi # ACPI support (mandatory) -device firewire # FireWire bus code -device miibus # MII bus support (ethernet) -device pci # PCI bus support -device scbus # SCSI bus (required for SCSI) -device usb # USB Bus (required for USB) +device acpi # ACPI support (mandatory) +device firewire # FireWire bus code +device miibus # MII bus support (ethernet) +device pci # PCI bus support +device scbus # SCSI bus (required for SCSI) +device usb # USB Bus (required for USB) # ATA and ATAPI devices -device ata # ATA controller -device atadisk # ATA disk drive -device atapicd # ATAPI CDROM drive -device atapifd # ATAPI floppy drive +device ata # ATA controller +device atadisk # ATA disk drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device ataraid # ATA RAID drives # SCSI Controllers -device ahc # AHA2940 and AIC7xxx devices -device ahd # AHA39320/29320 and AIC79xx devices -device isp # Qlogic family -device mpt # LSI-Logic MPT-Fusion -device sym # NCR/Symbios Logic +device ahc # AHA2940 and AIC7xxx devices +device ahd # AHA39320/29320 and AIC79xx devices +device isp # Qlogic family +device mpt # LSI-Logic MPT-Fusion +device sym # NCR/Symbios Logic # RAID controllers interfaced to the SCSI subsystem -device asr # DPT SmartRAID V, VI and Adaptec RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID +device asr # DPT SmartRAID V, VI and Adaptec RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV +device iir # Intel Integrated RAID +device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals -device cd # CD -device ch # Media changer -device da # Direct Access (ie disk) -device pass # Passthrough (direct SCSI access) -device sa # Sequential Access (ie tape) -device ses # Environmental Services (and SAF-TE) +device cd # CD-ROM, DVD-ROM etc. +device ch # Media changer +device da # Direct Access (ie disk) +device pass # Passthrough (direct SCSI access) +device sa # Sequential Access (ie tape) +device ses # Environmental Services (and SAF-TE) # RAID controllers -device amr # AMI MegaRAID -device ida # Compaq Smart RAID -device mlx # Mylex DAC960 family +device amr # AMI MegaRAID +device ida # Compaq Smart RAID +device mlx # Mylex DAC960 family # USB host controllers and peripherals -device ehci # EHCI host controller -device ohci # OHCI PCI->USB interface -device ugen # Generic device -device uhci # UHCI PCI->USB interface -device uhid # Human Interface Devices -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage (need scbus & da) -device ums # Mouse +device ehci # EHCI host controller +device ohci # OHCI PCI->USB interface +device ugen # Generic device +device uhci # UHCI PCI->USB interface +device uhid # Human Interface Devices +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage (need scbus & da) +device ums # Mouse # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse # PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') +device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') +device txp # 3Com 3cR990 (``Typhoon'') +device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. -device bge # Broadcom BCM570xx Gigabit Ethernet +device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') +device pcn # AMD Am79C97x PCI 10/100 NICs +device rl # RealTek 8129/8139 +device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device xl # 3Com 3c90x ("Boomerang", "Cyclone") +device xl # 3Com 3c90x ("Boomerang", "Cyclone") # USB Ethernet -device aue # ADMtek USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB ethernet +device cue # CATC USB ethernet +device kue # Kawasaki LSI USB ethernet # FireWire support -device sbp # SCSI over FireWire (need scbus & da) +device sbp # SCSI over FireWire (need scbus & da) # Various (pseudo) devices -device ether # Ethernet support -device faith # IPv6-to-IPv4 relaying (translation) -device gif # IPv6 and IPv4 tunneling -device loop # Network loopback -device md # Memory "disks" -device pty # Pseudo-ttys (telnet etc) -device random # Entropy device -device sc # System console -device tun # Packet tunnel. -device uart # Serial port (UART) -device vga # VGA video card driver +device ether # Ethernet support +device faith # IPv6-to-IPv4 relaying (translation) +device gif # IPv6 and IPv4 tunneling +device loop # Network loopback +device md # Memory "disks" +device pty # Pseudo-ttys (telnet etc) +device puc # Multi I/O cards and multi-channel UARTs +device random # Entropy device +device sc # System console +device tun # Packet tunnel. +device uart # Serial port (UART) +device vga # VGA video card driver # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -device bpf # Berkeley packet filter +device bpf # Berkeley packet filter ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.3 2002/11/05 08:23:26 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.4 2003/09/07 05:47:10 marcel Exp $ hint.atkbdc.0.at="isa" hint.atkbdc.0.disabled="1" hint.atkbdc.0.port="0x060" @@ -8,3 +8,6 @@ hint.psm.0.at="atkbdc" hint.psm.0.disabled="1" hint.psm.0.irq="12" +hint.uart.0.baud="115200" +hint.uart.0.flags="0x10" +hint.uart.0.port="0x3f8"