# HG changeset patch
# User David du Colombier <0intro@gmail.com>
# Date 1331073081 -3600
# Node ID 973230ca515fa1ee3efcf0cde09303b9dfb59226
# Parent  60634355f6d8d5929f72b083fccb3c67132ccff0
rc, include, ape, boot, libc: sync with plan 9

R=nixiedev, quanstro
CC=nix-dev
http://codereview.appspot.com/5762044

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r 60634355f6d8 -r 973230ca515f rc/bin/dontkill
--- a/rc/bin/dontkill	Tue Mar 06 20:04:28 2012 +0100
+++ b/rc/bin/dontkill	Tue Mar 06 23:31:21 2012 +0100
@@ -5,6 +5,7 @@
 	echo $0 regexp >[1=2]
 	exit usage
 }
+cd /proc
 # see /sys/src/9/port/proc.c:/^killbig
 pids=`{psu | awk '$NF ~ /'$1'/ {print $2}'}
-~ $#pids 0 || chmod -w /proc/^$pids^/ctl
+~ $#pids 0 || chmod -w $pids^/ctl >[2]/dev/null
diff -r 60634355f6d8 -r 973230ca515f rc/bin/mkusbboot
--- a/rc/bin/mkusbboot	Tue Mar 06 20:04:28 2012 +0100
+++ b/rc/bin/mkusbboot	Tue Mar 06 23:31:21 2012 +0100
@@ -15,7 +15,7 @@
 size=1900
 
 fn usage {
-	echo usage: $argv0 '[-p proto] [-r root] [-s 10⁶-bytes]' >[1=2]
+	echo usage: $argv0 '[-b boot] [-p proto] [-r root] [-s 10⁶-bytes]' >[1=2]
 	exit usage
 }
 
@@ -27,8 +27,10 @@
 # process arguments
 done=0
 argv0=$0
+boot=/386/9loadusb
 while (~ $done 0 && ! ~ $#* 0 && ~ $1 -*) {
 	switch ($1) {
+	case -b;	boot=$2; shift
 	case -p;	proto=$2; shift
 	case -r;	srcroot=$2; shift
 	case -s;	size=$2; shift
@@ -57,13 +59,12 @@
 
 # prep it: lay down mbr, fdisk partitions, 9 partitions
 echo -n mbr+fdisk+prep... >[1=2]
-disk/mbr -m /$objtype/mbr data
+disk/mbr -m /386/mbr data
 disk/fdisk -baw data
 disk/prep -bw -a^(9fat nvram fscfg fossil) plan9 >/dev/null
 
 # populate 9fat, nvram, fsconfig
 echo -n 9fat... >[1=2]
-cp /$objtype/9loadusb /tmp/9load	# force format to use the name `9load'
 switch ($objtype) {
 case 386
 	k=/$objtype/9pccpuf.gz
@@ -73,12 +74,13 @@
 	echo $0: 'can''t cope with architecture' $objtype >[1=2]
 	exit unknown-arch
 }
-disk/format -b /$objtype/pbslba -d -r 2 9fat /tmp/9load $k \
+cp $boot /tmp/9load		# force format to record the name `9load'
+disk/format -b /386/pbslba -d -r 2 9fat /tmp/9load $k \
 	$syscfg/usb/plan9.ini >[2=1] |
 	grep -v '^(add .* at clust |Init|type |Adding file|used )'
+rm -f /tmp/9load
 cp /dev/zero nvram >[2]/dev/null
 cp /dev/zero fscfg >[2]/dev/null
-rm -f /tmp/9load
 
 # fill the fossil
 9fs $srcfs
diff -r 60634355f6d8 -r 973230ca515f rc/bin/slay
--- a/rc/bin/slay	Tue Mar 06 20:04:28 2012 +0100
+++ b/rc/bin/slay	Tue Mar 06 23:31:21 2012 +0100
@@ -1,4 +1,5 @@
 #!/bin/rc
