Browse Source

plan9-20120419: import from nix (accepted)

Sync with plan 9 as of today.

Change-Id: I63abc1dd18ed299822171cc80a8508e65056a790
Reference: /n/patches.lsub.org/patch/plan9-20120419
Date: Thu Apr 19 14:08:37 GMT 2012
Signed-off-by: nemo@lsub.org
Signed-off-by: David du Colombier <0intro@gmail.com>
Reviewed-on: http://nxm.coreboot.org/review/319
Tested-by: Jenkins QA
Reviewed-by: Akshat Kumar <seed@mail.nanosouffle.net>
David du Colombier 11 years ago
parent
commit
e4eabb5c59
3 changed files with 24 additions and 10 deletions
  1. 2 0
      rc/bin/cpurc
  2. 1 10
      sys/src/libc/arm/getfcr.s
  3. 21 0
      sys/src/libc/arm/getfcr.vfp.S

+ 2 - 0
rc/bin/cpurc

@@ -50,6 +50,8 @@ if(! test -e /srv/dns)
 #	mv /rc/bin/service/tcp567 /rc/bin/service/_tcp567
 # }
 
+# netssh
+
 # start listeners if it hasn't already been done (dicey check)
 if(! netstat -n | grep -s 'tcp.*Listen.* (7|9|21|22|23|25|110|113|565|993|17007|17009|17010) .*')
 	aux/listen -q tcp

+ 1 - 10
sys/src/libc/arm/getfcr.s

@@ -1,21 +1,12 @@
-/* for VFP */
-#define VMRS(fp, cpu) WORD $(0xeef00a10 | (fp)<<16 | (cpu)<<12) /* FP → arm */
-#define VMSR(cpu, fp) WORD $(0xeee00a10 | (fp)<<16 | (cpu)<<12) /* arm → FP */
-
-#define Fpscr 1
-
 TEXT	setfcr(SB), $0
-	VMSR(0, Fpscr)
 	RET
 
 TEXT	getfcr(SB), $0
-	VMRS(Fpscr, 0)
 	RET
 
 TEXT	getfsr(SB), $0
-	VMSR(0, Fpscr)
 	RET
 
 TEXT	setfsr(SB), $0
-	VMRS(Fpscr, 0)
 	RET
+

+ 21 - 0
sys/src/libc/arm/getfcr.vfp.S

@@ -0,0 +1,21 @@
+/* for VFP */
+#define VMRS(fp, cpu) WORD $(0xeef00a10 | (fp)<<16 | (cpu)<<12) /* FP → arm */
+#define VMSR(cpu, fp) WORD $(0xeee00a10 | (fp)<<16 | (cpu)<<12) /* arm → FP */
+
+#define Fpscr 1
+
+TEXT	setfcr(SB), $0
+	VMSR(0, Fpscr)
+	RET
+
+TEXT	getfcr(SB), $0
+	VMRS(Fpscr, 0)
+	RET
+
+TEXT	getfsr(SB), $0
+	VMSR(0, Fpscr)
+	RET
+
+TEXT	setfsr(SB), $0
+	VMRS(Fpscr, 0)
+	RET