Re: ld.so diff
Hi, Posix says that mmap(2)ing 0 bytes is bad and furthermore, our subsystem is not written to support this (because there is no difference between no allocation and a 0-byte allocation). Strictly speaking, mmap(2) is to return EINVAL for 0 byte allocations and I intend to get that into the kernel. But before that can happen, ld.so must cease performing 0-byte mmaps. Hence the diff below. This diff is called mmap0_ld.so.diff.0, has no api/abi change and treats a 0-byte area mmap as a noop (i.e. skips the corresponding mmap call). ok? Wouldn't it be simpler, in library_mquery.c, to skip LDLIST_INSERT() for size == 0 elements? Miod
Re: transferred/transferring typos
On Sat, Jan 07, 2012 at 02:40:24PM +, Jason McIntyre wrote:
On Sat, Jan 07, 2012 at 03:29:40PM +0100, Tobias Ulmer wrote:
After typing 'transferring' wrong one time too many...
I didn't touch gcc, binutils, bind, lynx, kerberos, openssl or perl on
purpose.
ok by me.
jmc
Me too. ok krw@. Typos are very distracting when reading code.
Ken
Index: lib/libsndio/sio_sun.c
===
RCS file: /home/vcs/cvs/openbsd/src/lib/libsndio/sio_sun.c,v
retrieving revision 1.4
diff -u -p -r1.4 sio_sun.c
--- lib/libsndio/sio_sun.c 15 Nov 2011 08:05:22 - 1.4
+++ lib/libsndio/sio_sun.c 7 Jan 2012 14:11:33 -
@@ -48,7 +48,7 @@ struct sio_sun_hdl {
int fd;
int filling;
unsigned ibpf, obpf;/* bytes per frame */
- unsigned ibytes, obytes;/* bytes the hw transfered */
+ unsigned ibytes, obytes;/* bytes the hw transferred */
unsigned ierr, oerr;/* frames the hw dropped */
int offset; /* frames play is ahead of record */
int idelta, odelta; /* position reported to client */
Index: sys/arch/macppc/dev/tpms.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/macppc/dev/tpms.c,v
retrieving revision 1.15
diff -u -p -r1.15 tpms.c
--- sys/arch/macppc/dev/tpms.c 9 Apr 2010 17:01:30 - 1.15
+++ sys/arch/macppc/dev/tpms.c 7 Jan 2012 14:11:45 -
@@ -128,7 +128,7 @@
* Magic numbers.
*/
-/* The amount of data transfered by the USB device. */
+/* The amount of data transferred by the USB device. */
#define TPMS_DATA_LEN 81
/* The maximum number of sensors. */
Index: sys/arch/vax/dec/sii.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/vax/dec/sii.c,v
retrieving revision 1.13
diff -u -p -r1.13 sii.c
--- sys/arch/vax/dec/sii.c 17 Jul 2011 22:46:47 - 1.13
+++ sys/arch/vax/dec/sii.c 7 Jan 2012 14:11:51 -
@@ -645,7 +645,7 @@ again:
printf(%s: Parity error\n, sc-sc_dev.dv_xname);
goto abort;
}
- /* dmalen = amount left to transfer, i = amount transfered */
+ /* dmalen = amount left to transfer, i = amount transferred */
i = state-dmalen;
state-dmalen = 0;
state-dmaCurPhase = -1;
@@ -899,7 +899,7 @@ again:
#endif
}
- /* read amount transfered if DMA didn't finish */
+ /* read amount transferred if DMA didn't finish */
if (state-dmalen 0) {
i = state-dmalen - regs-dmlotc;
state-dmalen = 0;
Index: sys/dev/ata/wdvar.h
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ata/wdvar.h,v
retrieving revision 1.18
diff -u -p -r1.18 wdvar.h
--- sys/dev/ata/wdvar.h 22 Sep 2011 22:12:45 - 1.18
+++ sys/dev/ata/wdvar.h 7 Jan 2012 14:11:57 -
@@ -44,8 +44,8 @@ struct ata_bio {
struct disklabel *lp; /* pointer to drive's label info */
daddr64_t blkno; /* block addr */
daddr64_t blkdone; /* number of blks transferred */
-daddr64_t nblks; /* number of block currently transfering */
-int nbytes; /* number of bytes currently transfering */
+daddr64_t nblks; /* number of block currently transferring */
+int nbytes; /* number of bytes currently transferring */
longbcount; /* total number of bytes */
char *databuf; /* data buffer address */
volatile int error;
Index: sys/dev/ic/aic79xx.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.c,v
retrieving revision 1.48
diff -u -p -r1.48 aic79xx.c
--- sys/dev/ic/aic79xx.c19 Apr 2011 21:59:51 - 1.48
+++ sys/dev/ic/aic79xx.c7 Jan 2012 14:11:57 -
@@ -1225,7 +1225,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
* that requires host assistance for completion.
* While handling the message phase(s), we will be
* notified by the sequencer after each byte is
-* transfered so we can track bus phase changes.
+* transferred so we can track bus phase changes.
*
* If this is the first time we've seen a HOST_MSG_LOOP
* interrupt, initialize the state of the host message
Index: sys/dev/ic/aic79xx.h
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.h,v
retrieving revision 1.21
diff -u -p -r1.21 aic79xx.h
--- sys/dev/ic/aic79xx.h21 Dec 2006
New puc(4) device: quad rs232 found on ebay.
I bought this cheap chinese device from ebay, after tweaking a bit
with puc and some help from sthen@, it works fine, tested devices
tty02 and tty03.
The thing is I've no idea which vendor it is, noir which device it is,
the only thing written on the card is Sun 1040. The vendor-id and
device-id are not listed in any pci database.
Unfortunately I binned the driver cd which could contain some
information. Freebsd folks have something similar:
http://groups.google.com/group/mailing.freebsd.bugs/browse_thread/thread/41bedcffd4cbe4ef/b713700568c46002?show_docid=b713700568c46002
Should we leave the bare hexa numbers ? I'd like to get this in.
Index: pci/pucdata.c
===
RCS file: /cvs/src/sys/dev/pci/pucdata.c,v
retrieving revision 1.79
diff -d -u -p -w -r1.79 pucdata.c
--- pci/pucdata.c 2 Jan 2012 11:07:02 - 1.79
+++ pci/pucdata.c 7 Jan 2012 21:41:18 -
@@ -1892,6 +1892,16 @@ const struct puc_device_description puc_
{ PUC_COM_POW2(0), 0x10, 0x },
{ PUC_COM_POW2(0), 0x14, 0x },
},
+ },
+ { /* Sun 1040 board */
+ { 0x5372, 0x6873, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x },
+ { PUC_COM_POW2(0), 0x14, 0x },
+ { PUC_COM_POW2(0), 0x18, 0x },
+ { PUC_COM_POW2(0), 0x1c, 0x },
+ },
}
};
int puc_ndevs = nitems(puc_devs);
console is /pci@1f,0/pci@1,1/ebus@1/se@14,40:a
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2012 OpenBSD. All rights reserved. http://www.OpenBSD.org
OpenBSD 5.0-current (GENERIC) #7: Sat Jan 7 18:34:17 BRST 2012
root@gandalf.midearth:/usr/src/sys/arch/sparc64/compile/GENERIC
real mem = 268435456 (256MB)
avail mem = 251625472 (239MB)
mainbus0 at root: Sun Ultra 5/10 UPA/PCI (UltraSPARC-IIi 400MHz)
cpu0 at mainbus0: SUNW,UltraSPARC-IIi (rev 9.1) @ 400 MHz
cpu0: physical 16K instruction (32 b/l), 16K data (32 b/l), 2048K external (64
b/l)
psycho0 at mainbus0 addr 0xfffc4000: SUNW,sabre, impl 0, version 0, ign 7c0
psycho0: bus range 0-3, PCI bus 0
psycho0: dvma map c000-dfff
pci0 at psycho0
ppb0 at pci0 dev 1 function 1 Sun Simba PCI-PCI rev 0x13
pci1 at ppb0 bus 1
ebus0 at pci1 dev 1 function 0 Sun PCIO EBus2 rev 0x01
auxio0 at ebus0 addr 726000-726003, 728000-728003, 72a000-72a003,
72c000-72c003, 72f000-72f003
power0 at ebus0 addr 724000-724003 ivec 0x25
SUNW,pll at ebus0 addr 504000-504002 not configured
sab0 at ebus0 addr 40-40007f ivec 0x2b: rev 3.2
sabtty0 at sab0 port 0: console
sabtty1 at sab0 port 1
comkbd0 at ebus0 addr 3083f8-3083ff ivec 0x29: no keyboard
comms0 at ebus0 addr 3062f8-3062ff ivec 0x2a
wsmouse0 at comms0 mux 0
lpt0 at ebus0 addr 3043bc-3043cb, 30015c-30015d, 70-7f ivec 0x22: polled
fdthree at ebus0 addr 3023f0-3023f7, 706000-70600f, 72-720003 ivec 0x27
not configured
clock1 at ebus0 addr 0-1fff: mk48t59
flashprom at ebus0 addr 0-f not configured
audioce0 at ebus0 addr 20-2000ff, 702000-70200f, 704000-70400f,
722000-722003 ivec 0x23 ivec 0x24: nvaddrs 0
audio0 at audioce0
hme0 at pci1 dev 1 function 1 Sun HME rev 0x01: ivec 0x7e1, address
00:03:ba:08:72:5a
nsphy0 at hme0 phy 1: DP83840 10/100 PHY, rev. 1
machfb0 at pci1 dev 2 function 0 ATI Mach64 rev 0x5c
machfb0: ATY,GT-C, 1152x900
wsdisplay0 at machfb0 mux 1
wsdisplay0: screen 0 added (std, sun emulation)
pciide0 at pci1 dev 3 function 0 CMD Technology PCI0646 rev 0x03: DMA,
channel 0 configured to native-PCI, channel 1 configured to native-PCI
pciide0: using ivec 0x7e0 for native-PCI interrupt
wd0 at pciide0 channel 0 drive 0: QUANTUM FIREBALLlct20 40
wd0: 8-sector PIO, LBA, 38172MB, 78177792 sectors
wd0(pciide0:0:0): using PIO mode 4, DMA mode 2
atapiscsi0 at pciide0 channel 1 drive 0
scsibus0 at atapiscsi0: 2 targets
cd0 at scsibus0 targ 0 lun 0: LG, CD-ROM CRD-8483B, 1.02 ATAPI 5/cdrom
removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
ppb1 at pci0 dev 1 function 0 Sun Simba PCI-PCI rev 0x13
pci2 at ppb1 bus 2
pciide1 at pci2 dev 1 function 0 CMD Technology SiI3114 SATA rev 0x02: DMA
pciide1: using ivec 0x7d0 for native-PCI interrupt
pciide1: port 2: device present, speed: 1.5Gb/s
wd1 at pciide1 channel 2 drive 0: SAMSUNG HD154UI
wd1: 16-sector PIO, LBA48, 1430799MB, 2930277168 sectors
wd1(pciide1:2:0): using BIOS timings, Ultra-DMA mode 2
puc0 at pci2 dev 2 function 0 unknown vendor 0x5372 product 0x6873 rev 0x01:
ports: 4 com
com0 at puc0 port 0 ivec 0x7d4: st16650, 32 byte fifo
com0: probed fifo depth: 0 bytes
com1 at puc0 port 1 ivec 0x7d4: ns16550a, 16 byte fifo
com2 at puc0 port 2 ivec 0x7d4: ns16550a, 16 byte fifo
com2: probed fifo depth: 0 bytes
com3 at puc0 port 3 ivec 0x7d4: ns16550a, 16 byte fifo
com3: probed fifo depth: 0 bytes
ppb2 at pci2 dev 3 function
Re: New puc(4) device: quad rs232 found on ebay.
Forgot the pcidump: 2:2:0: unknown unknown 0x: Vendor ID: 5372 Product ID: 6873 0x0004: Command: 0041 Status ID: 0400 0x0008: Class: 07 Subclass: 80 Interface: 00 Revision: 01 0x000c: BIST: 00 Header Type: 00 Latency Timer: 00 Cache Line Size: 08 0x0010: BAR io addr: 0x1030/0x0008 0x0014: BAR io addr: 0x1038/0x0008 0x0018: BAR io addr: 0x1040/0x0008 0x001c: BAR io addr: 0x1048/0x0008 0x0020: BAR io addr: 0x1050/0x0008 0x0024: BAR io addr: 0x1060/0x0010 0x0028: Cardbus CIS: 0x002c: Subsystem Vendor ID: 1000 Product ID: 0004 0x0030: Expansion ROM Base Address: 0x0038: 0x003c: Interrupt Pin: 01 Line: ff Min Gnt: 00 Max Lat: 00 0x: 68735372 0441 0781 0008 0x0010: 1031 1039 1041 1049 0x0020: 1051 1061 00041000 0x0030: 01ff 0x0040: 0x0050: 0x0060: 0x0070: 0x0080: 0x0090: 0x00a0: 0x00b0: 0x00c0: 0x00d0: 0x00e0: 0x00f0:
Re: ld.so diff
On Sun, Jan 08, 2012 at 01:05:27PM +, Miod Vallat wrote:
Posix says that mmap(2)ing 0 bytes is bad and furthermore, our subsystem
is not written to support this (because there is no difference between
no allocation and a 0-byte allocation).
Strictly speaking, mmap(2) is to return EINVAL for 0 byte allocations
and I intend to get that into the kernel. But before that can happen,
ld.so must cease performing 0-byte mmaps. Hence the diff below.
This diff is called mmap0_ld.so.diff.0, has no api/abi change and treats
a 0-byte area mmap as a noop (i.e. skips the corresponding mmap call).
ok?
Wouldn't it be simpler, in library_mquery.c, to skip LDLIST_INSERT() for
size == 0 elements?
You're absolutely right. Updated diff (mmap0_ld.so.diff.1) below.
ok?
--
Ariane
Index: libexec/ld.so/library.c
===
RCS file: /cvs/src/libexec/ld.so/library.c,v
retrieving revision 1.63
diff -u -d -p -r1.63 library.c
--- libexec/ld.so/library.c 28 Nov 2011 20:59:03 - 1.63
+++ libexec/ld.so/library.c 8 Jan 2012 05:36:13 -
@@ -181,17 +181,20 @@ _dl_tryload_shlib(const char *libname, i
Elf_Addr size = off + phdp-p_filesz;
void *res;
- res = _dl_mmap(start, ROUND_PG(size),
- PFLAGS(phdp-p_flags),
- MAP_FIXED|MAP_PRIVATE, libfile,
- TRUNC_PG(phdp-p_offset));
+ if (size != 0) {
+ res = _dl_mmap(start, ROUND_PG(size),
+ PFLAGS(phdp-p_flags),
+ MAP_FIXED|MAP_PRIVATE, libfile,
+ TRUNC_PG(phdp-p_offset));
+ } else
+ res = NULL; /* silence gcc */
next_load = _dl_malloc(sizeof(struct load_list));
next_load-next = load_list;
load_list = next_load;
next_load-start = start;
next_load-size = size;
next_load-prot = PFLAGS(phdp-p_flags);
- if (_dl_mmap_error(res)) {
+ if (size != 0 _dl_mmap_error(res)) {
_dl_printf(%s: rtld mmap failed mapping %s.\n,
_dl_progname, libname);
_dl_close(libfile);
Index: libexec/ld.so/library_mquery.c
===
RCS file: /cvs/src/libexec/ld.so/library_mquery.c,v
retrieving revision 1.39
diff -u -d -p -r1.39 library_mquery.c
--- libexec/ld.so/library_mquery.c 28 Nov 2011 20:59:03 - 1.39
+++ libexec/ld.so/library_mquery.c 8 Jan 2012 16:49:52 -
@@ -157,15 +157,17 @@ _dl_tryload_shlib(const char *libname, i
off = (phdp-p_vaddr align);
size = off + phdp-p_filesz;
- ld = _dl_malloc(sizeof(struct load_list));
- ld-start = NULL;
- ld-size = size;
- ld-moff = TRUNC_PG(phdp-p_vaddr);
- ld-foff = TRUNC_PG(phdp-p_offset);
- ld-prot = PFLAGS(phdp-p_flags);
- LDLIST_INSERT(ld);
+ if (size != 0) {
+ ld = _dl_malloc(sizeof(struct load_list));
+ ld-start = NULL;
+ ld-size = size;
+ ld-moff = TRUNC_PG(phdp-p_vaddr);
+ ld-foff = TRUNC_PG(phdp-p_offset);
+ ld-prot = PFLAGS(phdp-p_flags);
+ LDLIST_INSERT(ld);
+ }
- if ((ld-prot PROT_WRITE) == 0 ||
+ if ((PFLAGS(phdp-p_flags) PROT_WRITE) == 0 ||
ROUND_PG(size) == ROUND_PG(off + phdp-p_memsz))
break;
/* This phdr has a zfod section */
Video money / Video és pénz
Klikk a kC)pre! Click on the picture! [IMAGE]
Improve Lucida font family look
Ever wondered why xkcd.com looks so bad on OpenBSD? This diff adds Dejavu replacements for the generic Lucida family as well as replacements for all Lucida-type fonts shipped with OSX and Windows. Test: http://www.tmux.org/~tobiasu/tmp/fonttest.html Index: 31-nonmst.conf === RCS file: /home/vcs/cvs/openbsd/xenocara/lib/fontconfig/conf.d/31-nonmst.conf,v retrieving revision 1.3 diff -u -p -r1.3 31-nonmst.conf --- 31-nonmst.conf 21 Jan 2010 19:57:57 - 1.3 +++ 31-nonmst.conf 8 Jan 2012 20:05:03 - @@ -61,4 +61,49 @@ /edit /match + match target=pattern + test qual=any name=family + stringLucida/string + /test + edit name=family mode=assign + stringDejaVu Sans/string + /edit + /match + + match target=pattern + test qual=any name=family + stringLucida Grande/string + /test + edit name=family mode=assign + stringDejaVu Sans/string + /edit + /match + + match target=pattern + test qual=any name=family + stringLucida Sans Unicode/string + /test + edit name=family mode=assign + stringDejaVu Sans/string + /edit + /match + + match target=pattern + test qual=any name=family + stringLucida Sans Typewriter/string + /test + edit name=family mode=assign + stringDejaVu Sans Mono/string + /edit + /match + + match target=pattern + test qual=any name=family + stringLucida Console/string + /test + edit name=family mode=assign + stringDejaVu Sans Mono/string + /edit + /match + /fontconfig
Reparamos Monitores LCD, Local a la calle en Caballito
[IMAGE] LABORATORIO REPARACION MONITORES LCD Todas las marcas y modelos: SAMSUNG, LG, BENQ, VIEWSONIC, HP, ACER, IBM, DELL Presupuestos sin cargo, Consulte por Retiros sin cargo Local a la calle, Zona Almagro-Caballito 4982.9696 BME. MITRE 4042 C.A.B.A. SOLARCOM srl solar...@solarcomsrl.com.ar [demime 1.01d removed an attachment of type image/jpeg which had a name of encabezado.jpg]