+rfork e
 U=`{cat /dev/user}
 for(i){
 	ps | sed -n '/^'$U' .* '$i'$/s%[^ ]*  *%~>/proc/%
diff -r 60634355f6d8 -r 973230ca515f rc/bin/tinyurl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rc/bin/tinyurl	Tue Mar 06 23:31:21 2012 +0100
@@ -0,0 +1,6 @@
+#!/bin/rc
+# tinyurl url
+for (url) {
+	hget http://tinyurl.com/api-create.php?url'='$url
+	echo
+}
diff -r 60634355f6d8 -r 973230ca515f sys/games/lib/fortunes
--- a/sys/games/lib/fortunes	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/games/lib/fortunes	Tue Mar 06 23:31:21 2012 +0100
@@ -4283,3 +4283,8 @@
 Spa Rood, met toegevoegd koolzuur -> Shovel red, with added cabbage heartburn. - Yahoo! Babel Fish
 Everything happens automatically and there is nothing new to learn. - Steve Jobs
 wrong malign list
+Sorry you try to use the function during a critical time. Out of technical reasons between 3:30 and 5:00 WET and 15:30 and 17:00 WET activations may be lost.
+Major funding for The Fabric of the Cosmos is provided by the National Science Foundation and the Alfred P. Sloan Foundation.
+Bonjour &FIRSTNAME;
+We are experiencing some technical difficulty.  Please contact our support team and provide them the reference number below. Error Reference: $referenceNumber
+User Modification Interface: UIM is currently down for maintenance.
diff -r 60634355f6d8 -r 973230ca515f sys/include/auth.h
--- a/sys/include/auth.h	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/include/auth.h	Tue Mar 06 23:31:21 2012 +0100
@@ -35,7 +35,7 @@
 struct AuthRpc
 {
 	int afd;
-	char ibuf[AuthRpcMax];
+	char ibuf[AuthRpcMax+1];	/* +1 for NUL in auth_rpc.c */
 	char obuf[AuthRpcMax];
 	char *arg;
 	uint narg;
diff -r 60634355f6d8 -r 973230ca515f sys/include/disk.h
--- a/sys/include/disk.h	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/include/disk.h	Tue Mar 06 23:31:21 2012 +0100
@@ -59,6 +59,69 @@
 	Gdisk,
 	Gguess,
 };
+enum {					/* SCSI command codes */
+	ScmdTur		= 0x00,		/* test unit ready */
+	ScmdRewind	= 0x01,		/* rezero/rewind */
+	ScmdRsense	= 0x03,		/* request sense */
+	ScmdFormat	= 0x04,		/* format unit */
+	ScmdRblimits	= 0x05,		/* read block limits */
+	ScmdRead	= 0x08,		/* read */
+	ScmdWrite	= 0x0A,		/* write */
+	ScmdSeek	= 0x0B,		/* seek */
+	ScmdFmark	= 0x10,		/* write filemarks */
+	ScmdSpace	= 0x11,		/* space forward/backward */
+	ScmdInq		= 0x12,		/* inquiry */
+	ScmdMselect6	= 0x15,		/* mode select */
+	ScmdMselect10	= 0x55,		/* mode select */
+	ScmdMsense6	= 0x1A,		/* mode sense */
+	ScmdMsense10	= 0x5A,		/* mode sense */
+	ScmdStart	= 0x1B,		/* start/stop unit */
+	ScmdRcapacity	= 0x25,		/* read capacity */
+	ScmdRcapacity16	= 0x9e,		/* long read capacity */
+	ScmdExtread	= 0x28,		/* extended read (10 bytes) */
+	ScmdRead16	= 0x88,		/* long read (16 bytes) */
+	ScmdWrite16	= 0x8A,		/* long write (16 bytes) */
+	ScmdExtwrite	= 0x2A,		/* extended write (10 bytes) */
+	ScmdExtseek	= 0x2B,		/* extended seek */
+
+	ScmdSynccache	= 0x35,		/* flush cache */
+	ScmdRTOC	= 0x43,		/* read TOC data */
+	ScmdRdiscinfo	= 0x51,		/* read disc information */
+	ScmdRtrackinfo	= 0x52,		/* read track information */
+	ScmdReserve	= 0x53,		/* reserve track */
+	ScmdBlank	= 0xA1,		/* blank *-RW media */
+
+	ScmdCDpause	= 0x4B,		/* pause/resume */
+	ScmdCDstop	= 0x4E,		/* stop play/scan */
+	ScmdCDplay	= 0xA5,		/* play audio */
+	ScmdCDload	= 0xA6,		/* load/unload */
+	ScmdCDscan	= 0xBA,		/* fast forward/reverse */
+	ScmdCDstatus	= 0xBD,		/* mechanism status */
+	Scmdgetconf	= 0x46,		/* get configuration */
+
+	ScmdEInitialise	= 0x07,		/* initialise element status */
+	ScmdMMove	= 0xA5,		/* move medium */
+	ScmdEStatus	= 0xB8,		/* read element status */
+	ScmdMExchange	= 0xA6,		/* exchange medium */
+	ScmdEposition	= 0x2B,		/* position to element */
+
+	ScmdReadDVD	= 0xAD,		/* read dvd structure */
+	ScmdReportKey	= 0xA4,		/* read dvd key */
+	ScmdSendKey	= 0xA3,		/* write dvd key */
+
+	ScmdClosetracksess= 0x5B,
+	ScmdRead12	= 0xA8,
+	ScmdSetcdspeed	= 0xBB,
+	ScmdReadcd	= 0xBE,
+
+	/* vendor-specific */
+	ScmdFwaddr	= 0xE2,		/* first writeable address */
+	ScmdTreserve	= 0xE4,		/* reserve track */
+	ScmdTinfo	= 0xE5,		/* read track info */
+	ScmdTwrite	= 0xE6,		/* write track */
+	ScmdMload	= 0xE7,		/* medium load/unload */
+	ScmdFixation	= 0xE9,		/* fixation */
+};
 
 /* proto file parsing */
 typedef void Protoenum(char *new, char *old, Dir *d, void *a);
diff -r 60634355f6d8 -r 973230ca515f sys/lib/lp/process/generic
--- a/sys/lib/lp/process/generic	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/lib/lp/process/generic	Tue Mar 06 23:31:21 2012 +0100
@@ -193,7 +193,7 @@
 	echo file is empty >[1=2]
 case cannot
 	echo cannot open file >[1=2]
-case English short extended alef limbo [Aa]scii assembler c latin rc sh \
+case English Cyrillic short extended alef limbo [Aa]scii assembler c latin rc sh \
     as mail email message/rfc822 manual HTML
 	switch ($LPCLASS) {
 	case *post*
diff -r 60634355f6d8 -r 973230ca515f sys/lib/mimetype
--- a/sys/lib/mimetype	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/lib/mimetype	Tue Mar 06 23:31:21 2012 +0100
@@ -21,7 +21,7 @@
 .bcpio		application	x-bcpio		-		m
 .bib		text		plain		-		y # BibTex input
 .bmp		image		bmp		-		y # bitmapped image
-.bz2		-		-		bzip2		m # bzipped file
+.bz2		application	x-bzip2		bzip2		m # bzipped file
 .c		text		plain		-		y # C program
 .c++		text		plain		-		y # C++ program
 .cacert		application	x-x509-ca-cert	-		y # DER X.509 CA certificate
@@ -53,7 +53,7 @@
 .gcd		text		x-pcs-gcd	-		y	# helper file for .qcp
 .gif		image		gif		-		y
 .gtar		application	x-gtar		-		m
-.gz		-		-		gzip		m # gzipped file
+.gz		application	x-gzip		gzip		m # gzipped file
 .h		text		plain		-		y # C header file
 .hdf		application	x-hdf		-		y
 .hdml		text		x-hdml		-		y
@@ -146,7 +146,7 @@
 .txt		text		plain		-		y
 .ucert		application	x-x509-user-cert	-	y # DER X.509 user certificate
 .ustar		application	x-ustar		-		m
-.vcf		text		directory	-		y # vCard
+.vcf		text		x-vcard		-		y # vCard
 .wav		audio		x-wav		-		y
 .wbmp		image		vnd.wap.wbmp	-		y # wireless bitmap
 .wml		text		vnd.wap.wml	-		m # WML doc
diff -r 60634355f6d8 -r 973230ca515f sys/lib/sysconfig/usb/plan9.ini
--- a/sys/lib/sysconfig/usb/plan9.ini	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/lib/sysconfig/usb/plan9.ini	Tue Mar 06 23:31:21 2012 +0100
@@ -1,7 +1,10 @@
 console=cga
 
+# new 9load can figure out bootfile
 bootfile=sdB0!9fat!9pcf
 nobootprompt=local!/dev/sdXX/fossil
+
+readparts=
 nvram=/dev/sdXX/nvram
 
 debugboot=1
diff -r 60634355f6d8 -r 973230ca515f sys/src/ape/cmd/pdksh/trap.c
--- a/sys/src/ape/cmd/pdksh/trap.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/ape/cmd/pdksh/trap.c	Tue Mar 06 23:31:21 2012 +0100
@@ -115,6 +115,8 @@
 			return &sigtraps[n];
 		return NULL;
 	}
+	if (strncasecmp(name, "sig", 3) == 0)
+		name += 3;
 	for (p = sigtraps, i = SIGNALS+1; --i >= 0; p++)
 		if (p->name && (igncase ? strcasecmp(p->name, name) == 0
 					: strcmp(p->name, name) == 0))
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/bootp.c
--- a/sys/src/boot/pc/bootp.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/bootp.c	Tue Mar 06 23:31:21 2012 +0100
@@ -407,7 +407,7 @@
 		udpsend(ctlrno, a, buf, sizeof(buf));
 
 		len = udprecv(ctlrno, a, tftp, dlen);
-		if(len <= sizeof(tftp->header)){
+		if(len < sizeof(tftp->header)){
 			if(debug)
 				print("tftpread: too short %d <= %d\n",
 					len, sizeof(tftp->header));
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/ether82563.c
--- a/sys/src/boot/pc/ether82563.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/ether82563.c	Tue Mar 06 23:31:21 2012 +0100
@@ -1081,11 +1081,9 @@
 			print("%s: unexpected CLS - %d bytes\n",
 				tname[type], cls*sizeof(long));
 			break;
-		case 0x00:
+		case 0x00:			/* alphapc 164lx returns 0 */
 		case 0xFF:
-			/* alphapc 164lx returns 0 */
-			print("%s: unusable PciCLS: %d, using %d longs\n",
-				tname[type], cls, CACHELINESZ/sizeof(long));
+			/* bogus value; use a sane default */
 			cls = CACHELINESZ/sizeof(long);
 			pcicfgw8(p, PciCLS, cls);
 			break;
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/etherigbe.c
--- a/sys/src/boot/pc/etherigbe.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/etherigbe.c	Tue Mar 06 23:31:21 2012 +0100
@@ -1678,11 +1678,9 @@
 				print("igbe: unexpected CLS - %d bytes\n",
 					cls*sizeof(long));
 				break;
-			case 0x00:
+			case 0x00:		/* alphapc 164lx returns 0 */
 			case 0xFF:
-				/* alphapc 164lx returns 0 */
-				print("igbe: unusable PciCLS: %d, using %d longs\n",
-					cls, CACHELINESZ/sizeof(long));
+				/* bogus value; use a sane default */
 				cls = CACHELINESZ/sizeof(long);
 				pcicfgw8(p, PciCLS, cls);
 				break;
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/mem.h
--- a/sys/src/boot/pc/mem.h	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/mem.h	Tue Mar 06 23:31:21 2012 +0100
@@ -12,6 +12,7 @@
 #define	WD2PG		(BY2PG/BY2WD)		/* words per page */
 #define	PGSHIFT		12			/* log(BY2PG) */
 #define	PGROUND(s)	(((s)+(BY2PG-1))&~(BY2PG-1))
+#define CACHELINESZ	32			/* pentium & later */
 
 #define	MAXMACH		1			/* max # cpus system can run */
 
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/sdata.c
--- a/sys/src/boot/pc/sdata.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/sdata.c	Tue Mar 06 23:31:21 2012 +0100
@@ -1515,6 +1515,7 @@
 		case (0x4376<<16)|0x1002:	/* ATI SB400 PATA */
 		case (0x4379<<16)|0x1002:	/* ATI SB400 SATA */
 		case (0x437a<<16)|0x1002:	/* ATI SB400 SATA */
+		case (0x438c<<16)|0x1002:	/* ATI SB600 PATA */
 			/*
 			 * This can probably be lumped in with the 768 above.
 			 */
@@ -1551,6 +1552,7 @@
 		case (0x248B<<16)|0x8086:	/* 82801CA (ICH3, High-End) */
 		case (0x24CA<<16)|0x8086:	/* 82801DBM (ICH4, Mobile) */
 		case (0x24CB<<16)|0x8086:	/* 82801DB (ICH4, High-End) */
+		case (0x24D1<<16)|0x8086:	/* 82801EB/ER (ICH5 High-End) */
 		case (0x24DB<<16)|0x8086:	/* 82801EB (ICH5) */
 		case (0x25A3<<16)|0x8086:	/* 6300ESB (E7210) */
 		case (0x2653<<16)|0x8086:	/* 82801FBM (ICH6M) */
diff -r 60634355f6d8 -r 973230ca515f sys/src/boot/pc/sdiahci.c
--- a/sys/src/boot/pc/sdiahci.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/boot/pc/sdiahci.c	Tue Mar 06 23:31:21 2012 +0100
@@ -646,10 +646,11 @@
 	if((u & Hsam) == 0)
 		h->ghc |= Hae;
 
-	print("ahci%d port %#p: hba sss %ld; ncs %ld; coal %ld; mports %ld; "
-		"led %ld; clo %ld; ems %ld;\n", count++, h,
-		(u>>27) & 1, (u>>8) & 0x1f, (u>>7) & 1,	u & 0x1f, (u>>25) & 1,
-		(u>>24) & 1, (u>>6) & 1);
+	print("ahci%d port %#p: hba sss %ld; ncs %ld; coal %ld; %ld ports; "
+		"led %ld; clo %ld; ems %ld\n", count++, h,
+		(u>>27) & 1, (u>>8) & 0x1f, (u>>7) & 1,
+		(u & 0x1f) + 1,
+		(u>>25) & 1, (u>>24) & 1, (u>>6) & 1);
 	return countbits(h->pi);
 }
 
@@ -1103,7 +1104,7 @@
 	c = a;
 	ilock(c);
 	cause = c->hba->isr;
-	for(i = 0; i < c->mport; i++){
+	for(i = 0; i <= c->mport; i++){
 		m = 1 << i;
 		if((cause & m) == 0)
 			continue;
diff -r 60634355f6d8 -r 973230ca515f sys/src/libc/arm/atom.s
--- a/sys/src/libc/arm/atom.s	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libc/arm/atom.s	Tue Mar 06 23:31:21 2012 +0100
@@ -1,4 +1,3 @@
-
 /*
  * int cas(ulong *p, ulong ov, ulong nv);
  */
@@ -8,7 +7,6 @@
 
 TEXT	cas+0(SB),0,$12		/* r0 holds p */
 TEXT	casp+0(SB),0,$12	/* r0 holds p */
-TEXT	casl+0(SB),0,$12	/* r0 holds p */
 	MOVW	ov+4(FP), R1
 	MOVW	nv+8(FP), R2
 spincas:
@@ -24,6 +22,7 @@
 	MOVW	$0, R0
 	RET
 
+TEXT _xinc(SB), $0	/* void	_xinc(long *); */
 TEXT ainc(SB), $0	/* long ainc(long *); */
 spinainc:
 	LDREX(0,3)	/*	LDREX	0(R0),R3	*/
@@ -34,7 +33,8 @@
 	MOVW	R3, R0
 	RET
 
-TEXT adec(SB), $0	/* long ainc(long *); */
+TEXT _xdec(SB), $0	/* long _xdec(long *); */
+TEXT adec(SB), $0	/* long adec(long *); */
 spinadec:
 	LDREX(0,3)	/*	LDREX	0(R0),R3	*/
 	SUB	$1,R3
@@ -50,6 +50,6 @@
 
 TEXT storecond(SB), $0	/* int storecond(long *, long); */
 	MOVW	ov+4(FP), R3
-	STREX(0,3,4)	/*	STREX	0(R0),R3,R0	*/
+	STREX(0,3,0)	/*	STREX	0(R0),R3,R0	*/
 	RSB	$1, R0
 	RET
diff -r 60634355f6d8 -r 973230ca515f sys/src/libc/arm/cas.s
--- a/sys/src/libc/arm/cas.s	Tue Mar 06 20:04:28 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-
-/*
- * int swp(int r, int *p);
- * uchar swpb(uchar r, uchar *p);
- *
- * int cas(uintptr *p, uintptr ov, uintptr nv);
- */
-
-#define	LDREX(a,r)	WORD	$(0xe<<28|0x01900f9f | (a)<<16 | (r)<<12)
-#define	STREX(a,v,r)	WORD	$(0xe<<28|0x01800f90 | (a)<<16 | (r)<<12 | (v)<<0)
-
-TEXT	cas+0(SB),0,$12		/* r0 holds p */
-	MOVW	ov+4(FP), R1
-	MOVW	nv+8(FP), R2
-spin:
-/*	LDREX	0(R0),R3	*/
-	LDREX(0,3)
-	CMP.S	R3, R1
-	BNE	fail
-/*	STREX	0(R0),R2,R4	*/
-	STREX(0,2,4)
-	CMP.S	$0, R4
-	BNE	spin
-	MOVW	$1, R0
-	RET
-fail:
-	MOVW	$0, R0
-	RET
diff -r 60634355f6d8 -r 973230ca515f sys/src/libc/fmt/dofmt.c
--- a/sys/src/libc/fmt/dofmt.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libc/fmt/dofmt.c	Tue Mar 06 23:31:21 2012 +0100
@@ -305,11 +305,16 @@
 	return _fmtrcpy(f, x, 1);
 }
 
+enum {
+	/* %,#llb could emit a sign, "0b" and 64 digits with 21 commas */
+	Maxintwidth = 1 + 2 + 64 + 64/3,
+};
+
 /* fmt an integer */
 int
 _ifmt(Fmt *f)
 {
-	char buf[70], *p, *conv;
+	char buf[Maxintwidth + 1], *p, *conv;
 	uvlong vu;
 	ulong u;
 	uintptr pu;
diff -r 60634355f6d8 -r 973230ca515f sys/src/libc/mips/lock.c
--- a/sys/src/libc/mips/lock.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libc/mips/lock.c	Tue Mar 06 23:31:21 2012 +0100
@@ -107,6 +107,7 @@
 			return 0;
 		return 1;
 	case R4K:
+	default:		/* silence compiler */
 		if(C_4ktas(&lk->val))
 			return 0;
 		return 1;
@@ -149,6 +150,7 @@
 	case MAGNUMII:
 		return C_3ktas(p);
 	case R4K:
+	default:		/* silence compiler */
 		return C_4ktas(p);
 	case POWER:
 		/* Use low order lock bits to generate hash */
diff -r 60634355f6d8 -r 973230ca515f sys/src/libmach/5db.c
--- a/sys/src/libmach/5db.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libmach/5db.c	Tue Mar 06 23:31:21 2012 +0100
@@ -135,18 +135,26 @@
 int
 armclass(long w)
 {
-	int op;
+	int op, done;
 
 	op = (w >> 25) & 0x7;
 	switch(op) {
 	case 0:	/* data processing r,r,r */
 		op = ((w >> 4) & 0xf);
 		if(op == 0x9) {
-			op = 48+16;		/* mul */
+			op = 48+16;		/* mul, swp or *rex */
+			if((w & 0x0ff00fff) == 0x01900f9f) {
+				op = 93;	/* ldrex */
+				break;
+			}
+			if((w & 0x0ff00ff0) == 0x01800f90) {
+				op = 94;	/* strex */
+				break;
+			}
 			if(w & (1<<24)) {
 				op += 2;
 				if(w & (1<<22))
-					op++;	/* swap */
+					op++;	/* swpb */
 				break;
 			}
 			if(w & (1<<23)) {	/* mullu */
@@ -174,6 +182,28 @@
 		op = (48) + ((w >> 21) & 0xf);
 		break;
 	case 2:	/* load/store byte/word i(r) */
+		if ((w & 0xffffff8f) == 0xf57ff00f) {	/* barriers, clrex */
+			done = 1;
+			switch ((w >> 4) & 7) {
+			case 1:
+				op = 95;	/* clrex */
+				break;
+			case 4:
+				op = 96;	/* dsb */
+				break;
+			case 5:
+				op = 97;	/* dmb */
+				break;
+			case 6:
+				op = 98;	/* isb */
+				break;
+			default:
+				done = 0;
+				break;
+			}
+			if (done)
+				break;
+		}
 		op = (48+24) + ((w >> 22) & 0x1) + ((w >> 19) & 0x2);
 		break;
 	case 3:	/* load/store byte/word (r)(r) */
@@ -188,7 +218,7 @@
 	case 7:	/* coprocessor crap */
 		op = (48+24+4+4+2+2) + ((w >> 3) & 0x2) + ((w >> 20) & 0x1);
 		break;
-	default:
+	default:	  
 		op = (48+24+4+4+2+2+4+4);
 		break;
 	}
@@ -823,8 +853,18 @@
 	"MULL%C%S",	armdpi, 0,	"R%M,R%s,(R%n,R%d)",
 	"MULAL%C%S",	armdpi, 0,	"R%M,R%s,(R%n,R%d)",
 
-/* 48+24+4+4+2+2+4+4 */
+/* 48+24+4+4+2+2+4+4 = 92 */
 	"UNK",		armunk, 0,	"",
+
+/* 93 */
+	"LDREX",	armdpi, 0,	"(R%n),R%d",
+	"STREX",	armdpi, 0,	"R%s,(R%n),R%d",
+	"CLREX",	armunk, 0,	"",
+
+/* 96 */
+	"DSB",		armunk, 0,	"",
+	"DMB",		armunk, 0,	"",
+	"ISB",		armunk, 0,	"",
 };
 
 static void
diff -r 60634355f6d8 -r 973230ca515f sys/src/libmach/map.c
--- a/sys/src/libmach/map.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libmach/map.c	Tue Mar 06 23:31:21 2012 +0100
@@ -89,13 +89,11 @@
 	map = newmap(0, 4);
 	if (!map)
 		return 0;
-	if(kflag) {
+	if(kflag)
 		regs = "kregs";
-		mode = OREAD;
-	} else {
+	else
 		regs = "regs";
-		mode = ORDWR;
-	}
+	mode = ORDWR;
 	if (mach->regsize) {
 		sprint(buf, "/proc/%d/%s", pid, regs);
 		fd = open(buf, mode);
diff -r 60634355f6d8 -r 973230ca515f sys/src/libsec/port/tlshand.c
--- a/sys/src/libsec/port/tlshand.c	Tue Mar 06 20:04:28 2012 +0100
+++ b/sys/src/libsec/port/tlshand.c	Tue Mar 06 23:31:21 2012 +0100
@@ -17,7 +17,7 @@
 enum {
 	TLSFinishedLen = 12,
 	SSL3FinishedLen = MD5dlen+SHA1dlen,
-	MaxKeyData = 104,	// amount of secret we may need
+	MaxKeyData = 136,	// amount of secret we may need
 	MaxChunk = 1<<14,
 	RandomSize = 32,
 	SidSize = 32,
@@ -239,9 +239,11 @@
 };
 
 static Algs cipherAlgs[] = {
-	{"rc4_128", "md5",	2 * (16 + MD5dlen), TLS_RSA_WITH_RC4_128_MD5},
-	{"rc4_128", "sha1",	2 * (16 + SHA1dlen), TLS_RSA_WITH_RC4_128_SHA},
-	{"3des_ede_cbc","sha1",2*(4*8+SHA1dlen), TLS_RSA_WITH_3DES_EDE_CBC_SHA},
+	{"rc4_128", "md5", 2*(16+MD5dlen), TLS_RSA_WITH_RC4_128_MD5},
+	{"rc4_128", "sha1", 2*(16+SHA1dlen), TLS_RSA_WITH_RC4_128_SHA},
+	{"3des_ede_cbc", "sha1", 2*(4*8+SHA1dlen), TLS_RSA_WITH_3DES_EDE_CBC_SHA},
+	{"aes_128_cbc", "sha1", 2*(16+16+SHA1dlen), TLS_RSA_WITH_AES_128_CBC_SHA},
+	{"aes_256_cbc", "sha1", 2*(32+16+SHA1dlen), TLS_RSA_WITH_AES_256_CBC_SHA}
 };
 
 static uchar compressors[] = {