PERFORCE change 54380 for review
Peter Wemm
peter at FreeBSD.org
Tue Jun 8 01:20:09 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=54380
Change 54380 by peter at peter_hammer on 2004/06/08 01:19:04
IFC @54379
Affected files ...
.. //depot/projects/hammer/lib/libarchive/archive_read.3#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/fpu.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#32 integrate
.. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#88 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#62 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#77 integrate
.. //depot/projects/hammer/sys/amd64/include/md_var.h#27 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#36 integrate
.. //depot/projects/hammer/sys/amd64/include/specialreg.h#16 integrate
Differences ...
==== //depot/projects/hammer/lib/libarchive/archive_read.3#7 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.6 2004/06/02 08:14:43 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.7 2004/06/08 00:23:27 kientzle Exp $
.\"
.Dd October 1, 2003
.Dt archive_read 3
@@ -288,7 +288,7 @@
archive_read_support_compression_all(a);
archive_read_support_format_all(a);
archive_read_open(a, mydata, myopen, myread, myclose);
- while (archive_read_next_header(a, &entry) == ARCHIVE_READ_OK) {
+ while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
printf("%s\\n",archive_entry_pathname(entry));
archive_read_data_skip(a);
}
@@ -327,16 +327,16 @@
.Sh RETURN VALUES
Most functions return zero on success, non-zero on error.
The possible return codes include:
-.Cm ARCHIVE_READ_OK
+.Cm ARCHIVE_OK
(the operation succeeded)
-.Cm ARCHIVE_READ_WARN
+.Cm ARCHIVE_WARN
(the operation succeeded but a non-critical error was encountered)
-.Cm ARCHIVE_READ_EOF
+.Cm ARCHIVE_EOF
(end-of-archive was encountered),
-.Cm ARCHIVE_READ_RETRY
+.Cm ARCHIVE_RETRY
(the operation failed but can be retried),
and
-.Cm ARCHIVE_READ_FATAL
+.Cm ARCHIVE_FATAL
(there was a fatal error; the archive should be closed immediately).
Detailed error codes and textual descriptions are available from the
.Fn archive_errno
==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#15 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.151 2004/06/06 09:16:02 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.152 2004/06/08 01:14:39 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,6 +73,7 @@
#define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr)))
#define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr)))
#define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr)))
+#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : "m" (r))
#define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \
: : "n" (CR0_TS) : "ax")
#define stop_emulating() __asm("clts")
@@ -111,6 +112,7 @@
fpuinit(void)
{
register_t savecrit;
+ u_int mxcsr;
u_short control;
savecrit = intr_disable();
@@ -119,6 +121,8 @@
fninit();
control = __INITIAL_FPUCW__;
fldcw(&control);
+ mxcsr = __INITIAL_MXCSR__;
+ ldmxcsr(mxcsr);
fxsave(&fpu_cleanstate);
start_emulating();
fpu_cleanstate_ready = 1;
==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#32 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.133 2004/06/08 01:02:51 peter Exp $");
#include "opt_cpu.h"
@@ -250,40 +250,40 @@
}
if (amd_feature != 0) {
printf("\n AMD Features=0x%b", amd_feature,
- "\020" /* in hex */
- "\001FPU" /* Integral FPU */
- "\002VME" /* Extended VM86 mode support */
- "\003DE" /* Debug extensions */
- "\004PSE" /* 4MByte page tables */
- "\005TSC" /* Timestamp counter */
- "\006MSR" /* Machine specific registers */
- "\007PAE" /* Physical address extension */
- "\010MCE" /* Machine Check support */
- "\011CX8" /* CMPEXCH8 instruction */
- "\012APIC" /* SMP local APIC */
- "\013<b10>"
- "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */
- "\015MTRR" /* Memory Type Range Registers */
- "\016PGE" /* PG_G (global bit) support */
- "\017MCA" /* Machine Check Architecture */
- "\020CMOV" /* CMOV instruction */
- "\021PAT" /* Page attributes table */
- "\022PGE36" /* 36 bit address space support */
- "\023RSVD" /* Reserved, unknown */
- "\024MP" /* Multiprocessor Capable */
- "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */
- "\026<b21>"
- "\027MMX+" /* AMD MMX Instruction Extensions */
- "\030MMX"
- "\031FXSAVE" /* FXSAVE/FXRSTOR */
- "\032<b25>"
- "\033<b26>"
- "\034<b27>"
- "\035<b28>"
- "\036LM" /* Long mode */
- "\0373DNow!+" /* AMD 3DNow! Instruction Extensions */
- "\0403DNow!" /* AMD 3DNow! Instructions */
- );
+ "\020" /* in hex */
+ "\001<s0>" /* Same */
+ "\002<s1>" /* Same */
+ "\003<s2>" /* Same */
+ "\004<s3>" /* Same */
+ "\005<s4>" /* Same */
+ "\006<s5>" /* Same */
+ "\007<s6>" /* Same */
+ "\010<s7>" /* Same */
+ "\011<s8>" /* Same */
+ "\012<s9>" /* Same */
+ "\013<b10>" /* Undefined */
+ "\014SYSCALL" /* Have SYSCALL/SYSRET */
+ "\015<s12>" /* Same */
+ "\016<s13>" /* Same */
+ "\017<s14>" /* Same */
+ "\020<s15>" /* Same */
+ "\021<s16>" /* Same */
+ "\022<s17>" /* Same */
+ "\023<b18>" /* Reserved, unknown */
+ "\024MP" /* Multiprocessor Capable */
+ "\025NX" /* Has EFER.NXE, NX */
+ "\026<b21>" /* Undefined */
+ "\027MMX+" /* AMD MMX Extensions */
+ "\030<s23>" /* Same */
+ "\031<s24>" /* Same */
+ "\032<b25>" /* Undefined */
+ "\033<b26>" /* Undefined */
+ "\034<b27>" /* Undefined */
+ "\035<b28>" /* Undefined */
+ "\036LM" /* 64 bit long mode */
+ "\0373DNow+" /* AMD 3DNow! Extensions */
+ "\0403DNow" /* AMD 3DNow! */
+ );
}
/*
==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.48 2004/06/08 01:02:51 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#88 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.607 2004/05/19 01:23:48 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.608 2004/06/08 01:02:51 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#62 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.237 2004/05/16 22:11:50 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.239 2004/06/08 01:07:51 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -429,12 +429,12 @@
/* set up CPU registers and state */
cpu_setregs();
+ /* set up SSE/NX registers */
+ initializecpu();
+
/* set up FPU state on the AP */
fpuinit();
- /* set up SSE/NX registers */
- initializecpu();
-
/* A quick check from sanity claus */
if (PCPU_GET(apic_id) != lapic_id()) {
printf("SMP: cpuid = %d\n", PCPU_GET(cpuid));
==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#12 (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/amd64/amd64/mpboot.S,v 1.25 2004/02/25 23:12:39 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.26 2004/06/08 01:02:52 peter Exp $
*/
#include <machine/asmacros.h> /* miscellaneous asm macros */
==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#77 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.464 2004/06/08 00:29:41 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.465 2004/06/08 01:02:52 peter Exp $");
/*
* Manages physical address maps.
@@ -174,7 +174,7 @@
static int ndmpdp;
static vm_paddr_t dmaplimit;
vm_offset_t kernel_vm_end;
-pt_entry_t pg_nx;
+pt_entry_t pg_nx;
static u_int64_t KPTphys; /* phys addr of kernel level 1 */
static u_int64_t KPDphys; /* phys addr of kernel level 2 */
==== //depot/projects/hammer/sys/amd64/include/md_var.h#27 (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/amd64/include/md_var.h,v 1.73 2004/04/11 04:26:58 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.74 2004/06/08 01:02:52 peter Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/hammer/sys/amd64/include/pmap.h#36 (text+ko) ====
@@ -39,7 +39,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.116 2004/06/08 00:29:42 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.117 2004/06/08 01:02:52 peter Exp $
*/
#ifndef _MACHINE_PMAP_H_
==== //depot/projects/hammer/sys/amd64/include/specialreg.h#16 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.29 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.30 2004/06/08 01:02:52 peter Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
More information about the p4-projects
mailing list