From owner-p4-projects@FreeBSD.ORG Sun Mar 30 20:11:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D39237B404; Sun, 30 Mar 2003 20:11:52 -0800 (PST) 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 4FB3137B401 for ; Sun, 30 Mar 2003 20:11:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D796543FAF for ; Sun, 30 Mar 2003 20:11:51 -0800 (PST) (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 h2V4Bp0U009065 for ; Sun, 30 Mar 2003 20:11:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2V4BpMI009062 for perforce@freebsd.org; Sun, 30 Mar 2003 20:11:51 -0800 (PST) Date: Sun, 30 Mar 2003 20:11:51 -0800 (PST) Message-Id: <200303310411.h2V4BpMI009062@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 27682 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, 31 Mar 2003 04:11:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=27682 Change 27682 by marcel@marcel_nfs on 2003/03/30 20:11:41 Add ar.csd and ar.ssd to the set of scratch registers. ar.csd is used by ld16/st16 and ar.ssd is reserved for future use. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#4 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/include/_regset.h#4 (text+ko) ==== @@ -149,6 +149,8 @@ uint64_t br6; uint64_t br7; uint64_t ccv; + uint64_t csd; + uint64_t ssd; uint64_t __spare; }; From owner-p4-projects@FreeBSD.ORG Sun Mar 30 20:41:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35F0E37B404; Sun, 30 Mar 2003 20:41:33 -0800 (PST) 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 C428A37B401 for ; Sun, 30 Mar 2003 20:41:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60F5743FBD for ; Sun, 30 Mar 2003 20:41:32 -0800 (PST) (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 h2V4fW0U011174 for ; Sun, 30 Mar 2003 20:41:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2V4fVsv011171 for perforce@freebsd.org; Sun, 30 Mar 2003 20:41:31 -0800 (PST) Date: Sun, 30 Mar 2003 20:41:31 -0800 (PST) Message-Id: <200303310441.h2V4fVsv011171@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 27690 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, 31 Mar 2003 04:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=27690 Change 27690 by marcel@marcel_nfs on 2003/03/30 20:41:27 o Save ar.csd and ar.ssd in _get_caller_saved(). o Restore ar.csd and ar.ssd in _set_caller_saved(). o Add _setcontext() and _getcontext() for use by the getcontext() and setcontext() syscall and for use by cpu_switch(), savectx() and restorectx(). o Add explicit bundling to _set_caller_saved(). Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#5 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#5 (text+ko) ==== @@ -32,6 +32,86 @@ .section .text.context, "ax" /* + * _getcontext(ucontext_t *ucp) + */ +ENTRY(_getcontext, 1) +{ .mii +1: nop 0 + mov r17=ip + add r16=UC_MCONTEXT+MC_SPECIAL,r32 + ;; +} +{ .mfb + add r17=2f-1b,r17 + nop 0 + br.sptk _get_special_sync + ;; +} +{ .mmi +2: alloc loc0=ar.pfs,1,2,1,0 + ;; + add in0=UC_MCONTEXT,in0 + mov loc1=rp + ;; +} +{ .mmb + st8 [in0]=r0 + add out0=MC_PRESERVED,in0 + br.call.sptk rp=_get_callee_saved + ;; +} +{ .mib + add out0=MC_PRESERVED_FP,in0 + add in0=8,in0 + br.call.sptk rp=_get_callee_saved_fp + ;; +} +{ .mii + st8 [in0]=r0 + mov ar.pfs=loc0 + mov rp=loc1 + ;; +} +{ .mfb + nop 0 + nop 0 + br.ret.sptk rp + ;; +} +END(_getcontext) + +/* + * _setcontext(ucontext_t *ucp) + */ +ENTRY(_setcontext, 1) +{ .mmi + alloc loc0=ar.pfs,1,2,1,0 + ;; + nop 0 + mov loc1=rp + ;; +} +{ .mib + nop 0 + add out0=UC_MCONTEXT+MC_PRESERVED_FP,in0 + br.call.sptk rp=_set_callee_saved_fp + ;; +} +{ .mib + nop 0 + add out0=UC_MCONTEXT+MC_PRESERVED,in0 + br.call.sptk rp=_set_callee_saved + ;; +} +{ .mib + nop 0 + add r16=UC_MCONTEXT+MC_SPECIAL,in0 + br.sptk _set_special_sync + ;; +} +END(_setcontext) + +/* * _{get|set}_special_sync * Does not follow runtime convention! * @@ -416,7 +496,19 @@ ;; } { .mmb - st8 [r3]=r10 // ccv + st8 [r3]=r10,16 // ccv + mov r9=ar.csd + nop 8 + ;; +} +{ .mmi + st8 [r2]=r9,16 // csd + mov r10=ar.ssd + nop 9 + ;; +} +{ .mmb + st8 [r3]=r10 // ssd st8 [r2]=r0 // __spare br.sptk b6 ;; @@ -434,79 +526,126 @@ * postcondition: Will return with register bank 0 selected. */ ENTRY(_set_caller_saved, 0) +{ .mii ld8 r8=[r16] // nat (after) add r2=40,r16 add r3=48,r16 ;; +} +{ .mmi mov ar.unat=r8 mov r8=r16 mov r9=r17 ;; +} +{ .mmi ld8.fill r10=[r2],16 // r10 ld8.fill r11=[r3],16 // r11 nop 0 ;; +} +{ .mmb ld8.fill r14=[r2],16 // r14 ld8.fill r15=[r3],16 // r15 nop 1 ;; +} +{ .mmi ld8.fill r16=[r2],16 // r16 ld8.fill r17=[r3],16 // r17 nop 2 ;; +} +{ .mmb ld8.fill r18=[r2],16 // r18 ld8.fill r19=[r3],16 // r19 nop 3 ;; +} +{ .mmi ld8.fill r20=[r2],16 // r20 ld8.fill r21=[r3],16 // r21 nop 4 ;; +} +{ .mmb ld8.fill r22=[r2],16 // r22 ld8.fill r23=[r3],16 // r23 nop 5 ;; +} +{ .mmi ld8.fill r24=[r2],16 // r24 ld8.fill r25=[r3],16 // r25 nop 6 ;; +} +{ .mmb ld8.fill r26=[r2],16 // r26 ld8.fill r27=[r3],16 // r27 nop 7 ;; +} +{ .mmi ld8.fill r28=[r2],16 // r28 ld8.fill r29=[r3],16 // r29 nop 8 ;; +} +{ .mmb ld8.fill r30=[r2],16 // r30 ld8.fill r31=[r3],16 // r31 bsw.0 ;; +} /* We're using register bank 0 now. */ - +{ .mii ld8 r18=[r2] // unat (before) add r16=8,r8 add r17=16,r8 +} +{ .mii ld8 r19=[r3] // b6 add r20=16,r2 add r21=16,r3 ;; +} +{ .mmi ld8.fill r2=[r16],16 // r2 ld8.fill r3=[r17],16 // r3 mov rp=r9 ;; - ld8 r16=[r20] // b7 - ld8 r17=[r21] // ccv +} +{ .mmi + ld8 r22=[r20],16 // b7 + ld8 r23=[r21],16 // ccv mov b6=r19 ;; +} +{ .mmi ld8.fill r8=[r16] // r8 ld8.fill r9=[r17] // r9 mov b7=r16 ;; +} +{ .mmb + ld8 r19=[r20] // csd mov ar.unat=r18 + nop 9 + ;; +} +{ .mmi + ld8 r18=[r21] // ssd mov ar.ccv=r17 + nop 10 + ;; +} +{ .mmb + mov ar.csd=r19 + mov ar.ssd=r18 br.ret.sptk rp ;; +} END(_get_called_saved) /* From owner-p4-projects@FreeBSD.ORG Sun Mar 30 20:45:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D8BC37B401; Sun, 30 Mar 2003 20:45:40 -0800 (PST) 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 BFE9137B404 for ; Sun, 30 Mar 2003 20:45:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5441243F3F for ; Sun, 30 Mar 2003 20:45:39 -0800 (PST) (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 h2V4jd0U011442 for ; Sun, 30 Mar 2003 20:45:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2V4jc33011439 for perforce@freebsd.org; Sun, 30 Mar 2003 20:45:38 -0800 (PST) Date: Sun, 30 Mar 2003 20:45:38 -0800 (PST) Message-Id: <200303310445.h2V4jc33011439@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 27693 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, 31 Mar 2003 04:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=27693 Change 27693 by marcel@marcel_nfs on 2003/03/30 20:44:46 Swap the mc_flags and the _reserved_ field. It makes more sense having the mc_flags field first. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/include/ucontext.h#4 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/include/ucontext.h#4 (text+ko) ==== @@ -34,10 +34,10 @@ #include typedef struct __mcontext { - uint64_t _reserved_; uint64_t mc_flags; #define IA64_MC_FLAGS_SCRATCH_VALID 1 #define IA64_MC_FLAGS_HIGHFP_VALID 2 + uint64_t _reserved_; struct _special mc_special; struct _callee_saved mc_preserved; struct _callee_saved_fp mc_preserved_fp; From owner-p4-projects@FreeBSD.ORG Sun Mar 30 20:49:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A0837B404; Sun, 30 Mar 2003 20:49:46 -0800 (PST) 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 A5AF037B401 for ; Sun, 30 Mar 2003 20:49:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1552E43FBD for ; Sun, 30 Mar 2003 20:49:46 -0800 (PST) (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 h2V4nj0U016732 for ; Sun, 30 Mar 2003 20:49:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2V4njEo016729 for perforce@freebsd.org; Sun, 30 Mar 2003 20:49:45 -0800 (PST) Date: Sun, 30 Mar 2003 20:49:45 -0800 (PST) Message-Id: <200303310449.h2V4njEo016729@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 27696 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, 31 Mar 2003 04:49:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=27696 Change 27696 by marcel@marcel_nfs on 2003/03/30 20:49:01 Add new symbols for offsets into mcontext_t and stop using a single symbol for when two are better: ie don't use UC_MCONTEXT_MC_SPECIAL, when you can add UC_MCONTEXT to MC_SPECIAL to get the same without combinatorial explosions. We probably want to do the same with MC_SPECIAL_RNAT later. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#5 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#5 (text+ko) ==== @@ -83,6 +83,12 @@ ASSYM(KSTACK_PAGES, KSTACK_PAGES); +ASSYM(MC_PRESERVED, offsetof(mcontext_t, mc_preserved)); +ASSYM(MC_PRESERVED_FP, offsetof(mcontext_t, mc_preserved_fp)); +ASSYM(MC_SPECIAL, offsetof(mcontext_t, mc_special)); +ASSYM(MC_SPECIAL_BSPSTORE, offsetof(mcontext_t, mc_special.bspstore)); +ASSYM(MC_SPECIAL_RNAT, offsetof(mcontext_t, mc_special.rnat)); + ASSYM(PAGE_SHIFT, PAGE_SHIFT); ASSYM(PAGE_SIZE, PAGE_SIZE); @@ -115,9 +121,6 @@ ASSYM(TF_SPECIAL_PFS, offsetof(struct trapframe, tf_special.pfs)); ASSYM(TF_SPECIAL_PSR, offsetof(struct trapframe, tf_special.psr)); -ASSYM(UC_MCONTEXT_MC_SPECIAL_BSPSTORE, - offsetof(ucontext_t, uc_mcontext.mc_special.bspstore)); -ASSYM(UC_MCONTEXT_MC_SPECIAL_RNAT, - offsetof(ucontext_t, uc_mcontext.mc_special.rnat)); +ASSYM(UC_MCONTEXT, offsetof(ucontext_t, uc_mcontext)); ASSYM(VM_MAX_ADDRESS, VM_MAX_ADDRESS); ==== //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#3 (text+ko) ==== @@ -267,7 +267,7 @@ mov b6=r8 // transfer to a branch register cover ;; - add r8=UC_MCONTEXT_MC_SPECIAL_BSPSTORE,r16 // address or mc_ar_bsp + add r8=UC_MCONTEXT+MC_SPECIAL_BSPSTORE,r16 // address or mc_ar_bsp mov r9=ar.bsp // save ar.bsp ;; st8 [r8]=r9 @@ -275,7 +275,7 @@ (p1) br.cond.sptk.few 1f // branch if not switching flushrs // flush out to old bs mov ar.rsc=0 // switch off RSE - add r8=UC_MCONTEXT_MC_SPECIAL_RNAT,r16 // address of mc_ar_rnat + add r8=UC_MCONTEXT+MC_SPECIAL_RNAT,r16 // address of mc_ar_rnat ;; mov r9=ar.rnat // value of ar.rnat after flush mov ar.bspstore=r18 // point at new bs @@ -298,11 +298,11 @@ ;; (p1) br.cond.sptk.few 2f // note: p1 is preserved mov ar.rsc=0 - add r8=UC_MCONTEXT_MC_SPECIAL_RNAT,r4 // address of mc_ar_rnat + add r8=UC_MCONTEXT+MC_SPECIAL_RNAT,r4 // address of mc_ar_rnat ;; ld8 r9=[r8] ;; - add r8=UC_MCONTEXT_MC_SPECIAL_BSPSTORE,r4 // address of mc_ar_bsp + add r8=UC_MCONTEXT+MC_SPECIAL_BSPSTORE,r4 // address of mc_ar_bsp ;; ld8 r10=[r8] ;; From owner-p4-projects@FreeBSD.ORG Wed Apr 2 08:04:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44B4D37B404; Wed, 2 Apr 2003 08:04:05 -0800 (PST) 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 D446C37B401 for ; Wed, 2 Apr 2003 08:04:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8302743F75 for ; Wed, 2 Apr 2003 08:04:03 -0800 (PST) (envelope-from jhb@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 h32G430U094218 for ; Wed, 2 Apr 2003 08:04:03 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h32G40XC094213 for perforce@freebsd.org; Wed, 2 Apr 2003 08:04:00 -0800 (PST) Date: Wed, 2 Apr 2003 08:04:00 -0800 (PST) Message-Id: <200304021604.h32G40XC094213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 27909 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, 02 Apr 2003 16:04:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=27909 Change 27909 by jhb@jhb_laptop on 2003/04/02 08:03:01 IFC @27908. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#53 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#44 integrate .. //depot/projects/smpng/sys/alpha/include/_types.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#12 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#16 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#35 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#24 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#40 integrate .. //depot/projects/smpng/sys/conf/files#68 integrate .. //depot/projects/smpng/sys/conf/files.pc98#38 integrate .. //depot/projects/smpng/sys/conf/options#49 integrate .. //depot/projects/smpng/sys/conf/options.i386#23 integrate .. //depot/projects/smpng/sys/conf/options.pc98#25 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#24 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#10 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#11 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#23 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#6 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#27 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.c#19 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#18 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#23 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/smpng/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#7 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#12 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#8 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/smpng/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#14 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#32 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#7 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/smpng/sys/dev/pccard/devlist2h.awk#3 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#5 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#8 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#10 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#28 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#21 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#7 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#7 integrate .. //depot/projects/smpng/sys/geom/geom.h#22 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#1 branch .. //depot/projects/smpng/sys/geom/geom_ext.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#21 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#14 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#2 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#53 integrate .. //depot/projects/smpng/sys/i386/conf/SMP#2 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#15 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#43 integrate .. //depot/projects/smpng/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#34 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#9 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#51 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/vm86bios.s#5 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#32 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#8 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#4 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#8 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#18 integrate .. //depot/projects/smpng/sys/i386/include/param.h#9 integrate .. //depot/projects/smpng/sys/i386/include/physio_proc.h#4 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#9 integrate .. //depot/projects/smpng/sys/i386/isa/elink.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/elink.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/isa_dma.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#32 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#29 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#51 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#43 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#4 integrate .. //depot/projects/smpng/sys/isa/fd.c#20 integrate .. //depot/projects/smpng/sys/isa/orm.c#2 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#5 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#7 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_context.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#1 branch .. //depot/projects/smpng/sys/kern/kern_thread.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#1 branch .. //depot/projects/smpng/sys/kern/makesyscalls.sh#14 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#49 integrate .. //depot/projects/smpng/sys/kern/subr_xxx.c#7 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#26 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#27 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#26 integrate .. //depot/projects/smpng/sys/kern/tty.c#32 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#5 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/modules/Makefile#47 integrate .. //depot/projects/smpng/sys/modules/apm/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/atspeaker/Makefile#3 delete .. //depot/projects/smpng/sys/modules/bios/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/smapi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/smbios/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/vpd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/dpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/elink/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ex/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ie/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mcd/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/pcspeaker/Makefile#2 delete .. //depot/projects/smpng/sys/modules/smapi/Makefile#3 delete .. //depot/projects/smpng/sys/modules/speaker/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_ppp.c#20 integrate .. //depot/projects/smpng/sys/netinet/in.h#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#5 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.c#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/pc98/apm/apm.c#9 delete .. //depot/projects/smpng/sys/pc98/apm/apm.h#2 delete .. //depot/projects/smpng/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#49 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#22 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#23 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#11 integrate .. //depot/projects/smpng/sys/pci/agp.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#28 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#11 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#23 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#13 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#19 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#12 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#15 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#21 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#10 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#11 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#11 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#21 integrate .. //depot/projects/smpng/sys/pci/meteor.c#7 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#34 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#31 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#13 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/smpng/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/fp.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#44 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#35 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#47 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#29 integrate .. //depot/projects/smpng/sys/sys/_types.h#9 integrate .. //depot/projects/smpng/sys/sys/acct.h#5 integrate .. //depot/projects/smpng/sys/sys/bio.h#13 integrate .. //depot/projects/smpng/sys/sys/conf.h#22 integrate .. //depot/projects/smpng/sys/sys/disk.h#11 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#3 integrate .. //depot/projects/smpng/sys/sys/mac.h#14 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#12 integrate .. //depot/projects/smpng/sys/sys/malloc.h#16 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#19 integrate .. //depot/projects/smpng/sys/sys/mman.h#6 integrate .. //depot/projects/smpng/sys/sys/mount.h#21 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#6 integrate .. //depot/projects/smpng/sys/sys/param.h#36 integrate .. //depot/projects/smpng/sys/sys/proc.h#75 integrate .. //depot/projects/smpng/sys/sys/signal.h#13 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#13 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#29 integrate .. //depot/projects/smpng/sys/sys/stat.h#13 integrate .. //depot/projects/smpng/sys/sys/syscall.h#27 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#27 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#17 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#29 integrate .. //depot/projects/smpng/sys/sys/systm.h#40 integrate .. //depot/projects/smpng/sys/sys/thr.h#1 branch .. //depot/projects/smpng/sys/sys/types.h#23 integrate .. //depot/projects/smpng/sys/sys/ucred.h#20 integrate .. //depot/projects/smpng/sys/sys/umtx.h#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#9 integrate .. //depot/projects/smpng/sys/vm/pmap.h#15 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#11 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/smpng/sys/x86_64/include/_types.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#53 (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/alpha/alpha/machdep.c,v 1.196 2003/02/25 00:42:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.199 2003/04/01 00:18:54 jeff Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1199,11 +1199,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1305,11 +1301,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1430,11 +1422,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1513,9 +1501,9 @@ * sigmask is stored in sc_reserved, sc_mask is only used for * backward compatibility. */ - SIGSETOLD(p->p_sigmask, ksc.sc_mask); - SIG_CANTMASK(p->p_sigmask); - signotify(p); + SIGSETOLD(td->td_sigmask, ksc.sc_mask); + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); @@ -1595,9 +1583,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = uc.uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = uc.uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); /* XXX ksc.sc_ownedfp ? */ @@ -1671,9 +1659,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = uc.uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = uc.uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); return (EJUSTRETURN); @@ -2336,3 +2324,9 @@ pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr; pcpu->pc_current_asngen = 1; } + +intptr_t +casuptr(intptr_t *p, intptr_t old, intptr_t new) +{ + return (-1); +} ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.43 2003/03/03 12:15:38 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $ */ /* @@ -218,7 +218,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#44 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.109 2003/03/04 21:03:04 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.110 2003/03/31 22:02:36 jeff Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -584,7 +584,7 @@ framep->tf_regs[FRAME_TRAPARG_A0] = a0; framep->tf_regs[FRAME_TRAPARG_A1] = a1; framep->tf_regs[FRAME_TRAPARG_A2] = a2; - trapsignal(p, i, ucode); + trapsignal(td, i, ucode); out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); ==== //depot/projects/smpng/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.3 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -89,6 +89,7 @@ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; ==== //depot/projects/smpng/sys/alpha/include/param.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.29 2002/09/17 01:48:54 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.30 2003/03/29 18:22:29 gallatin Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -91,8 +91,9 @@ #include #include +#define MAXSMPCPU 8 #ifdef SMP -#define MAXCPU 32 +#define MAXCPU MAXSMPCPU #else #define MAXCPU 1 #endif ==== //depot/projects/smpng/sys/alpha/include/pmap.h#14 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.21 2003/03/16 04:16:02 jake Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.22 2003/03/29 18:22:29 gallatin Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -176,7 +176,7 @@ struct { u_int32_t asn:ASN_BITS; /* address space number */ u_int32_t gen:ASNGEN_BITS; /* generation number */ - } pm_asn[MAXCPU]; + } pm_asn[MAXSMPCPU]; struct pmap_statistics pm_stats; /* pmap statistics */ struct vm_page *pm_ptphint; /* pmap ptp hint */ LIST_ENTRY(pmap) pm_list; /* list of all pmaps. */ ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#12 (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/alpha/linux/linux_sysvec.c,v 1.85 2003/03/21 19:49:33 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.87 2003/03/27 18:18:35 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -60,6 +60,7 @@ #include #include +#include #include #undef szsigcode @@ -258,6 +259,7 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); + linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#16 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.27 2003/02/20 20:54:43 phk Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.29 2003/03/31 22:49:14 jeff Exp $ */ #include "opt_compat.h" @@ -451,7 +451,7 @@ bmask = stackgap_alloc(&sg, sizeof(sigset_t)); PROC_LOCK(p); - set = p->p_sigmask; + set = td->td_sigmask; PROC_UNLOCK(p); SIGDELSET(set, signum); sa.sigmask = bmask; @@ -481,7 +481,7 @@ p = td->td_proc; error = 0; /* Fix the return value first if needed */ - bsd_to_osf1_sigset(&p->p_sigmask, &oss); + bsd_to_osf1_sigset(&td->td_sigmask, &oss); td->td_retval[0] = oss; osf1_to_bsd_sigset(&uap->mask, &bss); @@ -490,19 +490,19 @@ switch (uap->how) { case OSF1_SIG_BLOCK: - SIGSETOR(p->p_sigmask, bss); - SIG_CANTMASK(p->p_sigmask); + SIGSETOR(td->td_sigmask, bss); + SIG_CANTMASK(td->td_sigmask); break; case OSF1_SIG_UNBLOCK: - SIGSETNAND(p->p_sigmask, bss); - signotify(p); + SIGSETNAND(td->td_sigmask, bss); + signotify(td); break; case OSF1_SIG_SETMASK: - p->p_sigmask = bss; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = bss; + SIG_CANTMASK(td->td_sigmask); + signotify(td); break; default: @@ -528,8 +528,9 @@ p = td->td_proc; PROC_LOCK(p); - bss = p->p_siglist; - SIGSETAND(bss, p->p_sigmask); + bss = td->td_siglist; + SIGSETOR(bss, p->p_siglist); + SIGSETAND(bss, td->td_sigmask); PROC_UNLOCK(p); bsd_to_osf1_sigset(&bss, &oss); @@ -663,11 +664,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -731,9 +728,9 @@ * sigmask is stored in sc_reserved, sc_mask is only used for * backward compatibility. */ - osf1_to_bsd_sigset(&ksc.sc_mask, &p->p_sigmask); - SIG_CANTMASK(p->p_sigmask); - signotify(p); + osf1_to_bsd_sigset(&ksc.sc_mask, &td->td_sigmask); + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); ==== //depot/projects/smpng/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -95,6 +95,7 @@ typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint32_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint32_t __vm_size_t; ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#16 (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/cam/scsi/scsi_cd.c,v 1.76 2003/03/15 11:00:56 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.78 2003/04/01 15:06:21 phk Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -394,7 +394,6 @@ { int s; struct cd_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; @@ -424,11 +423,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); /* @@ -455,6 +450,11 @@ xpt_print_path(periph->path); printf("removing device entry\n"); + if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + xpt_print_path(periph->path); + printf("can't remove sysctl context\n"); + } + s = splsoftcam(); /* * In the queued, non-active case, the device in question @@ -688,6 +688,7 @@ 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); @@ -1458,7 +1459,7 @@ /* * Place it in the queue of disk activities for this disk */ - bioqdisksort(&softc->bio_queue, bp); + bioq_disksort(&softc->bio_queue, bp); splx(s); @@ -1624,16 +1625,11 @@ if (error != 0) { int s; - struct bio *q_bp; xpt_print_path(periph->path); printf("cddone: got error %#x back\n", error); s = splbio(); - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_resid = bp->bio_bcount; bp->bio_error = error; ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.134 2003/03/15 11:00:56 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.136 2003/04/01 15:06:21 phk Exp $ */ #ifdef _KERNEL @@ -43,7 +43,6 @@ #include #include -#include #include #include #include @@ -53,6 +52,8 @@ #include #include +#include + #ifndef _KERNEL #include #include @@ -750,7 +751,7 @@ /* * Place it in the queue of disk activities for this disk */ - bioqdisksort(&softc->bio_queue, bp); + bioq_disksort(&softc->bio_queue, bp); splx(s); @@ -935,7 +936,6 @@ { int s; struct da_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct da_softc *)periph->softc; @@ -965,11 +965,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); SLIST_REMOVE(&softc_list, softc, da_softc, links); @@ -987,6 +983,13 @@ xpt_print_path(periph->path); printf("removing device entry\n"); + /* + * If we can't free the sysctl tree, oh well... + */ + if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + xpt_print_path(periph->path); + printf("can't remove sysctl context\n"); + } disk_destroy(&softc->disk); free(softc, M_DEVBUF); } @@ -1142,6 +1145,7 @@ 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); @@ -1430,7 +1434,6 @@ return; } if (error != 0) { - struct bio *q_bp; s = splbio(); @@ -1452,12 +1455,7 @@ * the client can retry these I/Os in the * proper order should it attempt to recover. */ - while ((q_bp = bioq_first(&softc->bio_queue)) - != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_error = error; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.36 2003/03/15 10:50:42 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.37 2003/04/01 15:06:22 phk Exp $ */ #include @@ -353,7 +353,6 @@ { int s; struct pt_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct pt_softc *)periph->softc; @@ -383,11 +382,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); @@ -574,8 +569,6 @@ return; } if (error != 0) { - struct bio *q_bp; - s = splbio(); if (error == ENXIO) { @@ -593,12 +586,7 @@ * the client can retry these I/Os in the * proper order should it attempt to recover. */ - while ((q_bp = bioq_first(&softc->bio_queue)) - != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_error = error; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.91 2003/03/15 10:50:42 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.92 2003/04/01 15:06:22 phk Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -1281,7 +1281,6 @@ saoninvalidate(struct cam_periph *periph) { struct sa_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; int s; @@ -1312,11 +1311,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); softc->queue_count = 0; splx(s); @@ -1698,7 +1693,6 @@ if (error == EIO) { int s; - struct bio *q_bp; /* * Catastrophic error. Mark the tape as frozen @@ -1713,11 +1707,7 @@ s = splbio(); softc->flags |= SA_FLAG_TAPE_FROZEN; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 11:53:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9C3737B407; Fri, 4 Apr 2003 11:53:01 -0800 (PST) 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 5CCCD37B408 for ; Fri, 4 Apr 2003 11:53:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E71DE43FBF for ; Fri, 4 Apr 2003 11:52:59 -0800 (PST) (envelope-from jhb@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 h34Jqx0U040837 for ; Fri, 4 Apr 2003 11:52:59 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h34JqwhU040834 for perforce@freebsd.org; Fri, 4 Apr 2003 11:52:58 -0800 (PST) Date: Fri, 4 Apr 2003 11:52:58 -0800 (PST) Message-Id: <200304041952.h34JqwhU040834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 28076 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, 04 Apr 2003 19:53:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=28076 Change 28076 by jhb@jhb_laptop on 2003/04/04 11:52:51 IFC @28074. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/support.s#6 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/common/commands.c#3 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#7 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/copy.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/time.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/loader/conf.c#8 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#17 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/copy.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/time.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/main.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#5 integrate .. //depot/projects/smpng/sys/conf/files#69 integrate .. //depot/projects/smpng/sys/conf/options.i386#24 integrate .. //depot/projects/smpng/sys/conf/options.pc98#26 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#5 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/smpng/sys/dev/an/if_an.c#28 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#26 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#8 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/smpng/sys/dev/md/md.c#33 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/exphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/pnphy.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#9 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#9 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#21 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#12 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#48 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#12 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/smpng/sys/geom/geom.h#23 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_enc.c#7 delete .. //depot/projects/smpng/sys/geom/geom_event.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#10 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#16 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#56 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#10 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#16 integrate .. //depot/projects/smpng/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#19 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#15 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.s#10 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#22 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#40 integrate .. //depot/projects/smpng/sys/net/slcompress.c#3 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#9 integrate .. //depot/projects/smpng/sys/netinet/in.h#20 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#19 integrate .. //depot/projects/smpng/sys/netinet/ip.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#50 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#29 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#12 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#14 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#20 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#13 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#16 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#22 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#11 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#12 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/bcopy.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copystr.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/extintr.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fuswintr.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#35 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#26 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/sys_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#32 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#28 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#45 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/smpng/sys/sys/bio.h#14 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#23 integrate .. //depot/projects/smpng/sys/sys/diskmbr.h#4 integrate .. //depot/projects/smpng/sys/sys/diskslice.h#6 delete .. //depot/projects/smpng/sys/sys/endian.h#2 integrate .. //depot/projects/smpng/sys/sys/proc.h#76 integrate .. //depot/projects/smpng/sys/sys/reboot.h#4 integrate .. //depot/projects/smpng/sys/sys/systm.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/support.s#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/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.13 2003/04/04 17:29:54 des Exp $ */ /* @@ -270,16 +270,11 @@ /* * Copy a bytes within the kernel's address space. + * Handles overlapping regions. * - * In the kernel, bcopy() doesn't have to handle the overlapping - * case; that's that ovbcopy() is for. However, it doesn't hurt - * to do both in bcopy, and it does provide a measure of safety. - * * void bcopy(char *from, char *to, size_t len); - * void ovbcopy(char *from, char *to, size_t len); */ LEAF(bcopy,3) -XLEAF(ovbcopy,3) /* Check for negative length */ ble a2,bcopy_done ==== //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.12 2001/02/18 10:25:36 asmodai Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#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/boot/alpha/libalpha/srmdisk.c,v 1.11 2001/04/05 20:45:25 obrien Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,6 @@ #include #include -#include #include #include ==== //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#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/boot/arc/lib/arcdisk.c,v 1.4 2000/08/04 05:25:36 jhb Exp $ + * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,6 @@ #include #include -#include #include ==== //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.4 2001/02/18 10:25:41 asmodai Exp $ + * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/boot/common/commands.c#3 (text+ko) ==== @@ -23,12 +23,11 @@ * 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.17 2001/11/04 02:58:39 jhb Exp $ + * $FreeBSD: src/sys/boot/common/commands.c,v 1.18 2003/04/04 16:35:14 phk Exp $ */ #include #include -#include #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/common/load_elf.c#7 (text+ko) ==== @@ -24,12 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.25 2003/01/21 05:46:46 jake Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.26 2003/04/04 16:35:14 phk Exp $ */ #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/boot/efi/libefi/copy.c#4 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.4 2002/05/19 04:42:18 marcel Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.5 2003/04/03 21:36:29 obrien Exp $"); /* * MD primitives supporting placement of module data ==== //depot/projects/smpng/sys/boot/efi/libefi/delay.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.2 2001/06/16 02:12:36 obrien Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#3 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.3 2002/12/08 19:46:11 marcel Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.4 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#4 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.5 2003/03/01 05:13:59 marcel Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.6 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/efi/libefi/module.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/module.c,v 1.2 2001/06/16 02:12:36 obrien Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/module.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include ==== //depot/projects/smpng/sys/boot/efi/libefi/time.c#3 (text+ko) ==== @@ -38,10 +38,8 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.3 2001/09/22 18:33:09 dfr Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.4 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/efi/loader/conf.c#8 (text+ko) ==== @@ -31,10 +31,8 @@ * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.8 2002/12/19 19:34:58 jake Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.9 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/efi/loader/main.c#10 (text+ko) ==== @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.18 2003/03/01 05:18:28 marcel Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.19 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#17 (text+ko) ==== @@ -14,12 +14,10 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.62 2003/01/14 16:33:37 imp Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.63 2003/04/04 16:35:14 phk Exp $ */ #include -#include -#include #include #include #include ==== //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#4 (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/boot/i386/libi386/bioscd.c,v 1.3 2002/05/15 11:32:53 jhay Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.4 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#7 (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/boot/i386/libi386/biosdisk.c,v 1.38 2003/01/20 11:15:12 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.39 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,7 @@ #include #include -#include +#include #include ==== //depot/projects/smpng/sys/boot/i386/libi386/elf_freebsd.c#2 (text+ko) ==== @@ -23,12 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.10 2000/08/03 09:14:01 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ */ #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/boot/ia64/libski/copy.c#3 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.2 2002/05/19 04:42:18 marcel Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); /* * MD primitives supporting placement of module data ==== //depot/projects/smpng/sys/boot/ia64/libski/delay.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/delay.c,v 1.1 2001/09/12 08:34:26 dfr Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/delay.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); void delay(int usecs) ==== //depot/projects/smpng/sys/boot/ia64/libski/exit.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/exit.c,v 1.1 2001/09/12 08:34:26 dfr Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/exit.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/ia64/libski/module.c#2 (text+ko) ==== @@ -24,10 +24,9 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; -#endif /* not lint */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include ==== //depot/projects/smpng/sys/boot/ia64/libski/skiconsole.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include ==== //depot/projects/smpng/sys/boot/ia64/libski/time.c#3 (text+ko) ==== @@ -38,10 +38,8 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.2 2001/09/19 12:12:12 dfr Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/ia64/skiload/conf.c#3 (text+ko) ==== @@ -31,10 +31,8 @@ * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.2 2002/12/19 19:34:59 jake Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.4 2003/04/04 02:12:56 marcel Exp $"); #include ==== //depot/projects/smpng/sys/boot/ia64/skiload/main.c#3 (text+ko) ==== @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.2 2002/09/23 05:55:10 peter Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.8 2003/01/06 13:43:13 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.9 2003/04/04 16:35:15 phk Exp $ */ /* @@ -43,8 +43,8 @@ #include "boot.h" #include -#include #include +#include #define BIOS_DEV_FLOPPY 0x0 #define BIOS_DEV_WIN 0x80 ==== //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.3 2003/01/06 13:43:14 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.4 2003/04/04 16:35:15 phk Exp $ */ /* @@ -33,7 +33,6 @@ #include "boot.h" #include -#include #if 0 /* #define BUFSIZE 4096 */ ==== //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#7 (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/boot/pc98/libpc98/biosdisk.c,v 1.23 2003/01/21 13:59:53 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.24 2003/04/04 16:35:15 phk Exp $ */ /* @@ -39,9 +39,8 @@ #include #include -#include #include -#include +#include #include ==== //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#5 (text+ko) ==== @@ -17,11 +17,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.14 2002/06/05 12:12:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.15 2003/04/04 16:35:15 phk Exp $"); #include -#include -#include #include #include #include ==== //depot/projects/smpng/sys/conf/files#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.775 2003/04/01 01:13:29 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.777 2003/04/04 18:53:04 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,6 +255,7 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi +dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci dev/advansys/advansys.c optional adv @@ -889,7 +890,6 @@ geom/geom_dev.c standard geom/geom_disk.c standard geom/geom_dump.c standard -geom/geom_enc.c standard geom/geom_event.c standard geom/geom_gpt.c optional geom_gpt geom/geom_io.c standard ==== //depot/projects/smpng/sys/conf/options.i386#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.187 2003/03/30 05:24:51 jake Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.188 2003/04/02 23:53:28 peter Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -6,6 +6,8 @@ DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h +LAZY_SWITCH opt_swtch.h +SWTCH_OPTIM_STATS opt_swtch.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h MAXMEM ==== //depot/projects/smpng/sys/conf/options.pc98#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.160 2003/03/26 19:49:33 ps Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.161 2003/04/03 12:39:51 nyan Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -6,6 +6,8 @@ DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h +LAZY_SWITCH opt_swtch.h +SWTCH_OPTIM_STATS opt_swtch.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h MAXMEM ==== //depot/projects/smpng/sys/ddb/db_input.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_input.c,v 1.32 2002/09/28 17:14:19 phk Exp $ + * $FreeBSD: src/sys/ddb/db_input.c,v 1.33 2003/04/04 12:10:04 des Exp $ */ /* @@ -329,8 +329,8 @@ /* Maintain input line history for non-empty lines. */ if (++db_lhistidx == db_lhist_nlines) { /* Rotate history. */ - ovbcopy(db_lhistory + db_lhistlsize, db_lhistory, - db_lhistlsize * (db_lhist_nlines - 1)); + bcopy(db_lhistory + db_lhistlsize, db_lhistory, + db_lhistlsize * (db_lhist_nlines - 1)); db_lhistidx--; } bcopy(lstart, db_lhistory + db_lhistidx * db_lhistlsize, ==== //depot/projects/smpng/sys/dev/an/if_an.c#28 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT 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/dev/an/if_an.c,v 1.47 2003/02/19 05:47:00 imp Exp $ */ /* @@ -81,6 +79,9 @@ * driver handles all of the encapsulation/decapsulation itself. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.48 2003/04/03 21:36:29 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -132,11 +133,6 @@ #include #include -#if !defined(lint) -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.47 2003/02/19 05:47:00 imp Exp $"; -#endif - /* These are global because we need them in sys/pci/if_an_p.c. */ static void an_reset (struct an_softc *); static int an_init_mpi350_desc (struct an_softc *); ==== //depot/projects/smpng/sys/dev/an/if_an_isa.c#6 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT 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/dev/an/if_an_isa.c,v 1.9 2003/02/17 19:57:32 imp Exp $ */ /* @@ -40,7 +38,11 @@ * Columbia University, New York City */ +#include +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.10 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" + #ifdef INET #define ANCACHE #endif @@ -71,11 +73,6 @@ #include #include -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.9 2003/02/17 19:57:32 imp Exp $"; -#endif - static struct isa_pnp_id an_ids[] = { { 0x0100ec06, "Aironet ISA4500/ISA4800" }, { 0, NULL } ==== //depot/projects/smpng/sys/dev/an/if_an_pccard.c#7 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT 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/dev/an/if_an_pccard.c,v 1.16 2003/02/17 19:57:32 imp Exp $ */ /* @@ -40,6 +38,9 @@ * Columbia University, New York City */ +#include +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.17 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -70,11 +71,6 @@ #include #include "card_if.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.16 2003/02/17 19:57:32 imp Exp $"; -#endif - #include #include ==== //depot/projects/smpng/sys/dev/an/if_an_pci.c#10 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT 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/dev/an/if_an_pci.c,v 1.17 2003/02/17 19:57:32 imp Exp $ */ /* @@ -52,6 +50,9 @@ * to go through their sales office to get it. Bleh. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.18 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -82,11 +83,6 @@ #include #include -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.17 2003/02/17 19:57:32 imp Exp $"; -#endif - #include #include ==== //depot/projects/smpng/sys/dev/ata/atapi-tape.c#19 (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-tape.c,v 1.78 2003/04/01 15:06:23 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.79 2003/04/03 08:50:35 phk Exp $ */ #include "opt_ata.h" @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -125,12 +124,12 @@ DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_SEQUENTIAL | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_TAPE); - dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 0), + dev = make_dev(&ast_cdevsw, 2 * stp->lun, UID_ROOT, GID_OPERATOR, 0640, "ast%d", stp->lun); dev->si_drv1 = stp; dev->si_iosize_max = 256 * DEV_BSIZE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 15:42:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99D0337B404; Fri, 4 Apr 2003 15:42:05 -0800 (PST) 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 4747E37B401 for ; Fri, 4 Apr 2003 15:42:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DC1D43F75 for ; Fri, 4 Apr 2003 15:42:03 -0800 (PST) (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 h34Ng30U066319 for ; Fri, 4 Apr 2003 15:42:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h34NfsLt066211 for perforce@freebsd.org; Fri, 4 Apr 2003 15:41:54 -0800 (PST) Date: Fri, 4 Apr 2003 15:41:54 -0800 (PST) Message-Id: <200304042341.h34NfsLt066211@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 28085 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, 04 Apr 2003 23:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=28085 Change 28085 by peter@peter_daintree on 2003/04/04 15:41:01 IFC @28080 Affected files ... .. //depot/projects/hammer/Makefile#7 integrate .. //depot/projects/hammer/Makefile.inc1#8 integrate .. //depot/projects/hammer/Makefile.upgrade#2 delete .. //depot/projects/hammer/UPDATING#6 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#2 integrate .. //depot/projects/hammer/bin/chio/chio.1#3 integrate .. //depot/projects/hammer/bin/dd/args.c#3 integrate .. //depot/projects/hammer/bin/sh/expand.c#5 integrate .. //depot/projects/hammer/bin/sh/jobs.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/hammer/contrib/gcc/FAQ#2 delete .. //depot/projects/hammer/contrib/gcc/GNATS#2 delete .. //depot/projects/hammer/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/hammer/contrib/gcc/bugs.html#2 delete .. //depot/projects/hammer/contrib/gcc/config-ml.in#2 delete .. //depot/projects/hammer/contrib/gcc/config.if#2 delete .. //depot/projects/hammer/contrib/gcc/config.sub#2 delete .. //depot/projects/hammer/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/hammer/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/hammer/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/hammer/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#5 integrate .. //depot/projects/hammer/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/hammer/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/hammer/contrib/gcc/faq.html#2 delete .. //depot/projects/hammer/contrib/gcc/gnats.html#2 delete .. //depot/projects/hammer/contrib/gcc/include/COPYING#2 delete .. //depot/projects/hammer/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/md5.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/partition.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/sort.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/hammer/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/hammer/contrib/gcc/install-sh#2 delete .. //depot/projects/hammer/contrib/gcc/libtool.m4#2 delete .. //depot/projects/hammer/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/hammer/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/hammer/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/hammer/contrib/gcc/ltconfig#2 delete .. //depot/projects/hammer/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/hammer/contrib/gcc/missing#2 delete .. //depot/projects/hammer/contrib/gcc/mkdep#2 delete .. //depot/projects/hammer/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/hammer/contrib/gcc/symlink-tree#2 delete .. //depot/projects/hammer/contrib/gcc/ylwrap#2 delete .. //depot/projects/hammer/contrib/gdtoa/README#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.8#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/README#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/b.c#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/main.c#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/makefile#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/run.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/cfhead.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/mailer/usenet.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/hammer/contrib/sendmail/editmap/editmap.8#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/clock.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/mail.local.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-chall.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#3 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/hammer/etc/Makefile#6 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#6 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#6 integrate .. //depot/projects/hammer/etc/disktab#1 branch .. //depot/projects/hammer/etc/etc.alpha/disktab#2 delete .. //depot/projects/hammer/etc/etc.i386/disktab#2 delete .. //depot/projects/hammer/etc/etc.ia64/disktab#2 delete .. //depot/projects/hammer/etc/etc.sparc64/disktab#2 delete .. //depot/projects/hammer/etc/mail/aliases#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#5 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#3 integrate .. //depot/projects/hammer/etc/periodic/daily/220.backup-distfile#2 delete .. //depot/projects/hammer/etc/periodic/daily/320.rdist#2 delete .. //depot/projects/hammer/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/hammer/etc/printcap#2 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#6 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#4 integrate .. //depot/projects/hammer/etc/rc.d/kldxref#1 branch .. //depot/projects/hammer/etc/sysctl.conf#3 integrate .. //depot/projects/hammer/etc/syslog.conf#4 integrate .. //depot/projects/hammer/games/caesar/caesar.6#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/hammer/games/grdc/grdc.6#3 integrate .. //depot/projects/hammer/games/grdc/grdc.c#2 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.1#3 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#2 integrate .. //depot/projects/hammer/include/signal.h#5 integrate .. //depot/projects/hammer/include/wchar.h#10 integrate .. //depot/projects/hammer/lib/libatm/Makefile#2 integrate .. //depot/projects/hammer/lib/libatm/atm_addr.c#2 integrate .. //depot/projects/hammer/lib/libatm/cache_key.c#2 integrate .. //depot/projects/hammer/lib/libatm/ip_addr.c#2 integrate .. //depot/projects/hammer/lib/libatm/libatm.h#2 integrate .. //depot/projects/hammer/lib/libatm/timer.c#2 integrate .. //depot/projects/hammer/lib/libc/Makefile#6 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/string/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/i386/string/wcslen.S#1 branch .. //depot/projects/hammer/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libc/locale/lnumeric.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstod.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstof.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstold.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/_ctx_start.S#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/makecontext.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtod.c#4 delete .. //depot/projects/hammer/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/connect.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/madvise.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/open.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/socket.2#3 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_create.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutexattr.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_testcancel.3#2 integrate .. //depot/projects/hammer/lib/libc_r/man/sem_destroy.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/sem_getvalue.3#4 integrate .. //depot/projects/hammer/lib/libc_r/man/sem_init.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/sem_wait.3#3 integrate .. //depot/projects/hammer/lib/libc_r/man/sigwait.3#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_spinlock.c#2 integrate .. //depot/projects/hammer/lib/libcompat/4.1/cftime.3#2 integrate .. //depot/projects/hammer/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#3 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.c#3 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#9 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#9 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#7 integrate .. //depot/projects/hammer/lib/libdisk/write_alpha_disk.c#5 integrate .. //depot/projects/hammer/lib/libdisk/write_disk.c#6 integrate .. //depot/projects/hammer/lib/libdisk/write_i386_disk.c#5 integrate .. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#5 integrate .. //depot/projects/hammer/lib/libdisk/write_pc98_disk.c#5 integrate .. //depot/projects/hammer/lib/libfetch/ftp.c#5 integrate .. //depot/projects/hammer/lib/libfetch/http.c#6 integrate .. //depot/projects/hammer/lib/libgeom/Makefile#2 integrate .. //depot/projects/hammer/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/hammer/lib/libgeom/geom_stats.c#2 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_set_policy.3#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm.3#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getfiles.3#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_nlist.3#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_open.3#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#6 integrate .. //depot/projects/hammer/lib/libmd/mdX.3#2 integrate .. //depot/projects/hammer/lib/libmd/ripemd.3#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_conn.c#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_chroot/Makefile#1 branch .. //depot/projects/hammer/lib/libpam/modules/pam_chroot/pam_chroot.8#1 branch .. //depot/projects/hammer/lib/libpam/modules/pam_chroot/pam_chroot.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/hammer/lib/libstand/libstand.3#3 integrate .. //depot/projects/hammer/lib/libthr/Makefile#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_curthread.S#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#1 branch .. //depot/projects/hammer/lib/libthr/sys/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/sys/thr_error.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_autoinit.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_condattr_init.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_equal.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_find_thread.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_gc.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_getprio.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_main_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mattr_init.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_multi_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_rwlockattr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_self.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_seterrno.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_setprio.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_yield.c#1 branch .. //depot/projects/hammer/lib/libufs/block.c#4 integrate .. //depot/projects/hammer/lib/libufs/type.c#5 integrate .. //depot/projects/hammer/lib/libutil/_secure_path.3#2 integrate .. //depot/projects/hammer/lib/libutil/login_cap.3#3 integrate .. //depot/projects/hammer/lib/libutil/login_class.3#2 integrate .. //depot/projects/hammer/lib/libutil/login_ok.3#2 integrate .. //depot/projects/hammer/lib/libutil/login_times.3#2 integrate .. //depot/projects/hammer/lib/libutil/login_tty.3#2 integrate .. //depot/projects/hammer/lib/libutil/logout.3#2 integrate .. //depot/projects/hammer/lib/libutil/property.3#2 integrate .. //depot/projects/hammer/lib/libutil/pty.3#2 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#3 integrate .. //depot/projects/hammer/lib/libutil/realhostname.3#2 integrate .. //depot/projects/hammer/lib/libutil/realhostname_sa.3#3 integrate .. //depot/projects/hammer/lib/libutil/trimdomain.3#2 integrate .. //depot/projects/hammer/lib/libz/gzio.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#7 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#4 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/rstat_proc.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/reloc.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#5 integrate .. //depot/projects/hammer/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/hammer/libexec/talkd/announce.c#2 integrate .. //depot/projects/hammer/libexec/talkd/extern.h#2 integrate .. //depot/projects/hammer/libexec/talkd/print.c#2 integrate .. //depot/projects/hammer/libexec/talkd/table.c#2 integrate .. //depot/projects/hammer/libexec/talkd/talkd.c#2 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/hammer/release/Makefile#11 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#4 integrate .. //depot/projects/hammer/release/i386/dokern.sh#8 integrate .. //depot/projects/hammer/release/i386/drivers.conf#7 integrate .. //depot/projects/hammer/release/ia64/doFS.sh#2 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#7 integrate .. //depot/projects/hammer/release/pc98/drivers.conf#6 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#4 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#5 integrate .. //depot/projects/hammer/sbin/camcontrol/modeedit.c#3 integrate .. //depot/projects/hammer/sbin/devd/Makefile#4 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile.inc#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/hammer/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/hammer/sbin/disklabel/disklabel.8#5 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.c#8 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#7 integrate .. //depot/projects/hammer/sbin/gbde/Makefile#4 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#4 integrate .. //depot/projects/hammer/sbin/init/init.8#4 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/hammer/sbin/mknod/mknod.8#4 integrate .. //depot/projects/hammer/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#4 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#4 integrate .. //depot/projects/hammer/sbin/ping/ping.8#4 integrate .. //depot/projects/hammer/sbin/ping/ping.c#7 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#3 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#3 integrate .. //depot/projects/hammer/sbin/vinum/list.c#3 integrate .. //depot/projects/hammer/secure/lib/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.1#2 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse#3 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse.README#3 integrate .. //depot/projects/hammer/share/examples/ppp/ppp.conf.sample#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#8 integrate .. //depot/projects/hammer/share/man/man4/ahc.4#2 integrate .. //depot/projects/hammer/share/man/man4/amr.4#2 integrate .. //depot/projects/hammer/share/man/man4/bge.4#4 integrate .. //depot/projects/hammer/share/man/man4/card.4#2 delete .. //depot/projects/hammer/share/man/man4/ccd.4#3 integrate .. //depot/projects/hammer/share/man/man4/icmp.4#2 integrate .. //depot/projects/hammer/share/man/man4/iir.4#2 integrate .. //depot/projects/hammer/share/man/man4/inet.4#3 integrate .. //depot/projects/hammer/share/man/man4/intro.4#3 integrate .. //depot/projects/hammer/share/man/man4/ip.4#4 integrate .. //depot/projects/hammer/share/man/man4/kld.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_none.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_test.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/hammer/share/man/man4/oldcard.4#2 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#3 integrate .. //depot/projects/hammer/share/man/man4/tap.4#3 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#4 integrate .. //depot/projects/hammer/share/man/man4/tun.4#2 integrate .. //depot/projects/hammer/share/man/man4/ukbd.4#5 integrate .. //depot/projects/hammer/share/man/man4/urio.4#2 integrate .. //depot/projects/hammer/share/man/man4/wi.4#5 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/hammer/share/man/man7/release.7#6 integrate .. //depot/projects/hammer/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/hammer/share/man/man8/Makefile#3 integrate .. //depot/projects/hammer/share/man/man8/man8.alpha/MAKEDEV.8#3 delete .. //depot/projects/hammer/share/man/man8/man8.alpha/Makefile#2 delete .. //depot/projects/hammer/share/man/man8/man8.i386/MAKEDEV.8#3 delete .. //depot/projects/hammer/share/man/man8/man8.i386/Makefile#2 delete .. //depot/projects/hammer/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/hammer/share/man/man9/Makefile#7 integrate .. //depot/projects/hammer/share/man/man9/at_exit.9#2 delete .. //depot/projects/hammer/share/man/man9/at_fork.9#2 delete .. //depot/projects/hammer/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/hammer/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/hammer/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/hammer/share/man/man9/byteorder.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#7 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#5 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/mem.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#7 integrate .. //depot/projects/hammer/sys/alpha/include/_types.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_mount.c#4 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#5 integrate .. //depot/projects/hammer/sys/arm/include/_types.h#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/hammer/sys/boot/common/commands.c#2 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efi_console.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/copy.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/main.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.c#3 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/hammer/sys/conf/NOTES#13 integrate .. //depot/projects/hammer/sys/conf/files#13 integrate .. //depot/projects/hammer/sys/conf/files.i386#10 integrate .. //depot/projects/hammer/sys/conf/files.pc98#10 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#7 integrate .. //depot/projects/hammer/sys/conf/options#12 integrate .. //depot/projects/hammer/sys/conf/options.i386#6 integrate .. //depot/projects/hammer/sys/conf/options.pc98#7 integrate .. //depot/projects/hammer/sys/contrib/dev/fla/fla.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_input.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/hammer/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/hammer/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#4 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#6 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#6 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#6 integrate .. //depot/projects/hammer/sys/dev/an/if_an_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-all.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/ccd/ccd.c#5 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/em/LICENSE#2 integrate .. //depot/projects/hammer/sys/dev/em/README#5 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#6 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/hammer/sys/dev/fb/fb.c#3 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#6 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/hammer/sys/dev/ida/ida.c#4 integrate .. //depot/projects/hammer/sys/dev/ida/ida_disk.c#4 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/hammer/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/hammer/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/hammer/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/hammer/sys/dev/md/md.c#9 integrate .. //depot/projects/hammer/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/dcphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/exphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/lxtphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/mii.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/nsgphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/pnaphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/pnphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/qsphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mii/tdkphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mii/tlphy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/hammer/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/xmphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#5 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/hammer/sys/dev/pccard/devlist2h.awk#2 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#6 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#3 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/hammer/sys/dev/pst/pst-raid.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#5 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/hammer/sys/dev/puc/pucvar.h#5 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#5 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#4 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#8 integrate .. //depot/projects/hammer/sys/dev/sio/sioreg.h#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/apm/apm_saver.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#4 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#4 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/hammer/sys/geom/geom.h#10 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.h#1 branch .. //depot/projects/hammer/sys/geom/geom_dev.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_disk.h#1 branch .. //depot/projects/hammer/sys/geom/geom_dump.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_enc.c#7 delete .. //depot/projects/hammer/sys/geom/geom_event.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_ext.h#1 branch .. //depot/projects/hammer/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_stats.c#2 delete .. //depot/projects/hammer/sys/geom/geom_stats.h#2 delete .. //depot/projects/hammer/sys/geom/geom_subr.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/hammer/sys/geom/notes#2 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/fs.h#3 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/hammer/sys/i386/apm/apm.c#7 delete .. //depot/projects/hammer/sys/i386/apm/apm.h#2 delete .. //depot/projects/hammer/sys/i386/bios/apm.c#1 branch .. //depot/projects/hammer/sys/i386/bios/apm.h#1 branch .. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/hammer/sys/i386/bios/smapi.c#1 branch .. //depot/projects/hammer/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/hammer/sys/i386/bios/smbios.c#1 branch .. //depot/projects/hammer/sys/i386/bios/vpd.c#1 branch .. //depot/projects/hammer/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#10 integrate .. //depot/projects/hammer/sys/i386/conf/SMP#2 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#5 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#4 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/vm86bios.s#3 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_signal.c#5 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#4 integrate .. //depot/projects/hammer/sys/i386/include/apic.h#3 integrate .. //depot/projects/hammer/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/hammer/sys/i386/include/bus_at386.h#3 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#5 integrate .. //depot/projects/hammer/sys/i386/include/param.h#5 integrate .. //depot/projects/hammer/sys/i386/include/physio_proc.h#2 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#3 integrate .. //depot/projects/hammer/sys/i386/include/smapi.h#2 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/apic_vector.s#4 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/elink.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/elink.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/intr_machdep.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/mca_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#9 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/spigot.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/spkr.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/hammer/sys/i386/smapi/smapi.c#2 delete .. //depot/projects/hammer/sys/i386/smapi/smapi_bios.S#2 delete .. //depot/projects/hammer/sys/i386/smapi/smapi_isa.c#2 delete .. //depot/projects/hammer/sys/i386/smapi/smapi_var.h#2 delete .. //depot/projects/hammer/sys/i386/svr4/svr4_machdep.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#5 integrate .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/mem.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.s#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/hammer/sys/ia64/include/_types.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/float.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/hammer/sys/isa/fd.c#6 integrate .. //depot/projects/hammer/sys/isa/orm.c#2 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#3 integrate .. //depot/projects/hammer/sys/kern/bus_if.m#4 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_context.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#1 branch .. //depot/projects/hammer/sys/kern/kern_thread.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#1 branch .. //depot/projects/hammer/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_disk.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_xxx.c#3 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#5 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#11 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#11 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/hammer/sys/kern/tty.c#5 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 15:42:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A453037B404; Fri, 4 Apr 2003 15:42:11 -0800 (PST) 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 50A7637B401 for ; Fri, 4 Apr 2003 15:42:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D30443FCB for ; Fri, 4 Apr 2003 15:42:09 -0800 (PST) (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 h34Ng90U066397 for ; Fri, 4 Apr 2003 15:42:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h34Ng39w066322 for perforce@freebsd.org; Fri, 4 Apr 2003 15:42:03 -0800 (PST) Date: Fri, 4 Apr 2003 15:42:03 -0800 (PST) Message-Id: <200304042342.h34Ng39w066322@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 28086 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, 04 Apr 2003 23:42:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=28086 Change 28086 by peter@peter_daintree on 2003/04/04 15:41:35 IFC @28080 Affected files ... .. //depot/projects/ia64/Makefile#24 integrate .. //depot/projects/ia64/Makefile.inc1#52 integrate .. //depot/projects/ia64/Makefile.upgrade#3 delete .. //depot/projects/ia64/UPDATING#35 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#2 integrate .. //depot/projects/ia64/bin/chio/chio.1#3 integrate .. //depot/projects/ia64/contrib/gcc/FAQ#2 delete .. //depot/projects/ia64/contrib/gcc/GNATS#2 delete .. //depot/projects/ia64/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/ia64/contrib/gcc/bugs.html#2 delete .. //depot/projects/ia64/contrib/gcc/config-ml.in#2 delete .. //depot/projects/ia64/contrib/gcc/config.if#2 delete .. //depot/projects/ia64/contrib/gcc/config.sub#2 delete .. //depot/projects/ia64/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/ia64/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/ia64/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/ia64/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/ia64/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/ia64/contrib/gcc/faq.html#2 delete .. //depot/projects/ia64/contrib/gcc/gnats.html#2 delete .. //depot/projects/ia64/contrib/gcc/include/COPYING#2 delete .. //depot/projects/ia64/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/md5.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/partition.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/sort.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/ia64/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/ia64/contrib/gcc/install-sh#2 delete .. //depot/projects/ia64/contrib/gcc/libtool.m4#2 delete .. //depot/projects/ia64/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/ia64/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/ia64/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/ia64/contrib/gcc/ltconfig#2 delete .. //depot/projects/ia64/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/ia64/contrib/gcc/missing#2 delete .. //depot/projects/ia64/contrib/gcc/mkdep#2 delete .. //depot/projects/ia64/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/ia64/contrib/gcc/symlink-tree#2 delete .. //depot/projects/ia64/contrib/gcc/ylwrap#2 delete .. //depot/projects/ia64/contrib/gdtoa/README#3 integrate .. //depot/projects/ia64/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#13 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#10 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#10 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#9 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#10 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#10 integrate .. //depot/projects/ia64/contrib/sendmail/cf/mailer/usenet.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#6 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#10 integrate .. //depot/projects/ia64/contrib/sendmail/editmap/editmap.8#4 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/index.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/installation.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/overview.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_getsymval.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/clock.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/config.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/README#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/collect.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/sm_resolve.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#6 integrate .. //depot/projects/ia64/crypto/openssh/auth1.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#10 integrate .. //depot/projects/ia64/etc/Makefile#24 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#19 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#8 integrate .. //depot/projects/ia64/etc/disktab#1 branch .. //depot/projects/ia64/etc/etc.alpha/disktab#2 delete .. //depot/projects/ia64/etc/etc.i386/disktab#2 delete .. //depot/projects/ia64/etc/etc.ia64/disktab#2 delete .. //depot/projects/ia64/etc/etc.sparc64/disktab#2 delete .. //depot/projects/ia64/etc/mail/aliases#6 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/ia64/etc/periodic/daily/220.backup-distfile#2 delete .. //depot/projects/ia64/etc/periodic/daily/320.rdist#2 delete .. //depot/projects/ia64/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/ia64/etc/printcap#4 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#7 integrate .. //depot/projects/ia64/etc/rc.d/ipfw#4 integrate .. //depot/projects/ia64/etc/syslog.conf#7 integrate .. //depot/projects/ia64/games/caesar/caesar.6#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#7 integrate .. //depot/projects/ia64/games/grdc/grdc.6#3 integrate .. //depot/projects/ia64/games/grdc/grdc.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/include/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#5 integrate .. //depot/projects/ia64/include/signal.h#9 integrate .. //depot/projects/ia64/lib/libatm/Makefile#2 integrate .. //depot/projects/ia64/lib/libatm/atm_addr.c#3 integrate .. //depot/projects/ia64/lib/libatm/cache_key.c#3 integrate .. //depot/projects/ia64/lib/libatm/ip_addr.c#3 integrate .. //depot/projects/ia64/lib/libatm/libatm.h#3 integrate .. //depot/projects/ia64/lib/libatm/timer.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/ia64/lib/libc/i386/gen/signalcontext.c#3 integrate .. //depot/projects/ia64/lib/libc/include/spinlock.h#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/_ctx_start.S#1 branch .. //depot/projects/ia64/lib/libc/sparc64/gen/makecontext.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/realpath.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/realpath.c#5 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#7 integrate .. //depot/projects/ia64/lib/libc/sys/connect.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/madvise.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/open.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/socket.2#8 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#8 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_create.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_unlock.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_testcancel.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_destroy.3#4 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_getvalue.3#4 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_init.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_wait.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/sigwait.3#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_spinlock.c#4 integrate .. //depot/projects/ia64/lib/libcompat/4.1/cftime.3#3 integrate .. //depot/projects/ia64/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#13 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#17 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/ia64/lib/libdisk/rules.c#8 integrate .. //depot/projects/ia64/lib/libdisk/write_alpha_disk.c#6 integrate .. //depot/projects/ia64/lib/libdisk/write_disk.c#8 integrate .. //depot/projects/ia64/lib/libdisk/write_i386_disk.c#5 integrate .. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#9 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#7 integrate .. //depot/projects/ia64/lib/libfetch/http.c#13 integrate .. //depot/projects/ia64/lib/libgeom/Makefile#4 integrate .. //depot/projects/ia64/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/ia64/lib/libgeom/libgeom.h#4 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_set_policy.3#6 integrate .. //depot/projects/ia64/lib/libkvm/kvm.3#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_getfiles.3#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/ia64/lib/libkvm/kvm_nlist.3#2 integrate .. //depot/projects/ia64/lib/libkvm/kvm_open.3#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#15 integrate .. //depot/projects/ia64/lib/libmd/mdX.3#3 integrate .. //depot/projects/ia64/lib/libmd/ripemd.3#3 integrate .. //depot/projects/ia64/lib/libncp/ncpl_conn.c#2 integrate .. //depot/projects/ia64/lib/libncp/ncpl_subr.c#4 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_chroot/Makefile#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.8#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/ia64/lib/libstand/libstand.3#6 integrate .. //depot/projects/ia64/lib/libthr/Makefile#1 branch .. //depot/projects/ia64/lib/libthr/arch/i386/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_curthread.S#1 branch .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#1 branch .. //depot/projects/ia64/lib/libthr/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#1 branch .. //depot/projects/ia64/lib/libthr/sys/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/sys/thr_error.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_attr.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_autoinit.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_clean.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_condattr_init.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_equal.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_find_thread.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_gc.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_getprio.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_getschedparam.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_info.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_main_np.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mattr_init.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_multi_np.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_once.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_printf.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_resume_np.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_rwlock.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_rwlockattr.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_self.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_sem.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_seterrno.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_setprio.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_setschedparam.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_spec.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_stack.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_suspend_np.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_syscalls.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_yield.c#1 branch .. //depot/projects/ia64/lib/libufs/block.c#7 integrate .. //depot/projects/ia64/lib/libufs/type.c#7 integrate .. //depot/projects/ia64/lib/libutil/_secure_path.3#3 integrate .. //depot/projects/ia64/lib/libutil/login_cap.3#4 integrate .. //depot/projects/ia64/lib/libutil/login_class.3#2 integrate .. //depot/projects/ia64/lib/libutil/login_ok.3#2 integrate .. //depot/projects/ia64/lib/libutil/login_times.3#2 integrate .. //depot/projects/ia64/lib/libutil/login_tty.3#2 integrate .. //depot/projects/ia64/lib/libutil/logout.3#2 integrate .. //depot/projects/ia64/lib/libutil/property.3#2 integrate .. //depot/projects/ia64/lib/libutil/pty.3#2 integrate .. //depot/projects/ia64/lib/libutil/realhostname.3#2 integrate .. //depot/projects/ia64/lib/libutil/realhostname_sa.3#4 integrate .. //depot/projects/ia64/lib/libutil/trimdomain.3#2 integrate .. //depot/projects/ia64/lib/msun/src/math.h#13 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#11 integrate .. //depot/projects/ia64/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/ia64/libexec/talkd/announce.c#3 integrate .. //depot/projects/ia64/libexec/talkd/extern.h#2 integrate .. //depot/projects/ia64/libexec/talkd/print.c#3 integrate .. //depot/projects/ia64/libexec/talkd/table.c#3 integrate .. //depot/projects/ia64/libexec/talkd/talkd.c#3 integrate .. //depot/projects/ia64/release/Makefile#43 integrate .. //depot/projects/ia64/release/alpha/dokern.sh#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#15 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#76 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#10 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#20 integrate .. //depot/projects/ia64/release/i386/dokern.sh#14 integrate .. //depot/projects/ia64/release/ia64/doFS.sh#3 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#9 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#11 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#8 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#6 integrate .. //depot/projects/ia64/sbin/devd/Makefile#4 integrate .. //depot/projects/ia64/sbin/dhclient/Makefile#4 integrate .. //depot/projects/ia64/sbin/dhclient/Makefile.inc#3 integrate .. //depot/projects/ia64/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/ia64/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/ia64/sbin/disklabel/disklabel.8#15 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#25 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#15 integrate .. //depot/projects/ia64/sbin/gbde/Makefile#4 integrate .. //depot/projects/ia64/sbin/gbde/gbde.c#8 integrate .. //depot/projects/ia64/sbin/init/init.8#6 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.c#5 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#9 integrate .. //depot/projects/ia64/sbin/mknod/mknod.8#7 integrate .. //depot/projects/ia64/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#7 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#11 integrate .. //depot/projects/ia64/sbin/ping/ping.8#12 integrate .. //depot/projects/ia64/sbin/ping/ping.c#19 integrate .. //depot/projects/ia64/sbin/reboot/reboot.c#5 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#12 integrate .. //depot/projects/ia64/secure/lib/Makefile#3 integrate .. //depot/projects/ia64/secure/usr.bin/bdes/bdes.1#2 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#4 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#5 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.sample#4 integrate .. //depot/projects/ia64/share/man/man4/Makefile#38 integrate .. //depot/projects/ia64/share/man/man4/ahc.4#3 integrate .. //depot/projects/ia64/share/man/man4/amr.4#2 integrate .. //depot/projects/ia64/share/man/man4/bge.4#5 integrate .. //depot/projects/ia64/share/man/man4/card.4#3 delete .. //depot/projects/ia64/share/man/man4/ccd.4#6 integrate .. //depot/projects/ia64/share/man/man4/icmp.4#2 integrate .. //depot/projects/ia64/share/man/man4/iir.4#3 integrate .. //depot/projects/ia64/share/man/man4/inet.4#3 integrate .. //depot/projects/ia64/share/man/man4/intro.4#6 integrate .. //depot/projects/ia64/share/man/man4/ip.4#6 integrate .. //depot/projects/ia64/share/man/man4/kld.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#12 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_ifoff.4#4 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#4 integrate .. //depot/projects/ia64/share/man/man4/mac_mls.4#10 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_partition.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/ia64/share/man/man4/oldcard.4#2 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#4 integrate .. //depot/projects/ia64/share/man/man4/tap.4#4 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#14 integrate .. //depot/projects/ia64/share/man/man4/tun.4#2 integrate .. //depot/projects/ia64/share/man/man4/ukbd.4#6 integrate .. //depot/projects/ia64/share/man/man4/urio.4#2 integrate .. //depot/projects/ia64/share/man/man4/wi.4#17 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#30 integrate .. //depot/projects/ia64/share/man/man7/release.7#18 integrate .. //depot/projects/ia64/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/ia64/share/man/man8/Makefile#7 integrate .. //depot/projects/ia64/share/man/man8/man8.alpha/MAKEDEV.8#5 delete .. //depot/projects/ia64/share/man/man8/man8.alpha/Makefile#2 delete .. //depot/projects/ia64/share/man/man8/man8.i386/MAKEDEV.8#6 delete .. //depot/projects/ia64/share/man/man8/man8.i386/Makefile#2 delete .. //depot/projects/ia64/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/ia64/share/man/man9/Makefile#18 integrate .. //depot/projects/ia64/share/man/man9/at_exit.9#2 delete .. //depot/projects/ia64/share/man/man9/at_fork.9#3 delete .. //depot/projects/ia64/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/ia64/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/ia64/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/ia64/share/man/man9/byteorder.9#3 integrate .. //depot/projects/ia64/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/ia64/share/man/man9/style.9#20 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#10 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#11 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#25 integrate .. //depot/projects/ia64/sys/alpha/alpha/mem.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/support.s#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#23 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#20 integrate .. //depot/projects/ia64/sys/alpha/include/_types.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/param.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#8 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#9 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#11 integrate .. //depot/projects/ia64/sys/arm/include/_types.h#2 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/ia64/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/ia64/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/ia64/sys/boot/common/commands.c#3 integrate .. //depot/projects/ia64/sys/boot/common/load_elf.c#10 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/copy.c#3 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efi_console.c#4 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#7 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/loader/conf.c#7 integrate .. //depot/projects/ia64/sys/boot/efi/loader/main.c#17 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#16 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/bioscd.c#4 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/copy.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/conf.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/main.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#6 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#7 integrate .. //depot/projects/ia64/sys/boot/sparc64/boot1/boot1.c#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#38 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#12 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.c#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/ia64/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/ia64/sys/compat/linux/linux_mib.h#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#11 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#6 integrate .. //depot/projects/ia64/sys/conf/NOTES#45 integrate .. //depot/projects/ia64/sys/conf/files#70 integrate .. //depot/projects/ia64/sys/conf/files.i386#33 integrate .. //depot/projects/ia64/sys/conf/files.pc98#27 integrate .. //depot/projects/ia64/sys/conf/options#49 integrate .. //depot/projects/ia64/sys/conf/options.i386#13 integrate .. //depot/projects/ia64/sys/conf/options.pc98#15 integrate .. //depot/projects/ia64/sys/contrib/dev/fla/fla.c#9 integrate .. //depot/projects/ia64/sys/ddb/db_input.c#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#23 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/ia64/sys/dev/aac/aac_debug.c#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/aac/aacreg.h#9 integrate .. //depot/projects/ia64/sys/dev/aac/aacvar.h#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/ia64/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#6 integrate .. //depot/projects/ia64/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#7 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#17 integrate .. //depot/projects/ia64/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/ia64/sys/dev/amr/amr_disk.c#9 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#11 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#20 integrate .. //depot/projects/ia64/sys/dev/an/if_an_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#33 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-isa.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#18 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#13 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#10 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#21 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/ia64/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/ia64/sys/dev/fb/fb.c#9 integrate .. //depot/projects/ia64/sys/dev/fb/fbreg.h#5 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#22 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#20 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/ia64/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#8 integrate .. //depot/projects/ia64/sys/dev/ida/ida_disk.c#10 integrate .. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/ia64/sys/dev/ie/if_ie.c#6 integrate .. //depot/projects/ia64/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/ia64/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/ia64/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/ia64/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/ia64/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/ia64/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/ia64/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/ia64/sys/dev/md/md.c#25 integrate .. //depot/projects/ia64/sys/dev/mii/acphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/amphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/dcphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/exphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/lxtphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/mii.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/ia64/sys/dev/mii/nsgphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/nsphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/pnaphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/pnphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/qsphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/rlphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/tdkphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/tlphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/ukphy.c#5 integrate .. //depot/projects/ia64/sys/dev/mii/ukphy_subr.c#3 integrate .. //depot/projects/ia64/sys/dev/mii/xmphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx_disk.c#6 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/my/if_my.c#11 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#18 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#5 integrate .. //depot/projects/ia64/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/ia64/sys/dev/pccard/devlist2h.awk#3 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#17 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#6 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#7 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#12 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#12 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#12 integrate .. //depot/projects/ia64/sys/dev/scd/scd.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#16 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/ia64/sys/dev/syscons/apm/apm_saver.c#4 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#18 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#15 integrate .. //depot/projects/ia64/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/if_kue.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#23 integrate .. //depot/projects/ia64/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#35 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#15 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#20 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/ia64/sys/geom/geom.h#24 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.h#1 branch .. //depot/projects/ia64/sys/geom/geom_dev.c#32 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_disk.h#1 branch .. //depot/projects/ia64/sys/geom/geom_dump.c#17 integrate .. //depot/projects/ia64/sys/geom/geom_enc.c#9 delete .. //depot/projects/ia64/sys/geom/geom_event.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_ext.h#1 branch .. //depot/projects/ia64/sys/geom/geom_gpt.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_int.h#10 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_mirror.c#4 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#18 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#3 integrate .. //depot/projects/ia64/sys/geom/notes#3 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#13 integrate .. //depot/projects/ia64/sys/i386/apm/apm.c#7 delete .. //depot/projects/ia64/sys/i386/apm/apm.h#2 delete .. //depot/projects/ia64/sys/i386/bios/apm.c#1 branch .. //depot/projects/ia64/sys/i386/bios/apm.h#1 branch .. //depot/projects/ia64/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/ia64/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/ia64/sys/i386/bios/smapi.c#1 branch .. //depot/projects/ia64/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/ia64/sys/i386/bios/smbios.c#1 branch .. //depot/projects/ia64/sys/i386/bios/vpd.c#1 branch .. //depot/projects/ia64/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#35 integrate .. //depot/projects/ia64/sys/i386/conf/SMP#2 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/db_interface.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#36 integrate .. //depot/projects/ia64/sys/i386/i386/mem.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#39 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#9 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#8 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/vm86bios.s#4 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#7 integrate .. //depot/projects/ia64/sys/i386/include/_types.h#4 integrate .. //depot/projects/ia64/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/ia64/sys/i386/include/bus_at386.h#6 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#13 integrate .. //depot/projects/ia64/sys/i386/include/param.h#6 integrate .. //depot/projects/ia64/sys/i386/include/physio_proc.h#4 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/i386/include/smapi.h#2 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#8 integrate .. //depot/projects/ia64/sys/i386/isa/apic_vector.s#7 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#15 integrate .. //depot/projects/ia64/sys/i386/isa/elink.c#2 integrate .. //depot/projects/ia64/sys/i386/isa/elink.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/intr_machdep.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/intr_machdep.h#8 integrate .. //depot/projects/ia64/sys/i386/isa/isa_dma.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/mca_machdep.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#15 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/spigot.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/spkr.c#12 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#21 integrate .. //depot/projects/ia64/sys/i386/smapi/smapi.c#3 delete .. //depot/projects/ia64/sys/i386/smapi/smapi_bios.S#2 delete .. //depot/projects/ia64/sys/i386/smapi/smapi_isa.c#2 delete .. //depot/projects/ia64/sys/i386/smapi/smapi_var.h#2 delete .. //depot/projects/ia64/sys/i386/svr4/svr4_machdep.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#26 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#12 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#63 integrate .. //depot/projects/ia64/sys/ia64/ia64/mem.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/support.s#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#45 integrate .. //depot/projects/ia64/sys/ia64/include/_types.h#5 integrate .. //depot/projects/ia64/sys/ia64/include/float.h#3 integrate .. //depot/projects/ia64/sys/isa/fd.c#15 integrate .. //depot/projects/ia64/sys/isa/orm.c#2 integrate .. //depot/projects/ia64/sys/isa/vga_isa.c#4 integrate .. //depot/projects/ia64/sys/kern/bus_if.m#7 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_context.c#2 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#1 branch .. //depot/projects/ia64/sys/kern/kern_thread.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#1 branch .. //depot/projects/ia64/sys/kern/makesyscalls.sh#8 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#9 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_devstat.c#6 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#12 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#26 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#32 integrate .. //depot/projects/ia64/sys/kern/subr_xxx.c#7 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#30 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#26 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#27 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#13 integrate .. //depot/projects/ia64/sys/kern/tty.c#24 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#11 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#8 integrate .. //depot/projects/ia64/sys/kern/uipc_jumbo.c#5 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#15 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#30 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#29 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#45 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#19 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#27 integrate .. //depot/projects/ia64/sys/modules/Makefile#43 integrate .. //depot/projects/ia64/sys/modules/apm/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/atspeaker/Makefile#3 delete .. //depot/projects/ia64/sys/modules/bios/Makefile#1 branch .. //depot/projects/ia64/sys/modules/bios/smapi/Makefile#1 branch .. //depot/projects/ia64/sys/modules/bios/smbios/Makefile#1 branch .. //depot/projects/ia64/sys/modules/bios/vpd/Makefile#1 branch .. //depot/projects/ia64/sys/modules/dpt/Makefile#1 branch .. //depot/projects/ia64/sys/modules/elink/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ex/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ie/Makefile#1 branch .. //depot/projects/ia64/sys/modules/mcd/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/pcspeaker/Makefile#3 delete .. //depot/projects/ia64/sys/modules/smapi/Makefile#2 delete .. //depot/projects/ia64/sys/modules/speaker/Makefile#1 branch .. //depot/projects/ia64/sys/net/if_ppp.c#14 integrate .. //depot/projects/ia64/sys/net/slcompress.c#3 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_kxdr.c#6 integrate .. //depot/projects/ia64/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#10 integrate .. //depot/projects/ia64/sys/netinet/in.h#17 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/ia64/sys/netinet/ip.h#5 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#16 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#9 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#26 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#23 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#12 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#38 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/ia64/sys/netncp/ncp_ncp.c#7 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.c#5 integrate .. //depot/projects/ia64/sys/netsmb/smb_iod.c#9 integrate .. //depot/projects/ia64/sys/netsmb/smb_rq.c#9 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.c#11 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.h#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#12 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/pc98/apm/apm.c#8 delete .. //depot/projects/ia64/sys/pc98/apm/apm.h#2 delete .. //depot/projects/ia64/sys/pc98/conf/GENERIC#29 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#33 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#14 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#18 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98gdc.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/spkr.c#11 delete .. //depot/projects/ia64/sys/pc98/pc98/syscons.c#17 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#9 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd_cd.c#8 integrate .. //depot/projects/ia64/sys/pci/agp.c#16 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#29 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#12 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#26 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#11 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#17 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#11 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#15 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#19 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#10 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#16 integrate .. //depot/projects/ia64/sys/pci/if_wb.c#12 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#25 integrate .. //depot/projects/ia64/sys/pci/meteor.c#7 integrate .. //depot/projects/ia64/sys/pci/xrpu.c#7 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#18 integrate .. //depot/projects/ia64/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/autoconf.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/bcopy.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#9 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/clock.c#9 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#9 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/copystr.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/extintr.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/fpu.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/fuswintr.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#23 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#23 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/syncicache.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/sys_machdep.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#24 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/ia64/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#8 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#31 integrate .. //depot/projects/ia64/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/cpufunc.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/fp.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/pcb.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/tte.h#9 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#19 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#31 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#33 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#22 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/sys/_types.h#10 integrate .. //depot/projects/ia64/sys/sys/acct.h#3 integrate .. //depot/projects/ia64/sys/sys/ata.h#7 integrate .. //depot/projects/ia64/sys/sys/bio.h#16 integrate .. //depot/projects/ia64/sys/sys/conf.h#22 integrate .. //depot/projects/ia64/sys/sys/disk.h#14 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#23 integrate .. //depot/projects/ia64/sys/sys/diskmbr.h#4 integrate .. //depot/projects/ia64/sys/sys/diskslice.h#7 delete .. //depot/projects/ia64/sys/sys/endian.h#3 integrate .. //depot/projects/ia64/sys/sys/eventhandler.h#9 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:24:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E41737B404; Fri, 4 Apr 2003 16:24:03 -0800 (PST) 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 B602437B401 for ; Fri, 4 Apr 2003 16:24:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A504643FB1 for ; Fri, 4 Apr 2003 16:24:01 -0800 (PST) (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 h350O10U078766 for ; Fri, 4 Apr 2003 16:24:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350O1d6078763 for perforce@freebsd.org; Fri, 4 Apr 2003 16:24:01 -0800 (PST) Date: Fri, 4 Apr 2003 16:24:01 -0800 (PST) Message-Id: <200304050024.h350O1d6078763@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 28088 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, 05 Apr 2003 00:24:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=28088 Change 28088 by peter@peter_daintree on 2003/04/04 16:23:43 IFC i386_hammer branch Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#3 integrate .. //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#7 integrate .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/hammer/sys/x86_64/include/bus_at386.h#3 integrate .. //depot/projects/hammer/sys/x86_64/include/md_var.h#10 integrate .. //depot/projects/hammer/sys/x86_64/isa/clock.c#8 integrate .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#8 integrate .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#4 integrate .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/x86_64/isa/npx.c#17 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/busdma_machdep.c#4 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#30 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#6 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#10 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#6 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#7 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#16 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#9 integrate Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#3 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/i386/reloc.c,v 1.11 2002/11/18 22:08:49 tmm Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.12 2003/03/14 21:10:12 kan Exp $ */ /* @@ -125,8 +125,6 @@ cache = mmap(NULL, bytes, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); if (cache == MAP_FAILED) cache = NULL; - if (cache != NULL) - memset(cache, 0, bytes); rellim = (const Elf_Rel *) ((caddr_t) obj->rel + obj->relsize); for (rel = obj->rel; rel < rellim; rel++) { ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#7 (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/i386/acpica/acpi_machdep.c,v 1.7 2003/03/03 12:15:48 phk Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ */ #include ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#6 (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/i386/acpica/acpi_wakeup.c,v 1.17 2002/12/04 18:40:39 alc Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.18 2003/03/25 00:07:01 jake Exp $ */ #include #include ==== //depot/projects/hammer/sys/x86_64/include/bus_at386.h#3 (text+ko) ==== @@ -67,7 +67,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/i386/include/bus_at386.h,v 1.21 2003/03/11 19:43:38 jake Exp $ */ +/* $FreeBSD: src/sys/i386/include/bus_at386.h,v 1.22 2003/03/30 05:24:52 jake Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ @@ -92,15 +92,23 @@ /* * Bus address and size types */ -typedef u_int bus_addr_t; -typedef u_int bus_size_t; +#ifdef PAE +typedef uint64_t bus_addr_t; +#else +typedef uint32_t bus_addr_t; +#endif +typedef uint32_t bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF +#ifdef PAE +#define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL +#else #define BUS_SPACE_MAXADDR 0xFFFFFFFF +#endif #define BUS_SPACE_UNRESTRICTED (~0) ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#10 (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/i386/include/md_var.h,v 1.59 2003/01/22 18:18:45 jhb Exp $ + * $FreeBSD: src/sys/i386/include/md_var.h,v 1.62 2003/04/04 17:29:54 des Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,6 +36,11 @@ * Miscellaneous machine-dependent declarations. */ +extern void (*bcopy_vector)(const void *from, void *to, size_t len); +extern void (*bzero_vector)(void *buf, size_t len); +extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len); +extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); + extern long Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ extern int busdma_swi_pending; @@ -50,9 +55,6 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; -#ifdef COMPAT_FREEBSD4 -extern int szfreebsd4_sigcode; -#endif typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.195 2003/02/11 11:43:25 phk Exp $ + * $FreeBSD: src/sys/i386/isa/clock.c,v 1.197 2003/03/24 19:14:46 mdodd Exp $ */ /* @@ -52,7 +52,6 @@ #include "opt_isa.h" #include -#include #include #include #include ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.73 2002/10/20 18:02:46 phk Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ */ #include "opt_auto_eoi.h" ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#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/i386/isa/intr_machdep.h,v 1.42 2002/07/12 07:56:10 peter Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.43 2003/04/02 23:53:29 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ ==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.12 2002/04/29 07:43:14 peter Exp $ + * $FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.13 2003/03/25 00:07:03 jake Exp $ */ /* @@ -215,7 +215,7 @@ void isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan) { - vm_offset_t phys; + vm_paddr_t phys; int waport; caddr_t newaddr; @@ -375,7 +375,8 @@ static int isa_dmarangecheck(caddr_t va, u_int length, int chan) { - vm_offset_t phys, priorpage = 0, endva; + vm_paddr_t phys, priorpage = 0; + vm_offset_t endva; u_int dma_pgmsk = (chan & 4) ? ~(128*1024-1) : ~(64*1024-1); GIANT_REQUIRED; ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.137 2003/02/17 09:55:08 julian Exp $ + * $FreeBSD: src/sys/i386/isa/npx.c,v 1.140 2003/04/04 17:29:55 des Exp $ */ #include "opt_debug_npx.h" @@ -614,9 +614,8 @@ bzero(addr, sizeof(*addr)); return (_MC_FPOWNED_NONE); } - s = intr_disable(); - if (curthread == PCPU_GET(fpcurthread)) { + if (td == PCPU_GET(fpcurthread)) { fxsave(addr); intr_restore(s); return (_MC_FPOWNED_FPU); @@ -638,7 +637,7 @@ register_t s; s = intr_disable(); - if (curthread == PCPU_GET(fpcurthread)) { + if (td == PCPU_GET(fpcurthread)) { fxrstor(addr); intr_restore(s); } else { ==== //depot/projects/hammer/sys/x86_64/x86_64/busdma_machdep.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/i386/i386/busdma_machdep.c,v 1.34 2003/02/26 02:16:05 mux Exp $ + * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.38 2003/03/25 00:07:02 jake Exp $ */ #include @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include +#include #include #include @@ -95,13 +97,17 @@ static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist; static struct bus_dmamap nobounce_dmamap; +static void init_bounce_pages(void *dummy); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map); -static vm_offset_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, +static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr, bus_size_t size); static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage); static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); +/* To protect all the the bounce pages related lists and data. */ +static struct mtx bounce_lock; + /* * Return true if a match is made. * @@ -152,8 +158,9 @@ newtag->parent = parent; newtag->alignment = alignment; newtag->boundary = boundary; - newtag->lowaddr = trunc_page((vm_offset_t)lowaddr) + (PAGE_SIZE - 1); - newtag->highaddr = trunc_page((vm_offset_t)highaddr) + (PAGE_SIZE - 1); + newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); + newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + + (PAGE_SIZE - 1); newtag->filter = filter; newtag->filterarg = filterarg; newtag->maxsize = maxsize; @@ -181,12 +188,12 @@ newtag->filterarg = parent->filterarg; newtag->parent = parent->parent; } - if (newtag->parent != NULL) { - parent->ref_count++; - } + if (newtag->parent != NULL) + atomic_add_int(&parent->ref_count, 1); } - if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) { + if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) && + (flags & BUS_DMA_ALLOCNOW) != 0) { /* Must bounce */ if (lowaddr > bounce_lowaddr) { @@ -230,7 +237,7 @@ bus_dma_tag_t parent; parent = dmat->parent; - dmat->ref_count--; + atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { free(dmat, M_DEVBUF); /* @@ -257,7 +264,7 @@ error = 0; - if (dmat->lowaddr < ptoa(Maxmem)) { + if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)) { /* Must bounce */ int maxpages; @@ -339,7 +346,8 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = NULL; - if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { + if ((size <= PAGE_SIZE) && + dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { *vaddr = malloc(size, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); } else { @@ -348,10 +356,12 @@ * and handles multi-seg allocations. Nobody is doing * multi-seg allocations yet though. */ + mtx_lock(&Giant); *vaddr = contigmalloc(size, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); + mtx_unlock(&Giant); } if (*vaddr == NULL) return (ENOMEM); @@ -379,10 +389,13 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); - if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) + if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); - else + else { + mtx_lock(&Giant); contigfree(vaddr, size, M_DEVBUF); + mtx_unlock(&Giant); + } } void @@ -402,7 +415,7 @@ void *callback_arg, int flags) { vm_offset_t vaddr; - vm_offset_t paddr; + vm_paddr_t paddr; #ifdef __GNUC__ bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -411,7 +424,7 @@ bus_dma_segment_t *sg; int seg; int error; - vm_offset_t nextpaddr; + vm_paddr_t nextpaddr; if (map == NULL) map = &nobounce_dmamap; @@ -421,7 +434,8 @@ * If we are being called during a callback, pagesneeded will * be non-zero, so we can avoid doing the work twice. */ - if (dmat->lowaddr < ptoa(Maxmem) && map->pagesneeded == 0) { + if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) && + map->pagesneeded == 0) { vm_offset_t vendaddr; /* @@ -443,9 +457,7 @@ /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { - int s; - - s = splhigh(); + mtx_lock(&bounce_lock); if (reserve_bounce_pages(dmat, map) != 0) { /* Queue us for resources */ @@ -456,11 +468,10 @@ map->callback_arg = callback_arg; STAILQ_INSERT_TAIL(&bounce_map_waitinglist, map, links); - splx(s); - + mtx_unlock(&bounce_lock); return (EINPROGRESS); } - splx(s); + mtx_unlock(&bounce_lock); } vaddr = (vm_offset_t)buf; @@ -619,7 +630,7 @@ #endif int nsegs, error; - KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, + KASSERT(dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem) || map != NULL, ("bus_dmamap_load_mbuf: No support for bounce pages!")); KASSERT(m0->m_flags & M_PKTHDR, ("bus_dmamap_load_mbuf: no packet header")); @@ -675,7 +686,7 @@ struct iovec *iov; struct thread *td = NULL; - KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, + KASSERT(dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem) || map != NULL, ("bus_dmamap_load_uio: No support for bounce pages!")); resid = uio->uio_resid; @@ -772,42 +783,52 @@ } } +static void +init_bounce_pages(void *dummy __unused) +{ + + free_bpages = 0; + reserved_bpages = 0; + active_bpages = 0; + total_bpages = 0; + STAILQ_INIT(&bounce_page_list); + STAILQ_INIT(&bounce_map_waitinglist); + STAILQ_INIT(&bounce_map_callbacklist); + mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF); +} +SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL); + static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages) { int count; count = 0; - if (total_bpages == 0) { - STAILQ_INIT(&bounce_page_list); - STAILQ_INIT(&bounce_map_waitinglist); - STAILQ_INIT(&bounce_map_callbacklist); - } - while (numpages > 0) { struct bounce_page *bpage; - int s; bpage = (struct bounce_page *)malloc(sizeof(*bpage), M_DEVBUF, M_NOWAIT | M_ZERO); if (bpage == NULL) break; + mtx_lock(&Giant); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, PAGE_SIZE, 0); + mtx_unlock(&Giant); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; } bpage->busaddr = pmap_kextract(bpage->vaddr); - s = splhigh(); + mtx_lock(&bounce_lock); STAILQ_INSERT_TAIL(&bounce_page_list, bpage, links); total_bpages++; free_bpages++; - splx(s); + mtx_unlock(&bounce_lock); count++; numpages--; } @@ -819,6 +840,7 @@ { int pages; + mtx_assert(&bounce_lock, MA_OWNED); pages = MIN(free_bpages, map->pagesneeded - map->pagesreserved); free_bpages -= pages; reserved_bpages += pages; @@ -828,11 +850,10 @@ return (pages); } -static vm_offset_t +static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr, bus_size_t size) { - int s; struct bounce_page *bpage; if (map->pagesneeded == 0) @@ -843,7 +864,7 @@ panic("add_bounce_page: map doesn't need any pages"); map->pagesreserved--; - s = splhigh(); + mtx_lock(&bounce_lock); bpage = STAILQ_FIRST(&bounce_page_list); if (bpage == NULL) panic("add_bounce_page: free page list is empty"); @@ -851,7 +872,7 @@ STAILQ_REMOVE_HEAD(&bounce_page_list, links); reserved_bpages--; active_bpages++; - splx(s); + mtx_unlock(&bounce_lock); bpage->datavaddr = vaddr; bpage->datacount = size; @@ -862,13 +883,12 @@ static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage) { - int s; struct bus_dmamap *map; bpage->datavaddr = 0; bpage->datacount = 0; - s = splhigh(); + mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bounce_page_list, bpage, links); free_bpages++; active_bpages--; @@ -881,22 +901,21 @@ swi_sched(vm_ih, 0); } } - splx(s); + mtx_unlock(&bounce_lock); } void busdma_swi(void) { - int s; struct bus_dmamap *map; - s = splhigh(); + mtx_lock(&bounce_lock); while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); - splx(s); + mtx_unlock(&bounce_lock); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); - s = splhigh(); + mtx_lock(&bounce_lock); } - splx(s); + mtx_unlock(&bounce_lock); } ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#30 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.554 2003/02/20 05:35:52 peter Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.561 2003/04/02 23:53:28 peter Exp $ */ #include "opt_atalk.h" @@ -48,6 +48,7 @@ #include "opt_maxmem.h" #include "opt_msgbuf.h" #include "opt_perfmon.h" +#include "opt_swtch.h" #include "opt_kstack_pages.h" #include @@ -140,11 +141,40 @@ vm_offset_t proc0kstack; /* address of proc 0 kstack space */ #if defined(SWTCH_OPTIM_STATS) -extern int swtch_optim_stats; +int stupid_switch; +SYSCTL_INT(_debug, OID_AUTO, stupid_switch, + CTLFLAG_RW, &stupid_switch, 0, ""); +int swtch_optim_stats; SYSCTL_INT(_debug, OID_AUTO, swtch_optim_stats, - CTLFLAG_RD, &swtch_optim_stats, 0, ""); + CTLFLAG_RW, &swtch_optim_stats, 0, ""); +int tlb_flush_count; SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count, - CTLFLAG_RD, &tlb_flush_count, 0, ""); + CTLFLAG_RW, &tlb_flush_count, 0, ""); +int lazy_flush_count; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_count, + CTLFLAG_RW, &lazy_flush_count, 0, ""); +int lazy_flush_fixup; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_fixup, + CTLFLAG_RW, &lazy_flush_fixup, 0, ""); +#ifdef SMP +int lazy_flush_smpfixup; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpfixup, + CTLFLAG_RW, &lazy_flush_smpfixup, 0, ""); +int lazy_flush_smpipi; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpipi, + CTLFLAG_RW, &lazy_flush_smpipi, 0, ""); +int lazy_flush_smpbadcr3; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpbadcr3, + CTLFLAG_RW, &lazy_flush_smpbadcr3, 0, ""); +int lazy_flush_smpmiss; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpmiss, + CTLFLAG_RW, &lazy_flush_smpmiss, 0, ""); +#endif +#endif +#ifdef LAZY_SWITCH +int lazy_flush_enable = 1; +SYSCTL_INT(_debug, OID_AUTO, lazy_flush_enable, + CTLFLAG_RW, &lazy_flush_enable, 0, ""); #endif int cold = 1; @@ -156,7 +186,7 @@ long Maxmem = 0; -vm_offset_t phys_avail[10]; +vm_paddr_t phys_avail[10]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) @@ -181,8 +211,8 @@ #ifdef PERFMON perfmon_init(); #endif - printf("real memory = %u (%u MB)\n", ptoa(Maxmem), - ptoa(Maxmem) / 1048576); + printf("real memory = %ju (%ju MB)\n", ptoa((uintmax_t)Maxmem), + ptoa((uintmax_t)Maxmem) / 1048576); /* * Display any holes after the first chunk of extended memory. */ @@ -191,19 +221,22 @@ printf("Physical memory chunk(s):\n"); for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) { - unsigned int size1; + vm_paddr_t size; - size1 = phys_avail[indx + 1] - phys_avail[indx]; - printf("0x%08x - 0x%08x, %u bytes (%u pages)\n", - phys_avail[indx], phys_avail[indx + 1] - 1, size1, - size1 / PAGE_SIZE); + size = phys_avail[indx + 1] - phys_avail[indx]; + printf( + "0x%016jx - 0x%016jx, %ju bytes (%ju pages)\n", + (uintmax_t)phys_avail[indx], + (uintmax_t)phys_avail[indx + 1] - 1, + (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); } } vm_ksubmap_init(&kmi); - printf("avail memory = %u (%u MB)\n", ptoa(cnt.v_free_count), - ptoa(cnt.v_free_count) / 1048576); + printf("avail memory = %ju (%ju MB)\n", + ptoa((uintmax_t)cnt.v_free_count), + ptoa((uintmax_t)cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -498,7 +531,7 @@ /* Go back to user mode if both flags are set. */ if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) - trapsignal(p, SIGBUS, 0); + trapsignal(td, SIGBUS, 0); if (vm86->vm86_has_vme) { eflags = (tf->tf_eflags & ~VME_USERCHANGE) | @@ -544,7 +577,7 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("freebsd4_sigreturn: cs = 0x%x\n", cs); - trapsignal(p, SIGBUS, T_PROTFLT); + trapsignal(td, SIGBUS, T_PROTFLT); return (EINVAL); } @@ -559,9 +592,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = ucp->uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = ucp->uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); return (EJUSTRETURN); } @@ -632,9 +665,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = ucp->uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = ucp->uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); return (EJUSTRETURN); } @@ -671,6 +704,9 @@ * XXX we need to have a cpu mask of idle cpus and generate an IPI or * otherwise generate some sort of interrupt to wake up cpus sitting in HLT. * Then we can have our cake and eat it too. + * + * XXX I'm turning it on for SMP as well by default for now. It seems to + * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, @@ -685,6 +721,12 @@ void cpu_idle(void) { + +#ifdef SMP + if (mp_grab_cpu_hlt()) + return; +#endif + if (cpu_idle_hlt) { disable_intr(); if (sched_runnable()) { @@ -1051,13 +1093,15 @@ * * Total memory size may be set by the kernel environment variable * hw.physmem or the compile-time define MAXMEM. + * + * XXX first should be vm_paddr_t. */ static void getmemsize(int first) { int i, physmap_idx, pa_indx; u_int basemem, extmem; - vm_offset_t pa, physmap[PHYSMAP_SIZE]; + vm_paddr_t pa, physmap[PHYSMAP_SIZE]; pt_entry_t *pte; char *cp; struct bios_smap *smap; @@ -1079,12 +1123,8 @@ physmap_idx = 0; do { if (boothowto & RB_VERBOSE) - printf("SMAP type=%02x base=%08x %08x len=%08x %08x\n", - smap->type, - *(u_int32_t *)((char *)&smap->base + 4), - (u_int32_t)smap->base, - *(u_int32_t *)((char *)&smap->length + 4), - (u_int32_t)smap->length); + printf("SMAP type=%02x base=%016llx len=%016llx\n", + smap->type, smap->base, smap->length); if (smap->type != 0x01) goto next_run; @@ -1092,11 +1132,13 @@ if (smap->length == 0) goto next_run; +#ifndef PAE if (smap->base >= 0xffffffff) { printf("%uK of memory above 4GB ignored\n", (u_int)(smap->length / 1024)); goto next_run; } +#endif for (i = 0; i <= physmap_idx; i += 2) { if (smap->base < physmap[i + 1]) { @@ -1227,7 +1269,7 @@ * extend the last memory segment to the new limit. */ if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa(Maxmem); + physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); /* call pmap initialization to make new kernel address space */ pmap_bootstrap(first, 0); @@ -1246,9 +1288,9 @@ * round up the start address and round down the end address. */ for (i = 0; i <= physmap_idx; i += 2) { - vm_offset_t end; + vm_paddr_t end; - end = ptoa(Maxmem); + end = ptoa((vm_paddr_t)Maxmem); if (physmap[i + 1] < end) end = trunc_page(physmap[i + 1]); for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) { @@ -1529,7 +1571,11 @@ dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); +#ifdef PAE + dblfault_tss.tss_cr3 = (int)IdlePDPT; +#else dblfault_tss.tss_cr3 = (int)IdlePTD; +#endif dblfault_tss.tss_eip = (int)dblfault_handler; dblfault_tss.tss_eflags = PSL_KERNEL; dblfault_tss.tss_ds = dblfault_tss.tss_es = dblfault_tss.tss_fs = @@ -1571,7 +1617,11 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ +#ifdef PAE + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; +#else thread0.td_pcb->pcb_cr3 = (int)IdlePTD; +#endif thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } ==== //depot/projects/hammer/sys/x86_64/x86_64/mem.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/mem.c,v 1.104 2003/03/03 12:15:49 phk Exp $ + * $FreeBSD: src/sys/i386/i386/mem.c,v 1.106 2003/04/03 23:44:35 jake Exp $ */ /* @@ -179,8 +179,6 @@ if (addr < (vm_offset_t)VADDR(PTDPTDI, 0)) return (EFAULT); - if (eaddr >= (vm_offset_t)VADDR(APTDPTDI, 0)) - return (EFAULT); for (; addr < eaddr; addr += PAGE_SIZE) if (pmap_extract(kernel_pmap, addr) == 0) return (EFAULT); @@ -211,7 +209,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { switch (minor(dev)) { ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#10 (text+ko) ==== @@ -39,7 +39,38 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.397 2003/03/12 07:38:37 jake Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.403 2003/04/03 23:44:35 jake Exp $ + */ +/*- + * Copyright (c) 2003 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Jake Burkholder, + * Safeport Network Services, and Network Associates Laboratories, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * 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. */ /* @@ -71,6 +102,7 @@ #include "opt_pmap.h" #include "opt_msgbuf.h" #include "opt_kstack_pages.h" +#include "opt_swtch.h" #include #include @@ -144,9 +176,12 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; +#if defined(SMP) && defined(LAZY_SWITCH) +static struct mtx lazypmap_lock; +#endif -vm_offset_t avail_start; /* PA of first available physical page */ -vm_offset_t avail_end; /* PA of last available physical page */ +vm_paddr_t avail_start; /* PA of first available physical page */ +vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ @@ -157,6 +192,10 @@ vm_offset_t kernel_vm_end; u_int32_t KERNend; /* Written in 32 bit mode */ +#ifdef PAE +static uma_zone_t pdptzone; +#endif + /* * Data for the pv entry allocation mechanism */ @@ -186,7 +225,6 @@ static pt_entry_t *PADDR1 = 0; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pt_entry_t *get_ptbase(pmap_t pmap); static pv_entry_t get_pv_entry(void); static void i386_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -203,11 +241,13 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); -static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va); 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); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); -static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); +static void *pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); +#ifdef PAE +static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); +#endif static pd_entry_t pdir4mb; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:40:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D923937B404; Fri, 4 Apr 2003 16:40:22 -0800 (PST) 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 853F337B401 for ; Fri, 4 Apr 2003 16:40:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EA2D43FA3 for ; Fri, 4 Apr 2003 16:40:22 -0800 (PST) (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 h350eL0U079675 for ; Fri, 4 Apr 2003 16:40:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350eLum079669 for perforce@freebsd.org; Fri, 4 Apr 2003 16:40:21 -0800 (PST) Date: Fri, 4 Apr 2003 16:40:21 -0800 (PST) Message-Id: <200304050040.h350eLum079669@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 28089 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, 05 Apr 2003 00:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=28089 Change 28089 by peter@peter_daintree on 2003/04/04 16:39:32 IFC @28080 on i386_hammer Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#19 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#6 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.88 2003/02/27 20:13:20 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.96 2003/04/04 10:09:44 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -70,7 +70,7 @@ /* Our various interpretations of the above */ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 -#define PG_FRAME (~PAGE_MASK) +#define PG_FRAME (~((vm_paddr_t)PAGE_MASK)) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ @@ -131,10 +131,12 @@ typedef u_int64_t pdp_entry_t; typedef u_int64_t pml4_entry_t; -#define PML4ESHIFT (2) -#define PDPESHIFT (2) -#define PTESHIFT (2) -#define PDESHIFT (2) +#define PML4ESHIFT (3) +#define PDPESHIFT (3) +#define PTESHIFT (3) +#define PDESHIFT (3) + +#endif /* * Address of current and alternate address space page table maps @@ -146,11 +148,11 @@ * in the page tables and the evil overlapping. */ #ifdef _KERNEL -extern pt_entry_t PTmap[], APTmap[]; -extern pd_entry_t PDmap[], APDmap[]; -extern pdp_entry_t PDPmap[], APDPmap[]; -extern pml4_entry_t PML4[], APML4; -extern pd_entry_t PML4pml4e[], APML4pml4e[]; +extern pt_entry_t PTmap[]: +extern pd_entry_t PDmap[]: +extern pdp_entry_t PDPmap[]: +extern pml4_entry_t PML4[]: +extern pd_entry_t PML4pml4e[]: extern pd_entry_t *IdlePML4; /* physical address of "Idle" state directory */ #endif @@ -163,7 +165,6 @@ * the corresponding pde that in turn maps it. */ #define vtopte(va) (PTmap + x86_64_btop(va)) -#define avtopte(va) (APTmap + x86_64_btop(va)) /* * Routine: pmap_kextract @@ -171,24 +172,48 @@ * Extract the physical page address associated * kernel virtual address. */ -static __inline vm_offset_t +static __inline vm_paddr_t pmap_kextract(vm_offset_t va) { - vm_offset_t pa; + vm_paddr_t pa; /* XXX the acronyms are giving me headaches at the moment */ /* XXX if ((pa = (vm_offset_t) PTD[va >> PDRSHIFT]) & PG_PS) { pa = (pa & ~(NBPDR - 1)) | (va & (NBPDR - 1)); } else */ { - pa = *(vm_offset_t *)vtopte(va); + pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); } return pa; } #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) + +#ifdef PAE + +static __inline pt_entry_t +pte_load_clear(pt_entry_t *pte) +{ + pt_entry_t r; + + r = *pte; + __asm __volatile( + "1:\n" + "\tcmpxchg8b %1\n" + "\tjnz 1b" + : "+A" (r) + : "m" (*pte), "b" (0), "c" (0)); + return (r); +} + +#else + +#define pte_load_clear(pte) atomic_readandclear_int(pte) + #endif +#endif + /* * Pmap stuff */ @@ -203,9 +228,13 @@ pd_entry_t *pm_pdir; /* KVA of page directory */ vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - int pm_active; /* active on cpus */ + u_int pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ +#ifdef PAE + pdpt_entry_t *pm_pdpt; /* KVA of page director pointer + table */ +#endif }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) @@ -242,19 +271,21 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_offset_t avail_end; -extern vm_offset_t avail_start; +extern vm_paddr_t avail_end; +extern vm_paddr_t avail_start; extern vm_offset_t clean_eva; extern vm_offset_t clean_sva; -extern vm_offset_t phys_avail[]; +extern vm_paddr_t phys_avail[]; extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; -void pmap_bootstrap(vm_offset_t, vm_offset_t); -void *pmap_mapdev(vm_offset_t, vm_size_t); +void pmap_bootstrap(vm_paddr_t, vm_paddr_t); +void pmap_kenter(vm_offset_t va, vm_paddr_t pa); +void pmap_kremove(vm_offset_t); +void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); -pt_entry_t *pmap_pte(pmap_t, vm_offset_t) __pure2; +pt_entry_t *pmap_pte_quick(pmap_t, vm_offset_t) __pure2; void pmap_set_opt(void); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#19 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.169 2003/02/23 22:12:07 jake Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -54,12 +54,6 @@ /* * PTmap is recursive pagemap at top of virtual address space. * Within PTmap, the page directory can be found (third indirection). - * - * NOTE: PTDpde, PTmap, and PTD are being defined as address symbols. - * In C you access them directly, and not with a '*'. Storage is not being - * allocated. They will magically address the correct locations in KVM - * which C will treat as normal variables of the type they are defined in - * machine/pmap.h, i.e. PTDpde = XX ; to set a PDE entry, NOT *PTDpde = XX; */ .globl PTmap,PTD,PTDpde .set PTmap,(PTDPTDI << PDRSHIFT) @@ -67,16 +61,6 @@ .set PTDpde,PTD + (PTDPTDI * PDESIZE) /* - * APTmap, APTD is the alternate recursive pagemap. - * It's used when modifying another process's page tables. - * See the note above. It is true here as well. - */ - .globl APTmap,APTD,APTDpde - .set APTmap,APTDPTDI << PDRSHIFT - .set APTD,APTmap + (APTDPTDI * PAGE_SIZE) - .set APTDpde,PTD + (APTDPTDI * PDESIZE) - -/* * Compiled KERNBASE location */ .globl kernbase @@ -223,7 +207,11 @@ xorl %ebp,%ebp /* mark end of frames */ +#ifdef PAE + movl IdlePDPT,%esi +#else movl IdlePTD,%esi +#endif movl %esi,(KSTACK_PAGES*PAGE_SIZE-PCB_SIZE+PCB_CR3)(%eax) pushl physfree /* value of first for init386(first) */ @@ -308,6 +296,11 @@ movl %esi,R(KPTphys) /* Allocate Page Table Directory */ +#ifdef PAE + /* XXX only need 32 bytes (easier for now) */ + ALLOCPAGES(1) + movl %esi,R(IdlePDPT) +#endif ALLOCPAGES(NPGPTD) movl %esi,R(IdlePTD) @@ -341,6 +334,12 @@ fillkptphys(%edx) /* Map page directory. */ +#ifdef PAE + movl R(IdlePDPT), %eax + movl $1, %ecx + fillkptphys($PG_RW) +#endif + movl R(IdlePTD), %eax movl $NPGPTD, %ecx fillkptphys($PG_RW) @@ -378,6 +377,13 @@ movl $NPGPTD,%ecx fillkpt(R(IdlePTD), $PG_RW) +#ifdef PAE + movl R(IdlePTD), %eax + xorl %ebx, %ebx + movl $NPGPTD, %ecx + fillkpt(R(IdlePDPT), $0x0) +#endif + ret /********************************************************************** From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:55:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E721B37B404; Fri, 4 Apr 2003 16:55:41 -0800 (PST) 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 884EE37B401 for ; Fri, 4 Apr 2003 16:55:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DFFF43F85 for ; Fri, 4 Apr 2003 16:55:41 -0800 (PST) (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 h350te0U085845 for ; Fri, 4 Apr 2003 16:55:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350teWC085842 for perforce@freebsd.org; Fri, 4 Apr 2003 16:55:40 -0800 (PST) Date: Fri, 4 Apr 2003 16:55:40 -0800 (PST) Message-Id: <200304050055.h350teWC085842@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 28090 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, 05 Apr 2003 00:55:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=28090 Change 28090 by peter@peter_overcee on 2003/04/04 16:54:41 supercede 32 bit perfctr registers with 64 bit ones Affected files ... .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/specialreg.h#6 (text+ko) ==== @@ -309,6 +309,8 @@ #define MSR_PERFEVSEL1 0xc0010001 #define MSR_PERFEVSEL2 0xc0010002 #define MSR_PERFEVSEL3 0xc0010003 +#undef MSR_PERFCTR0 +#undef MSR_PERFCTR1 #define MSR_PERFCTR0 0xc0010004 #define MSR_PERFCTR1 0xc0010005 #define MSR_PERFCTR2 0xc0010006 From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:56:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B714B37B404; Fri, 4 Apr 2003 16:56:43 -0800 (PST) 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 597C937B401 for ; Fri, 4 Apr 2003 16:56:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 065CC43F3F for ; Fri, 4 Apr 2003 16:56:43 -0800 (PST) (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 h350ug0U085882 for ; Fri, 4 Apr 2003 16:56:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350ugcv085879 for perforce@freebsd.org; Fri, 4 Apr 2003 16:56:42 -0800 (PST) Date: Fri, 4 Apr 2003 16:56:42 -0800 (PST) Message-Id: <200304050056.h350ugcv085879@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 28091 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, 05 Apr 2003 00:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=28091 Change 28091 by peter@peter_overcee on 2003/04/04 16:55:44 dont hide the link command for now Affected files ... .. //depot/projects/hammer/sys/conf/kern.pre.mk#6 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -68,7 +68,7 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= ${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:57:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C11C037B404; Fri, 4 Apr 2003 16:57:45 -0800 (PST) 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 583AE37B401 for ; Fri, 4 Apr 2003 16:57:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E325D43F3F for ; Fri, 4 Apr 2003 16:57:44 -0800 (PST) (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 h350vi0U085917 for ; Fri, 4 Apr 2003 16:57:44 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350viKN085914 for perforce@freebsd.org; Fri, 4 Apr 2003 16:57:44 -0800 (PST) Date: Fri, 4 Apr 2003 16:57:44 -0800 (PST) Message-Id: <200304050057.h350viKN085914@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 28092 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, 05 Apr 2003 00:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=28092 Change 28092 by peter@peter_overcee on 2003/04/04 16:56:44 hammer cpu types Affected files ... .. //depot/projects/hammer/sys/conf/options.x86_64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.x86_64#5 (text+ko) ==== @@ -55,3 +55,6 @@ # ------------------------------- # EOF # ------------------------------- +CLAWHAMMER opt_cpu.h +SLEDGEHAMMER opt_cpu.h +HAMMER opt_cpu.h From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:58:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 965C137B404; Fri, 4 Apr 2003 16:58:47 -0800 (PST) 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 2E8CF37B401 for ; Fri, 4 Apr 2003 16:58:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEB0443FAF for ; Fri, 4 Apr 2003 16:58:46 -0800 (PST) (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 h350wk0U086001 for ; Fri, 4 Apr 2003 16:58:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350wk4g085998 for perforce@freebsd.org; Fri, 4 Apr 2003 16:58:46 -0800 (PST) Date: Fri, 4 Apr 2003 16:58:46 -0800 (PST) Message-Id: <200304050058.h350wk4g085998@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 28093 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, 05 Apr 2003 00:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=28093 Change 28093 by peter@peter_overcee on 2003/04/04 16:58:14 missing bits for kernel configuration Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#7 (text+ko) ==== @@ -121,6 +121,23 @@ #define KSTACK_GUARD 1 /* compile in the kstack guard page */ /* + * Ceiling on amount of swblock kva space, can be changed via + * the kern.maxswzone /boot/loader.conf variable. + */ +#ifndef VM_SWZONE_SIZE_MAX +#define VM_SWZONE_SIZE_MAX (32 * 1024 * 1024) +#endif + +/* + * Ceiling on size of buffer cache (really only effects write queueing, + * the VM page cache is not effected), can be changed via + * the kern.maxbcache /boot/loader.conf variable. + */ +#ifndef VM_BCACHE_SIZE_MAX +#define VM_BCACHE_SIZE_MAX (200 * 1024 * 1024) +#endif + +/* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:58:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE40737B404; Fri, 4 Apr 2003 16:58:48 -0800 (PST) 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 BE51E37B401 for ; Fri, 4 Apr 2003 16:58:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 522CD43FAF for ; Fri, 4 Apr 2003 16:58:47 -0800 (PST) (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 h350wl0U086007 for ; Fri, 4 Apr 2003 16:58:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h350wkYQ086004 for perforce@freebsd.org; Fri, 4 Apr 2003 16:58:46 -0800 (PST) Date: Fri, 4 Apr 2003 16:58:46 -0800 (PST) Message-Id: <200304050058.h350wkYQ086004@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 28094 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, 05 Apr 2003 00:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=28094 Change 28094 by peter@peter_overcee on 2003/04/04 16:58:44 align to 64 bits Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#8 (text+ko) ==== @@ -55,7 +55,7 @@ * */ #ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(int) - 1) +#define _ALIGNBYTES (sizeof(long) - 1) #endif #ifndef _ALIGN #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:00:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B16637B404; Fri, 4 Apr 2003 17:00:51 -0800 (PST) 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 EEAFD37B401 for ; Fri, 4 Apr 2003 17:00:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88CC143FDD for ; Fri, 4 Apr 2003 17:00:50 -0800 (PST) (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 h3510o0U086270 for ; Fri, 4 Apr 2003 17:00:50 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3510obJ086267 for perforce@freebsd.org; Fri, 4 Apr 2003 17:00:50 -0800 (PST) Date: Fri, 4 Apr 2003 17:00:50 -0800 (PST) Message-Id: <200304050100.h3510obJ086267@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 28095 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, 05 Apr 2003 01:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=28095 Change 28095 by peter@peter_overcee on 2003/04/04 17:00:18 long is 64 bits, not 32. XXX most of this file is still wrong Affected files ... .. //depot/projects/hammer/sys/x86_64/include/atomic.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#5 (text+ko) ==== @@ -68,6 +68,7 @@ void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ @@ -137,6 +138,29 @@ return (res); } +static __inline int +atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) +{ +#if 0 + long res = exp; + + __asm __volatile ( + " " __XSTRING(MPLOCKED) " " + " cmpxchgl %1,%2 ; " + " setz %%al ; " + " movzbl %%al,%0 ; " + "1: " + "# atomic_cmpset_int" + : "+a" (res) /* 0 (result) */ + : "r" (src), /* 1 */ + "m" (*(dst)) /* 2 */ + : "memory"); + + return (res); +#else + return (0); +#endif +} #endif /* defined(__GNUC__) */ #if defined(__GNUC__) @@ -170,6 +194,7 @@ #else /* !defined(__GNUC__) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); +extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ @@ -194,15 +219,15 @@ ATOMIC_ASM(add, int, "addl %1,%0", "ir", v); ATOMIC_ASM(subtract, int, "subl %1,%0", "ir", v); -ATOMIC_ASM(set, long, "orl %1,%0", "ir", v); -ATOMIC_ASM(clear, long, "andl %1,%0", "ir", ~v); -ATOMIC_ASM(add, long, "addl %1,%0", "ir", v); -ATOMIC_ASM(subtract, long, "subl %1,%0", "ir", v); +ATOMIC_ASM(set, long, "orq %1,%0", "ir", v); +ATOMIC_ASM(clear, long, "andq %1,%0", "ir", ~v); +ATOMIC_ASM(add, long, "addq %1,%0", "ir", v); +ATOMIC_ASM(subtract, long, "subq %1,%0", "ir", v); ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "xchgb %b1,%0"); ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "xchgw %w1,%0"); ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "xchgl %1,%0"); -ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1", "xchgl %1,%0"); +ATOMIC_STORE_LOAD(long, "cmpxchgq %0,%1", "xchgq %1,%0"); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD @@ -244,9 +269,6 @@ #define atomic_add_rel_long atomic_add_long #define atomic_subtract_acq_long atomic_subtract_long #define atomic_subtract_rel_long atomic_subtract_long -#define atomic_cmpset_long atomic_cmpset_int -#define atomic_cmpset_acq_long atomic_cmpset_acq_int -#define atomic_cmpset_rel_long atomic_cmpset_rel_int #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_rel_ptr atomic_cmpset_ptr @@ -305,39 +327,39 @@ atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) { - return (atomic_cmpset_int((volatile u_int *)dst, (u_int)exp, - (u_int)src)); + return (atomic_cmpset_long((volatile u_long *)dst, + (u_long)exp, (u_long)src)); } static __inline void * atomic_load_acq_ptr(volatile void *p) { - return (void *)atomic_load_acq_int((volatile u_int *)p); + return (void *)atomic_load_acq_long((volatile u_long *)p); } static __inline void atomic_store_rel_ptr(volatile void *p, void *v) { - atomic_store_rel_int((volatile u_int *)p, (u_int)v); + atomic_store_rel_long((volatile u_long *)p, (u_long)v); } #define ATOMIC_PTR(NAME) \ static __inline void \ atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ { \ - atomic_##NAME##_int((volatile u_int *)p, v); \ + atomic_##NAME##_long((volatile u_long *)p, v); \ } \ \ static __inline void \ atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ { \ - atomic_##NAME##_acq_int((volatile u_int *)p, v);\ + atomic_##NAME##_acq_long((volatile u_long *)p, v);\ } \ \ static __inline void \ atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ { \ - atomic_##NAME##_rel_int((volatile u_int *)p, v);\ + atomic_##NAME##_rel_long((volatile u_long *)p, v);\ } ATOMIC_PTR(set) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:01:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCF3C37B405; Fri, 4 Apr 2003 17:01:53 -0800 (PST) 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 649AA37B401 for ; Fri, 4 Apr 2003 17:01:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D38F543FAF for ; Fri, 4 Apr 2003 17:01:52 -0800 (PST) (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 h3511q0U086474 for ; Fri, 4 Apr 2003 17:01:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3511q6U086471 for perforce@freebsd.org; Fri, 4 Apr 2003 17:01:52 -0800 (PST) Date: Fri, 4 Apr 2003 17:01:52 -0800 (PST) Message-Id: <200304050101.h3511q6U086471@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 28097 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, 05 Apr 2003 01:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=28097 Change 28097 by peter@peter_overcee on 2003/04/04 17:01:43 strip down for hammer Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcpu.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcpu.h#3 (text+ko) ==== @@ -43,14 +43,7 @@ */ #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ - struct i386tss pc_common_tss; \ - struct segment_descriptor pc_common_tssd; \ - struct segment_descriptor *pc_tss_gdt; \ - int pc_currentldt; \ - u_int32_t pc_int_pending; /* master int pending flag */ \ - u_int32_t pc_ipending; /* pending slow interrupts */ \ - u_int32_t pc_fpending; /* pending fast interrupts */ \ - u_int32_t pc_spending /* pending soft interrupts */ + int pc_currentldt; #if defined(lint) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:01:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89EEF37B425; Fri, 4 Apr 2003 17:01:54 -0800 (PST) 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 7383A37B404 for ; Fri, 4 Apr 2003 17:01:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ABBA43FA3 for ; Fri, 4 Apr 2003 17:01:52 -0800 (PST) (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 h3511q0U086468 for ; Fri, 4 Apr 2003 17:01:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3511psA086465 for perforce@freebsd.org; Fri, 4 Apr 2003 17:01:51 -0800 (PST) Date: Fri, 4 Apr 2003 17:01:51 -0800 (PST) Message-Id: <200304050101.h3511psA086465@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 28096 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, 05 Apr 2003 01:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=28096 Change 28096 by peter@peter_overcee on 2003/04/04 17:01:14 update some 64 bit inlines; still too many XXX's here Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#4 (text+ko) ==== @@ -310,12 +310,12 @@ __asm __volatile("pause"); } -static __inline u_int -read_eflags(void) +static __inline u_long +read_rflags(void) { u_int ef; - __asm __volatile("pushfl; popl %0" : "=r" (ef)); + __asm __volatile("pushfl; XXX; popl %0" : "=r" (ef)); return (ef); } @@ -324,7 +324,7 @@ { u_int64_t rv; - __asm __volatile("rdmsr" : "=A" (rv) : "c" (msr)); + __asm __volatile("rdmsr XXX" : "=A" (rv) : "c" (msr)); return (rv); } @@ -333,7 +333,7 @@ { u_int64_t rv; - __asm __volatile("rdpmc" : "=A" (rv) : "c" (pmc)); + __asm __volatile("rdpmc XXX" : "=A" (rv) : "c" (pmc)); return (rv); } @@ -342,7 +342,7 @@ { u_int64_t rv; - __asm __volatile("rdtsc" : "=A" (rv)); + __asm __volatile("rdtsc XXX" : "=A" (rv)); return (rv); } @@ -353,68 +353,68 @@ } static __inline void -write_eflags(u_int ef) +write_rflags(u_long ef) { - __asm __volatile("pushl %0; popfl" : : "r" (ef)); + __asm __volatile("pushl %0; XXXpopfl" : : "r" (ef)); } static __inline void wrmsr(u_int msr, u_int64_t newval) { - __asm __volatile("wrmsr" : : "A" (newval), "c" (msr)); + __asm __volatile("wrmsr XXX" : : "A" (newval), "c" (msr)); } static __inline void -load_cr0(u_int data) +load_cr0(u_long data) { __asm __volatile("movl %0,%%cr0" : : "r" (data)); } -static __inline u_int +static __inline u_long rcr0(void) { - u_int data; + u_long data; __asm __volatile("movl %%cr0,%0" : "=r" (data)); return (data); } -static __inline u_int +static __inline u_long rcr2(void) { - u_int data; + u_long data; __asm __volatile("movl %%cr2,%0" : "=r" (data)); return (data); } static __inline void -load_cr3(u_int data) +load_cr3(u_long data) { __asm __volatile("movl %0,%%cr3" : : "r" (data) : "memory"); } -static __inline u_int +static __inline u_long rcr3(void) { - u_int data; + u_long data; __asm __volatile("movl %%cr3,%0" : "=r" (data)); return (data); } static __inline void -load_cr4(u_int data) +load_cr4(u_long data) { __asm __volatile("movl %0,%%cr4" : : "r" (data)); } -static __inline u_int +static __inline u_long rcr4(void) { - u_int data; + u_long data; __asm __volatile("movl %%cr4,%0" : "=r" (data)); return (data); @@ -435,7 +435,7 @@ * Only works on 486+ CPUs (i386 does not have PG_G). */ static __inline void -invlpg(u_int addr) +invlpg(u_long addr) { __asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory"); @@ -623,8 +623,8 @@ int breakpoint(void); u_int bsfl(u_int mask); u_int bsrl(u_int mask); -void cpu_invlpg(u_int addr); -void cpu_invlpg_range(u_int start, u_int end); +void cpu_invlpg(u_long addr); +void cpu_invlpg_range(u_long start, u_long end); void disable_intr(void); void do_cpuid(u_int ax, u_int *p); void enable_intr(void); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:02:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE4C37B404; Fri, 4 Apr 2003 17:02:55 -0800 (PST) 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 5C2D837B401 for ; Fri, 4 Apr 2003 17:02:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3F7C43F85 for ; Fri, 4 Apr 2003 17:02:54 -0800 (PST) (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 h3512s0U086534 for ; Fri, 4 Apr 2003 17:02:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3512s23086531 for perforce@freebsd.org; Fri, 4 Apr 2003 17:02:54 -0800 (PST) Date: Fri, 4 Apr 2003 17:02:54 -0800 (PST) Message-Id: <200304050102.h3512s23086531@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 28098 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, 05 Apr 2003 01:02:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=28098 Change 28098 by peter@peter_overcee on 2003/04/04 17:02:23 leave out the custom ldt stuff for now Affected files ... .. //depot/projects/hammer/sys/x86_64/include/proc.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/proc.h#5 (text+ko) ==== @@ -39,14 +39,6 @@ #include -struct proc_ldt { - caddr_t ldt_base; - int ldt_len; - int ldt_refcnt; - u_long ldt_active; - struct segment_descriptor ldt_sd; -}; - /* * Machine-dependent part of the proc structure for i386. */ @@ -55,7 +47,6 @@ }; struct mdproc { - struct proc_ldt *md_ldt; /* (j) per-process ldt */ }; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:03:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6721C37B404; Fri, 4 Apr 2003 17:03:57 -0800 (PST) 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 07C2F37B401 for ; Fri, 4 Apr 2003 17:03:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A687843FA3 for ; Fri, 4 Apr 2003 17:03:56 -0800 (PST) (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 h3513u0U087489 for ; Fri, 4 Apr 2003 17:03:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3513uhx087486 for perforce@freebsd.org; Fri, 4 Apr 2003 17:03:56 -0800 (PST) Date: Fri, 4 Apr 2003 17:03:56 -0800 (PST) Message-Id: <200304050103.h3513uhx087486@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 28099 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, 05 Apr 2003 01:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=28099 Change 28099 by peter@peter_overcee on 2003/04/04 17:03:30 fix some duplicate fields. #if 0 some no longer usable prototypes for functions. There is no descriptor union anymore, as some descriptors are double entries. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#11 (text+ko) ==== @@ -93,7 +93,7 @@ u_int64_t sd_hibase:40; /* segment base address (msb) */ u_int64_t sd_xx1:8; u_int64_t sd_mbz:5; /* MUST be zero */ - u_int64_t sd_xx1:19; + u_int64_t sd_xx2:19; }; /* @@ -111,7 +111,7 @@ u_int64_t gd_hioffset:38; /* gate offset (msb) */ u_int64_t sd_xx1:8; u_int64_t sd_mbz:5; /* MUST be zero */ - u_int64_t sd_xx1:19; + u_int64_t sd_xx2:19; }; /* system segments and gate types */ @@ -207,10 +207,12 @@ extern union descriptor ldt[NLDT]; void lgdt(struct region_descriptor *rdp); +#if 0 void sdtossd(struct segment_descriptor *sdp, struct soft_segment_descriptor *ssdp); void ssdtosd(struct soft_segment_descriptor *ssdp, struct segment_descriptor *sdp); +#endif #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:05:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93EBF37B404; Fri, 4 Apr 2003 17:04:59 -0800 (PST) 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 1D16537B401 for ; Fri, 4 Apr 2003 17:04:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE24D43F93 for ; Fri, 4 Apr 2003 17:04:58 -0800 (PST) (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 h3514w0U087537 for ; Fri, 4 Apr 2003 17:04:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3514wY5087534 for perforce@freebsd.org; Fri, 4 Apr 2003 17:04:58 -0800 (PST) Date: Fri, 4 Apr 2003 17:04:58 -0800 (PST) Message-Id: <200304050104.h3514wY5087534@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 28100 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, 05 Apr 2003 01:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=28100 Change 28100 by peter@peter_overcee on 2003/04/04 17:04:27 add a serial trace function, and stub out some stuff. I dont remember the details. :-] Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#20 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#20 (text+ko) ==== @@ -44,7 +44,6 @@ */ #include -#include #include #include #include @@ -151,6 +150,15 @@ call init_serial PING('H'); + PING('e'); + PING('l'); + PING('l'); + PING('o'); + PING('!'); + PING('\r'); + PING('\n'); + hlt +#if 0 call recover_metadata PING('i'); call identify_cpu @@ -274,8 +282,6 @@ movl %eax,R(cpu_id) # store cpu_id movl %ebx,R(cpu_procinfo) # store cpu_procinfo movl %edx,R(cpu_feature) # store cpu_feature - - movl $CPU_686,R(cpu) # call it a pentium pro ret @@ -423,6 +429,7 @@ /* Region descriptor for the gdt above */ gdt_rd: .word (gdt_end - gdt) .word R(gdt) +#endif .bss ALIGN_DATA /* just to be sure */ @@ -430,7 +437,120 @@ .space 0x1000 /* space for tmpstk - temporary stack */ HIDENAME(tmpstk): +#if 0 physfree: .space 4 /* phys addr of next free page */ KPTphys: .space 4 /* phys addr of kernel page tables */ p0upa: .space 4 /* phys addr of proc0's UAREA */ p0kpa: .space 4 /* phys addr of proc0's STACK */ +#endif + +#define COMBRD(x) (1843200 / (16*(x))) +#define COMCONSOLE 0x3f8 +#define CONSPEED 9600 + + .code32 + .text +/* + * void serial_putc(int ch); + * Write character `ch' to port COMCONSOLE. + */ + .globl serial_putc + .type serial_putc@function +serial_putc: + movl $10000, %ecx # timeout + movl $COMCONSOLE + 5, %edx # line status reg +1: + decl %ecx + je 2f + inb %dx, %al + testb $0x20, %al + je 1b # TX buffer not empty + + movb 4(%esp), %al + + subl $5, %edx # TX output reg + outb %al, %dx # send this one + +2: + ret + +/* + * int serial_getc(void); + * Read a character from port COMCONSOLE. + */ + .globl serial_getc + .type serial_getc@function +serial_getc: + mov $COMCONSOLE + 5, %edx # line status reg +1: + inb %dx, %al + testb $0x01, %al + je 1b # no rx char available + + xorl %eax, %eax + subl $5, %edx # rx buffer reg + inb %dx, %al # fetch (first) character + + andb $0x7F, %al # remove any parity bits we get + cmpb $0x7F, %al # make DEL... + jne 2f + movb $0x08, %al # look like BS +2: + ret + +/* + * int serial_ischar(void); + * If there is a character in the input buffer of port COMCONSOLE, + * return nonzero; otherwise return 0. + */ + + .globl serial_ischar + .type serial_ischar@function +serial_ischar: + xorl %eax, %eax + movl $COMCONSOLE + 5, %edx # line status reg + inb %dx, %al + andb $0x01, %al # rx char available? + ret + +/* + * void init_serial(void); + * Initialize port COMCONSOLE to speed CONSPEED, line settings 8N1. + */ + + .globl init_serial + .type init_serial@function +init_serial: + movl $COMCONSOLE + 3, %edx # line control reg + movb $0x80, %al + outb %al, %dx # enable DLAB + + subl $3, %edx # divisor latch, low byte + movb $COMBRD(CONSPEED) & 0xff, %al + outb %al, %dx + incl %edx # divisor latch, high byte + movb $COMBRD(CONSPEED) >> 8, %al + outb %al, %dx + + incl %edx # fifo control register (if any) + xorl %eax,%eax + outb %al, %dx # disable fifo to reduce worst-case busy-wait + + incl %edx # line control reg + movb $0x03, %al + outb %al, %dx # 8N1 + + incl %edx # modem control reg + outb %al, %dx # enable DTR/RTS + + /* Flush the input buffer. */ + incl %edx # line status reg +1: + subl $5, %edx # rx buffer reg + inb %dx, %al # throw away (unconditionally the first time) + addl $5, %edx # line status reg + inb %dx, %al + testb $0x01, %al + jne 1b # more + + ret From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:12:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB7BA37B405; Fri, 4 Apr 2003 17:12:08 -0800 (PST) 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 8ED2637B401 for ; Fri, 4 Apr 2003 17:12:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F305743FBD for ; Fri, 4 Apr 2003 17:12:07 -0800 (PST) (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 h351C70U088111 for ; Fri, 4 Apr 2003 17:12:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351C7JO088108 for perforce@freebsd.org; Fri, 4 Apr 2003 17:12:07 -0800 (PST) Date: Fri, 4 Apr 2003 17:12:07 -0800 (PST) Message-Id: <200304050112.h351C7JO088108@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 28101 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, 05 Apr 2003 01:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=28101 Change 28101 by peter@peter_daintree on 2003/04/04 17:11:20 s/movl/movq/ for 64 bit stuff Affected files ... .. //depot/projects/hammer/sys/x86_64/include/asm.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/asm.h#4 (text+ko) ==== @@ -107,38 +107,38 @@ #define ARCH_DISPATCH(x) \ _START_ENTRY; \ .globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \ - movl PIC_GOT(AVECNAME(x)),%rax; \ - jmpl *(%rax) + movq PIC_GOT(AVECNAME(x)),%rax; \ + jmpq *(%rax) #define ARCH_SELECT(x) _START_ENTRY; \ .type ASELNAME(x),@function; \ ASELNAME(x): \ call PIC_PLT(CNAME(__get_hw_float)); \ - testl %rax,%rax; \ - movl PIC_GOT(ANAME(x)),%rax; \ + testq %rax,%rax; \ + movq PIC_GOT(ANAME(x)),%rax; \ jne 8f; \ - movl PIC_GOT(GNAME(x)),%rax; \ + movq PIC_GOT(GNAME(x)),%rax; \ 8: \ - movl PIC_GOT(AVECNAME(x)),%rdx; \ - movl %rax,(%rdx); \ - jmpl *%rax + movq PIC_GOT(AVECNAME(x)),%rdx; \ + movq %rax,(%rdx); \ + jmpq *%rax #else /* !PIC */ #define ARCH_DISPATCH(x) \ _START_ENTRY; \ .globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \ - jmpl *AVECNAME(x) + jmpw *AVECNAME(x) #define ARCH_SELECT(x) _START_ENTRY; \ .type ASELNAME(x),@function; \ ASELNAME(x): \ call CNAME(__get_hw_float); \ - testl %rax,%rax; \ - movl $ANAME(x),%rax; \ + testw %rax,%rax; \ + movw $ANAME(x),%rax; \ jne 8f; \ - movl $GNAME(x),%rax; \ + movw $GNAME(x),%rax; \ 8: \ - movl %rax,AVECNAME(x); \ - jmpl *%rax + movw %rax,AVECNAME(x); \ + jmpw *%rax #endif /* PIC */ #define ARCH_VECTOR(x) .data; .p2align 2; \ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:49:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4121537B405; Fri, 4 Apr 2003 17:49:56 -0800 (PST) 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 F254B37B401 for ; Fri, 4 Apr 2003 17:49:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B57743F75 for ; Fri, 4 Apr 2003 17:49:55 -0800 (PST) (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 h351nt0U090285 for ; Fri, 4 Apr 2003 17:49:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351ns0H090282 for perforce@freebsd.org; Fri, 4 Apr 2003 17:49:54 -0800 (PST) Date: Fri, 4 Apr 2003 17:49:54 -0800 (PST) Message-Id: <200304050149.h351ns0H090282@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 28104 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, 05 Apr 2003 01:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=28104 Change 28104 by peter@peter_daintree on 2003/04/04 17:49:16 implement some more. This is just about done I think. Have to check the gcc manual for how to specify 64 bit regs though. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/atomic.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#6 (text+ko) ==== @@ -141,25 +141,21 @@ static __inline int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) { -#if 0 long res = exp; __asm __volatile ( " " __XSTRING(MPLOCKED) " " - " cmpxchgl %1,%2 ; " + " cmpxchgq %1,%2 ; " " setz %%al ; " " movzbl %%al,%0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res) /* 0 (result) */ + : "+a" (res) /* 0 (result) %rax, XXX check */ : "r" (src), /* 1 */ "m" (*(dst)) /* 2 */ : "memory"); return (res); -#else - return (0); -#endif } #endif /* defined(__GNUC__) */ @@ -392,8 +388,8 @@ u_long result; __asm __volatile ( - " xorl %0,%0 ; " - " xchgl %1,%0 ; " + " xorq %0,%0 ; " + " xchgq %1,%0 ; " "# atomic_readandclear_int" : "=&r" (result) /* 0 (result) */ : "m" (*addr)); /* 1 (addr) */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:50:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70D4337B404; Fri, 4 Apr 2003 17:50:58 -0800 (PST) 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 0FA2D37B401 for ; Fri, 4 Apr 2003 17:50:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AACCA43F85 for ; Fri, 4 Apr 2003 17:50:57 -0800 (PST) (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 h351ov0U090709 for ; Fri, 4 Apr 2003 17:50:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351oukP090706 for perforce@freebsd.org; Fri, 4 Apr 2003 17:50:56 -0800 (PST) Date: Fri, 4 Apr 2003 17:50:56 -0800 (PST) Message-Id: <200304050150.h351oukP090706@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 28105 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, 05 Apr 2003 01:50:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=28105 Change 28105 by peter@peter_daintree on 2003/04/04 17:50:06 increase alignment, s/l/q/ in pcpu stuff, but the pcpu stuff still needs to be taken out and shot. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/asmacros.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/asmacros.h#2 (text+ko) ==== @@ -50,11 +50,11 @@ #define CNAME(csym) csym #define HIDENAME(asmsym) .asmsym -#define ALIGN_DATA .p2align 2 /* 4 byte alignment, zero filled */ +#define ALIGN_DATA .p2align 3 /* 8 byte alignment, zero filled */ #ifdef GPROF #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ #else -#define ALIGN_TEXT .p2align 2,0x90 /* 4-byte alignment, nop filled */ +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ #endif #define SUPERALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ @@ -64,8 +64,9 @@ #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ #ifdef LOCORE +XXX gotta redo this to use a register #define PCPU(member) %fs:PC_ ## member -#define PCPU_ADDR(member, reg) movl %fs:PC_PRVSPACE,reg; \ +#define PCPU_ADDR(member, reg) movq %fs:PC_PRVSPACE,reg; \ addl $PC_ ## member,reg #endif @@ -115,7 +116,7 @@ #define CROSSJUMPTARGET(label) \ ALIGN_TEXT; __CONCAT(to,label): ; MCOUNT; jmp label #define ENTRY(name) GEN_ENTRY(name) ; 9: ; MCOUNT -#define FAKE_MCOUNT(caller) pushl caller ; call __mcount ; popl %ecx +#define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popl %ecx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT #define MEXITCOUNT call HIDENAME(mexitcount) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:51:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0E3637B409; Fri, 4 Apr 2003 17:50:59 -0800 (PST) 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 DA24E37B40A for ; Fri, 4 Apr 2003 17:50:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 648FA43F85 for ; Fri, 4 Apr 2003 17:50:58 -0800 (PST) (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 h351ow0U090716 for ; Fri, 4 Apr 2003 17:50:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351ovlV090712 for perforce@freebsd.org; Fri, 4 Apr 2003 17:50:57 -0800 (PST) Date: Fri, 4 Apr 2003 17:50:57 -0800 (PST) Message-Id: <200304050150.h351ovlV090712@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 28106 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, 05 Apr 2003 01:51:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=28106 Change 28106 by peter@peter_daintree on 2003/04/04 17:50:39 64 bit updates. I have to check the register constraints though. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#5 (text+ko) ==== @@ -52,10 +52,12 @@ #define readb(va) (*(volatile u_int8_t *) (va)) #define readw(va) (*(volatile u_int16_t *) (va)) #define readl(va) (*(volatile u_int32_t *) (va)) +#define readq(va) (*(volatile u_int64_t *) (va)) #define writeb(va, d) (*(volatile u_int8_t *) (va) = (d)) #define writew(va, d) (*(volatile u_int16_t *) (va) = (d)) #define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) +#define writeq(va, d) (*(volatile u_int64_t *) (va) = (d)) #ifdef __GNUC__ @@ -313,9 +315,9 @@ static __inline u_long read_rflags(void) { - u_int ef; + u_long ef; - __asm __volatile("pushfl; XXX; popl %0" : "=r" (ef)); + __asm __volatile("pushfq; popq %0" : "=r" (ef)); return (ef); } @@ -324,7 +326,7 @@ { u_int64_t rv; - __asm __volatile("rdmsr XXX" : "=A" (rv) : "c" (msr)); + __asm __volatile("rdmsr" : "=A" (rv) : "c" (msr)); return (rv); } @@ -333,7 +335,7 @@ { u_int64_t rv; - __asm __volatile("rdpmc XXX" : "=A" (rv) : "c" (pmc)); + __asm __volatile("rdpmc" : "=A" (rv) : "c" (pmc)); return (rv); } @@ -342,7 +344,7 @@ { u_int64_t rv; - __asm __volatile("rdtsc XXX" : "=A" (rv)); + __asm __volatile("rdtsc" : "=A" (rv)); return (rv); } @@ -355,13 +357,13 @@ static __inline void write_rflags(u_long ef) { - __asm __volatile("pushl %0; XXXpopfl" : : "r" (ef)); + __asm __volatile("pushl %0; popfq" : : "r" (ef)); } static __inline void wrmsr(u_int msr, u_int64_t newval) { - __asm __volatile("wrmsr XXX" : : "A" (newval), "c" (msr)); + __asm __volatile("wrmsr" : : "A" (newval), "c" (msr)); } static __inline void @@ -441,6 +443,7 @@ __asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory"); } +/* XXX these are replaced with rdmsr/wrmsr */ static __inline u_int rfs(void) { From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:52:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73E9337B404; Fri, 4 Apr 2003 17:52:01 -0800 (PST) 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 1F5EF37B401 for ; Fri, 4 Apr 2003 17:52:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58D5843FBF for ; Fri, 4 Apr 2003 17:52:00 -0800 (PST) (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 h351q00U090780 for ; Fri, 4 Apr 2003 17:52:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351pxXS090777 for perforce@freebsd.org; Fri, 4 Apr 2003 17:51:59 -0800 (PST) Date: Fri, 4 Apr 2003 17:51:59 -0800 (PST) Message-Id: <200304050151.h351pxXS090777@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 28107 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, 05 Apr 2003 01:52:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=28107 Change 28107 by peter@peter_daintree on 2003/04/04 17:50:57 note that we have a 64 bit bswap instruction, but dont do it yet. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/endian.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/endian.h#4 (text+ko) ==== @@ -89,6 +89,7 @@ static __inline __uint64_t __bswap64(__uint64_t _x) { + /* XXX we have a 64 bit variation of the bswap instruction now */ return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) | ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) | ((_x << 24) & ((__uint64_t)0xff << 40)) | From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:52:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB93B37B401; Fri, 4 Apr 2003 17:52:02 -0800 (PST) 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 AB12037B411 for ; Fri, 4 Apr 2003 17:52:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D108443FD7 for ; Fri, 4 Apr 2003 17:52:00 -0800 (PST) (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 h351q00U090790 for ; Fri, 4 Apr 2003 17:52:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351q0vL090785 for perforce@freebsd.org; Fri, 4 Apr 2003 17:52:00 -0800 (PST) Date: Fri, 4 Apr 2003 17:52:00 -0800 (PST) Message-Id: <200304050152.h351q0vL090785@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 28108 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, 05 Apr 2003 01:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=28108 Change 28108 by peter@peter_daintree on 2003/04/04 17:51:19 premature update of some register names Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpu.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpu.h#6 (text+ko) ==== @@ -55,16 +55,16 @@ #define cpu_exec(p) /* nothing */ #define cpu_swapin(p) /* nothing */ -#define cpu_getstack(td) ((td)->td_frame->tf_esp) -#define cpu_setstack(td, ap) ((td)->td_frame->tf_esp = (ap)) +#define cpu_getstack(td) ((td)->td_frame->tf_rsp) +#define cpu_setstack(td, ap) ((td)->td_frame->tf_rsp = (ap)) #define TRAPF_USERMODE(framep) \ (ISPL((framep)->tf_cs) == SEL_UPL) -#define TRAPF_PC(framep) ((framep)->tf_eip) +#define TRAPF_PC(framep) ((framep)->tf_rip) #define CLKF_USERMODE(framep) \ (ISPL((framep)->cf_cs) == SEL_UPL) -#define CLKF_PC(framep) ((framep)->cf_eip) +#define CLKF_PC(framep) ((framep)->cf_rip) /* * CTL_MACHDEP definitions. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:52:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CE7E37B420; Fri, 4 Apr 2003 17:52:03 -0800 (PST) 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 DDFF037B40B for ; Fri, 4 Apr 2003 17:52:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 586D643FBF for ; Fri, 4 Apr 2003 17:52:01 -0800 (PST) (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 h351q10U090796 for ; Fri, 4 Apr 2003 17:52:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351q0s1090793 for perforce@freebsd.org; Fri, 4 Apr 2003 17:52:00 -0800 (PST) Date: Fri, 4 Apr 2003 17:52:00 -0800 (PST) Message-Id: <200304050152.h351q0s1090793@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 28109 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, 05 Apr 2003 01:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28109 Change 28109 by peter@peter_daintree on 2003/04/04 17:51:36 premature update of register sizes Affected files ... .. //depot/projects/hammer/sys/x86_64/include/kse.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/kse.h#2 (text+ko) ==== @@ -38,8 +38,8 @@ union kse_td_ctx { #ifdef _KERNEL struct { - int tf_onstack; - int tf_gs; + long tf_onstack; + long tf_gs; struct trapframe tf_tf; } tfrm; #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:53:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1585F37B404; Fri, 4 Apr 2003 17:53:04 -0800 (PST) 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 AA4D137B401 for ; Fri, 4 Apr 2003 17:53:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40F5743FA3 for ; Fri, 4 Apr 2003 17:53:03 -0800 (PST) (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 h351r30U090842 for ; Fri, 4 Apr 2003 17:53:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351r2VH090839 for perforce@freebsd.org; Fri, 4 Apr 2003 17:53:02 -0800 (PST) Date: Fri, 4 Apr 2003 17:53:02 -0800 (PST) Message-Id: <200304050153.h351r2VH090839@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 28110 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, 05 Apr 2003 01:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28110 Change 28110 by peter@peter_daintree on 2003/04/04 17:52:59 On second thoughts, lets not go near kse Affected files ... .. //depot/projects/hammer/sys/x86_64/include/kse.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/kse.h#3 (text+ko) ==== @@ -36,14 +36,7 @@ #include union kse_td_ctx { -#ifdef _KERNEL - struct { - long tf_onstack; - long tf_gs; - struct trapframe tf_tf; - } tfrm; -#endif - mcontext_t mcontext; + int teh_stuff; }; #endif /* MACHINE_KSE_H */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:54:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF53337B404; Fri, 4 Apr 2003 17:54:05 -0800 (PST) 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 7F81037B401 for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28FA343FBD for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) (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 h351s50U090890 for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351s4lw090887 for perforce@freebsd.org; Fri, 4 Apr 2003 17:54:04 -0800 (PST) Date: Fri, 4 Apr 2003 17:54:04 -0800 (PST) Message-Id: <200304050154.h351s4lw090887@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 28111 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, 05 Apr 2003 01:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=28111 Change 28111 by peter@peter_daintree on 2003/04/04 17:53:28 premature 64 bit update.. the calling conventions are wrong though. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/mutex.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/mutex.h#2 (text+ko) ==== @@ -56,20 +56,20 @@ * locks) in the near future, however. */ #define MTX_LOCK_SPIN(lck, flags) \ - pushl $0 ; \ - pushl $0 ; \ - pushl $flags ; \ - pushl $lck ; \ + pushq $0 ; \ + pushq $0 ; \ + pushq $flags ; \ + pushq $lck ; \ call _mtx_lock_spin_flags ; \ - addl $0x10, %esp ; \ + addl $0x20, %esp ; \ #define MTX_UNLOCK_SPIN(lck) \ - pushl $0 ; \ - pushl $0 ; \ - pushl $0 ; \ - pushl $lck ; \ + pushq $0 ; \ + pushq $0 ; \ + pushq $0 ; \ + pushq $lck ; \ call _mtx_unlock_spin_flags ; \ - addl $0x10, %esp ; \ + addl $0x20, %esp ; \ #endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:54:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1093E37B408; Fri, 4 Apr 2003 17:54:07 -0800 (PST) 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 F37DA37B40B for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AEED43FBD for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) (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 h351s50U090896 for ; Fri, 4 Apr 2003 17:54:05 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351s5M4090893 for perforce@freebsd.org; Fri, 4 Apr 2003 17:54:05 -0800 (PST) Date: Fri, 4 Apr 2003 17:54:05 -0800 (PST) Message-Id: <200304050154.h351s5M4090893@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 28112 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, 05 Apr 2003 01:54:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=28112 Change 28112 by peter@peter_daintree on 2003/04/04 17:53:51 I'm going to write simple C bcopy/bzero/etc. None of this fancy asm stuff yet. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#11 (text+ko) ==== @@ -36,10 +36,10 @@ * Miscellaneous machine-dependent declarations. */ -extern void (*bcopy_vector)(const void *from, void *to, size_t len); -extern void (*bzero_vector)(void *buf, size_t len); -extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len); -extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); +extern void bcopy(const void *from, void *to, size_t len); +extern void bzero(void *buf, size_t len); +extern int copyin(const void *udaddr, void *kaddr, size_t len); +extern int copyout(const void *kaddr, void *udaddr, size_t len); extern long Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ @@ -79,7 +79,6 @@ void enable_sse(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void pagezero(void *addr); -void init_AMD_Elan_sc520(void); int is_physical_memory(vm_offset_t addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:01:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0368B37B404; Fri, 4 Apr 2003 18:01:15 -0800 (PST) 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 90D4737B401 for ; Fri, 4 Apr 2003 18:01:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE85043FAF for ; Fri, 4 Apr 2003 18:01:14 -0800 (PST) (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 h3521E0U091517 for ; Fri, 4 Apr 2003 18:01:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3521E3w091510 for perforce@freebsd.org; Fri, 4 Apr 2003 18:01:14 -0800 (PST) Date: Fri, 4 Apr 2003 18:01:14 -0800 (PST) Message-Id: <200304050201.h3521E3w091510@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 28113 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, 05 Apr 2003 02:01:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=28113 Change 28113 by peter@peter_daintree on 2003/04/04 18:01:12 Steer well clear of user LDT, debug regs, and 4.x hammer binaries. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#31 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#31 (text+ko) ==== @@ -179,11 +179,6 @@ int cold = 1; -#ifdef COMPAT_FREEBSD4 -static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, - u_long code); -#endif - long Maxmem = 0; vm_paddr_t phys_avail[10]; @@ -258,127 +253,6 @@ * frame pointer, it returns to the user * specified pc, psl. */ -#ifdef COMPAT_FREEBSD4 -static void -freebsd4_sendsig(catcher, sig, mask, code) - sig_t catcher; - int sig; - sigset_t *mask; - u_long code; -{ - struct sigframe4 sf, *sfp; - struct proc *p; - struct thread *td; - struct sigacts *psp; - struct trapframe *regs; - int oonstack; - - td = curthread; - p = td->td_proc; - PROC_LOCK_ASSERT(p, MA_OWNED); - psp = p->p_sigacts; - regs = td->td_frame; - oonstack = sigonstack(regs->tf_esp); - - /* Save user context. */ - bzero(&sf, sizeof(sf)); - sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) - ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; - sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; - sf.sf_uc.uc_mcontext.mc_gs = rgs(); - bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs)); - - /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && - SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe4)); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; -#endif - } else - sfp = (struct sigframe4 *)regs->tf_esp - 1; - PROC_UNLOCK(p); - - /* Translate the signal if appropriate. */ - if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) - sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; - - /* Build the argument list for the signal handler. */ - sf.sf_signum = sig; - sf.sf_ucontext = (register_t)&sfp->sf_uc; - PROC_LOCK(p); - if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { - /* Signal handler installed with SA_SIGINFO. */ - sf.sf_siginfo = (register_t)&sfp->sf_si; - sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher; - - /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void *)regs->tf_err; - } else { - /* Old FreeBSD-style arguments. */ - sf.sf_siginfo = code; - sf.sf_addr = regs->tf_err; - sf.sf_ahu.sf_handler = catcher; - } - PROC_UNLOCK(p); - - /* - * If we're a vm86 process, we want to save the segment registers. - * We also change eflags to be our emulated eflags, not the actual - * eflags. - */ - if (regs->tf_eflags & PSL_VM) { - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86; - - sf.sf_uc.uc_mcontext.mc_gs = tf->tf_vm86_gs; - sf.sf_uc.uc_mcontext.mc_fs = tf->tf_vm86_fs; - sf.sf_uc.uc_mcontext.mc_es = tf->tf_vm86_es; - sf.sf_uc.uc_mcontext.mc_ds = tf->tf_vm86_ds; - - if (vm86->vm86_has_vme == 0) - sf.sf_uc.uc_mcontext.mc_eflags = - (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) | - (vm86->vm86_eflags & (PSL_VIF | PSL_VIP)); - - /* - * Clear PSL_NT to inhibit T_TSSFLT faults on return from - * syscalls made by the signal handler. This just avoids - * wasting time for our lazy fixup of such faults. PSL_NT - * does nothing in vm86 mode, but vm86 programs can set it - * almost legitimately in probes for old cpu types. - */ - tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP); - } - - /* - * Copy the sigframe out to the user's stack. - */ - if (copyout(&sf, sfp, sizeof(*sfp)) != 0) { -#ifdef DEBUG - printf("process %ld has trashed its stack\n", (long)p->p_pid); -#endif - PROC_LOCK(p); - sigexit(td, SIGILL); - } - - regs->tf_esp = (int)sfp; - regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode; - regs->tf_eflags &= ~PSL_T; - regs->tf_cs = _ucodesel; - regs->tf_ds = _udatasel; - regs->tf_es = _udatasel; - regs->tf_fs = _udatasel; - regs->tf_ss = _udatasel; - PROC_LOCK(p); -} -#endif /* COMPAT_FREEBSD4 */ - void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -398,12 +272,6 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; -#ifdef COMPAT_FREEBSD4 - if (SIGISMEMBER(psp->ps_freebsd4, sig)) { - freebsd4_sendsig(catcher, sig, mask, code); - return; - } -#endif regs = td->td_frame; oonstack = sigonstack(regs->tf_esp); @@ -492,117 +360,6 @@ * * MPSAFE */ -#ifdef COMPAT_FREEBSD4 -/* - * MPSAFE - */ -int -freebsd4_sigreturn(td, uap) - struct thread *td; - struct freebsd4_sigreturn_args /* { - const ucontext4 *sigcntxp; - } */ *uap; -{ - struct ucontext4 uc; - struct proc *p = td->td_proc; - struct trapframe *regs; - const struct ucontext4 *ucp; - int cs, eflags, error; - - error = copyin(uap->sigcntxp, &uc, sizeof(uc)); - if (error != 0) - return (error); - ucp = &uc; - regs = td->td_frame; - eflags = ucp->uc_mcontext.mc_eflags; - if (eflags & PSL_VM) { - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86; - - /* - * if pcb_ext == 0 or vm86_inited == 0, the user hasn't - * set up the vm86 area, and we can't enter vm86 mode. - */ - if (td->td_pcb->pcb_ext == 0) - return (EINVAL); - vm86 = &td->td_pcb->pcb_ext->ext_vm86; - if (vm86->vm86_inited == 0) - return (EINVAL); - - /* Go back to user mode if both flags are set. */ - if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) - trapsignal(td, SIGBUS, 0); - - if (vm86->vm86_has_vme) { - eflags = (tf->tf_eflags & ~VME_USERCHANGE) | - (eflags & VME_USERCHANGE) | PSL_VM; - } else { - vm86->vm86_eflags = eflags; /* save VIF, VIP */ - eflags = (tf->tf_eflags & ~VM_USERCHANGE) | - (eflags & VM_USERCHANGE) | PSL_VM; - } - bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe)); - tf->tf_eflags = eflags; - tf->tf_vm86_ds = tf->tf_ds; - tf->tf_vm86_es = tf->tf_es; - tf->tf_vm86_fs = tf->tf_fs; - tf->tf_vm86_gs = ucp->uc_mcontext.mc_gs; - tf->tf_ds = _udatasel; - tf->tf_es = _udatasel; - tf->tf_fs = _udatasel; - } else { - /* - * Don't allow users to change privileged or reserved flags. - */ - /* - * XXX do allow users to change the privileged flag PSL_RF. - * The cpu sets PSL_RF in tf_eflags for faults. Debuggers - * should sometimes set it there too. tf_eflags is kept in - * the signal context during signal handling and there is no - * other place to remember it, so the PSL_RF bit may be - * corrupted by the signal handler without us knowing. - * Corruption of the PSL_RF bit at worst causes one more or - * one less debugger trap, so allowing it is fairly harmless. - */ - if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) { - printf("freebsd4_sigreturn: eflags = 0x%x\n", eflags); - return (EINVAL); - } - - /* - * Don't allow users to load a valid privileged %cs. Let the - * hardware check for invalid selectors, excess privilege in - * other selectors, invalid %eip's and invalid %esp's. - */ - cs = ucp->uc_mcontext.mc_cs; - if (!CS_SECURE(cs)) { - printf("freebsd4_sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); - return (EINVAL); - } - - bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs)); - } - - PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) - if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; - else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; -#endif - - td->td_sigmask = ucp->uc_sigmask; - SIG_CANTMASK(td->td_sigmask); - signotify(td); - PROC_UNLOCK(p); - return (EJUSTRETURN); -} -#endif /* COMPAT_FREEBSD4 */ - -/* - * MPSAFE - */ int sigreturn(td, uap) struct thread *td; @@ -759,9 +516,6 @@ pcb->pcb_gs = _udatasel; load_gs(_udatasel); - if (td->td_proc->p_md.md_ldt) - user_ldt_free(td); - bzero((char *)regs, sizeof(struct trapframe)); regs->tf_eip = entry; regs->tf_esp = stack; @@ -775,28 +529,6 @@ /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ regs->tf_ebx = ps_strings; - /* - * Reset the hardware debug registers if they were in use. - * They won't have any meaning for the newly exec'd process. - */ - if (pcb->pcb_flags & PCB_DBREGS) { - pcb->pcb_dr0 = 0; - pcb->pcb_dr1 = 0; - pcb->pcb_dr2 = 0; - pcb->pcb_dr3 = 0; - pcb->pcb_dr6 = 0; - pcb->pcb_dr7 = 0; - if (pcb == PCPU_GET(curpcb)) { - /* - * Clear the debug registers on the running - * CPU, otherwise they will end up affecting - * the next process we switch to. - */ - reset_dbregs(); - } - pcb->pcb_flags &= ~PCB_DBREGS; - } - /* * Initialize the math emulator (if any) for the current process. * Actually, just clear the bit that says that the emulator has @@ -1932,185 +1664,17 @@ int fill_dbregs(struct thread *td, struct dbreg *dbregs) { - struct pcb *pcb; - if (td == NULL) { - dbregs->dr[0] = rdr0(); - dbregs->dr[1] = rdr1(); - dbregs->dr[2] = rdr2(); - dbregs->dr[3] = rdr3(); - dbregs->dr[4] = rdr4(); - dbregs->dr[5] = rdr5(); - dbregs->dr[6] = rdr6(); - dbregs->dr[7] = rdr7(); - } else { - pcb = td->td_pcb; - dbregs->dr[0] = pcb->pcb_dr0; - dbregs->dr[1] = pcb->pcb_dr1; - dbregs->dr[2] = pcb->pcb_dr2; - dbregs->dr[3] = pcb->pcb_dr3; - dbregs->dr[4] = 0; - dbregs->dr[5] = 0; - dbregs->dr[6] = pcb->pcb_dr6; - dbregs->dr[7] = pcb->pcb_dr7; - } return (0); } int set_dbregs(struct thread *td, struct dbreg *dbregs) { - struct pcb *pcb; - int i; - u_int32_t mask1, mask2; - - if (td == NULL) { - load_dr0(dbregs->dr[0]); - load_dr1(dbregs->dr[1]); - load_dr2(dbregs->dr[2]); - load_dr3(dbregs->dr[3]); - load_dr4(dbregs->dr[4]); - load_dr5(dbregs->dr[5]); - load_dr6(dbregs->dr[6]); - load_dr7(dbregs->dr[7]); - } else { - /* - * Don't let an illegal value for dr7 get set. Specifically, - * check for undefined settings. Setting these bit patterns - * result in undefined behaviour and can lead to an unexpected - * TRCTRAP. - */ - for (i = 0, mask1 = 0x3<<16, mask2 = 0x2<<16; i < 8; - i++, mask1 <<= 2, mask2 <<= 2) - if ((dbregs->dr[7] & mask1) == mask2) - return (EINVAL); - - pcb = td->td_pcb; - - /* - * Don't let a process set a breakpoint that is not within the - * process's address space. If a process could do this, it - * could halt the system by setting a breakpoint in the kernel - * (if ddb was enabled). Thus, we need to check to make sure - * that no breakpoints are being enabled for addresses outside - * process's address space, unless, perhaps, we were called by - * uid 0. - * - * XXX - what about when the watched area of the user's - * address space is written into from within the kernel - * ... wouldn't that still cause a breakpoint to be generated - * from within kernel mode? - */ - if (suser(td) != 0) { - if (dbregs->dr[7] & 0x3) { - /* dr0 is enabled */ - if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - - if (dbregs->dr[7] & (0x3<<2)) { - /* dr1 is enabled */ - if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - - if (dbregs->dr[7] & (0x3<<4)) { - /* dr2 is enabled */ - if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - - if (dbregs->dr[7] & (0x3<<6)) { - /* dr3 is enabled */ - if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - } - - pcb->pcb_dr0 = dbregs->dr[0]; - pcb->pcb_dr1 = dbregs->dr[1]; - pcb->pcb_dr2 = dbregs->dr[2]; - pcb->pcb_dr3 = dbregs->dr[3]; - pcb->pcb_dr6 = dbregs->dr[6]; - pcb->pcb_dr7 = dbregs->dr[7]; - - pcb->pcb_flags |= PCB_DBREGS; - } - return (0); } -/* - * Return > 0 if a hardware breakpoint has been hit, and the - * breakpoint was in user space. Return 0, otherwise. - */ -int -user_dbreg_trap(void) -{ - u_int32_t dr7, dr6; /* debug registers dr6 and dr7 */ - u_int32_t bp; /* breakpoint bits extracted from dr6 */ - int nbp; /* number of breakpoints that triggered */ - caddr_t addr[4]; /* breakpoint addresses */ - int i; - - dr7 = rdr7(); - if ((dr7 & 0x000000ff) == 0) { - /* - * all GE and LE bits in the dr7 register are zero, - * thus the trap couldn't have been caused by the - * hardware debug registers - */ - return 0; - } - - nbp = 0; - dr6 = rdr6(); - bp = dr6 & 0x0000000f; - - if (!bp) { - /* - * None of the breakpoint bits are set meaning this - * trap was not caused by any of the debug registers - */ - return 0; - } - - /* - * at least one of the breakpoints were hit, check to see - * which ones and if any of them are user space addresses - */ - - if (bp & 0x01) { - addr[nbp++] = (caddr_t)rdr0(); - } - if (bp & 0x02) { - addr[nbp++] = (caddr_t)rdr1(); - } - if (bp & 0x04) { - addr[nbp++] = (caddr_t)rdr2(); - } - if (bp & 0x08) { - addr[nbp++] = (caddr_t)rdr3(); - } - - for (i=0; i Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7482437B404; Fri, 4 Apr 2003 18:02:17 -0800 (PST) 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 12B5B37B401 for ; Fri, 4 Apr 2003 18:02:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1B5F43FB1 for ; Fri, 4 Apr 2003 18:02:16 -0800 (PST) (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 h3522G0U091576 for ; Fri, 4 Apr 2003 18:02:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3522GZO091573 for perforce@freebsd.org; Fri, 4 Apr 2003 18:02:16 -0800 (PST) Date: Fri, 4 Apr 2003 18:02:16 -0800 (PST) Message-Id: <200304050202.h3522GZO091573@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 28114 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, 05 Apr 2003 02:02:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=28114 Change 28114 by peter@peter_daintree on 2003/04/04 18:01:34 avoid ldt stuff Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#8 (text+ko) ==== @@ -212,30 +212,6 @@ movl %edx, PCPU(CURPCB) movl %ecx, PCPU(CURTHREAD) /* into next thread */ - /* - * Determine the LDT to use and load it if is the default one and - * that is not the current one. - */ - movl TD_PROC(%ecx),%eax - cmpl $0,P_MD+MD_LDT(%eax) - jnz 1f - movl _default_ldt,%eax - cmpl PCPU(CURRENTLDT),%eax - je 2f - lldt _default_ldt - movl %eax,PCPU(CURRENTLDT) - jmp 2f -1: - /* Load the LDT when it is not the default one. */ - pushl %edx /* Preserve pointer to pcb. */ - addl $P_MD,%eax /* Pointer to mdproc is arg. */ - pushl %eax - call set_user_ldt - addl $4,%esp - popl %edx -2: - - /* This must be done after loading the user LDT. */ .globl cpu_switch_load_gs cpu_switch_load_gs: movl PCB_GS(%edx),%gs From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:02:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4EBB37B404; Fri, 4 Apr 2003 18:02:18 -0800 (PST) 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 8D98B37B40C for ; Fri, 4 Apr 2003 18:02:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3334143FA3 for ; Fri, 4 Apr 2003 18:02:17 -0800 (PST) (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 h3522H0U091582 for ; Fri, 4 Apr 2003 18:02:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3522Gow091579 for perforce@freebsd.org; Fri, 4 Apr 2003 18:02:16 -0800 (PST) Date: Fri, 4 Apr 2003 18:02:16 -0800 (PST) Message-Id: <200304050202.h3522Gow091579@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 28115 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, 05 Apr 2003 02:02:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=28115 Change 28115 by peter@peter_daintree on 2003/04/04 18:01:47 avoid ldt, debug regs Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#12 (text+ko) ==== @@ -122,15 +122,7 @@ ASSYM(PCB_EIP, offsetof(struct pcb, pcb_eip)); ASSYM(PCB_GS, offsetof(struct pcb, pcb_gs)); -ASSYM(PCB_DR0, offsetof(struct pcb, pcb_dr0)); -ASSYM(PCB_DR1, offsetof(struct pcb, pcb_dr1)); -ASSYM(PCB_DR2, offsetof(struct pcb, pcb_dr2)); -ASSYM(PCB_DR3, offsetof(struct pcb, pcb_dr3)); -ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); -ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_PSL, offsetof(struct pcb, pcb_psl)); -ASSYM(PCB_DBREGS, PCB_DBREGS); -ASSYM(PCB_EXT, offsetof(struct pcb, pcb_ext)); ASSYM(PCB_SPARE, offsetof(struct pcb, __pcb_spare)); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); @@ -159,7 +151,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CURRENTLDT, offsetof(struct pcpu, pc_currentldt)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL)); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:03:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D55B37B405; Fri, 4 Apr 2003 18:03:20 -0800 (PST) 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 EF4BE37B401 for ; Fri, 4 Apr 2003 18:03:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CDAA43FD7 for ; Fri, 4 Apr 2003 18:03:19 -0800 (PST) (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 h3523J0U092603 for ; Fri, 4 Apr 2003 18:03:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3523IXb092600 for perforce@freebsd.org; Fri, 4 Apr 2003 18:03:18 -0800 (PST) Date: Fri, 4 Apr 2003 18:03:18 -0800 (PST) Message-Id: <200304050203.h3523IXb092600@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 28116 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, 05 Apr 2003 02:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=28116 Change 28116 by peter@peter_daintree on 2003/04/04 18:02:24 avoid ldt stuff for now. it has no meaning in long mode, only under compat mode. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#9 (text+ko) ==== @@ -35,45 +35,11 @@ * */ -#include "opt_kstack_pages.h" -#include "opt_mac.h" - #include #include #include -#include -#include -#include #include -#include #include -#include - -#include -#include -#include -#include - -#include -#include /* pcb.h included by sys/user.h */ -#include -#include - -#include /* for kernel_map */ - -#if 0 -#define MAX_LD 8192 -#define LD_PER_PAGE 512 -#define NEW_MAX_LD(num) ((num + LD_PER_PAGE) & ~(LD_PER_PAGE-1)) -#define SIZE_FROM_LARGEST_LD(num) (NEW_MAX_LD(num) << 3) - - - -static int i386_get_ldt(struct thread *, char *); -static int i386_set_ldt(struct thread *, char *); -static int i386_get_ioperm(struct thread *, char *); -static int i386_set_ioperm(struct thread *, char *); -#endif #ifndef _SYS_SYSPROTO_H_ struct sysarch_args { @@ -90,438 +56,9 @@ int error = 0; switch(uap->op) { -#if 0 - case I386_GET_LDT: - error = i386_get_ldt(td, uap->parms); - break; - case I386_SET_LDT: - error = i386_set_ldt(td, uap->parms); - break; - case I386_GET_IOPERM: - error = i386_get_ioperm(td, uap->parms); - break; - case I386_SET_IOPERM: - error = i386_set_ioperm(td, uap->parms); - break; -#endif default: error = EOPNOTSUPP; break; } return (error); } - -#if 0 -int -i386_extend_pcb(struct thread *td) -{ - int i, offset; - u_long *addr; - struct pcb_ext *ext; - struct soft_segment_descriptor ssd = { - 0, /* segment base address (overwritten) */ - ctob(IOPAGES + 1) - 1, /* length */ - SDT_SYS386TSS, /* segment type */ - 0, /* priority level */ - 1, /* descriptor present */ - 0, 0, - 0, /* default 32 size */ - 0 /* granularity */ - }; - - if (td->td_proc->p_flag & P_THREADED) - return (EINVAL); /* XXXKSE */ -/* XXXKSE All the code below only works in 1:1 needs changing */ - ext = (struct pcb_ext *)kmem_alloc(kernel_map, ctob(IOPAGES+1)); - if (ext == 0) - return (ENOMEM); - bzero(ext, sizeof(struct pcb_ext)); - ext->ext_tss.tss_esp0 = td->td_kstack + ctob(KSTACK_PAGES) - - sizeof(struct pcb); - ext->ext_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL); - /* - * The last byte of the i/o map must be followed by an 0xff byte. - * We arbitrarily allocate 16 bytes here, to keep the starting - * address on a doubleword boundary. - */ - offset = PAGE_SIZE - 16; - ext->ext_tss.tss_ioopt = - (offset - ((unsigned)&ext->ext_tss - (unsigned)ext)) << 16; - ext->ext_iomap = (caddr_t)ext + offset; - - ssd.ssd_base = (unsigned)&ext->ext_tss; - ssd.ssd_limit -= ((unsigned)&ext->ext_tss - (unsigned)ext); - ssdtosd(&ssd, &ext->ext_tssd); - - KASSERT(td->td_proc == curthread->td_proc, ("giving TSS to !curproc")); - KASSERT(td->td_pcb->pcb_ext == 0, ("already have a TSS!")); - mtx_lock_spin(&sched_lock); - td->td_pcb->pcb_ext = ext; - - /* switch to the new TSS after syscall completes */ - td->td_flags |= TDF_NEEDRESCHED; - mtx_unlock_spin(&sched_lock); - - return 0; -} - -static int -i386_set_ioperm(td, args) - struct thread *td; - char *args; -{ - int i, error; - struct i386_ioperm_args ua; - char *iomap; - - if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) - return (error); - -#ifdef MAC - if ((error = mac_check_sysarch_ioperm(td->td_ucred)) != 0) - return (error); -#endif - if ((error = suser(td)) != 0) - return (error); - if ((error = securelevel_gt(td->td_ucred, 0)) != 0) - return (error); - /* - * XXX - * While this is restricted to root, we should probably figure out - * whether any other driver is using this i/o address, as so not to - * cause confusion. This probably requires a global 'usage registry'. - */ - - if (td->td_pcb->pcb_ext == 0) - if ((error = i386_extend_pcb(td)) != 0) - return (error); - iomap = (char *)td->td_pcb->pcb_ext->ext_iomap; - - if (ua.start + ua.length > IOPAGES * PAGE_SIZE * NBBY) - return (EINVAL); - - for (i = ua.start; i < ua.start + ua.length; i++) { - if (ua.enable) - iomap[i >> 3] &= ~(1 << (i & 7)); - else - iomap[i >> 3] |= (1 << (i & 7)); - } - return (error); -} - -static int -i386_get_ioperm(td, args) - struct thread *td; - char *args; -{ - int i, state, error; - struct i386_ioperm_args ua; - char *iomap; - - if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) - return (error); - if (ua.start >= IOPAGES * PAGE_SIZE * NBBY) - return (EINVAL); - - if (td->td_pcb->pcb_ext == 0) { - ua.length = 0; - goto done; - } - - iomap = (char *)td->td_pcb->pcb_ext->ext_iomap; - - i = ua.start; - state = (iomap[i >> 3] >> (i & 7)) & 1; - ua.enable = !state; - ua.length = 1; - - for (i = ua.start + 1; i < IOPAGES * PAGE_SIZE * NBBY; i++) { - if (state != ((iomap[i >> 3] >> (i & 7)) & 1)) - break; - ua.length++; - } - -done: - error = copyout(&ua, args, sizeof(struct i386_ioperm_args)); - return (error); -} - -/* - * Update the GDT entry pointing to the LDT to point to the LDT of the - * current process. - * - * This must be called with sched_lock held. Unfortunately, we can't use a - * mtx_assert() here because cpu_switch() calls this function after changing - * curproc but before sched_lock's owner is updated in mi_switch(). - */ -void -set_user_ldt(struct mdproc *mdp) -{ - struct proc_ldt *pldt; - - pldt = mdp->md_ldt; - gdt[GUSERLDT_SEL].sd = pldt->ldt_sd; - lldt(GSEL(GUSERLDT_SEL, SEL_KPL)); - PCPU_SET(currentldt, GSEL(GUSERLDT_SEL, SEL_KPL)); -} - -/* - * Must be called with either sched_lock free or held but not recursed. - * If it does not return NULL, it will return with it owned. - */ -struct proc_ldt * -user_ldt_alloc(struct mdproc *mdp, int len) -{ - struct proc_ldt *pldt, *new_ldt; - - if (mtx_owned(&sched_lock)) - mtx_unlock_spin(&sched_lock); - mtx_assert(&sched_lock, MA_NOTOWNED); - MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), - M_SUBPROC, M_WAITOK); - - new_ldt->ldt_len = len = NEW_MAX_LD(len); - new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map, - len * sizeof(union descriptor)); - if (new_ldt->ldt_base == NULL) { - FREE(new_ldt, M_SUBPROC); - return NULL; - } - new_ldt->ldt_refcnt = 1; - new_ldt->ldt_active = 0; - - mtx_lock_spin(&sched_lock); - gdt_segs[GUSERLDT_SEL].ssd_base = (unsigned)new_ldt->ldt_base; - gdt_segs[GUSERLDT_SEL].ssd_limit = len * sizeof(union descriptor) - 1; - ssdtosd(&gdt_segs[GUSERLDT_SEL], &new_ldt->ldt_sd); - - if ((pldt = mdp->md_ldt)) { - if (len > pldt->ldt_len) - len = pldt->ldt_len; - bcopy(pldt->ldt_base, new_ldt->ldt_base, - len * sizeof(union descriptor)); - } else { - bcopy(ldt, new_ldt->ldt_base, sizeof(ldt)); - } - return new_ldt; -} - -/* - * Must be called either with sched_lock free or held but not recursed. - * If md_ldt is not NULL, it will return with sched_lock released. - */ -void -user_ldt_free(struct thread *td) -{ - struct mdproc *mdp = &td->td_proc->p_md; - struct proc_ldt *pldt = mdp->md_ldt; - - if (pldt == NULL) - return; - - if (!mtx_owned(&sched_lock)) - mtx_lock_spin(&sched_lock); - mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); - if (td == PCPU_GET(curthread)) { - lldt(_default_ldt); - PCPU_SET(currentldt, _default_ldt); - } - - mdp->md_ldt = NULL; - if (--pldt->ldt_refcnt == 0) { - mtx_unlock_spin(&sched_lock); - kmem_free(kernel_map, (vm_offset_t)pldt->ldt_base, - pldt->ldt_len * sizeof(union descriptor)); - FREE(pldt, M_SUBPROC); - } else - mtx_unlock_spin(&sched_lock); -} - -static int -i386_get_ldt(td, args) - struct thread *td; - char *args; -{ - int error = 0; - struct proc_ldt *pldt = td->td_proc->p_md.md_ldt; - int nldt, num; - union descriptor *lp; - struct i386_ldt_args ua, *uap = &ua; - - if ((error = copyin(args, uap, sizeof(struct i386_ldt_args))) < 0) - return(error); - -#ifdef DEBUG - printf("i386_get_ldt: start=%d num=%d descs=%p\n", - uap->start, uap->num, (void *)uap->descs); -#endif - - /* verify range of LDTs exist */ - if ((uap->start < 0) || (uap->num <= 0)) - return(EINVAL); - - if (pldt) { - nldt = pldt->ldt_len; - num = min(uap->num, nldt); - lp = &((union descriptor *)(pldt->ldt_base))[uap->start]; - } else { - nldt = sizeof(ldt)/sizeof(ldt[0]); - num = min(uap->num, nldt); - lp = &ldt[uap->start]; - } - if (uap->start + num > nldt) - return(EINVAL); - - error = copyout(lp, uap->descs, num * sizeof(union descriptor)); - if (!error) - td->td_retval[0] = num; - - return(error); -} - -static int -i386_set_ldt(td, args) - struct thread *td; - char *args; -{ - int error = 0, i, n; - int largest_ld; - struct mdproc *mdp = &td->td_proc->p_md; - struct proc_ldt *pldt = mdp->md_ldt; - struct i386_ldt_args ua, *uap = &ua; - union descriptor *descs; - caddr_t old_ldt_base; - int descs_size, old_ldt_len; - register_t savecrit; - - if ((error = copyin(args, uap, sizeof(struct i386_ldt_args))) < 0) - return(error); - -#ifdef DEBUG - printf("i386_set_ldt: start=%d num=%d descs=%p\n", - uap->start, uap->num, (void *)uap->descs); -#endif - - /* verify range of descriptors to modify */ - if ((uap->start < 0) || (uap->start >= MAX_LD) || (uap->num < 0) || - (uap->num > MAX_LD)) - { - return(EINVAL); - } - largest_ld = uap->start + uap->num - 1; - if (largest_ld >= MAX_LD) - return(EINVAL); - - /* allocate user ldt */ - if (!pldt || largest_ld >= pldt->ldt_len) { - struct proc_ldt *new_ldt = user_ldt_alloc(mdp, largest_ld); - if (new_ldt == NULL) - return ENOMEM; - if (pldt) { - old_ldt_base = pldt->ldt_base; - old_ldt_len = pldt->ldt_len; - pldt->ldt_sd = new_ldt->ldt_sd; - pldt->ldt_base = new_ldt->ldt_base; - pldt->ldt_len = new_ldt->ldt_len; - mtx_unlock_spin(&sched_lock); - kmem_free(kernel_map, (vm_offset_t)old_ldt_base, - old_ldt_len * sizeof(union descriptor)); - FREE(new_ldt, M_SUBPROC); - mtx_lock_spin(&sched_lock); - } else { - mdp->md_ldt = pldt = new_ldt; - } - set_user_ldt(mdp); - mtx_unlock_spin(&sched_lock); - } - - descs_size = uap->num * sizeof(union descriptor); - descs = (union descriptor *)kmem_alloc(kernel_map, descs_size); - if (descs == NULL) - return (ENOMEM); - error = copyin(&uap->descs[0], descs, descs_size); - if (error) { - kmem_free(kernel_map, (vm_offset_t)descs, descs_size); - return (error); - } - /* Check descriptors for access violations */ - for (i = 0, n = uap->start; i < uap->num; i++, n++) { - union descriptor *dp; - dp = &descs[i]; - - switch (dp->sd.sd_type) { - case SDT_SYSNULL: /* system null */ - dp->sd.sd_p = 0; - break; - case SDT_SYS286TSS: /* system 286 TSS available */ - case SDT_SYSLDT: /* system local descriptor table */ - case SDT_SYS286BSY: /* system 286 TSS busy */ - case SDT_SYSTASKGT: /* system task gate */ - case SDT_SYS286IGT: /* system 286 interrupt gate */ - case SDT_SYS286TGT: /* system 286 trap gate */ - case SDT_SYSNULL2: /* undefined by Intel */ - case SDT_SYS386TSS: /* system 386 TSS available */ - case SDT_SYSNULL3: /* undefined by Intel */ - case SDT_SYS386BSY: /* system 386 TSS busy */ - case SDT_SYSNULL4: /* undefined by Intel */ - case SDT_SYS386IGT: /* system 386 interrupt gate */ - case SDT_SYS386TGT: /* system 386 trap gate */ - case SDT_SYS286CGT: /* system 286 call gate */ - case SDT_SYS386CGT: /* system 386 call gate */ - /* I can't think of any reason to allow a user proc - * to create a segment of these types. They are - * for OS use only. - */ - kmem_free(kernel_map, (vm_offset_t)descs, descs_size); - return EACCES; - /*NOTREACHED*/ - - /* memory segment types */ - case SDT_MEMEC: /* memory execute only conforming */ - case SDT_MEMEAC: /* memory execute only accessed conforming */ - case SDT_MEMERC: /* memory execute read conforming */ - case SDT_MEMERAC: /* memory execute read accessed conforming */ - /* Must be "present" if executable and conforming. */ - if (dp->sd.sd_p == 0) { - kmem_free(kernel_map, (vm_offset_t)descs, - descs_size); - return (EACCES); - } - break; - case SDT_MEMRO: /* memory read only */ - case SDT_MEMROA: /* memory read only accessed */ - case SDT_MEMRW: /* memory read write */ - case SDT_MEMRWA: /* memory read write accessed */ - case SDT_MEMROD: /* memory read only expand dwn limit */ - case SDT_MEMRODA: /* memory read only expand dwn lim accessed */ - case SDT_MEMRWD: /* memory read write expand dwn limit */ - case SDT_MEMRWDA: /* memory read write expand dwn lim acessed */ - case SDT_MEME: /* memory execute only */ - case SDT_MEMEA: /* memory execute only accessed */ - case SDT_MEMER: /* memory execute read */ - case SDT_MEMERA: /* memory execute read accessed */ - break; - default: - kmem_free(kernel_map, (vm_offset_t)descs, descs_size); - return(EINVAL); - /*NOTREACHED*/ - } - - /* Only user (ring-3) descriptors may be present. */ - if ((dp->sd.sd_p != 0) && (dp->sd.sd_dpl != SEL_UPL)) { - kmem_free(kernel_map, (vm_offset_t)descs, descs_size); - return (EACCES); - } - } - - /* Fill in range */ - savecrit = intr_disable(); - bcopy(descs, - &((union descriptor *)(pldt->ldt_base))[uap->start], - uap->num * sizeof(union descriptor)); - td->td_retval[0] = uap->start; - intr_restore(savecrit); - kmem_free(kernel_map, (vm_offset_t)descs, descs_size); - return (0); -} -#endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:03:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4ECE37B41B; Fri, 4 Apr 2003 18:03:20 -0800 (PST) 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 1E90A37B404 for ; Fri, 4 Apr 2003 18:03:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9186543FDD for ; Fri, 4 Apr 2003 18:03:19 -0800 (PST) (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 h3523J0U092610 for ; Fri, 4 Apr 2003 18:03:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3523JqG092606 for perforce@freebsd.org; Fri, 4 Apr 2003 18:03:19 -0800 (PST) Date: Fri, 4 Apr 2003 18:03:19 -0800 (PST) Message-Id: <200304050203.h3523JqG092606@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 28117 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, 05 Apr 2003 02:03:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=28117 Change 28117 by peter@peter_daintree on 2003/04/04 18:02:36 no debug regs Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#17 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#17 (text+ko) ==== @@ -478,25 +478,6 @@ goto out; } /* - * Ignore debug register trace traps due to - * accesses in the user's address space, which - * can happen under several conditions such as - * if a user sets a watchpoint on a buffer and - * then passes that buffer to a system call. - * We still want to get TRCTRAPS for addresses - * in kernel space because that is useful when - * debugging the kernel. - */ - /* XXX Giant */ - if (user_dbreg_trap()) { - /* - * Reset breakpoint bits because the - * processor doesn't - */ - load_dr6(rdr6() & 0xfffffff0); - goto out; - } - /* * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:03:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D423437B444; Fri, 4 Apr 2003 18:03:21 -0800 (PST) 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 9C02637B415 for ; Fri, 4 Apr 2003 18:03:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2855643FCB for ; Fri, 4 Apr 2003 18:03:20 -0800 (PST) (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 h3523K0U092616 for ; Fri, 4 Apr 2003 18:03:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3523JIZ092613 for perforce@freebsd.org; Fri, 4 Apr 2003 18:03:19 -0800 (PST) Date: Fri, 4 Apr 2003 18:03:19 -0800 (PST) Message-Id: <200304050203.h3523JIZ092613@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 28118 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, 05 Apr 2003 02:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=28118 Change 28118 by peter@peter_daintree on 2003/04/04 18:03:01 no dbregs, ldt, kse Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#10 (text+ko) ==== @@ -99,22 +99,8 @@ register_t savecrit; p1 = td1->td_proc; - if ((flags & RFPROC) == 0) { - if ((flags & RFMEM) == 0) { - /* unshare user LDT */ - struct mdproc *mdp1 = &p1->p_md; - struct proc_ldt *pldt = mdp1->md_ldt; - if (pldt && pldt->ldt_refcnt > 1) { - pldt = user_ldt_alloc(mdp1, pldt->ldt_len); - if (pldt == NULL) - panic("could not copy LDT"); - mdp1->md_ldt = pldt; - set_user_ldt(mdp1); - user_ldt_free(td1); - } - } + if ((flags & RFPROC) == 0) return; - } /* Ensure that p1's pcb is up to date. */ if (td1 == curthread) @@ -164,7 +150,6 @@ pcb2->pcb_eip = (int)fork_trampoline; pcb2->pcb_psl = td2->td_frame->tf_eflags & ~PSL_I; /* ints disabled */ /*- - * pcb2->pcb_dr*: cloned above. * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). @@ -177,20 +162,6 @@ */ pcb2->pcb_ext = 0; - /* Copy the LDT, if necessary. */ - mtx_lock_spin(&sched_lock); - if (mdp2->md_ldt != 0) { - if (flags & RFMEM) { - mdp2->md_ldt->ldt_refcnt++; - } else { - mdp2->md_ldt = user_ldt_alloc(mdp2, - mdp2->md_ldt->ldt_len); - if (mdp2->md_ldt == NULL) - panic("could not copy LDT"); - } - } - mtx_unlock_spin(&sched_lock); - /* * Now, cpu_switch() can schedule the new process. * pcb_esp is loaded pointing to the cpu_switch() stack frame @@ -228,9 +199,6 @@ struct mdproc *mdp; mdp = &td->td_proc->p_md; - if (mdp->md_ldt) - user_ldt_free(td); - reset_dbregs(); } void @@ -239,34 +207,11 @@ struct pcb *pcb = td->td_pcb; npxexit(td); - if (pcb->pcb_flags & PCB_DBREGS) { - /* - * disable all hardware breakpoints - */ - reset_dbregs(); - pcb->pcb_flags &= ~PCB_DBREGS; - } } void cpu_thread_clean(struct thread *td) { - struct pcb *pcb; - - pcb = td->td_pcb; - if (pcb->pcb_ext != 0) { - /* XXXKSE XXXSMP not SMP SAFE.. what locks do we have? */ - /* if (pcb->pcb_ext->ext_refcount-- == 1) ?? */ - /* - * XXX do we need to move the TSS off the allocated pages - * before freeing them? (not done here) - */ - mtx_lock(&Giant); - kmem_free(kernel_map, (vm_offset_t)pcb->pcb_ext, - ctob(IOPAGES + 1)); - mtx_unlock(&Giant); - pcb->pcb_ext = 0; - } } void @@ -294,59 +239,6 @@ void cpu_set_upcall(struct thread *td, void *pcb) { - struct pcb *pcb2; - - /* Point the pcb to the top of the stack. */ - pcb2 = td->td_pcb; - - /* - * Copy the upcall pcb. This loads kernel regs. - * Those not loaded individually below get their default - * values here. - * - * XXXKSE It might be a good idea to simply skip this as - * the values of the other registers may be unimportant. - * This would remove any requirement for knowing the KSE - * at this time (see the matching comment below for - * more analysis) (need a good safe default). - */ - bcopy(pcb, pcb2, sizeof(*pcb2)); - - /* - * Create a new fresh stack for the new thread. - * Don't forget to set this stack value into whatever supplies - * the address for the fault handlers. - * The contexts are filled in at the time we actually DO the - * upcall as only then do we know which KSE we got. - */ - td->td_frame = (struct trapframe *)pcb2 - 1; - - /* - * Set registers for trampoline to user mode. Leave space for the - * return address on stack. These are the kernel mode register values. - */ -#ifdef PAE - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdpt); -#else - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdir); -#endif - pcb2->pcb_edi = 0; - pcb2->pcb_esi = (int)fork_return; /* trampoline arg */ - pcb2->pcb_ebp = 0; - pcb2->pcb_esp = (int)td->td_frame - sizeof(void *); /* trampoline arg */ - pcb2->pcb_ebx = (int)td; /* trampoline arg */ - pcb2->pcb_eip = (int)fork_trampoline; - pcb2->pcb_psl &= ~(PSL_I); /* interrupts must be disabled */ - /* - * If we didn't copy the pcb, we'd need to do the following registers: - * pcb2->pcb_dr*: cloned above. - * pcb2->pcb_savefpu: cloned above. - * pcb2->pcb_flags: cloned above. - * pcb2->pcb_onfault: cloned above (always NULL here?). - * pcb2->pcb_gs: cloned above. XXXKSE ??? - * pcb2->pcb_ext: cleared below. - */ - pcb2->pcb_ext = NULL; } /* @@ -357,30 +249,6 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { - - /* - * Do any extra cleaning that needs to be done. - * The thread may have optional components - * that are not present in a fresh thread. - * This may be a recycled thread so make it look - * as though it's newly allocated. - */ - cpu_thread_clean(td); - - /* - * Set the trap frame to point at the beginning of the uts - * function. - */ - td->td_frame->tf_esp = - (int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size; - td->td_frame->tf_eip = (int)ku->ku_func; - - /* - * Pass the address of the mailbox for this kse to the uts - * function as a parameter on the stack. - */ - suword((void *)(td->td_frame->tf_esp + sizeof(void *)), - (int)ku->ku_mailbox); } void From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:04:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2D6837B401; Fri, 4 Apr 2003 18:04:22 -0800 (PST) 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 709A537B401 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0751243FB1 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) (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 h3524L0U092642 for ; Fri, 4 Apr 2003 18:04:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3524LvK092639 for perforce@freebsd.org; Fri, 4 Apr 2003 18:04:21 -0800 (PST) Date: Fri, 4 Apr 2003 18:04:21 -0800 (PST) Message-Id: <200304050204.h3524LvK092639@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 28119 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, 05 Apr 2003 02:04:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=28119 Change 28119 by peter@peter_daintree on 2003/04/04 18:03:22 no dbregs Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#12 (text+ko) ==== @@ -82,6 +82,5 @@ int is_physical_memory(vm_offset_t addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); -int user_dbreg_trap(void); #endif /* !_MACHINE_MD_VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:04:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CEAE37B41D; Fri, 4 Apr 2003 18:04:23 -0800 (PST) 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 C62DD37B404 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7053343F85 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) (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 h3524M0U092648 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3524M4F092645 for perforce@freebsd.org; Fri, 4 Apr 2003 18:04:22 -0800 (PST) Date: Fri, 4 Apr 2003 18:04:22 -0800 (PST) Message-Id: <200304050204.h3524M4F092645@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 28120 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, 05 Apr 2003 02:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=28120 Change 28120 by peter@peter_daintree on 2003/04/04 18:03:51 64 bit general regs. gotta add others yet. delete dbregs, the interface is different. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcb.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcb.h#6 (text+ko) ==== @@ -46,32 +46,23 @@ #include struct pcb { - int pcb_cr3; - int pcb_edi; - int pcb_esi; - int pcb_ebp; - int pcb_esp; - int pcb_ebx; - int pcb_eip; + long pcb_cr3; + long pcb_edi; + long pcb_esi; + long pcb_ebp; + long pcb_esp; + long pcb_ebx; + long pcb_eip; - int pcb_dr0; - int pcb_dr1; - int pcb_dr2; - int pcb_dr3; - int pcb_dr6; - int pcb_dr7; - struct savefpu pcb_save; - u_int pcb_flags; -#define PCB_DBREGS 0x02 /* process using debug registers */ + u_long pcb_flags; #define PCB_NPXTRAP 0x04 /* npx trap pending */ #define PCB_NPXINITDONE 0x08 /* fpu state is initialized */ caddr_t pcb_onfault; /* copyin/out fault recovery */ - int pcb_gs; struct pcb_ext *pcb_ext; /* optional pcb extension */ - int pcb_psl; /* process status long */ - u_long __pcb_spare[2]; /* adjust to avoid core dump size changes */ + long pcb_gs; + long pcb_psl; /* process status long */ }; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:04:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA56D37B408; Fri, 4 Apr 2003 18:04:23 -0800 (PST) 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 56B8A37B41E for ; Fri, 4 Apr 2003 18:04:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEF6543F85 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) (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 h3524M0U092655 for ; Fri, 4 Apr 2003 18:04:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3524Me2092651 for perforce@freebsd.org; Fri, 4 Apr 2003 18:04:22 -0800 (PST) Date: Fri, 4 Apr 2003 18:04:22 -0800 (PST) Message-Id: <200304050204.h3524Me2092651@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 28121 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, 05 Apr 2003 02:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=28121 Change 28121 by peter@peter_daintree on 2003/04/04 18:04:05 no currentldt for now Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcpu.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcpu.h#4 (text+ko) ==== @@ -43,7 +43,6 @@ */ #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ - int pc_currentldt; #if defined(lint) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:05:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF86A37B404; Fri, 4 Apr 2003 18:05:25 -0800 (PST) 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 6DEF537B401 for ; Fri, 4 Apr 2003 18:05:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18C1A43F85 for ; Fri, 4 Apr 2003 18:05:25 -0800 (PST) (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 h3525O0U092808 for ; Fri, 4 Apr 2003 18:05:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3525OCi092805 for perforce@freebsd.org; Fri, 4 Apr 2003 18:05:24 -0800 (PST) Date: Fri, 4 Apr 2003 18:05:24 -0800 (PST) Message-Id: <200304050205.h3525OCi092805@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 28122 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, 05 Apr 2003 02:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=28122 Change 28122 by peter@peter_daintree on 2003/04/04 18:04:27 implement pte_load_clear() using native instructions Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#7 (text+ko) ==== @@ -189,29 +189,8 @@ #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) -#ifdef PAE - -static __inline pt_entry_t -pte_load_clear(pt_entry_t *pte) -{ - pt_entry_t r; +#define pte_load_clear(pte) atomic_readandclear_long(pte) - r = *pte; - __asm __volatile( - "1:\n" - "\tcmpxchg8b %1\n" - "\tjnz 1b" - : "+A" (r) - : "m" (*pte), "b" (0), "c" (0)); - return (r); -} - -#else - -#define pte_load_clear(pte) atomic_readandclear_int(pte) - -#endif - #endif /* @@ -228,7 +207,7 @@ pd_entry_t *pm_pdir; /* KVA of page directory */ vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - u_int pm_active; /* active on cpus */ + u_long pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ #ifdef PAE From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:05:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3641F37B404; Fri, 4 Apr 2003 18:05:27 -0800 (PST) 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 3338637B41A for ; Fri, 4 Apr 2003 18:05:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D090C43F85 for ; Fri, 4 Apr 2003 18:05:25 -0800 (PST) (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 h3525P0U092815 for ; Fri, 4 Apr 2003 18:05:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3525Pj8092811 for perforce@freebsd.org; Fri, 4 Apr 2003 18:05:25 -0800 (PST) Date: Fri, 4 Apr 2003 18:05:25 -0800 (PST) Message-Id: <200304050205.h3525Pj8092811@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 28123 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, 05 Apr 2003 02:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=28123 Change 28123 by peter@peter_daintree on 2003/04/04 18:04:41 no compat4 hammer binaries Affected files ... .. //depot/projects/hammer/sys/x86_64/include/sigframe.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/sigframe.h#4 (text+ko) ==== @@ -34,25 +34,6 @@ /* * Signal frames, arguments passed to application signal handlers. */ -#ifdef _KERNEL -#ifdef COMPAT_FREEBSD4 -/* FreeBSD 4.x */ -struct sigframe4 { - register_t sf_signum; - register_t sf_siginfo; /* code or pointer to sf_si */ - register_t sf_ucontext; /* points to sf_uc */ - register_t sf_addr; /* undocumented 4th arg */ - - union { - __siginfohandler_t *sf_action; - __sighandler_t *sf_handler; - } sf_ahu; - struct ucontext4 sf_uc; /* = *sf_ucontext */ - siginfo_t sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ -}; -#endif -#endif - struct sigframe { /* * The first four members may be used by applications. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:06:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8690637B404; Fri, 4 Apr 2003 18:06:28 -0800 (PST) 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 1D52037B401 for ; Fri, 4 Apr 2003 18:06:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B895443FAF for ; Fri, 4 Apr 2003 18:06:27 -0800 (PST) (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 h3526R0U092855 for ; Fri, 4 Apr 2003 18:06:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3526RFc092852 for perforce@freebsd.org; Fri, 4 Apr 2003 18:06:27 -0800 (PST) Date: Fri, 4 Apr 2003 18:06:27 -0800 (PST) Message-Id: <200304050206.h3526RFc092852@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 28124 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, 05 Apr 2003 02:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=28124 Change 28124 by peter@peter_daintree on 2003/04/04 18:05:50 no ldt. on hammer, %fs and %gs are basically 64 bit address base registers. (gee, wouldn't that be nice on x86?) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/proc.h#6 edit .. //depot/projects/hammer/sys/x86_64/include/sysarch.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/proc.h#6 (text+ko) ==== @@ -49,12 +49,4 @@ struct mdproc { }; -#ifdef _KERNEL - -void set_user_ldt(struct mdproc *); -struct proc_ldt *user_ldt_alloc(struct mdproc *, int); -void user_ldt_free(struct thread *); - -#endif /* _KERNEL */ - #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/hammer/sys/x86_64/include/sysarch.h#5 (text+ko) ==== @@ -39,41 +39,4 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#if 0 -#define I386_GET_LDT 0 -#define I386_SET_LDT 1 - /* I386_IOPL */ -#define I386_GET_IOPERM 3 -#define I386_SET_IOPERM 4 - /* xxxxx */ -struct i386_ldt_args { - unsigned int start; - union descriptor *descs; - unsigned int num; -}; - -struct i386_ioperm_args { - unsigned int start; - unsigned int length; - int enable; -}; - -#ifndef _KERNEL -#include - -union descriptor; -struct dbreg; - -__BEGIN_DECLS -int i386_get_ldt(int, union descriptor *, int); -int i386_set_ldt(int, union descriptor *, int); -int i386_get_ioperm(unsigned int, unsigned int *, int *); -int i386_set_ioperm(unsigned int, unsigned int, int); -int i386_set_watch(int, unsigned int, int, int, struct dbreg *); -int i386_clr_watch(int, struct dbreg *); -__END_DECLS -#endif - -#endif - #endif /* !_MACHINE_SYSARCH_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:06:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E000537B401; Fri, 4 Apr 2003 18:06:29 -0800 (PST) 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 8D3E137B401 for ; Fri, 4 Apr 2003 18:06:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 248B443FDD for ; Fri, 4 Apr 2003 18:06:28 -0800 (PST) (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 h3526R0U092861 for ; Fri, 4 Apr 2003 18:06:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3526R0p092858 for perforce@freebsd.org; Fri, 4 Apr 2003 18:06:27 -0800 (PST) Date: Fri, 4 Apr 2003 18:06:27 -0800 (PST) Message-Id: <200304050206.h3526R0p092858@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 28125 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, 05 Apr 2003 02:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=28125 Change 28125 by peter@peter_daintree on 2003/04/04 18:06:13 64 bit sig_atomic_t Affected files ... .. //depot/projects/hammer/sys/x86_64/include/signal.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/signal.h#8 (text+ko) ==== @@ -44,7 +44,7 @@ * Machine-dependent signal definitions */ -typedef int sig_atomic_t; +typedef long sig_atomic_t; #if __XSI_VISIBLE /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:06:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53ECC37B41C; Fri, 4 Apr 2003 18:06:30 -0800 (PST) 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 0BD2937B40C for ; Fri, 4 Apr 2003 18:06:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C91B43FAF for ; Fri, 4 Apr 2003 18:06:28 -0800 (PST) (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 h3526S0U092869 for ; Fri, 4 Apr 2003 18:06:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3526Svi092864 for perforce@freebsd.org; Fri, 4 Apr 2003 18:06:28 -0800 (PST) Date: Fri, 4 Apr 2003 18:06:28 -0800 (PST) Message-Id: <200304050206.h3526Svi092864@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 28126 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, 05 Apr 2003 02:06:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=28126 Change 28126 by peter@peter_daintree on 2003/04/04 18:06:24 there are no 4.x hammer binaries Affected files ... .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#7 (text+ko) ==== @@ -74,31 +74,4 @@ int mc_spare2[8]; } mcontext_t; -#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) -struct mcontext4 { - int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; /* machine state (struct trapframe) */ - int mc_fs; - int mc_es; - int mc_ds; - int mc_edi; - int mc_esi; - int mc_ebp; - int mc_isp; - int mc_ebx; - int mc_edx; - int mc_ecx; - int mc_eax; - int mc_trapno; - int mc_err; - int mc_eip; - int mc_cs; - int mc_eflags; - int mc_esp; /* machine state */ - int mc_ss; - int mc_fpregs[28]; /* env87 + fpacc87 + u_long */ - int __spare__[17]; -}; -#endif - #endif /* !_MACHINE_UCONTEXT_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:09:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09DDD37B405; Fri, 4 Apr 2003 18:09:34 -0800 (PST) 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 87DDF37B401 for ; Fri, 4 Apr 2003 18:09:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2162343F3F for ; Fri, 4 Apr 2003 18:09:33 -0800 (PST) (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 h3529W0U092975 for ; Fri, 4 Apr 2003 18:09:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3529WJB092972 for perforce@freebsd.org; Fri, 4 Apr 2003 18:09:32 -0800 (PST) Date: Fri, 4 Apr 2003 18:09:32 -0800 (PST) Message-Id: <200304050209.h3529WJB092972@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 28128 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, 05 Apr 2003 02:09:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=28128 Change 28128 by peter@peter_daintree on 2003/04/04 18:08:46 nuke pcb_ext, thats another complication I dont need yet Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcb.h#7 edit .. //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#32 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcb.h#7 (text+ko) ==== @@ -60,7 +60,6 @@ #define PCB_NPXINITDONE 0x08 /* fpu state is initialized */ caddr_t pcb_onfault; /* copyin/out fault recovery */ - struct pcb_ext *pcb_ext; /* optional pcb extension */ long pcb_gs; long pcb_psl; /* process status long */ }; ==== //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#3 (text+ko) ==== @@ -29,22 +29,4 @@ #ifndef _I386_PCB_EXT_H_ #define _I386_PCB_EXT_H_ -/* - * Extension to the 386 process control block - */ -#include -#include - -struct pcb_ext { - struct segment_descriptor ext_tssd; /* tss descriptor */ - struct i386tss ext_tss; /* per-process i386tss */ - caddr_t ext_iomap; /* i/o permission bitmap */ -}; - -#ifdef _KERNEL - -int i386_extend_pcb(struct thread *); - -#endif - #endif /* _I386_PCB_EXT_H_ */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#32 (text+ko) ==== @@ -100,7 +100,6 @@ #include #include #include -#include /* pcb.h included via sys/user.h */ #include #ifdef PERFMON #include @@ -1354,7 +1353,6 @@ #else thread0.td_pcb->pcb_cr3 = (int)IdlePTD; #endif - thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#9 (text+ko) ==== @@ -167,37 +167,6 @@ * At this point, we've switched address spaces and are ready * to load up the rest of the next context. */ - cmpl $0, PCB_EXT(%edx) /* has pcb extension? */ - je 1f /* If not, use the default */ - btsl %esi, private_tss /* mark use of private tss */ - movl PCB_EXT(%edx), %edi /* new tss descriptor */ - jmp 2f /* Load it up */ - -1: /* - * Use the common default TSS instead of our own. - * Set our stack pointer into the TSS, it's set to just - * below the PCB. In C, common_tss.tss_esp0 = &pcb; - */ - movl %ebx, PCPU(COMMON_TSS) + TSS_ESP0 - - /* - * Test this CPU's bit in the bitmap to see if this - * CPU was using a private TSS. - */ - btrl %esi, private_tss /* Already using the common? */ - jae 3f /* if so, skip reloading */ - PCPU_ADDR(COMMON_TSSD, %edi) -2: - /* Move correct tss descriptor into GDT slot, then reload tr. */ - movl PCPU(TSS_GDT), %ebx /* entry in GDT */ - movl 0(%edi), %eax - movl %eax, 0(%ebx) - movl 4(%edi), %eax - movl %eax, 4(%ebx) - movl $GPROC0_SEL*8, %esi /* GSEL(entry, SEL_KPL) */ - ltr %si -3: - /* Restore context. */ movl PCB_EBX(%edx),%ebx movl PCB_ESP(%edx),%esp ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#11 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include #include @@ -154,15 +153,9 @@ * pcb2->pcb_flags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). * pcb2->pcb_gs: cloned above. - * pcb2->pcb_ext: cleared below. */ /* - * XXX don't copy the i/o pages. this should probably be fixed. - */ - pcb2->pcb_ext = 0; - - /* * Now, cpu_switch() can schedule the new process. * pcb_esp is loaded pointing to the cpu_switch() stack frame * containing the return address when exiting cpu_switch. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:18:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C06037B404; Fri, 4 Apr 2003 18:18:46 -0800 (PST) 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 B334237B401 for ; Fri, 4 Apr 2003 18:18:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AC2C43F85 for ; Fri, 4 Apr 2003 18:18:45 -0800 (PST) (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 h352Ij0U093649 for ; Fri, 4 Apr 2003 18:18:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352IiIa093646 for perforce@freebsd.org; Fri, 4 Apr 2003 18:18:44 -0800 (PST) Date: Fri, 4 Apr 2003 18:18:44 -0800 (PST) Message-Id: <200304050218.h352IiIa093646@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 28130 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, 05 Apr 2003 02:18:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=28130 Change 28130 by peter@peter_daintree on 2003/04/04 18:18:20 hack a bit of the PML4 stuff in. Still need to do the middle page. I think I'm going to use a couple of 2M pages initially and then create the rest of the page tables in C and reclaim the initial ones. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#21 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#21 (text+ko) ==== @@ -174,7 +174,7 @@ PING('e'); /* Point to the PML4 */ - movl R(IdlePTD), %eax + movl R(IdlePML4), %eax movl %eax,%cr3 /* load ptd addr into mmu */ PING('r'); @@ -215,11 +215,7 @@ xorl %ebp,%ebp /* mark end of frames */ -#ifdef PAE - movl IdlePDPT,%esi -#else - movl IdlePTD,%esi -#endif + movl IdlePML4,%esi movl %esi,(KSTACK_PAGES*PAGE_SIZE-PCB_SIZE+PCB_CR3)(%eax) pushl physfree /* value of first for init386(first) */ @@ -302,11 +298,9 @@ movl %esi,R(KPTphys) /* Allocate Page Table Directory */ -#ifdef PAE /* XXX only need 32 bytes (easier for now) */ ALLOCPAGES(1) - movl %esi,R(IdlePDPT) -#endif + movl %esi,R(IdlePML4) ALLOCPAGES(NPGPTD) movl %esi,R(IdlePTD) @@ -340,11 +334,9 @@ fillkptphys(%edx) /* Map page directory. */ -#ifdef PAE - movl R(IdlePDPT), %eax + movl R(IdlePML4), %eax movl $1, %ecx fillkptphys($PG_RW) -#endif movl R(IdlePTD), %eax movl $NPGPTD, %ecx @@ -383,12 +375,10 @@ movl $NPGPTD,%ecx fillkpt(R(IdlePTD), $PG_RW) -#ifdef PAE movl R(IdlePTD), %eax xorl %ebx, %ebx movl $NPGPTD, %ecx - fillkpt(R(IdlePDPT), $0x0) -#endif + fillkpt(R(IdlePML4), $0x0) ret From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:21:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B220D37B404; Fri, 4 Apr 2003 18:21:50 -0800 (PST) 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 5130937B401 for ; Fri, 4 Apr 2003 18:21:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D468843F93 for ; Fri, 4 Apr 2003 18:21:49 -0800 (PST) (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 h352Ln0U094077 for ; Fri, 4 Apr 2003 18:21:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352LntV094074 for perforce@freebsd.org; Fri, 4 Apr 2003 18:21:49 -0800 (PST) Date: Fri, 4 Apr 2003 18:21:49 -0800 (PST) Message-Id: <200304050221.h352LntV094074@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 28131 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, 05 Apr 2003 02:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=28131 Change 28131 by peter@peter_daintree on 2003/04/04 18:21:12 deep-six SWITCH_OPTIM_STATS and LAZY_SWITCH for now Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#33 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#33 (text+ko) ==== @@ -48,7 +48,6 @@ #include "opt_maxmem.h" #include "opt_msgbuf.h" #include "opt_perfmon.h" -#include "opt_swtch.h" #include "opt_kstack_pages.h" #include @@ -139,43 +138,6 @@ struct user *proc0uarea; /* address of proc 0 uarea space */ vm_offset_t proc0kstack; /* address of proc 0 kstack space */ -#if defined(SWTCH_OPTIM_STATS) -int stupid_switch; -SYSCTL_INT(_debug, OID_AUTO, stupid_switch, - CTLFLAG_RW, &stupid_switch, 0, ""); -int swtch_optim_stats; -SYSCTL_INT(_debug, OID_AUTO, swtch_optim_stats, - CTLFLAG_RW, &swtch_optim_stats, 0, ""); -int tlb_flush_count; -SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count, - CTLFLAG_RW, &tlb_flush_count, 0, ""); -int lazy_flush_count; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_count, - CTLFLAG_RW, &lazy_flush_count, 0, ""); -int lazy_flush_fixup; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_fixup, - CTLFLAG_RW, &lazy_flush_fixup, 0, ""); -#ifdef SMP -int lazy_flush_smpfixup; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpfixup, - CTLFLAG_RW, &lazy_flush_smpfixup, 0, ""); -int lazy_flush_smpipi; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpipi, - CTLFLAG_RW, &lazy_flush_smpipi, 0, ""); -int lazy_flush_smpbadcr3; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpbadcr3, - CTLFLAG_RW, &lazy_flush_smpbadcr3, 0, ""); -int lazy_flush_smpmiss; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_smpmiss, - CTLFLAG_RW, &lazy_flush_smpmiss, 0, ""); -#endif -#endif -#ifdef LAZY_SWITCH -int lazy_flush_enable = 1; -SYSCTL_INT(_debug, OID_AUTO, lazy_flush_enable, - CTLFLAG_RW, &lazy_flush_enable, 0, ""); -#endif - int cold = 1; long Maxmem = 0; ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#11 (text+ko) ==== @@ -102,7 +102,6 @@ #include "opt_pmap.h" #include "opt_msgbuf.h" #include "opt_kstack_pages.h" -#include "opt_swtch.h" #include #include @@ -176,9 +175,6 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; -#if defined(SMP) && defined(LAZY_SWITCH) -static struct mtx lazypmap_lock; -#endif vm_paddr_t avail_start; /* PA of first available physical page */ vm_paddr_t avail_end; /* PA of last available physical page */ @@ -328,9 +324,6 @@ kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); -#if defined(SMP) && defined(LAZY_SWITCH) - mtx_init(&lazypmap_lock, "lazypmap", NULL, MTX_SPIN); -#endif mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); @@ -1346,121 +1339,6 @@ * Pmap allocation/deallocation routines. ***************************************************/ -#ifdef LAZY_SWITCH -#ifdef SMP -/* - * Deal with a SMP shootdown of other users of the pmap that we are - * trying to dispose of. This can be a bit hairy. - */ -static u_int *lazymask; -static u_int lazyptd; -static volatile u_int lazywait; - -void pmap_lazyfix_action(void); - -void -pmap_lazyfix_action(void) -{ - u_int mymask = PCPU_GET(cpumask); - - if (rcr3() == lazyptd) { - load_cr3(PCPU_GET(curpcb)->pcb_cr3); -#ifdef SWTCH_OPTIM_STATS - atomic_add_int(&lazy_flush_smpfixup, 1); - } else { - if (*lazymask & mymask) - lazy_flush_smpbadcr3++; - else - lazy_flush_smpmiss++; -#endif - } - atomic_clear_int(lazymask, mymask); - atomic_store_rel_int(&lazywait, 1); -} - -static void -pmap_lazyfix_self(u_int mymask) -{ - - if (rcr3() == lazyptd) { - load_cr3(PCPU_GET(curpcb)->pcb_cr3); -#ifdef SWTCH_OPTIM_STATS - lazy_flush_fixup++; - } else { - if (*lazymask & mymask) - lazy_flush_smpbadcr3++; - else - lazy_flush_smpmiss++; -#endif - } - atomic_clear_int(lazymask, mymask); -} - - -static void -pmap_lazyfix(pmap_t pmap) -{ - u_int mymask = PCPU_GET(cpumask); - u_int mask; - register u_int spins; - - while ((mask = pmap->pm_active) != 0) { - spins = 50000000; - mask = mask & -mask; /* Find least significant set bit */ - mtx_lock_spin(&lazypmap_lock); -#ifdef PAE - lazyptd = vtophys(pmap->pm_pdpt); -#else - lazyptd = vtophys(pmap->pm_pdir); -#endif - if (mask == mymask) { - lazymask = &pmap->pm_active; - pmap_lazyfix_self(mymask); - } else { - atomic_store_rel_int((u_int *)&lazymask, - (u_int)&pmap->pm_active); - atomic_store_rel_int(&lazywait, 0); - ipi_selected(mask, IPI_LAZYPMAP); - while (lazywait == 0) { - ia32_pause(); - if (--spins == 0) - break; - } -#ifdef SWTCH_OPTIM_STATS - lazy_flush_smpipi++; -#endif - } - mtx_unlock_spin(&lazypmap_lock); - if (spins == 0) - printf("pmap_lazyfix: spun for 50000000\n"); - } -} - -#else /* SMP */ - -/* - * Cleaning up on uniprocessor is easy. For various reasons, we're - * unlikely to have to even execute this code, including the fact - * that the cleanup is deferred until the parent does a wait(2), which - * means that another userland process has run. - */ -static void -pmap_lazyfix(pmap_t pmap) -{ - u_int cr3; - - cr3 = vtophys(pmap->pm_pdir); - if (cr3 == rcr3()) { - load_cr3(PCPU_GET(curpcb)->pcb_cr3); - pmap->pm_active &= ~(PCPU_GET(cpumask)); -#ifdef SWTCH_OPTIM_STATS - lazy_flush_fixup++; -#endif - } -} -#endif /* SMP */ -#endif /* LAZY_SWITCH */ - /* * Release any resources held by the given physical map. * Called when a pmap initialized by pmap_pinit is being released. @@ -1482,9 +1360,6 @@ ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); -#ifdef LAZY_SWITCH - pmap_lazyfix(pmap); -#endif mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); @@ -3226,9 +3101,6 @@ td->td_pcb->pcb_cr3 = cr3; } load_cr3(cr3); -#ifdef SWTCH_OPTIM_STATS - tlb_flush_count++; -#endif critical_exit(); } From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:26:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F95237B404; Fri, 4 Apr 2003 18:26:58 -0800 (PST) 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 B920737B401 for ; Fri, 4 Apr 2003 18:26:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6237B43FBD for ; Fri, 4 Apr 2003 18:26:57 -0800 (PST) (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 h352Qv0U094235 for ; Fri, 4 Apr 2003 18:26:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352Qul8094232 for perforce@freebsd.org; Fri, 4 Apr 2003 18:26:56 -0800 (PST) Date: Fri, 4 Apr 2003 18:26:56 -0800 (PST) Message-Id: <200304050226.h352Qul8094232@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 28133 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, 05 Apr 2003 02:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=28133 Change 28133 by peter@peter_daintree on 2003/04/04 18:26:46 Some SMP stuff snuck back in Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#34 edit .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#34 (text+ko) ==== @@ -440,11 +440,6 @@ cpu_idle(void) { -#ifdef SMP - if (mp_grab_cpu_hlt()) - return; -#endif - if (cpu_idle_hlt) { disable_intr(); if (sched_runnable()) { ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#7 (text+ko) ==== @@ -376,11 +376,7 @@ cmpl $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ ja fusufault -#if defined(SMP) - lock cmpxchgl %ecx, (%edx) /* Compare and set. */ -#else /* !SMP */ cmpxchgl %ecx, (%edx) -#endif /* !SMP */ /* * The old value is in %eax. If the store succeeded it will be the ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#12 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:30:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACEBD37B404; Fri, 4 Apr 2003 18:30:02 -0800 (PST) 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 4496837B401 for ; Fri, 4 Apr 2003 18:30:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C70F143FAF for ; Fri, 4 Apr 2003 18:30:01 -0800 (PST) (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 h352U10U094393 for ; Fri, 4 Apr 2003 18:30:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352U1Bw094390 for perforce@freebsd.org; Fri, 4 Apr 2003 18:30:01 -0800 (PST) Date: Fri, 4 Apr 2003 18:30:01 -0800 (PST) Message-Id: <200304050230.h352U1Bw094390@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 28134 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, 05 Apr 2003 02:30:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=28134 Change 28134 by peter@peter_daintree on 2003/04/04 18:29:32 add isa/isa.c Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#4 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#4 (text+ko) ==== @@ -59,4 +59,5 @@ x86_64/isa/clock.c standard x86_64/isa/intr_machdep.c standard +x86_64/isa/isa.c standard x86_64/isa/ithread.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:42:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AEF537B404; Fri, 4 Apr 2003 18:42:18 -0800 (PST) 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 AB96737B401 for ; Fri, 4 Apr 2003 18:42:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 551CB43FBD for ; Fri, 4 Apr 2003 18:42:17 -0800 (PST) (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 h352gH0U095358 for ; Fri, 4 Apr 2003 18:42:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352gGjh095355 for perforce@freebsd.org; Fri, 4 Apr 2003 18:42:16 -0800 (PST) Date: Fri, 4 Apr 2003 18:42:16 -0800 (PST) Message-Id: <200304050242.h352gGjh095355@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 28135 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, 05 Apr 2003 02:42:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=28135 Change 28135 by peter@peter_overcee on 2003/04/04 18:41:49 use 64 bit bswap. XXX check constraints. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/endian.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/endian.h#5 (text+ko) ==== @@ -74,12 +74,15 @@ __asm ("rorl $16, %0" : "+r" (__X)); \ __X; }) -#if defined(_KERNEL) #define __byte_swap_int(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \ __X; }) -#endif + +#define __byte_swap_long(x) \ +__extension__ ({ register __uint64_t __X = (x); \ + __asm ("bswap %0" : "+r" (__X)); \ + __X; }) #define __byte_swap_word(x) \ __extension__ ({ register __uint16_t __X = (x); \ @@ -89,11 +92,8 @@ static __inline __uint64_t __bswap64(__uint64_t _x) { - /* XXX we have a 64 bit variation of the bswap instruction now */ - return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) | - ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) | - ((_x << 24) & ((__uint64_t)0xff << 40)) | - ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56))); + + return (__byte_swap_long(_x)); } static __inline __uint32_t From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:42:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6911337B404; Fri, 4 Apr 2003 18:42:19 -0800 (PST) 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 2B8D037B407 for ; Fri, 4 Apr 2003 18:42:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C909D43FBD for ; Fri, 4 Apr 2003 18:42:17 -0800 (PST) (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 h352gH0U095364 for ; Fri, 4 Apr 2003 18:42:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352gHjU095361 for perforce@freebsd.org; Fri, 4 Apr 2003 18:42:17 -0800 (PST) Date: Fri, 4 Apr 2003 18:42:17 -0800 (PST) Message-Id: <200304050242.h352gHjU095361@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 28136 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, 05 Apr 2003 02:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=28136 Change 28136 by peter@peter_overcee on 2003/04/04 18:42:09 use the cross compiler Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#3 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#3 (text+ko) ==== @@ -17,6 +17,19 @@ # after which config should be rerun for all machines. # +# The FSF cross tools don't understand -fformat-extensions +CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ + -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ + -ffreestanding +CC= x86_64-unknown-freebsd5.0-gcc +LD= x86_64-unknown-freebsd5.0-ld +NM= x86_64-unknown-freebsd5.0-nm +SIZE= x86_64-unknown-freebsd5.0-size +OBJCOPY= x86_64-unknown-freebsd5.0-objcopy +OBJDUMP= x86_64-unknown-freebsd5.0-objdump +MACHINE_ARCH= x86_64 + + # Which version of config(8) is required. %VERSREQ= 500011 From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:44:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B82D437B404; Fri, 4 Apr 2003 18:44:21 -0800 (PST) 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 6C6EE37B401 for ; Fri, 4 Apr 2003 18:44:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1786143F75 for ; Fri, 4 Apr 2003 18:44:21 -0800 (PST) (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 h352iK0U095479 for ; Fri, 4 Apr 2003 18:44:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352iKlw095476 for perforce@freebsd.org; Fri, 4 Apr 2003 18:44:20 -0800 (PST) Date: Fri, 4 Apr 2003 18:44:20 -0800 (PST) Message-Id: <200304050244.h352iKlw095476@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 28137 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, 05 Apr 2003 02:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=28137 Change 28137 by peter@peter_overcee on 2003/04/04 18:44:04 s/eflags/rflags/ Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#6 (text+ko) ==== @@ -608,17 +608,17 @@ static __inline register_t intr_disable(void) { - register_t eflags; + register_t rflags; - eflags = read_eflags(); + rflags = read_rflags(); disable_intr(); - return (eflags); + return (rflags); } static __inline void -intr_restore(register_t eflags) +intr_restore(register_t rflags) { - write_eflags(eflags); + write_rflags(rflags); } #else /* !__GNUC__ */ @@ -667,9 +667,9 @@ u_int64_t rdmsr(u_int msr); u_int64_t rdpmc(u_int pmc); u_int64_t rdtsc(void); -u_int read_eflags(void); +u_int read_rflags(void); void wbinvd(void); -void write_eflags(u_int ef); +void write_rflags(u_int ef); void wrmsr(u_int msr, u_int64_t newval); u_int rdr0(void); void load_dr0(u_int dr0); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:46:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3267C37B404; Fri, 4 Apr 2003 18:46:25 -0800 (PST) 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 C599537B401 for ; Fri, 4 Apr 2003 18:46:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7158843F93 for ; Fri, 4 Apr 2003 18:46:24 -0800 (PST) (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 h352kO0U095587 for ; Fri, 4 Apr 2003 18:46:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352kNHs095584 for perforce@freebsd.org; Fri, 4 Apr 2003 18:46:23 -0800 (PST) Date: Fri, 4 Apr 2003 18:46:23 -0800 (PST) Message-Id: <200304050246.h352kNHs095584@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 28138 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, 05 Apr 2003 02:46:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=28138 Change 28138 by peter@peter_overcee on 2003/04/04 18:45:28 fix some silly typos Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#8 (text+ko) ==== @@ -136,8 +136,6 @@ #define PTESHIFT (3) #define PDESHIFT (3) -#endif - /* * Address of current and alternate address space page table maps * and directories. @@ -148,11 +146,11 @@ * in the page tables and the evil overlapping. */ #ifdef _KERNEL -extern pt_entry_t PTmap[]: -extern pd_entry_t PDmap[]: -extern pdp_entry_t PDPmap[]: -extern pml4_entry_t PML4[]: -extern pd_entry_t PML4pml4e[]: +extern pt_entry_t PTmap[]; +extern pd_entry_t PDmap[]; +extern pdp_entry_t PDPmap[]; +extern pml4_entry_t PML4[]; +extern pd_entry_t PML4pml4e[]; extern pd_entry_t *IdlePML4; /* physical address of "Idle" state directory */ #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:09:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4251E37B404; Fri, 4 Apr 2003 19:09:54 -0800 (PST) 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 CD58A37B401 for ; Fri, 4 Apr 2003 19:09:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65D6D43F3F for ; Fri, 4 Apr 2003 19:09:53 -0800 (PST) (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 h3539r0U097981 for ; Fri, 4 Apr 2003 19:09:53 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3539qXx097978 for perforce@freebsd.org; Fri, 4 Apr 2003 19:09:52 -0800 (PST) Date: Fri, 4 Apr 2003 19:09:52 -0800 (PST) Message-Id: <200304050309.h3539qXx097978@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 28139 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, 05 Apr 2003 03:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=28139 Change 28139 by peter@peter_overcee on 2003/04/04 19:09:10 shoot for an x86-PAE-like VM layout where there is 32 bits of address space. This keeps it simpler for now. A lot. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#9 edit .. //depot/projects/hammer/sys/x86_64/include/pmap.h#9 edit .. //depot/projects/hammer/sys/x86_64/include/vmparam.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#9 (text+ko) ==== @@ -111,11 +111,15 @@ #define NBPML4T (1ul< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972EA37B404; Fri, 4 Apr 2003 19:22:09 -0800 (PST) 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 3587637B401 for ; Fri, 4 Apr 2003 19:22:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D298743FB1 for ; Fri, 4 Apr 2003 19:22:08 -0800 (PST) (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 h353M80U099014 for ; Fri, 4 Apr 2003 19:22:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353M8q3099011 for perforce@freebsd.org; Fri, 4 Apr 2003 19:22:08 -0800 (PST) Date: Fri, 4 Apr 2003 19:22:08 -0800 (PST) Message-Id: <200304050322.h353M8q3099011@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 28140 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, 05 Apr 2003 03:22:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=28140 Change 28140 by peter@peter_overcee on 2003/04/04 19:21:27 use the global decls for bzero/etc Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#13 (text+ko) ==== @@ -36,11 +36,6 @@ * Miscellaneous machine-dependent declarations. */ -extern void bcopy(const void *from, void *to, size_t len); -extern void bzero(void *buf, size_t len); -extern int copyin(const void *udaddr, void *kaddr, size_t len); -extern int copyout(const void *kaddr, void *udaddr, size_t len); - extern long Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ extern int busdma_swi_pending; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:22:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F6B337B404; Fri, 4 Apr 2003 19:22:11 -0800 (PST) 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 B69E037B408 for ; Fri, 4 Apr 2003 19:22:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55C5743FB1 for ; Fri, 4 Apr 2003 19:22:09 -0800 (PST) (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 h353M90U099020 for ; Fri, 4 Apr 2003 19:22:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353M8PK099017 for perforce@freebsd.org; Fri, 4 Apr 2003 19:22:08 -0800 (PST) Date: Fri, 4 Apr 2003 19:22:08 -0800 (PST) Message-Id: <200304050322.h353M8PK099017@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 28141 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, 05 Apr 2003 03:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=28141 Change 28141 by peter@peter_overcee on 2003/04/04 19:21:59 use the PAE + alpha/ia64 configuration for busspace (64 bit, ha!) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/bus_at386.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/bus_at386.h#4 (text+ko) ==== @@ -92,11 +92,7 @@ /* * Bus address and size types */ -#ifdef PAE typedef uint64_t bus_addr_t; -#else -typedef uint32_t bus_addr_t; -#endif typedef uint32_t bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF @@ -104,19 +100,15 @@ #define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#ifdef PAE #define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL -#else -#define BUS_SPACE_MAXADDR 0xFFFFFFFF -#endif #define BUS_SPACE_UNRESTRICTED (~0) /* * Access methods for bus resources and address space. */ -typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; +typedef u_long bus_space_tag_t; +typedef u_long bus_space_handle_t; /* * Map a region of device bus space into CPU virtual address space. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:23:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2550B37B409; Fri, 4 Apr 2003 19:23:12 -0800 (PST) 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 AADBA37B408 for ; Fri, 4 Apr 2003 19:23:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 416F543F3F for ; Fri, 4 Apr 2003 19:23:11 -0800 (PST) (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 h353NB0U099060 for ; Fri, 4 Apr 2003 19:23:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353NA47099057 for perforce@freebsd.org; Fri, 4 Apr 2003 19:23:10 -0800 (PST) Date: Fri, 4 Apr 2003 19:23:10 -0800 (PST) Message-Id: <200304050323.h353NA47099057@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 28142 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, 05 Apr 2003 03:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=28142 Change 28142 by peter@peter_overcee on 2003/04/04 19:22:38 fix typo Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#22 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#22 (text+ko) ==== @@ -382,7 +382,7 @@ ret -/********************************************************************** +/**********************************************************************/ /* * We need to switch to a new gdt in order to get from compatability * mode to full 64 bit mode. These are 'long mode descriptors', not From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:23:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A43A137B404; Fri, 4 Apr 2003 19:23:12 -0800 (PST) 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 2023A37B407 for ; Fri, 4 Apr 2003 19:23:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8A6F43F3F for ; Fri, 4 Apr 2003 19:23:11 -0800 (PST) (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 h353NB0U099066 for ; Fri, 4 Apr 2003 19:23:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353NBwO099063 for perforce@freebsd.org; Fri, 4 Apr 2003 19:23:11 -0800 (PST) Date: Fri, 4 Apr 2003 19:23:11 -0800 (PST) Message-Id: <200304050323.h353NBwO099063@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 28143 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, 05 Apr 2003 03:23:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=28143 Change 28143 by peter@peter_overcee on 2003/04/04 19:23:00 s/l/q/ for 64 bit regs Affected files ... .. //depot/projects/hammer/sys/x86_64/include/asmacros.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/atomic.h#7 edit .. //depot/projects/hammer/sys/x86_64/include/mutex.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/pcpu.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/asmacros.h#3 (text+ko) ==== @@ -64,10 +64,9 @@ #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ #ifdef LOCORE -XXX gotta redo this to use a register #define PCPU(member) %fs:PC_ ## member #define PCPU_ADDR(member, reg) movq %fs:PC_PRVSPACE,reg; \ - addl $PC_ ## member,reg + addq $PC_ ## member,reg #endif #ifdef GPROF ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#7 (text+ko) ==== @@ -147,7 +147,7 @@ " " __XSTRING(MPLOCKED) " " " cmpxchgq %1,%2 ; " " setz %%al ; " - " movzbl %%al,%0 ; " + " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_int" : "+a" (res) /* 0 (result) %rax, XXX check */ ==== //depot/projects/hammer/sys/x86_64/include/mutex.h#3 (text+ko) ==== @@ -61,7 +61,7 @@ pushq $flags ; \ pushq $lck ; \ call _mtx_lock_spin_flags ; \ - addl $0x20, %esp ; \ + addq $0x20, %rsp ; \ #define MTX_UNLOCK_SPIN(lck) \ pushq $0 ; \ @@ -69,7 +69,7 @@ pushq $0 ; \ pushq $lck ; \ call _mtx_unlock_spin_flags ; \ - addl $0x20, %esp ; \ + addq $0x20, %rsp ; \ #endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ ==== //depot/projects/hammer/sys/x86_64/include/pcpu.h#5 (text+ko) ==== @@ -72,7 +72,7 @@ #define __PCPU_PTR(name) ({ \ __pcpu_type(name) *__p; \ \ - __asm __volatile("movl %%fs:%1,%0; addl %2,%0" \ + __asm __volatile("movq %%fs:%1,%0; addq %2,%0" \ : "=r" (__p) \ : "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace))), \ "i" (__pcpu_offset(name))); \ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:26:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB16037B404; Fri, 4 Apr 2003 19:26:16 -0800 (PST) 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 846FA37B401 for ; Fri, 4 Apr 2003 19:26:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BA9943FBF for ; Fri, 4 Apr 2003 19:26:16 -0800 (PST) (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 h353QF0U099198 for ; Fri, 4 Apr 2003 19:26:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353QFIC099195 for perforce@freebsd.org; Fri, 4 Apr 2003 19:26:15 -0800 (PST) Date: Fri, 4 Apr 2003 19:26:15 -0800 (PST) Message-Id: <200304050326.h353QFIC099195@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 28144 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, 05 Apr 2003 03:26:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=28144 Change 28144 by peter@peter_overcee on 2003/04/04 19:25:46 try and stop crashing gcc-3.2 in cross configuration Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#4 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#4 (text+ko) ==== @@ -28,6 +28,7 @@ OBJCOPY= x86_64-unknown-freebsd5.0-objcopy OBJDUMP= x86_64-unknown-freebsd5.0-objdump MACHINE_ARCH= x86_64 +COPTFLAGS= # none, -O crashes the 3.2 cross compiler I have # Which version of config(8) is required. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:27:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF9F437B404; Fri, 4 Apr 2003 19:27:18 -0800 (PST) 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 7E51D37B401 for ; Fri, 4 Apr 2003 19:27:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 186A043F3F for ; Fri, 4 Apr 2003 19:27:18 -0800 (PST) (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 h353RH0U099232 for ; Fri, 4 Apr 2003 19:27:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353RHTE099229 for perforce@freebsd.org; Fri, 4 Apr 2003 19:27:17 -0800 (PST) Date: Fri, 4 Apr 2003 19:27:17 -0800 (PST) Message-Id: <200304050327.h353RHTE099229@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 28145 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, 05 Apr 2003 03:27:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=28145 Change 28145 by peter@peter_overcee on 2003/04/04 19:26:20 branch in i386/include/exec.h Affected files ... .. //depot/projects/hammer/sys/x86_64/include/exec.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:28:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B966A37B404; Fri, 4 Apr 2003 19:28:20 -0800 (PST) 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 7020B37B401 for ; Fri, 4 Apr 2003 19:28:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0739643FBF for ; Fri, 4 Apr 2003 19:28:20 -0800 (PST) (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 h353SJ0U099299 for ; Fri, 4 Apr 2003 19:28:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353SJw8099296 for perforce@freebsd.org; Fri, 4 Apr 2003 19:28:19 -0800 (PST) Date: Fri, 4 Apr 2003 19:28:19 -0800 (PST) Message-Id: <200304050328.h353SJw8099296@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 28146 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, 05 Apr 2003 03:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=28146 Change 28146 by peter@peter_overcee on 2003/04/04 19:27:36 suck in i386/include/ db_machdep.h, ptrace.h, smp.h Affected files ... .. //depot/projects/hammer/sys/x86_64/include/db_machdep.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/ptrace.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/smp.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:31:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 420A137B404; Fri, 4 Apr 2003 19:31:25 -0800 (PST) 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 ED10D37B401 for ; Fri, 4 Apr 2003 19:31:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81C1343FBF for ; Fri, 4 Apr 2003 19:31:24 -0800 (PST) (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 h353VO0U099761 for ; Fri, 4 Apr 2003 19:31:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353VNBq099758 for perforce@freebsd.org; Fri, 4 Apr 2003 19:31:23 -0800 (PST) Date: Fri, 4 Apr 2003 19:31:23 -0800 (PST) Message-Id: <200304050331.h353VNBq099758@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 28147 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, 05 Apr 2003 03:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=28147 Change 28147 by peter@peter_overcee on 2003/04/04 19:30:33 begin munging these into compilable state (or gut them) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/db_machdep.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/exec.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/ptrace.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/smp.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/db_machdep.h#2 (text+ko) ==== @@ -42,7 +42,7 @@ extern db_regs_t ddb_regs; /* register state */ #define DDB_REGS (&ddb_regs) -#define PC_REGS(regs) ((db_addr_t)(regs)->tf_eip) +#define PC_REGS(regs) ((db_addr_t)(regs)->tf_rip) #define BKPT_INST 0xcc /* breakpoint instruction */ #define BKPT_SIZE (1) /* size of breakpoint inst */ ==== //depot/projects/hammer/sys/x86_64/include/exec.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/include/ptrace.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/include/smp.h#2 (text+ko) ==== @@ -13,150 +13,4 @@ #ifndef _MACHINE_SMP_H_ #define _MACHINE_SMP_H_ -#ifdef _KERNEL - -#if defined(SMP) && defined(I386_CPU) && !defined(COMPILING_LINT) -#error SMP not supported with I386_CPU -#endif -#if defined(SMP) && !defined(APIC_IO) -# error APIC_IO required for SMP, add "options APIC_IO" to your config file. -#endif /* SMP && !APIC_IO */ -#if defined(SMP) && defined(CPU_DISABLE_CMPXCHG) && !defined(COMPILING_LINT) -#error SMP not supported with CPU_DISABLE_CMPXCHG -#endif - -#if defined(SMP) || defined(APIC_IO) - -#ifndef LOCORE - -/* - * For sending values to POST displays. - * XXX FIXME: where does this really belong, isa.h/isa.c perhaps? - */ -extern int current_postcode; /** XXX currently in mp_machdep.c */ -#define POSTCODE(X) current_postcode = (X), \ - outb(0x80, current_postcode) -#define POSTCODE_LO(X) current_postcode &= 0xf0, \ - current_postcode |= ((X) & 0x0f), \ - outb(0x80, current_postcode) -#define POSTCODE_HI(X) current_postcode &= 0x0f, \ - current_postcode |= (((X) << 4) & 0xf0), \ - outb(0x80, current_postcode) - - -#include /* XXX */ -#include -#include -#include -#include - -/* - * Interprocessor interrupts for SMP. - */ -#define IPI_INVLTLB XINVLTLB_OFFSET -#define IPI_INVLPG XINVLPG_OFFSET -#define IPI_INVLRNG XINVLRNG_OFFSET -#define IPI_LAZYPMAP XLAZYPMAP_OFFSET -#define IPI_RENDEZVOUS XRENDEZVOUS_OFFSET -#define IPI_AST XCPUAST_OFFSET -#define IPI_STOP XCPUSTOP_OFFSET -#define IPI_HARDCLOCK XHARDCLOCK_OFFSET -#define IPI_STATCLOCK XSTATCLOCK_OFFSET - -/* global data in mpboot.s */ -extern int bootMP_size; - -/* functions in mpboot.s */ -void bootMP(void); - -/* global data in mp_machdep.c */ -extern int bsp_apic_ready; -extern int mp_naps; -extern int mp_nbusses; -extern int mp_napics; -extern int mp_picmode; -extern int boot_cpu_id; -extern vm_offset_t cpu_apic_address; -extern vm_offset_t io_apic_address[]; -extern u_int32_t cpu_apic_versions[]; -extern u_int32_t *io_apic_versions; -extern int cpu_num_to_apic_id[]; -extern int io_num_to_apic_id[]; -extern int apic_id_to_logical[]; -#define APIC_INTMAPSIZE 32 -struct apic_intmapinfo { - int ioapic; - int int_pin; - volatile void *apic_address; - int redirindex; -}; -extern struct apic_intmapinfo int_to_apicintpin[]; -extern struct pcb stoppcbs[]; - -/* functions in mp_machdep.c */ -void i386_mp_probe(void); -u_int mp_bootaddress(u_int); -u_int isa_apic_mask(u_int); -int isa_apic_irq(int); -int pci_apic_irq(int, int, int); -int apic_irq(int, int); -int next_apic_irq(int); -int undirect_isa_irq(int); -int undirect_pci_irq(int); -int apic_bus_type(int); -int apic_src_bus_id(int, int); -int apic_src_bus_irq(int, int); -int apic_int_type(int, int); -int apic_trigger(int, int); -int apic_polarity(int, int); -int mp_grab_cpu_hlt(void); -void assign_apic_irq(int apic, int intpin, int irq); -void revoke_apic_irq(int irq); -void bsp_apic_configure(void); -void init_secondary(void); -void forward_statclock(void); -void forwarded_statclock(struct clockframe frame); -void forward_hardclock(void); -void forwarded_hardclock(struct clockframe frame); -void ipi_selected(u_int cpus, u_int ipi); -void ipi_all(u_int ipi); -void ipi_all_but_self(u_int ipi); -void ipi_self(u_int ipi); -#ifdef APIC_INTR_REORDER -void set_lapic_isrloc(int, int); -#endif /* APIC_INTR_REORDER */ -void smp_invlpg(vm_offset_t addr); -void smp_masked_invlpg(u_int mask, vm_offset_t addr); -void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva); -void smp_masked_invlpg_range(u_int mask, vm_offset_t startva, - vm_offset_t endva); -void smp_invltlb(void); -void smp_masked_invltlb(u_int mask); - -/* global data in mpapic.c */ -extern volatile lapic_t lapic; -extern volatile ioapic_t **ioapic; - -/* functions in mpapic.c */ -void apic_dump(char*); -void apic_initialize(void); -void imen_dump(void); -int apic_ipi(int, int, int); -int selected_apic_ipi(u_int, int, int); -int io_apic_setup(int); -void io_apic_setup_intpin(int, int); -void io_apic_set_id(int, int); -int io_apic_get_id(int); -int ext_int_setup(int, int); - -void set_apic_timer(int); -int read_apic_timer(void); -void u_sleep(int); -u_int io_apic_read(int, int); -void io_apic_write(int, int, u_int); - -#endif /* !LOCORE */ -#endif /* SMP && !APIC_IO */ - -#endif /* _KERNEL */ #endif /* _MACHINE_SMP_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:32:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C79037B404; Fri, 4 Apr 2003 19:32:27 -0800 (PST) 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 BEAD937B401 for ; Fri, 4 Apr 2003 19:32:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B86D43FB1 for ; Fri, 4 Apr 2003 19:32:26 -0800 (PST) (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 h353WQ0U099793 for ; Fri, 4 Apr 2003 19:32:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353WPBk099790 for perforce@freebsd.org; Fri, 4 Apr 2003 19:32:25 -0800 (PST) Date: Fri, 4 Apr 2003 19:32:25 -0800 (PST) Message-Id: <200304050332.h353WPBk099790@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 28148 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, 05 Apr 2003 03:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=28148 Change 28148 by peter@peter_overcee on 2003/04/04 19:31:34 use 64 bit typenames, use 64 bit size (jake) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/bus_at386.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/bus_at386.h#5 (text+ko) ==== @@ -93,7 +93,7 @@ * Bus address and size types */ typedef uint64_t bus_addr_t; -typedef uint32_t bus_size_t; +typedef uint64_t bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF @@ -107,8 +107,8 @@ /* * Access methods for bus resources and address space. */ -typedef u_long bus_space_tag_t; -typedef u_long bus_space_handle_t; +typedef uint64_t bus_space_tag_t; +typedef uint64_t bus_space_handle_t; /* * Map a region of device bus space into CPU virtual address space. From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:33:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ACEB37B404; Fri, 4 Apr 2003 19:33:29 -0800 (PST) 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 C02E937B401 for ; Fri, 4 Apr 2003 19:33:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56AE143F85 for ; Fri, 4 Apr 2003 19:33:28 -0800 (PST) (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 h353XS0U099826 for ; Fri, 4 Apr 2003 19:33:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353XRdE099823 for perforce@freebsd.org; Fri, 4 Apr 2003 19:33:27 -0800 (PST) Date: Fri, 4 Apr 2003 19:33:27 -0800 (PST) Message-Id: <200304050333.h353XRdE099823@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 28149 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, 05 Apr 2003 03:33:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=28149 Change 28149 by peter@peter_overcee on 2003/04/04 19:32:58 oops. s/l/q/ in write_rflags() Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#7 (text+ko) ==== @@ -357,7 +357,7 @@ static __inline void write_rflags(u_long ef) { - __asm __volatile("pushl %0; popfq" : : "r" (ef)); + __asm __volatile("pushq %0; popfq" : : "r" (ef)); } static __inline void From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:34:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 022A537B404; Fri, 4 Apr 2003 19:34:31 -0800 (PST) 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 93B3137B401 for ; Fri, 4 Apr 2003 19:34:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4012443F75 for ; Fri, 4 Apr 2003 19:34:30 -0800 (PST) (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 h353YU0U099855 for ; Fri, 4 Apr 2003 19:34:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353YT0T099852 for perforce@freebsd.org; Fri, 4 Apr 2003 19:34:29 -0800 (PST) Date: Fri, 4 Apr 2003 19:34:29 -0800 (PST) Message-Id: <200304050334.h353YT0T099852@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 28150 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, 05 Apr 2003 03:34:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=28150 Change 28150 by peter@peter_overcee on 2003/04/04 19:34:21 -Wno-format (FSF gcc doesn't like our kernel printf) Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#5 (text+ko) ==== @@ -20,7 +20,7 @@ # The FSF cross tools don't understand -fformat-extensions CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -ffreestanding + -ffreestanding -Wno-format CC= x86_64-unknown-freebsd5.0-gcc LD= x86_64-unknown-freebsd5.0-ld NM= x86_64-unknown-freebsd5.0-nm From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:43:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7709637B404; Fri, 4 Apr 2003 19:43:42 -0800 (PST) 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 2D20837B401 for ; Fri, 4 Apr 2003 19:43:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE46743FB1 for ; Fri, 4 Apr 2003 19:43:41 -0800 (PST) (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 h353hf0U000690 for ; Fri, 4 Apr 2003 19:43:41 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353hf4B000687 for perforce@freebsd.org; Fri, 4 Apr 2003 19:43:41 -0800 (PST) Date: Fri, 4 Apr 2003 19:43:41 -0800 (PST) Message-Id: <200304050343.h353hf4B000687@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 28151 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, 05 Apr 2003 03:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=28151 Change 28151 by peter@peter_overcee on 2003/04/04 19:43:03 looks like the FSF configuration of gcc for freebsd has got ptrdiff_t = int, which truely blows. Affected files ... .. //depot/projects/hammer/sys/vm/vm_pager.c#3 edit Differences ... ==== //depot/projects/hammer/sys/vm/vm_pager.c#3 (text+ko) ==== @@ -335,7 +335,7 @@ bp->b_rcred = NOCRED; bp->b_wcred = NOCRED; bp->b_qindex = 0; /* On no queue (QUEUE_NONE) */ - bp->b_data = (caddr_t) (MAXPHYS * (bp - swbuf)) + swapbkva; + bp->b_data = (caddr_t) ((MAXPHYS * (bp - swbuf)) + swapbkva); bp->b_kvabase = bp->b_data; bp->b_kvasize = MAXPHYS; bp->b_xflags = 0; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:43:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC1C837B404; Fri, 4 Apr 2003 19:43:43 -0800 (PST) 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 9B3CD37B40F for ; Fri, 4 Apr 2003 19:43:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4663443FB1 for ; Fri, 4 Apr 2003 19:43:42 -0800 (PST) (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 h353hg0U000696 for ; Fri, 4 Apr 2003 19:43:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353hfZF000693 for perforce@freebsd.org; Fri, 4 Apr 2003 19:43:41 -0800 (PST) Date: Fri, 4 Apr 2003 19:43:41 -0800 (PST) Message-Id: <200304050343.h353hfZF000693@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 28152 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, 05 Apr 2003 03:43:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=28152 Change 28152 by peter@peter_overcee on 2003/04/04 19:43:15 chop some files Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#5 (text+ko) ==== @@ -31,20 +31,14 @@ dev/syscons/sysmouse.c optional sc isa/atkbd_isa.c optional atkbd -libkern/ffs.c standard - x86_64/x86_64/autoconf.c standard -x86_64/x86_64/bios.c standard -x86_64/x86_64/bioscall.s standard x86_64/x86_64/busdma_machdep.c standard x86_64/x86_64/critical.c standard x86_64/x86_64/dump_machdep.c standard x86_64/x86_64/elf_machdep.c standard x86_64/x86_64/exception.s standard -x86_64/x86_64/i686_mem.c standard x86_64/x86_64/identcpu.c standard x86_64/x86_64/initcpu.c standard -x86_64/x86_64/k6_mem.c standard x86_64/x86_64/locore.s standard no-obj x86_64/x86_64/machdep.c standard x86_64/x86_64/mem.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:43:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE2E137B404; Fri, 4 Apr 2003 19:43:49 -0800 (PST) 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 6555F37B401 for ; Fri, 4 Apr 2003 19:43:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5668743FB1 for ; Fri, 4 Apr 2003 19:43:47 -0800 (PST) (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 h353hl0U000713 for ; Fri, 4 Apr 2003 19:43:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353hgrq000700 for perforce@freebsd.org; Fri, 4 Apr 2003 19:43:42 -0800 (PST) Date: Fri, 4 Apr 2003 19:43:42 -0800 (PST) Message-Id: <200304050343.h353hgrq000700@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 28153 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, 05 Apr 2003 03:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=28153 Change 28153 by marcel@marcel_nfs on 2003/04/04 19:43:24 MFia64 Affected files ... .. //depot/projects/ia64_epc/Makefile#3 integrate .. //depot/projects/ia64_epc/Makefile.inc1#6 integrate .. //depot/projects/ia64_epc/Makefile.upgrade#2 delete .. //depot/projects/ia64_epc/UPDATING#3 integrate .. //depot/projects/ia64_epc/bin/chflags/chflags.1#2 integrate .. //depot/projects/ia64_epc/bin/chio/chio.1#2 integrate .. //depot/projects/ia64_epc/contrib/gcc/FAQ#2 delete .. //depot/projects/ia64_epc/contrib/gcc/GNATS#2 delete .. //depot/projects/ia64_epc/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/ia64_epc/contrib/gcc/bugs.html#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config-ml.in#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config.if#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config.sub#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/ia64_epc/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/ia64_epc/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/ia64_epc/contrib/gcc/faq.html#2 delete .. //depot/projects/ia64_epc/contrib/gcc/gnats.html#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/COPYING#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/md5.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/partition.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/sort.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/ia64_epc/contrib/gcc/install-sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/libtool.m4#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ltconfig#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/ia64_epc/contrib/gcc/missing#2 delete .. //depot/projects/ia64_epc/contrib/gcc/mkdep#2 delete .. //depot/projects/ia64_epc/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/ia64_epc/contrib/gcc/symlink-tree#2 delete .. //depot/projects/ia64_epc/contrib/gcc/ylwrap#2 delete .. //depot/projects/ia64_epc/contrib/gdtoa/README#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/ia64_epc/contrib/isc-dhcp/client/dhclient.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/README#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/cf/mailer/usenet.m4#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/doc/op/op.me#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/editmap/editmap.8#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libsm/clock.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/mail.local/mail.local.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/README#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/deliver.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/milter.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/parseaddr.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/tls.c#3 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/ia64_epc/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth.h#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth1.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth2-pam-freebsd.c#3 integrate .. //depot/projects/ia64_epc/etc/Makefile#3 integrate .. //depot/projects/ia64_epc/etc/defaults/pccard.conf#3 integrate .. //depot/projects/ia64_epc/etc/defaults/periodic.conf#2 integrate .. //depot/projects/ia64_epc/etc/disktab#1 branch .. //depot/projects/ia64_epc/etc/etc.alpha/disktab#2 delete .. //depot/projects/ia64_epc/etc/etc.i386/disktab#2 delete .. //depot/projects/ia64_epc/etc/etc.ia64/disktab#2 delete .. //depot/projects/ia64_epc/etc/etc.sparc64/disktab#2 delete .. //depot/projects/ia64_epc/etc/mail/aliases#2 integrate .. //depot/projects/ia64_epc/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/ia64_epc/etc/periodic/daily/220.backup-distfile#2 delete .. //depot/projects/ia64_epc/etc/periodic/daily/320.rdist#2 delete .. //depot/projects/ia64_epc/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/ia64_epc/etc/printcap#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/ipfilter#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/ipfw#2 integrate .. //depot/projects/ia64_epc/etc/syslog.conf#2 integrate .. //depot/projects/ia64_epc/games/caesar/caesar.6#2 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/fortunes2-o#3 integrate .. //depot/projects/ia64_epc/games/grdc/grdc.6#2 integrate .. //depot/projects/ia64_epc/games/grdc/grdc.c#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/ia64_epc/include/signal.h#2 integrate .. //depot/projects/ia64_epc/lib/libatm/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libatm/atm_addr.c#2 integrate .. //depot/projects/ia64_epc/lib/libatm/cache_key.c#2 integrate .. //depot/projects/ia64_epc/lib/libatm/ip_addr.c#2 integrate .. //depot/projects/ia64_epc/lib/libatm/libatm.h#2 integrate .. //depot/projects/ia64_epc/lib/libatm/timer.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/ia64_epc/lib/libc/i386/gen/signalcontext.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/ia64_epc/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/lib/libc/sparc64/gen/_ctx_start.S#1 branch .. //depot/projects/ia64_epc/lib/libc/sparc64/gen/makecontext.c#1 branch .. //depot/projects/ia64_epc/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/realpath.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/ia64_epc/lib/libc/sys/connect.2#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/open.2#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/socket.2#3 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_attr_get_np.3#4 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_create.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_mutexattr.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/pthread_testcancel.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/sem_destroy.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/sem_getvalue.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/sem_init.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/sem_wait.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/man/sigwait.3#2 integrate .. //depot/projects/ia64_epc/lib/libc_r/uthread/uthread_spinlock.c#2 integrate .. //depot/projects/ia64_epc/lib/libcompat/4.1/cftime.3#2 integrate .. //depot/projects/ia64_epc/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/create_chunk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/disk.c#3 integrate .. //depot/projects/ia64_epc/lib/libdisk/libdisk.3#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/rules.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_alpha_disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_pc98_disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libfetch/http.c#3 integrate .. //depot/projects/ia64_epc/lib/libgeom/Makefile#3 integrate .. //depot/projects/ia64_epc/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/ia64_epc/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/ia64_epc/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_getfiles.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_nlist.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_open.3#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/ia64_epc/lib/libmd/mdX.3#2 integrate .. //depot/projects/ia64_epc/lib/libmd/ripemd.3#2 integrate .. //depot/projects/ia64_epc/lib/libncp/ncpl_conn.c#2 integrate .. //depot/projects/ia64_epc/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_chroot/Makefile#1 branch .. //depot/projects/ia64_epc/lib/libpam/modules/pam_chroot/pam_chroot.8#1 branch .. //depot/projects/ia64_epc/lib/libpam/modules/pam_chroot/pam_chroot.c#1 branch .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/ia64_epc/lib/libstand/libstand.3#2 integrate .. //depot/projects/ia64_epc/lib/libthr/Makefile#1 branch .. //depot/projects/ia64_epc/lib/libthr/arch/i386/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libthr/arch/i386/i386/_curthread.S#1 branch .. //depot/projects/ia64_epc/lib/libthr/arch/i386/i386/_setcurthread.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/sys/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libthr/sys/thr_error.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_attr.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_autoinit.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_cancel.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_clean.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_cond.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_condattr_init.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_create.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_detach.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_equal.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_exit.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_find_thread.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_gc.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_getprio.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_getschedparam.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_info.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_init.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_join.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_kern.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_main_np.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mattr_init.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_multi_np.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mutex.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_once.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_printf.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_private.h#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_resume_np.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_rwlock.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_rwlockattr.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_self.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_sem.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_seterrno.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_setprio.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_setschedparam.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_sig.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_spec.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_spinlock.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_stack.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_suspend_np.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_syscalls.c#1 branch .. //depot/projects/ia64_epc/lib/libthr/thread/thr_yield.c#1 branch .. //depot/projects/ia64_epc/lib/libufs/block.c#3 integrate .. //depot/projects/ia64_epc/lib/libufs/type.c#2 integrate .. //depot/projects/ia64_epc/lib/libutil/_secure_path.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/login_cap.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/login_class.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/login_ok.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/login_times.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/login_tty.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/logout.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/property.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/pty.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/realhostname.3#2 integrate .. //depot/projects/ia64_epc/lib/libutil/realhostname_sa.3#3 integrate .. //depot/projects/ia64_epc/lib/libutil/trimdomain.3#2 integrate .. //depot/projects/ia64_epc/lib/msun/src/math.h#4 integrate .. //depot/projects/ia64_epc/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/ia64_epc/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/ia64_epc/libexec/talkd/announce.c#2 integrate .. //depot/projects/ia64_epc/libexec/talkd/extern.h#2 integrate .. //depot/projects/ia64_epc/libexec/talkd/print.c#2 integrate .. //depot/projects/ia64_epc/libexec/talkd/table.c#2 integrate .. //depot/projects/ia64_epc/libexec/talkd/talkd.c#2 integrate .. //depot/projects/ia64_epc/release/Makefile#5 integrate .. //depot/projects/ia64_epc/release/alpha/dokern.sh#2 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/errata/article.sgml#3 integrate .. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#3 integrate .. //depot/projects/ia64_epc/release/i386/dokern.sh#3 integrate .. //depot/projects/ia64_epc/release/ia64/doFS.sh#3 integrate .. //depot/projects/ia64_epc/release/pc98/dokern.sh#3 integrate .. //depot/projects/ia64_epc/release/scripts/doFS.sh#4 integrate .. //depot/projects/ia64_epc/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/ia64_epc/sbin/atm/ilmid/ilmid.c#2 integrate .. //depot/projects/ia64_epc/sbin/devd/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/dhclient/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/dhclient/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/ia64_epc/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/ia64_epc/sbin/disklabel/disklabel.8#4 integrate .. //depot/projects/ia64_epc/sbin/disklabel/disklabel.c#4 integrate .. //depot/projects/ia64_epc/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/ia64_epc/sbin/gbde/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/gbde/gbde.c#3 integrate .. //depot/projects/ia64_epc/sbin/init/init.8#3 integrate .. //depot/projects/ia64_epc/sbin/ip6fw/ip6fw.c#2 integrate .. //depot/projects/ia64_epc/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/ia64_epc/sbin/mknod/mknod.8#3 integrate .. //depot/projects/ia64_epc/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/ia64_epc/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/ia64_epc/sbin/ping/ping.8#5 integrate .. //depot/projects/ia64_epc/sbin/ping/ping.c#5 integrate .. //depot/projects/ia64_epc/sbin/reboot/reboot.c#2 integrate .. //depot/projects/ia64_epc/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/ia64_epc/secure/lib/Makefile#2 integrate .. //depot/projects/ia64_epc/secure/usr.bin/bdes/bdes.1#2 integrate .. //depot/projects/ia64_epc/share/examples/cvsup/refuse#2 integrate .. //depot/projects/ia64_epc/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/ia64_epc/share/examples/ppp/ppp.conf.sample#2 integrate .. //depot/projects/ia64_epc/share/man/man4/Makefile#4 integrate .. //depot/projects/ia64_epc/share/man/man4/ahc.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/amr.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/bge.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/card.4#3 delete .. //depot/projects/ia64_epc/share/man/man4/ccd.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/icmp.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/iir.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/inet.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/intro.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/ip.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/kld.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_none.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/ia64_epc/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/mac_test.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/ia64_epc/share/man/man4/oldcard.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/pcm.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/tap.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/tcp.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/tun.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/ukbd.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/urio.4#2 integrate .. //depot/projects/ia64_epc/share/man/man4/wi.4#4 integrate .. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/ia64_epc/share/man/man7/release.7#4 integrate .. //depot/projects/ia64_epc/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/ia64_epc/share/man/man8/Makefile#2 integrate .. //depot/projects/ia64_epc/share/man/man8/man8.alpha/MAKEDEV.8#2 delete .. //depot/projects/ia64_epc/share/man/man8/man8.alpha/Makefile#2 delete .. //depot/projects/ia64_epc/share/man/man8/man8.i386/MAKEDEV.8#2 delete .. //depot/projects/ia64_epc/share/man/man8/man8.i386/Makefile#2 delete .. //depot/projects/ia64_epc/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/ia64_epc/share/man/man9/Makefile#2 integrate .. //depot/projects/ia64_epc/share/man/man9/at_exit.9#2 delete .. //depot/projects/ia64_epc/share/man/man9/at_fork.9#2 delete .. //depot/projects/ia64_epc/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/ia64_epc/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/ia64_epc/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/ia64_epc/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/ia64_epc/share/man/man9/byteorder.9#2 integrate .. //depot/projects/ia64_epc/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/ia64_epc/share/man/man9/style.9#2 integrate .. //depot/projects/ia64_epc/share/misc/bsd-family-tree#3 integrate .. //depot/projects/ia64_epc/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/ia64_epc/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/mem.c#4 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/trap.c#4 integrate .. //depot/projects/ia64_epc/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/ia64_epc/sys/alpha/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/alpha/include/param.h#2 integrate .. //depot/projects/ia64_epc/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/ia64_epc/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/ia64_epc/sys/arm/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/common/commands.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/loader/conf.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/ia64_epc/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/copy.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/ia64_epc/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/ia64_epc/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/ia64_epc/sys/conf/NOTES#7 integrate .. //depot/projects/ia64_epc/sys/conf/files#7 integrate .. //depot/projects/ia64_epc/sys/conf/files.i386#5 integrate .. //depot/projects/ia64_epc/sys/conf/files.pc98#5 integrate .. //depot/projects/ia64_epc/sys/conf/options#6 integrate .. //depot/projects/ia64_epc/sys/conf/options.i386#3 integrate .. //depot/projects/ia64_epc/sys/conf/options.pc98#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/fla/fla.c#5 integrate .. //depot/projects/ia64_epc/sys/ddb/db_input.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/ia64_epc/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aha/aha.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/amr/amr.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/an/if_an.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-all.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ccd/ccd.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/fb/fb.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/fb/vga.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/gfb/gfb_pci.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ida/ida.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ida/ida_disk.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/ia64_epc/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/ia64_epc/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/md/md.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/mii.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/my/if_my.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/devlist2h.awk#2 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/pdq/pdq_freebsd.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/sab/sab.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/scd/scd.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/syscons/apm/apm_saver.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/umass.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/ia64_epc/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/ia64_epc/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_crypt.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom.h#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom_aes.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_apple.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ctl.h#1 branch .. //depot/projects/ia64_epc/sys/geom/geom_dev.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_disk.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_disk.h#1 branch .. //depot/projects/ia64_epc/sys/geom/geom_dump.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_enc.c#2 delete .. //depot/projects/ia64_epc/sys/geom/geom_event.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ext.h#1 branch .. //depot/projects/ia64_epc/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_int.h#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_io.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_kern.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_mirror.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_slice.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom_subr.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/notes#2 integrate .. //depot/projects/ia64_epc/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/apm/apm.c#3 delete .. //depot/projects/ia64_epc/sys/i386/apm/apm.h#2 delete .. //depot/projects/ia64_epc/sys/i386/bios/apm.c#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/apm.h#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/smapi.c#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/smbios.c#1 branch .. //depot/projects/ia64_epc/sys/i386/bios/vpd.c#1 branch .. //depot/projects/ia64_epc/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/ia64_epc/sys/i386/conf/NOTES#6 integrate .. //depot/projects/ia64_epc/sys/i386/conf/SMP#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/bios.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/locore.s#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/mem.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/ia64_epc/sys/i386/i386/support.s#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/trap.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/ibcs2/ibcs2_signal.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/ia64_epc/sys/i386/include/md_var.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/param.h#3 integrate .. //depot/projects/ia64_epc/sys/i386/include/physio_proc.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/pmap.h#4 integrate .. //depot/projects/ia64_epc/sys/i386/include/smapi.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/smp.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/apic_vector.s#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/clock.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/isa/elink.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/elink.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/intr_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/intr_machdep.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/mca_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/npx.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/isa/spkr.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/ia64_epc/sys/i386/smapi/smapi.c#3 delete .. //depot/projects/ia64_epc/sys/i386/smapi/smapi_bios.S#2 delete .. //depot/projects/ia64_epc/sys/i386/smapi/smapi_isa.c#2 delete .. //depot/projects/ia64_epc/sys/i386/smapi/smapi_var.h#2 delete .. //depot/projects/ia64_epc/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/ia64_epc/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/ia64_epc/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/ia64_epc/sys/ia64/conf/SKI#3 integrate .. //depot/projects/ia64_epc/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/mem.c#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/sscdisk.c#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/support.s#3 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/ia64_epc/sys/ia64/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/ia64/include/float.h#2 integrate .. //depot/projects/ia64_epc/sys/isa/fd.c#5 integrate .. //depot/projects/ia64_epc/sys/isa/orm.c#2 integrate .. //depot/projects/ia64_epc/sys/isa/vga_isa.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/bus_if.m#2 integrate .. //depot/projects/ia64_epc/sys/kern/init_sysent.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_context.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/kern_exec.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_exit.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_fork.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_mac.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_proc.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_sig.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_subr.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_switch.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thr.c#1 branch .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_umtx.c#1 branch .. //depot/projects/ia64_epc/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/ia64_epc/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/sched_ule.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_bus.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_disk.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_prf.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_smp.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/subr_trap.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/subr_witness.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/subr_xxx.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/syscalls.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/syscalls.master#3 integrate .. //depot/projects/ia64_epc/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/tty.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/tty_pty.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_cow.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/ia64_epc/sys/modules/Makefile#7 integrate .. //depot/projects/ia64_epc/sys/modules/apm/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/modules/atspeaker/Makefile#2 delete .. //depot/projects/ia64_epc/sys/modules/bios/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/bios/smapi/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/bios/smbios/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/bios/vpd/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/dpt/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/elink/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/ex/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/ie/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/mcd/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/modules/pcspeaker/Makefile#2 delete .. //depot/projects/ia64_epc/sys/modules/smapi/Makefile#2 delete .. //depot/projects/ia64_epc/sys/modules/speaker/Makefile#1 branch .. //depot/projects/ia64_epc/sys/net/if_ppp.c#4 integrate .. //depot/projects/ia64_epc/sys/net/slcompress.c#2 integrate .. //depot/projects/ia64_epc/sys/netatm/spans/spans_kxdr.c#2 integrate .. //depot/projects/ia64_epc/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/ia64_epc/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet/in.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip.h#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_input.c#4 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_output.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_var.h#3 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/ia64_epc/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/ia64_epc/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/ia64_epc/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/ia64_epc/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/ia64_epc/sys/netncp/ncp_ncp.c#4 integrate .. //depot/projects/ia64_epc/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/ia64_epc/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/ia64_epc/sys/netsmb/smb_rq.c#3 integrate .. //depot/projects/ia64_epc/sys/netsmb/smb_subr.c#4 integrate .. //depot/projects/ia64_epc/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/ia64_epc/sys/pc98/apm/apm.c#3 delete .. //depot/projects/ia64_epc/sys/pc98/apm/apm.h#2 delete .. //depot/projects/ia64_epc/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/ia64_epc/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/ia64_epc/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/clock.c#3 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/spkr.c#4 delete .. //depot/projects/ia64_epc/sys/pc98/pc98/syscons.c#5 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/wd.c#4 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/wd_cd.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/agp.c#5 integrate .. //depot/projects/ia64_epc/sys/pci/if_dc.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/if_pcn.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_rl.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/if_sf.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_sis.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_sk.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_ste.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_ti.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/if_tl.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_vr.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_wb.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_xl.c#5 integrate .. //depot/projects/ia64_epc/sys/pci/meteor.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/xrpu.c#4 integrate .. //depot/projects/ia64_epc/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/busdma_machdep.c#4 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/copystr.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/extintr.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/fpu.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/fuswintr.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/sys_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/trap.c#5 integrate .. //depot/projects/ia64_epc/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/ia64_epc/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/ia64_epc/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/ia64_epc/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/ia64_epc/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/ia64_epc/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/ia64_epc/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/ia64_epc/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/ia64_epc/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/fp.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/pci/ofw_pci.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/ia64_epc/sys/sys/_types.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/acct.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/ata.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/bio.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/conf.h#5 integrate .. //depot/projects/ia64_epc/sys/sys/disk.h#5 integrate .. //depot/projects/ia64_epc/sys/sys/disklabel.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/diskmbr.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/diskslice.h#2 delete .. //depot/projects/ia64_epc/sys/sys/endian.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/eventhandler.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:46:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 857AA37B404; Fri, 4 Apr 2003 19:46:52 -0800 (PST) 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 22FFE37B401 for ; Fri, 4 Apr 2003 19:46:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEE3043FAF for ; Fri, 4 Apr 2003 19:46:51 -0800 (PST) (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 h353kp0U000837 for ; Fri, 4 Apr 2003 19:46:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353kpbN000834 for perforce@freebsd.org; Fri, 4 Apr 2003 19:46:51 -0800 (PST) Date: Fri, 4 Apr 2003 19:46:51 -0800 (PST) Message-Id: <200304050346.h353kpbN000834@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 28154 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, 05 Apr 2003 03:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=28154 Change 28154 by peter@peter_overcee on 2003/04/04 19:46:03 make this compile Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/critical.c#5 (text+ko) ==== @@ -26,9 +26,9 @@ { struct thread *td; - td = cuthread; + td = curthread; td->td_critnest = 1; - td->td_md.md_critnest = read_eflags() & PSL_I; + td->td_md.md_savecrit = read_rflags() & PSL_I; } /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:50:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F332E37B405; Fri, 4 Apr 2003 19:50:58 -0800 (PST) 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 7182D37B401 for ; Fri, 4 Apr 2003 19:50:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EA5A43FA3 for ; Fri, 4 Apr 2003 19:50:57 -0800 (PST) (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 h353ov0U001309 for ; Fri, 4 Apr 2003 19:50:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353ouXY001306 for perforce@freebsd.org; Fri, 4 Apr 2003 19:50:56 -0800 (PST) Date: Fri, 4 Apr 2003 19:50:56 -0800 (PST) Message-Id: <200304050350.h353ouXY001306@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 28155 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, 05 Apr 2003 03:51:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=28155 Change 28155 by peter@peter_overcee on 2003/04/04 19:50:34 opt_auto_eoi.h doesn't exist Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/vector.s#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#4 (text+ko) ==== @@ -3,8 +3,6 @@ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ -#include "opt_auto_eoi.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:51:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A959B37B41B; Fri, 4 Apr 2003 19:50:59 -0800 (PST) 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 A67D037B404 for ; Fri, 4 Apr 2003 19:50:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 339D343FAF for ; Fri, 4 Apr 2003 19:50:58 -0800 (PST) (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 h353ov0U001316 for ; Fri, 4 Apr 2003 19:50:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353oviN001313 for perforce@freebsd.org; Fri, 4 Apr 2003 19:50:57 -0800 (PST) Date: Fri, 4 Apr 2003 19:50:57 -0800 (PST) Message-Id: <200304050350.h353oviN001313@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 28156 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, 05 Apr 2003 03:51:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=28156 Change 28156 by peter@peter_overcee on 2003/04/04 19:50:55 make this compile.. XXX hiding here Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#6 (text+ko) ==== @@ -117,7 +117,7 @@ } if (local) { - if (rtype == R_386_RELATIVE) { /* A + B */ + if (rtype == R_X86_64_RELATIVE) { /* A + B */ addr = relocbase + addend; if (*where != addr) *where = addr; @@ -144,7 +144,7 @@ if (addr == 0) return -1; addr += addend - (Elf_Addr)where; - XXX needs to be 32 bit *where, not 64 bit + /* XXX needs to be 32 bit *where, not 64 bit */ if (*where != addr) *where = addr; break; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:52:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCE7D37B404; Fri, 4 Apr 2003 19:52:00 -0800 (PST) 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 6AB3637B401 for ; Fri, 4 Apr 2003 19:52:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1775843F85 for ; Fri, 4 Apr 2003 19:52:00 -0800 (PST) (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 h353px0U001385 for ; Fri, 4 Apr 2003 19:51:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353pxex001382 for perforce@freebsd.org; Fri, 4 Apr 2003 19:51:59 -0800 (PST) Date: Fri, 4 Apr 2003 19:51:59 -0800 (PST) Message-Id: <200304050351.h353pxex001382@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 28157 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, 05 Apr 2003 03:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=28157 Change 28157 by peter@peter_overcee on 2003/04/04 19:51:13 use the right paths.. its x86_64, not i386.. fear Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/dump_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#10 (text+ko) ==== @@ -231,7 +231,7 @@ * XXX it should be in a stand-alone file. It's still icu-dependent and * belongs in i386/isa. */ -#include "i386/isa/vector.s" +#include "x86_64/isa/vector.s" .data ALIGN_DATA @@ -319,4 +319,4 @@ movl $T_PROTFLT,TF_TRAPNO(%esp) jmp alltraps_with_regs_pushed -#include "i386/isa/icu_ipl.s" +#include "x86_64/isa/icu_ipl.s" From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:54:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFD7437B407; Fri, 4 Apr 2003 19:54:03 -0800 (PST) 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 8CAE637B401 for ; Fri, 4 Apr 2003 19:54:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37DF843FAF for ; Fri, 4 Apr 2003 19:54:03 -0800 (PST) (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 h353s30U001437 for ; Fri, 4 Apr 2003 19:54:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353s2b7001434 for perforce@freebsd.org; Fri, 4 Apr 2003 19:54:02 -0800 (PST) Date: Fri, 4 Apr 2003 19:54:02 -0800 (PST) Message-Id: <200304050354.h353s2b7001434@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 28158 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, 05 Apr 2003 03:54:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28158 Change 28158 by peter@peter_overcee on 2003/04/04 19:53:44 make it compile Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#9 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include -#include #include #include #include @@ -928,9 +927,9 @@ { u_int count; u_int high, low; - u_int eflags; + u_long rflags; - eflags = read_eflags(); + rflags = read_rflags(); mtx_lock_spin(&clock_lock); /* Select timer0 and latch counter value. */ @@ -941,7 +940,7 @@ count = timer0_max_count - ((high << 8) | low); if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || - ((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) && + ((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) && (inb(IO_ICU1) & 1))) )) { i8254_ticked = 1; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:13:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45DFF37B405; Fri, 4 Apr 2003 20:13:28 -0800 (PST) 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 D838837B401 for ; Fri, 4 Apr 2003 20:13:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 518B043F93 for ; Fri, 4 Apr 2003 20:13:27 -0800 (PST) (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 h354DR0U003644 for ; Fri, 4 Apr 2003 20:13:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354DQ3c003641 for perforce@freebsd.org; Fri, 4 Apr 2003 20:13:26 -0800 (PST) Date: Fri, 4 Apr 2003 20:13:26 -0800 (PST) Message-Id: <200304050413.h354DQ3c003641@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 28159 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, 05 Apr 2003 04:13:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=28159 Change 28159 by peter@peter_overcee on 2003/04/04 20:13:01 we wont be saving %gs in the trapframe for now. We should, but I dont have to just yet. When we start using the swapgs instruction for fast syscalls, we will have to use %gs for local storage rather than %fs, which means we'll save/restore %gs instead of %fs. This segment saving thing is all up in the air anyway and is probably bogus since there aren't segment registers in the i386 sense. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#5 (text+ko) ==== @@ -49,7 +49,6 @@ */ struct trapframe { - int64_t tf_gs; int64_t tf_fs; int64_t tf_es; int64_t tf_ds; @@ -83,7 +82,6 @@ struct intrframe { int64_t if_vec; - int64_t if_gs; int64_t if_fs; int64_t if_es; int64_t if_ds; @@ -117,7 +115,6 @@ struct clockframe { int64_t cf_vec; - int64_t cf_gs; int64_t cf_fs; int64_t cf_es; int64_t cf_ds; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:23:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 504AA37B404; Fri, 4 Apr 2003 20:23:41 -0800 (PST) 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 E2B9B37B401 for ; Fri, 4 Apr 2003 20:23:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A2D343F85 for ; Fri, 4 Apr 2003 20:23:40 -0800 (PST) (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 h354Ne0U004253 for ; Fri, 4 Apr 2003 20:23:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354Ndbs004250 for perforce@freebsd.org; Fri, 4 Apr 2003 20:23:39 -0800 (PST) Date: Fri, 4 Apr 2003 20:23:39 -0800 (PST) Message-Id: <200304050423.h354Ndbs004250@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 28160 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, 05 Apr 2003 04:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=28160 Change 28160 by peter@peter_overcee on 2003/04/04 20:22:57 argh. get exception.s to compile. Lotsa broken stuff here still, its doing stack param passing instead of registers. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/icu_ipl.s#2 edit .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#4 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/icu_ipl.s#2 (text+ko) ==== @@ -48,7 +48,7 @@ SUPERALIGN_TEXT ENTRY(INTREN) - movl 4(%esp), %eax + movq 8(%rsp), %rax # XXX wrong, use regparm movl %eax, %ecx notl %eax andl %eax, imen @@ -65,7 +65,7 @@ ret ENTRY(INTRDIS) - movl 4(%esp), %eax + movq 8(%rsp), %rax # XXX wrong, use regparm movl %eax, %ecx orl %eax, imen movl imen, %eax ==== //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#4 (text+ko) ==== @@ -20,33 +20,48 @@ * Macros for interrupt interrupt entry, call to handler, and exit. */ -#define FAST_INTR(irq_num, vec_name, icu, enable_icus) \ +#define FAST_INTR(irq_num, vec_name, enable_icus) \ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - pushal ; \ - pushl %ds ; /* save our data and extra segments */ \ - pushl %es ; \ - pushl %fs ; \ + pushq $0 ; /* dummy error code */ \ + pushq $0 ; /* dummy trap type */ \ + pushq %rax ; \ + pushq %rcx ; \ + pushq %rdx ; \ + pushq %rbx ; \ + pushq %rbp ; \ + pushq %rsi ; \ + pushq %rdi ; \ + pushq %r8 ; \ + pushq %r9 ; \ + pushq %r10 ; \ + pushq %r11 ; \ + pushq %r12 ; \ + pushq %r13 ; \ + pushq %r14 ; \ + pushq %r15 ; \ + pushq %ds ; /* save our data and extra segments */ \ + pushq %es ; \ + pushq %fs ; \ + pushq %gs ; \ mov $KDSEL,%ax ; \ mov %ax,%ds ; \ mov %ax,%es ; \ mov $KPSEL,%ax ; \ mov %ax,%fs ; \ - FAKE_MCOUNT((12+ACTUALLY_PUSHED)*4(%esp)) ; \ + FAKE_MCOUNT((12+ACTUALLY_PUSHED)*4(%rsp)) ; \ call critical_enter ; \ - movl PCPU(CURTHREAD),%ebx ; \ - incl TD_INTR_NESTING_LEVEL(%ebx) ; \ - pushl intr_unit + (irq_num) * 4 ; \ + movq PCPU(CURTHREAD),%rbx ; \ + incl TD_INTR_NESTING_LEVEL(%rbx) ; \ + pushq intr_unit + (irq_num) * 4 ; \ call *intr_handler + (irq_num) * 4 ; /* do the work ASAP */ \ enable_icus ; /* (re)enable ASAP (helps edge trigger?) */ \ - addl $4,%esp ; \ + addq $8,%rsp ; \ incl cnt+V_INTR ; /* book-keeping can wait */ \ - movl intr_countp + (irq_num) * 4,%eax ; \ - incl (%eax) ; \ - decl TD_INTR_NESTING_LEVEL(%ebx) ; \ + movq intr_countp + (irq_num) * 4,%rax ; \ + incq (%rax) ; \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ call critical_exit ; \ MEXITCOUNT ; \ jmp doreti @@ -60,16 +75,31 @@ * interrupt handler and don't run anything. We could just do an * iret. FIXME. */ -#define INTR(irq_num, vec_name, icu, enable_icus, maybe_extra_ipending) \ +#define INTR(irq_num, vec_name, enable_icus, maybe_extra_ipending) \ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - pushal ; \ - pushl %ds ; /* save our data and extra segments */ \ - pushl %es ; \ - pushl %fs ; \ + pushq $0 ; /* dummy error code */ \ + pushq $0 ; /* dummy trap type */ \ + pushq %rax ; \ + pushq %rcx ; \ + pushq %rdx ; \ + pushq %rbx ; \ + pushq %rbp ; \ + pushq %rsi ; \ + pushq %rdi ; \ + pushq %r8 ; \ + pushq %r9 ; \ + pushq %r10 ; \ + pushq %r11 ; \ + pushq %r12 ; \ + pushq %r13 ; \ + pushq %r14 ; \ + pushq %r15 ; \ + pushq %ds ; /* save our data and extra segments */ \ + pushq %es ; \ + pushq %fs ; \ + pushq %gs ; \ mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ mov %ax,%ds ; \ mov %ax,%es ; \ @@ -79,15 +109,15 @@ movb imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \ movb %al,imen + IRQ_BYTE(irq_num) ; \ - outb %al,$icu+ICU_IMR_OFFSET ; \ + #XXXoutb %al,$icu+ICU_IMR_OFFSET ; \ enable_icus ; \ - movl PCPU(CURTHREAD),%ebx ; \ + movq PCPU(CURTHREAD),%rbx ; \ incl TD_INTR_NESTING_LEVEL(%ebx) ; \ - FAKE_MCOUNT(13*4(%esp)) ; /* XXX late to avoid double count */ \ - pushl $irq_num; /* pass the IRQ */ \ + FAKE_MCOUNT(13*4(%rsp)) ; /* XXX late to avoid double count */ \ + pushq $irq_num; /* pass the IRQ */ \ call sched_ithd ; \ - addl $4, %esp ; /* discard the parameter */ \ - decl TD_INTR_NESTING_LEVEL(%ebx) ; \ + addq $8, %rsp ; /* discard the parameter */ \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ MEXITCOUNT ; \ /* We could usually avoid the following jmp by inlining some of */ \ /* doreti, but it's probably better to use less cache. */ \ ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#5 (text+ko) ==== @@ -91,4 +91,4 @@ * loading segregs. */ -#include "i386/isa/icu_vector.s" +#include "x86_64/isa/icu_vector.s" ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#11 (text+ko) ==== @@ -74,29 +74,29 @@ */ #define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \ .type __CONCAT(X,name),@function; __CONCAT(X,name): -#define TRAP(a) pushl $(a) ; jmp alltraps +#define TRAP(a) pushq $(a) ; jmp alltraps MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) IDTVEC(div) - pushl $0; TRAP(T_DIVIDE) + pushq $0; TRAP(T_DIVIDE) IDTVEC(dbg) - pushl $0; TRAP(T_TRCTRAP) + pushq $0; TRAP(T_TRCTRAP) IDTVEC(nmi) - pushl $0; TRAP(T_NMI) + pushq $0; TRAP(T_NMI) IDTVEC(bpt) - pushl $0; TRAP(T_BPTFLT) + pushq $0; TRAP(T_BPTFLT) IDTVEC(ofl) - pushl $0; TRAP(T_OFLOW) + pushq $0; TRAP(T_OFLOW) IDTVEC(bnd) - pushl $0; TRAP(T_BOUND) + pushq $0; TRAP(T_BOUND) IDTVEC(ill) - pushl $0; TRAP(T_PRIVINFLT) + pushq $0; TRAP(T_PRIVINFLT) IDTVEC(dna) - pushl $0; TRAP(T_DNA) + pushq $0; TRAP(T_DNA) IDTVEC(fpusegm) - pushl $0; TRAP(T_FPOPFLT) + pushq $0; TRAP(T_FPOPFLT) IDTVEC(tss) TRAP(T_TSSFLT) IDTVEC(missing) @@ -108,16 +108,16 @@ IDTVEC(page) TRAP(T_PAGEFLT) IDTVEC(mchk) - pushl $0; TRAP(T_MCHK) + pushq $0; TRAP(T_MCHK) IDTVEC(rsvd) - pushl $0; TRAP(T_RESERVED) + pushq $0; TRAP(T_RESERVED) IDTVEC(fpu) - pushl $0; TRAP(T_ARITHTRAP) + pushq $0; TRAP(T_ARITHTRAP) IDTVEC(align) TRAP(T_ALIGNFLT) IDTVEC(xmm) - pushl $0; TRAP(T_XMMFLT) + pushq $0; TRAP(T_XMMFLT) /* * alltraps entry point. Interrupts are enabled if this was a trap @@ -130,17 +130,31 @@ .globl alltraps .type alltraps,@function alltraps: - pushal - pushl %ds - pushl %es - pushl %fs + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq %ds + pushq %es + pushq %fs alltraps_with_regs_pushed: mov $KDSEL,%ax mov %ax,%ds mov %ax,%es mov $KPSEL,%ax mov %ax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(13*4(%rsp)) calltrap: FAKE_MCOUNT(btrap) /* init "from" btrap -> calltrap */ call trap @@ -165,20 +179,35 @@ */ SUPERALIGN_TEXT IDTVEC(lcall_syscall) - pushfl /* save eflags */ - popl 8(%esp) /* shuffle into tf_eflags */ - pushl $7 /* sizeof "lcall 7,0" */ - subl $4,%esp /* skip over tf_trapno */ - pushal - pushl %ds - pushl %es - pushl %fs + pushfq /* save eflags */ + popq 16(%rsp) /* shuffle into tf_eflags */ + pushq $7 /* sizeof "lcall 7,0" */ + subq $8,%rsp /* skip over tf_trapno */ + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq %ds + pushq %ds + pushq %es + pushq %fs mov $KDSEL,%ax /* switch to kernel segments */ mov %ax,%ds mov %ax,%es mov $KPSEL,%ax mov %ax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(13*4(%rsp)) call syscall MEXITCOUNT jmp doreti @@ -192,31 +221,45 @@ */ SUPERALIGN_TEXT IDTVEC(int0x80_syscall) - pushl $2 /* sizeof "int 0x80" */ - subl $4,%esp /* skip over tf_trapno */ - pushal - pushl %ds - pushl %es - pushl %fs + pushq $2 /* sizeof "int 0x80" */ + subq $8,%rsp /* skip over tf_trapno */ + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq %ds + pushq %es + pushq %fs mov $KDSEL,%ax /* switch to kernel segments */ mov %ax,%ds mov %ax,%es mov $KPSEL,%ax mov %ax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(13*4(%rsp)) call syscall MEXITCOUNT jmp doreti ENTRY(fork_trampoline) - pushl %esp /* trapframe pointer */ - pushl %ebx /* arg1 */ - pushl %esi /* function */ - movl PCPU(CURTHREAD),%ebx /* setup critnest */ - movl $1,TD_CRITNEST(%ebx) + pushq %rsp /* trapframe pointer */ + pushq %rbx /* arg1 */ + pushq %rsi /* function */ + movq PCPU(CURTHREAD),%rbx /* setup critnest */ + movl $1,TD_CRITNEST(%rbx) sti /* enable interrupts */ call fork_exit - addl $12,%esp + addq $24,%rsp /* cut from syscall */ /* @@ -250,7 +293,7 @@ /* * Check if ASTs can be handled now. */ - testb $SEL_RPL_MASK,TF_CS(%esp) /* are we returning to user mode? */ + testb $SEL_RPL_MASK,TF_CS(%rsp) /* are we returning to user mode? */ jz doreti_exit /* can't handle ASTs now if not */ doreti_ast: @@ -260,13 +303,13 @@ * since we will be informed of any new ASTs by an IPI. */ cli - movl PCPU(CURTHREAD),%eax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%eax) + movq PCPU(CURTHREAD),%rax + testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) je doreti_exit sti - pushl %esp /* pass a pointer to the trapframe */ + pushq %rsp /* pass a pointer to the trapframe */ call ast - add $4,%esp + addq $8,%rsp jmp doreti_ast /* @@ -281,15 +324,29 @@ .globl doreti_popl_fs doreti_popl_fs: - popl %fs + popq %fs .globl doreti_popl_es doreti_popl_es: - popl %es + popq %es .globl doreti_popl_ds doreti_popl_ds: - popl %ds - popal - addl $8,%esp + popq %ds + popq %r15 + popq %r14 + popq %r13 + popq %r12 + popq %r11 + popq %r10 + popq %r9 + popq %r8 + popq %rdi + popq %rsi + popq %rbp + popq %rbx + popq %rdx + popq %rcx + popq %rax + addq $16,%rsp .globl doreti_iret doreti_iret: iret @@ -304,19 +361,33 @@ ALIGN_TEXT .globl doreti_iret_fault doreti_iret_fault: - subl $8,%esp - pushal - pushl %ds + subq $16,%rsp + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq %ds .globl doreti_popl_ds_fault doreti_popl_ds_fault: - pushl %es + pushq %es .globl doreti_popl_es_fault doreti_popl_es_fault: - pushl %fs + pushq %fs .globl doreti_popl_fs_fault doreti_popl_fs_fault: - movl $0,TF_ERR(%esp) /* XXX should be the error code */ - movl $T_PROTFLT,TF_TRAPNO(%esp) + movq $0,TF_ERR(%rsp) /* XXX should be the error code */ + movq $T_PROTFLT,TF_TRAPNO(%rsp) jmp alltraps_with_regs_pushed #include "x86_64/isa/icu_ipl.s" From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:24:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DC3337B404; Fri, 4 Apr 2003 20:24:43 -0800 (PST) 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 AE3EC37B401 for ; Fri, 4 Apr 2003 20:24:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C7F43F85 for ; Fri, 4 Apr 2003 20:24:42 -0800 (PST) (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 h354Og0U004280 for ; Fri, 4 Apr 2003 20:24:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354OfTt004277 for perforce@freebsd.org; Fri, 4 Apr 2003 20:24:41 -0800 (PST) Date: Fri, 4 Apr 2003 20:24:41 -0800 (PST) Message-Id: <200304050424.h354OfTt004277@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 28161 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, 05 Apr 2003 04:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=28161 Change 28161 by peter@peter_overcee on 2003/04/04 20:24:32 make this compile Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/ithread.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ void sched_ithd(void *cookie) { - int irq = (int) cookie; /* IRQ we're handling */ + int irq = (uintptr_t) cookie; /* IRQ we're handling */ struct ithd *ithd = ithds[irq]; /* and the process that does it */ int error; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:26:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B1037B404; Fri, 4 Apr 2003 20:26:46 -0800 (PST) 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 C401C37B401 for ; Fri, 4 Apr 2003 20:26:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6901443F3F for ; Fri, 4 Apr 2003 20:26:45 -0800 (PST) (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 h354Qj0U004388 for ; Fri, 4 Apr 2003 20:26:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354QiO2004385 for perforce@freebsd.org; Fri, 4 Apr 2003 20:26:44 -0800 (PST) Date: Fri, 4 Apr 2003 20:26:44 -0800 (PST) Message-Id: <200304050426.h354QiO2004385@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 28162 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, 05 Apr 2003 04:26:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=28162 Change 28162 by peter@peter_overcee on 2003/04/04 20:26:38 ugh. nasty! Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/mem.c#7 (text+ko) ==== @@ -98,7 +98,7 @@ { switch (minor(dev)) { case 14: - td->td_frame->tf_eflags &= ~PSL_IOPL; + td->td_frame->tf_rflags &= ~PSL_IOPL; } return (0); } @@ -124,7 +124,7 @@ error = securelevel_gt(td->td_ucred, 0); if (error != 0) return (error); - td->td_frame->tf_eflags |= PSL_IOPL; + td->td_frame->tf_rflags |= PSL_IOPL; break; } return (0); @@ -135,7 +135,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) { int o; - u_int c = 0, v; + u_long c = 0, v; struct iovec *iov; int error = 0; vm_offset_t addr, eaddr; @@ -159,7 +159,7 @@ v &= ~PAGE_MASK; pmap_kenter((vm_offset_t)ptvmmap, v); o = (int)uio->uio_offset & PAGE_MASK; - c = (u_int)(PAGE_SIZE - ((int)iov->iov_base & PAGE_MASK)); + c = (u_long)(PAGE_SIZE - ((long)iov->iov_base & PAGE_MASK)); c = min(c, (u_int)(PAGE_SIZE - o)); c = min(c, (u_int)iov->iov_len); error = uiomove((caddr_t)&ptvmmap[o], (int)c, uio); @@ -177,17 +177,17 @@ addr = trunc_page(uio->uio_offset); eaddr = round_page(uio->uio_offset + c); - if (addr < (vm_offset_t)VADDR(PTDPTDI, 0)) + if (addr < (vm_offset_t)VADDR(0, 0, PTDPTDI, 0)) return (EFAULT); for (; addr < eaddr; addr += PAGE_SIZE) if (pmap_extract(kernel_pmap, addr) == 0) return (EFAULT); - if (!kernacc((caddr_t)(int)uio->uio_offset, c, + if (!kernacc((caddr_t)(long)uio->uio_offset, c, uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE)) return (EFAULT); - error = uiomove((caddr_t)(int)uio->uio_offset, (int)c, uio); + error = uiomove((caddr_t)(long)uio->uio_offset, (int)c, uio); continue; default: From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:28:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 557C837B404; Fri, 4 Apr 2003 20:28:49 -0800 (PST) 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 E59F537B401 for ; Fri, 4 Apr 2003 20:28:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F7FA43FA3 for ; Fri, 4 Apr 2003 20:28:48 -0800 (PST) (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 h354Sm0U004496 for ; Fri, 4 Apr 2003 20:28:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354Sm8s004493 for perforce@freebsd.org; Fri, 4 Apr 2003 20:28:48 -0800 (PST) Date: Fri, 4 Apr 2003 20:28:48 -0800 (PST) Message-Id: <200304050428.h354Sm8s004493@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 28163 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, 05 Apr 2003 04:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=28163 Change 28163 by peter@peter_overcee on 2003/04/04 20:28:46 integrate from i386 (prepare to be gutted) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cputypes.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:31:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88C9837B404; Fri, 4 Apr 2003 20:31:53 -0800 (PST) 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 3FC4F37B401 for ; Fri, 4 Apr 2003 20:31:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE19843F75 for ; Fri, 4 Apr 2003 20:31:52 -0800 (PST) (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 h354Vq0U004934 for ; Fri, 4 Apr 2003 20:31:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354VqIX004931 for perforce@freebsd.org; Fri, 4 Apr 2003 20:31:52 -0800 (PST) Date: Fri, 4 Apr 2003 20:31:52 -0800 (PST) Message-Id: <200304050431.h354VqIX004931@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 28164 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, 05 Apr 2003 04:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=28164 Change 28164 by peter@peter_overcee on 2003/04/04 20:31:08 boilerplate Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cputypes.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cputypes.h#2 (text+ko) ==== @@ -33,32 +33,15 @@ /* * Classes of processor. */ -#define CPUCLASS_286 0 -#define CPUCLASS_386 1 -#define CPUCLASS_486 2 -#define CPUCLASS_586 3 -#define CPUCLASS_686 4 +#define CPUCLASS_X86 0 /* X86 */ +#define CPUCLASS_K8 1 /* K8 X86-64 class */ /* * Kinds of processor. */ -#define CPU_286 0 /* Intel 80286 */ -#define CPU_386SX 1 /* Intel 80386SX */ -#define CPU_386 2 /* Intel 80386DX */ -#define CPU_486SX 3 /* Intel 80486SX */ -#define CPU_486 4 /* Intel 80486DX */ -#define CPU_586 5 /* Intel P.....m (I hate lawyers; it's TM) */ -#define CPU_486DLC 6 /* Cyrix 486DLC */ -#define CPU_686 7 /* Pentium Pro */ -#define CPU_M1SC 8 /* Cyrix M1sc (aka 5x86) */ -#define CPU_M1 9 /* Cyrix M1 (aka 6x86) */ -#define CPU_BLUE 10 /* IBM BlueLighting CPU */ -#define CPU_M2 11 /* Cyrix M2 (aka enhanced 6x86 with MMX */ -#define CPU_NX586 12 /* NexGen (now AMD) 586 */ -#define CPU_CY486DX 13 /* Cyrix 486S/DX/DX2/DX4 */ -#define CPU_PII 14 /* Intel Pentium II */ -#define CPU_PIII 15 /* Intel Pentium III */ -#define CPU_P4 16 /* Intel Pentium 4 */ +#define CPU_X86 0 /* Intel */ +#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ +#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ #ifndef LOCORE struct cpu_nameclass { From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:31:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD89F37B404; Fri, 4 Apr 2003 20:31:54 -0800 (PST) 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 CCB7937B401 for ; Fri, 4 Apr 2003 20:31:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62A5443F75 for ; Fri, 4 Apr 2003 20:31:53 -0800 (PST) (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 h354Vr0U004940 for ; Fri, 4 Apr 2003 20:31:53 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354VqYv004937 for perforce@freebsd.org; Fri, 4 Apr 2003 20:31:52 -0800 (PST) Date: Fri, 4 Apr 2003 20:31:52 -0800 (PST) Message-Id: <200304050431.h354VqYv004937@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 28165 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, 05 Apr 2003 04:31:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=28165 Change 28165 by peter@peter_overcee on 2003/04/04 20:31:38 leave out identcpu and initcpu for now. that stuff is scary. Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#6 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#6 (text+ko) ==== @@ -37,8 +37,6 @@ x86_64/x86_64/dump_machdep.c standard x86_64/x86_64/elf_machdep.c standard x86_64/x86_64/exception.s standard -x86_64/x86_64/identcpu.c standard -x86_64/x86_64/initcpu.c standard x86_64/x86_64/locore.s standard no-obj x86_64/x86_64/machdep.c standard x86_64/x86_64/mem.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:45:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A2C537B404; Fri, 4 Apr 2003 20:45:11 -0800 (PST) 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 0A00437B401 for ; Fri, 4 Apr 2003 20:45:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A534A43F75 for ; Fri, 4 Apr 2003 20:45:10 -0800 (PST) (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 h354jA0U005737 for ; Fri, 4 Apr 2003 20:45:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h354jAsk005734 for perforce@freebsd.org; Fri, 4 Apr 2003 20:45:10 -0800 (PST) Date: Fri, 4 Apr 2003 20:45:10 -0800 (PST) Message-Id: <200304050445.h354jAsk005734@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 28167 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, 05 Apr 2003 04:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=28167 Change 28167 by peter@peter_overcee on 2003/04/04 20:44:55 drop debug regs Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#10 (text+ko) ==== @@ -110,25 +110,6 @@ pushfl /* PSL */ popl PCB_PSL(%edx) - /* Test if debug registers should be saved. */ - testl $PCB_DBREGS,PCB_FLAGS(%edx) - jz 1f /* no, skip over */ - movl %dr7,%eax /* yes, do the save */ - movl %eax,PCB_DR7(%edx) - andl $0x0000fc00, %eax /* disable all watchpoints */ - movl %eax,%dr7 - movl %dr6,%eax - movl %eax,PCB_DR6(%edx) - movl %dr3,%eax - movl %eax,PCB_DR3(%edx) - movl %dr2,%eax - movl %eax,PCB_DR2(%edx) - movl %dr1,%eax - movl %eax,PCB_DR1(%edx) - movl %dr0,%eax - movl %eax,PCB_DR0(%edx) -1: - /* have we used fp, and need a save? */ cmpl %ecx,PCPU(FPCURTHREAD) jne 1f @@ -185,31 +166,6 @@ cpu_switch_load_gs: movl PCB_GS(%edx),%gs - /* Test if debug registers should be restored. */ - testl $PCB_DBREGS,PCB_FLAGS(%edx) - jz 1f - - /* - * Restore debug registers. The special code for dr7 is to - * preserve the current values of its reserved bits. - */ - movl PCB_DR6(%edx),%eax - movl %eax,%dr6 - movl PCB_DR3(%edx),%eax - movl %eax,%dr3 - movl PCB_DR2(%edx),%eax - movl %eax,%dr2 - movl PCB_DR1(%edx),%eax - movl %eax,%dr1 - movl PCB_DR0(%edx),%eax - movl %eax,%dr0 - movl %dr7,%eax - andl $0x0000fc00,%eax - movl PCB_DR7(%edx),%ecx - andl $~0x0000fc00,%ecx - orl %ecx,%eax - movl %eax,%dr7 -1: ret #ifdef INVARIANTS From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:13:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF7B337B404; Fri, 4 Apr 2003 21:13:49 -0800 (PST) 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 6B23D37B401 for ; Fri, 4 Apr 2003 21:13:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F06B943F85 for ; Fri, 4 Apr 2003 21:13:48 -0800 (PST) (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 h355Dm0U014043 for ; Fri, 4 Apr 2003 21:13:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355Dmfe014040 for perforce@freebsd.org; Fri, 4 Apr 2003 21:13:48 -0800 (PST) Date: Fri, 4 Apr 2003 21:13:48 -0800 (PST) Message-Id: <200304050513.h355Dmfe014040@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 28172 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, 05 Apr 2003 05:13:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=28172 Change 28172 by peter@peter_overcee on 2003/04/04 21:13:22 make cpu_switch assemble. Still needs regparm work. needs to do rest of saved registers. Needs PCB_E* renamed to PCB_R* Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#11 (text+ko) ==== @@ -54,28 +54,29 @@ * about its state. This is only a slight optimization and is probably * not worth it anymore. Note that we need to clear the pm_active bits so * we do need the old proc if it still exists. - * 0(%esp) = ret - * 4(%esp) = oldtd - * 8(%esp) = newtd + * 0(%rsp) = ret + * 8(%rsp) = oldtd + * 16(%rsp) = newtd */ ENTRY(cpu_throw) + xorq %rsi, %rsi movl PCPU(CPUID), %esi - movl 4(%esp),%ecx /* Old thread */ - testl %ecx,%ecx /* no thread? */ + movq 8(%rsp),%rcx /* Old thread */ + testq %rcx,%rcx /* no thread? */ jz 1f /* release bit from old pm_active */ - movl TD_PROC(%ecx), %eax /* thread->td_proc */ - movl P_VMSPACE(%eax), %ebx /* proc->p_vmspace */ - btrl %esi, VM_PMAP+PM_ACTIVE(%ebx) /* clear old */ + movq TD_PROC(%rcx), %rax /* thread->td_proc */ + movq P_VMSPACE(%rax), %rbx /* proc->p_vmspace */ + btrq %rsi, VM_PMAP+PM_ACTIVE(%rbx) /* clear old */ 1: - movl 8(%esp),%ecx /* New thread */ - movl TD_PCB(%ecx),%edx - movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + movq 16(%rsp),%rcx /* New thread */ + movq TD_PCB(%rcx),%rdx + movq PCB_CR3(%rdx),%rax + movq %rax,%cr3 /* new address space */ /* set bit in new pm_active */ - movl TD_PROC(%ecx),%eax - movl P_VMSPACE(%eax), %ebx - btsl %esi, VM_PMAP+PM_ACTIVE(%ebx) /* set new */ + movq TD_PROC(%rcx),%rax + movq P_VMSPACE(%rax), %rbx + btsq %rsi, VM_PMAP+PM_ACTIVE(%rbx) /* set new */ jmp sw1 /* @@ -83,65 +84,66 @@ * * Save the current thread state, then select the next thread to run * and load its state. - * 0(%esp) = ret - * 4(%esp) = oldtd - * 8(%esp) = newtd + * 0(%rsp) = ret + * 8(%rsp) = oldtd + * 16(%rsp) = newtd */ ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ - movl 4(%esp),%ecx + movq 8(%rsp),%rcx #ifdef INVARIANTS - testl %ecx,%ecx /* no thread? */ + testq %rcx,%rcx /* no thread? */ jz badsw2 /* no, panic */ #endif - movl TD_PCB(%ecx),%edx + movq TD_PCB(%rcx),%rdx - movl (%esp),%eax /* Hardware registers */ - movl %eax,PCB_EIP(%edx) - movl %ebx,PCB_EBX(%edx) - movl %esp,PCB_ESP(%edx) - movl %ebp,PCB_EBP(%edx) - movl %esi,PCB_ESI(%edx) - movl %edi,PCB_EDI(%edx) - movl %gs,PCB_GS(%edx) - pushfl /* PSL */ - popl PCB_PSL(%edx) + movq (%rsp),%rax /* Hardware registers */ + movq %rax,PCB_EIP(%rdx) + movq %rbx,PCB_EBX(%rdx) + movq %rsp,PCB_ESP(%rdx) + movq %rbp,PCB_EBP(%rdx) + movq %rsi,PCB_ESI(%rdx) + movq %rdi,PCB_EDI(%rdx) +#XXX movq %gs,PCB_GS(%rdx) + pushfq /* PSL */ + popq PCB_PSL(%rdx) /* have we used fp, and need a save? */ - cmpl %ecx,PCPU(FPCURTHREAD) + cmpq %rcx,PCPU(FPCURTHREAD) jne 1f - addl $PCB_SAVEFPU,%edx /* h/w bugs make saving complicated */ - pushl %edx + addq $PCB_SAVEFPU,%rdx /* h/w bugs make saving complicated */ + pushq %rdx call npxsave /* do it in a big C function */ - popl %eax + popq %rax 1: /* Save is done. Now fire up new thread. Leave old vmspace. */ - movl %ecx,%edi - movl 8(%esp),%ecx /* New thread */ + movq %rcx,%rdi + movq 16(%rsp),%rcx /* New thread */ #ifdef INVARIANTS - testl %ecx,%ecx /* no thread? */ + testq %rcx,%rcx /* no thread? */ jz badsw3 /* no, panic */ #endif - movl TD_PCB(%ecx),%edx + movq TD_PCB(%rcx),%rdx + xorq %rsi, %rsi movl PCPU(CPUID), %esi /* switch address space */ - movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + movq PCB_CR3(%rdx),%rax + movq %rax,%cr3 /* new address space */ /* Release bit from old pmap->pm_active */ - movl TD_PROC(%edi), %eax /* oldproc */ - movl P_VMSPACE(%eax), %ebx - btrl %esi, VM_PMAP+PM_ACTIVE(%ebx) /* clear old */ + movq TD_PROC(%rdi), %rax /* oldproc */ + movq P_VMSPACE(%rax), %rbx + btrq %rsi, VM_PMAP+PM_ACTIVE(%rbx) /* clear old */ /* Set bit in new pmap->pm_active */ - movl TD_PROC(%ecx),%eax /* newproc */ - movl P_VMSPACE(%eax), %ebx - btsl %esi, VM_PMAP+PM_ACTIVE(%ebx) /* set new */ + movq TD_PROC(%rcx),%rax /* newproc */ + movq P_VMSPACE(%rax), %rbx + btsq %rsi, VM_PMAP+PM_ACTIVE(%rbx) /* set new */ sw1: /* @@ -149,41 +151,83 @@ * to load up the rest of the next context. */ /* Restore context. */ - movl PCB_EBX(%edx),%ebx - movl PCB_ESP(%edx),%esp - movl PCB_EBP(%edx),%ebp - movl PCB_ESI(%edx),%esi - movl PCB_EDI(%edx),%edi - movl PCB_EIP(%edx),%eax - movl %eax,(%esp) - pushl PCB_PSL(%edx) - popfl + movq PCB_EBX(%rdx),%rbx + movq PCB_ESP(%rdx),%rsp + movq PCB_EBP(%rdx),%rbp + movq PCB_ESI(%rdx),%rsi + movq PCB_EDI(%rdx),%rdi + movq PCB_EIP(%rdx),%rax + movq %rax,(%rsp) + pushq PCB_PSL(%rdx) + popfq - movl %edx, PCPU(CURPCB) - movl %ecx, PCPU(CURTHREAD) /* into next thread */ + movq %rdx, PCPU(CURPCB) + movq %rcx, PCPU(CURTHREAD) /* into next thread */ .globl cpu_switch_load_gs cpu_switch_load_gs: - movl PCB_GS(%edx),%gs +#XXX movq PCB_GS(%rdx),%gs ret #ifdef INVARIANTS badsw1: - pushal - pushl $sw0_1 + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq $sw0_1 call panic sw0_1: .asciz "cpu_throw: no newthread supplied" badsw2: - pushal - pushl $sw0_2 + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq $sw0_2 call panic sw0_2: .asciz "cpu_switch: no curthread supplied" badsw3: - pushal - pushl $sw0_3 + pushq %rax + pushq %rcx + pushq %rdx + pushq %rbx + pushq %rbp + pushq %rsi + pushq %rdi + pushq %r8 + pushq %r9 + pushq %r10 + pushq %r11 + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + pushq $sw0_3 call panic sw0_3: .asciz "cpu_switch: no newthread supplied" #endif @@ -194,23 +238,23 @@ */ ENTRY(savectx) /* Fetch PCB. */ - movl 4(%esp),%ecx + movq 8(%rsp),%rcx /* Save caller's return address. Child won't execute this routine. */ - movl (%esp),%eax - movl %eax,PCB_EIP(%ecx) + movq (%rsp),%rax + movq %rax,PCB_EIP(%rcx) - movl %cr3,%eax - movl %eax,PCB_CR3(%ecx) + movq %cr3,%rax + movq %rax,PCB_CR3(%rcx) - movl %ebx,PCB_EBX(%ecx) - movl %esp,PCB_ESP(%ecx) - movl %ebp,PCB_EBP(%ecx) - movl %esi,PCB_ESI(%ecx) - movl %edi,PCB_EDI(%ecx) - movl %gs,PCB_GS(%ecx) - pushfl - popl PCB_PSL(%ecx) + movq %rbx,PCB_EBX(%rcx) + movq %rsp,PCB_ESP(%rcx) + movq %rbp,PCB_EBP(%rcx) + movq %rsi,PCB_ESI(%rcx) + movq %rdi,PCB_EDI(%rcx) +#XXX movq %gs,PCB_GS(%rcx) + pushfq + popq PCB_PSL(%rcx) /* * If fpcurthread == NULL, then the npx h/w state is irrelevant and the @@ -224,29 +268,29 @@ * have to handle h/w bugs for reloading. We used to lose the * parent's npx state for forks by forgetting to reload. */ - pushfl + pushfq cli - movl PCPU(FPCURTHREAD),%eax - testl %eax,%eax + movq PCPU(FPCURTHREAD),%rax + testq %rax,%rax je 1f - pushl %ecx - movl TD_PCB(%eax),%eax - leal PCB_SAVEFPU(%eax),%eax - pushl %eax - pushl %eax + pushq %rcx + movq TD_PCB(%rax),%rax + leaq PCB_SAVEFPU(%rax),%rax + pushq %rax + pushq %rax call npxsave - addl $4,%esp - popl %eax - popl %ecx + addq $8,%rsp + popq %rax + popq %rcx - pushl $PCB_SAVEFPU_SIZE - leal PCB_SAVEFPU(%ecx),%ecx - pushl %ecx - pushl %eax + pushq $PCB_SAVEFPU_SIZE + leaq PCB_SAVEFPU(%rcx),%rcx + pushq %rcx + pushq %rax call bcopy - addl $12,%esp + addq $24,%rsp 1: - popfl + popfq ret From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:17:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F71C37B404; Fri, 4 Apr 2003 21:17:55 -0800 (PST) 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 EBCA337B401 for ; Fri, 4 Apr 2003 21:17:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E57D43FAF for ; Fri, 4 Apr 2003 21:17:54 -0800 (PST) (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 h355Hs0U014206 for ; Fri, 4 Apr 2003 21:17:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355Hs6i014203 for perforce@freebsd.org; Fri, 4 Apr 2003 21:17:54 -0800 (PST) Date: Fri, 4 Apr 2003 21:17:54 -0800 (PST) Message-Id: <200304050517.h355Hs6i014203@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 28173 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, 05 Apr 2003 05:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=28173 Change 28173 by peter@peter_overcee on 2003/04/04 21:17:34 bcopy/zero/etc can move to C. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#8 (text+ko) ==== @@ -43,193 +43,6 @@ .text -/* - * bcopy family - * void bzero(void *buf, u_int len) - */ - -ENTRY(bzero) - pushl %edi - movl 8(%esp),%edi - movl 12(%esp),%ecx - xorl %eax,%eax - shrl $2,%ecx - cld - rep - stosl - movl 12(%esp),%ecx - andl $3,%ecx - rep - stosb - popl %edi - ret - -ENTRY(pagezero) - pushl %edi - pushl %ebx - - movl 12(%esp), %edi - movl $1024, %ecx - cld - - ALIGN_TEXT -1: - xorl %eax, %eax - repe - scasl - jnz 2f - - popl %ebx - popl %edi - ret - - ALIGN_TEXT - -2: - incl %ecx - subl $4, %edi - - movl %ecx, %edx - cmpl $16, %ecx - - jge 3f - - movl %edi, %ebx - andl $0x3f, %ebx - shrl %ebx - shrl %ebx - movl $16, %ecx - subl %ebx, %ecx - -3: - subl %ecx, %edx - rep - stosl - - movl %edx, %ecx - testl %edx, %edx - jnz 1b - - popl %ebx - popl %edi - ret - -/* fillw(pat, base, cnt) */ -ENTRY(fillw) - pushl %edi - movl 8(%esp),%eax - movl 12(%esp),%edi - movl 16(%esp),%ecx - cld - rep - stosw - popl %edi - ret - -ENTRY(bcopyb) - pushl %esi - pushl %edi - movl 12(%esp),%esi - movl 16(%esp),%edi - movl 20(%esp),%ecx - movl %edi,%eax - subl %esi,%eax - cmpl %ecx,%eax /* overlapping && src < dst? */ - jb 1f - cld /* nope, copy forwards */ - rep - movsb - popl %edi - popl %esi - ret - - ALIGN_TEXT -1: - addl %ecx,%edi /* copy backwards. */ - addl %ecx,%esi - decl %edi - decl %esi - std - rep - movsb - popl %edi - popl %esi - cld - ret - -/* - * bcopy(src, dst, cnt) - * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 - */ -ALTENTRY(ovbcopy) -ENTRY(bcopy) - pushl %esi - pushl %edi - movl 12(%esp),%esi - movl 16(%esp),%edi - movl 20(%esp),%ecx - - movl %edi,%eax - subl %esi,%eax - cmpl %ecx,%eax /* overlapping && src < dst? */ - jb 1f - - shrl $2,%ecx /* copy by 32-bit words */ - cld /* nope, copy forwards */ - rep - movsl - movl 20(%esp),%ecx - andl $3,%ecx /* any bytes left? */ - rep - movsb - popl %edi - popl %esi - ret - - ALIGN_TEXT -1: - addl %ecx,%edi /* copy backwards */ - addl %ecx,%esi - decl %edi - decl %esi - andl $3,%ecx /* any fractional bytes? */ - std - rep - movsb - movl 20(%esp),%ecx /* copy remainder by 32-bit words */ - shrl $2,%ecx - subl $3,%esi - subl $3,%edi - rep - movsl - popl %edi - popl %esi - cld - ret - -/* - * Note: memcpy does not support overlapping copies - */ -ENTRY(memcpy) - pushl %edi - pushl %esi - movl 12(%esp),%edi - movl 16(%esp),%esi - movl 20(%esp),%ecx - movl %edi,%eax - shrl $2,%ecx /* copy by 32-bit words */ - cld /* nope, copy forwards */ - rep - movsl - movl 20(%esp),%ecx - andl $3,%ecx /* any bytes left? */ - rep - movsb - popl %esi - popl %edi - ret - - /*****************************************************************************/ /* copyout and fubyte family */ /*****************************************************************************/ @@ -682,14 +495,3 @@ pushq $KCSEL pushq %rax lretq - -/* void reset_dbregs() */ -ENTRY(reset_dbregs) - movl $0,%eax - movl %eax,%dr7 /* disable all breapoints first */ - movl %eax,%dr0 - movl %eax,%dr1 - movl %eax,%dr2 - movl %eax,%dr3 - movl %eax,%dr6 - ret From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:22:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 503CB37B401; Fri, 4 Apr 2003 21:22:01 -0800 (PST) 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 D727237B404 for ; Fri, 4 Apr 2003 21:22:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 274B543FAF for ; Fri, 4 Apr 2003 21:22:00 -0800 (PST) (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 h355Lx0U014729 for ; Fri, 4 Apr 2003 21:21:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355Lx1W014726 for perforce@freebsd.org; Fri, 4 Apr 2003 21:21:59 -0800 (PST) Date: Fri, 4 Apr 2003 21:21:59 -0800 (PST) Message-Id: <200304050521.h355Lx1W014726@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 28174 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, 05 Apr 2003 05:22:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=28174 Change 28174 by peter@peter_overcee on 2003/04/04 21:21:26 convert copyout to x86-64 Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#9 (text+ko) ==== @@ -65,14 +65,14 @@ * copyout(from_kernel, to_user, len) - MP SAFE */ ENTRY(copyout) - movl PCPU(CURPCB),%eax - movl $copyout_fault,PCB_ONFAULT(%eax) - pushl %esi - pushl %edi - pushl %ebx - movl 16(%esp),%esi - movl 20(%esp),%edi - movl 24(%esp),%ebx + movq PCPU(CURPCB),%rax + movq $copyout_fault,PCB_ONFAULT(%rax) + pushq %rsi + pushq %rdi + pushq %rbx + movq 32(%rsp),%rsi + movq 40(%rsp),%rdi + movq 48(%rsp),%rbx testl %ebx,%ebx /* anything to do? */ jz done_copyout @@ -86,8 +86,8 @@ /* * First, prevent address wrapping. */ - movl %edi,%eax - addl %ebx,%eax + movq %rdi,%rax + addq %rbx,%rax jc copyout_fault /* * XXX STOP USING VM_MAXUSER_ADDRESS. @@ -95,38 +95,38 @@ * looks like there is an off by one error, and of course it caused an off * by one error in several places. */ - cmpl $VM_MAXUSER_ADDRESS,%eax + cmpq $VM_MAXUSER_ADDRESS,%rax ja copyout_fault - /* bcopy(%esi, %edi, %ebx) */ - movl %ebx,%ecx + /* bcopy(%rsi, %rdi, %rbx) */ + movq %rbx,%rcx - shrl $2,%ecx + shrq $3,%rcx cld rep - movsl + movsq movb %bl,%cl - andb $3,%cl + andb $7,%cl rep movsb done_copyout: - popl %ebx - popl %edi - popl %esi - xorl %eax,%eax - movl PCPU(CURPCB),%edx - movl %eax,PCB_ONFAULT(%edx) + popq %rbx + popq %rdi + popq %rsi + xorq %rax,%rax + movq PCPU(CURPCB),%rdx + movq %rax,PCB_ONFAULT(%rdx) ret ALIGN_TEXT copyout_fault: - popl %ebx - popl %edi - popl %esi - movl PCPU(CURPCB),%edx - movl $0,PCB_ONFAULT(%edx) - movl $EFAULT,%eax + popq %rbx + popq %rdi + popq %rsi + movq PCPU(CURPCB),%rdx + movq $0,PCB_ONFAULT(%rdx) + movq $EFAULT,%rax ret /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:24:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 138B837B404; Fri, 4 Apr 2003 21:24:04 -0800 (PST) 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 9F56D37B401 for ; Fri, 4 Apr 2003 21:24:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48A8C43FCB for ; Fri, 4 Apr 2003 21:24:03 -0800 (PST) (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 h355O30U014774 for ; Fri, 4 Apr 2003 21:24:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355O2MR014771 for perforce@freebsd.org; Fri, 4 Apr 2003 21:24:02 -0800 (PST) Date: Fri, 4 Apr 2003 21:24:02 -0800 (PST) Message-Id: <200304050524.h355O2MR014771@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 28175 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, 05 Apr 2003 05:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28175 Change 28175 by peter@peter_overcee on 2003/04/04 21:23:36 convert copyin Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#10 (text+ko) ==== @@ -133,47 +133,47 @@ * copyin(from_user, to_kernel, len) - MP SAFE */ ENTRY(copyin) - movl PCPU(CURPCB),%eax - movl $copyin_fault,PCB_ONFAULT(%eax) - pushl %esi - pushl %edi - movl 12(%esp),%esi /* caddr_t from */ - movl 16(%esp),%edi /* caddr_t to */ - movl 20(%esp),%ecx /* size_t len */ + movq PCPU(CURPCB),%rax + movq $copyin_fault,PCB_ONFAULT(%rax) + pushq %rsi + pushq %rdi + movq 24(%rsp),%rsi /* caddr_t from */ + movq 32(%rsp),%rdi /* caddr_t to */ + movq 40(%rsp),%rcx /* size_t len */ /* * make sure address is valid */ - movl %esi,%edx - addl %ecx,%edx + movq %rsi,%rdx + addq %rcx,%rdx jc copyin_fault - cmpl $VM_MAXUSER_ADDRESS,%edx + cmpq $VM_MAXUSER_ADDRESS,%rdx ja copyin_fault movb %cl,%al - shrl $2,%ecx /* copy longword-wise */ + shrq $3,%rcx /* copy longword-wise */ cld rep - movsl + movsq movb %al,%cl - andb $3,%cl /* copy remaining bytes */ + andb $7,%cl /* copy remaining bytes */ rep movsb - popl %edi - popl %esi - xorl %eax,%eax - movl PCPU(CURPCB),%edx - movl %eax,PCB_ONFAULT(%edx) + popq %rdi + popq %rsi + xorq %rax,%rax + movq PCPU(CURPCB),%rdx + movq %rax,PCB_ONFAULT(%rdx) ret ALIGN_TEXT copyin_fault: - popl %edi - popl %esi - movl PCPU(CURPCB),%edx - movl $0,PCB_ONFAULT(%edx) - movl $EFAULT,%eax + popq %rdi + popq %rsi + movq PCPU(CURPCB),%rdx + movq $0,PCB_ONFAULT(%rdx) + movq $EFAULT,%rax ret /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:32:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7D4537B404; Fri, 4 Apr 2003 21:32:16 -0800 (PST) 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 8EBE837B401 for ; Fri, 4 Apr 2003 21:32:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8C9C43FBD for ; Fri, 4 Apr 2003 21:32:13 -0800 (PST) (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 h355WD0U015449 for ; Fri, 4 Apr 2003 21:32:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355WDs8015446 for perforce@freebsd.org; Fri, 4 Apr 2003 21:32:13 -0800 (PST) Date: Fri, 4 Apr 2003 21:32:13 -0800 (PST) Message-Id: <200304050532.h355WDs8015446@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 28176 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, 05 Apr 2003 05:32:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=28176 Change 28176 by peter@peter_overcee on 2003/04/04 21:32:09 convert fu* Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#11 (text+ko) ==== @@ -180,16 +180,16 @@ * casuptr. Compare and set user pointer. Returns -1 or the current value. */ ENTRY(casuptr) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx /* dst */ - movl 8(%esp),%eax /* old */ - movl 12(%esp),%ecx /* new */ + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%esp),%rdx /* dst */ + movq 16(%esp),%rax /* old */ + movq 24(%esp),%rcx /* new */ - cmpl $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ + cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address is valid */ ja fusufault - cmpxchgl %ecx, (%edx) + cmpxchgq %rcx, (%rdx) /* * The old value is in %eax. If the store succeeded it will be the @@ -197,9 +197,9 @@ * be the current value. */ - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl $0,PCB_ONFAULT(%ecx) + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq $0,PCB_ONFAULT(%rcx) ret /* @@ -208,15 +208,17 @@ * Fetch a byte (sword, word) from user memory */ ENTRY(fuword) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx /* from */ + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%edx /* from */ - cmpl $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ + cmpq $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ ja fusufault - movl (%edx),%eax - movl $0,PCB_ONFAULT(%ecx) +# XXX use the 64 extend + xorq %rax, %rax + movl (%rdx),%eax + movq $0,PCB_ONFAULT(%rcx) ret ENTRY(fuword32) @@ -230,45 +232,49 @@ */ ALTENTRY(suswintr) ENTRY(fuswintr) - movl $-1,%eax + movq $-1,%rax ret /* * fuword16 - MP SAFE */ ENTRY(fuword16) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%rdx - cmpl $VM_MAXUSER_ADDRESS-2,%edx + cmpq $VM_MAXUSER_ADDRESS-2,%rdx ja fusufault - movzwl (%edx),%eax - movl $0,PCB_ONFAULT(%ecx) +# XXX use the 64 extend + xorq %rax, %rax + movzwl (%rdx),%eax + movq $0,PCB_ONFAULT(%rcx) ret /* * fubyte - MP SAFE */ ENTRY(fubyte) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%edx - cmpl $VM_MAXUSER_ADDRESS-1,%edx + cmpq $VM_MAXUSER_ADDRESS-1,%rdx ja fusufault - movzbl (%edx),%eax - movl $0,PCB_ONFAULT(%ecx) +# XXX use the 64 extend + xorq %rax, %rax + movzbl (%rdx),%eax + movl $0,PCB_ONFAULT(%rcx) ret ALIGN_TEXT fusufault: - movl PCPU(CURPCB),%ecx - xorl %eax,%eax - movl %eax,PCB_ONFAULT(%ecx) - decl %eax + movq PCPU(CURPCB),%rcx + xorq %rax,%rax + movq %rax,PCB_ONFAULT(%rcx) + decq %rax ret /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:38:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3A2B37B404; Fri, 4 Apr 2003 21:38:22 -0800 (PST) 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 437D437B401 for ; Fri, 4 Apr 2003 21:38:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7EFA43F3F for ; Fri, 4 Apr 2003 21:38:21 -0800 (PST) (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 h355cL0U015750 for ; Fri, 4 Apr 2003 21:38:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355cL54015745 for perforce@freebsd.org; Fri, 4 Apr 2003 21:38:21 -0800 (PST) Date: Fri, 4 Apr 2003 21:38:21 -0800 (PST) Message-Id: <200304050538.h355cL54015745@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 28177 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, 05 Apr 2003 05:38:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=28177 Change 28177 by peter@peter_overcee on 2003/04/04 21:37:23 convert su*, nuke bcmp for a C version (todo) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#12 (text+ko) ==== @@ -283,18 +283,18 @@ * Write a byte (word, longword) to user memory */ ENTRY(suword) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%edx - cmpl $VM_MAXUSER_ADDRESS-4,%edx /* verify address validity */ + cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address validity */ ja fusufault - movl 8(%esp),%eax - movl %eax,(%edx) - xorl %eax,%eax - movl PCPU(CURPCB),%ecx - movl %eax,PCB_ONFAULT(%ecx) + movl 16(%rsp),%rax + movl %eax,(%rdx) + xorq %rax,%rax + movq PCPU(CURPCB),%rcx + movq %rax,PCB_ONFAULT(%rcx) ret ENTRY(suword32) @@ -304,36 +304,36 @@ * suword16 - MP SAFE */ ENTRY(suword16) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%rdx - cmpl $VM_MAXUSER_ADDRESS-2,%edx /* verify address validity */ + cmpq $VM_MAXUSER_ADDRESS-2,%rdx /* verify address validity */ ja fusufault - movw 8(%esp),%ax - movw %ax,(%edx) - xorl %eax,%eax - movl PCPU(CURPCB),%ecx /* restore trashed register */ - movl %eax,PCB_ONFAULT(%ecx) + movw 16(%rsp),%ax + movw %ax,(%rdx) + xorq %rax,%rax + movq PCPU(CURPCB),%rcx /* restore trashed register */ + movq %rax,PCB_ONFAULT(%rcx) ret /* * subyte - MP SAFE */ ENTRY(subyte) - movl PCPU(CURPCB),%ecx - movl $fusufault,PCB_ONFAULT(%ecx) - movl 4(%esp),%edx + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%rdx - cmpl $VM_MAXUSER_ADDRESS-1,%edx /* verify address validity */ + cmpq $VM_MAXUSER_ADDRESS-1,%rdx /* verify address validity */ ja fusufault - movb 8(%esp),%al - movb %al,(%edx) - xorl %eax,%eax - movl PCPU(CURPCB),%ecx /* restore trashed register */ - movl %eax,PCB_ONFAULT(%ecx) + movb 18(%rsp),%al + movb %al,(%rdx) + xorq %rax,%rax + movq PCPU(CURPCB),%rcx /* restore trashed register */ + movq %rax,PCB_ONFAULT(%rcx) ret /* @@ -450,34 +450,6 @@ popl %esi ret -ENTRY(bcmp) - pushl %edi - pushl %esi - movl 12(%esp),%edi - movl 16(%esp),%esi - movl 20(%esp),%edx - xorl %eax,%eax - - movl %edx,%ecx - shrl $2,%ecx - cld /* compare forwards */ - repe - cmpsl - jne 1f - - movl %edx,%ecx - andl $3,%ecx - repe - cmpsb - je 2f -1: - incl %eax -2: - popl %esi - popl %edi - ret - - /* * Handling of special 386 registers and descriptor tables etc */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 21:57:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ACF137B404; Fri, 4 Apr 2003 21:57:46 -0800 (PST) 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 3F06C37B401 for ; Fri, 4 Apr 2003 21:57:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D020D43FBF for ; Fri, 4 Apr 2003 21:57:45 -0800 (PST) (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 h355vj0U017191 for ; Fri, 4 Apr 2003 21:57:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h355vj2i017188 for perforce@freebsd.org; Fri, 4 Apr 2003 21:57:45 -0800 (PST) Date: Fri, 4 Apr 2003 21:57:45 -0800 (PST) Message-Id: <200304050557.h355vj2i017188@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 28178 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, 05 Apr 2003 05:57:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=28178 Change 28178 by peter@peter_overcee on 2003/04/04 21:57:04 get this to assemble - except there is no 64 bit immediate compare. GRR. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#13 (text+ko) ==== @@ -182,9 +182,9 @@ ENTRY(casuptr) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) - movq 8(%esp),%rdx /* dst */ - movq 16(%esp),%rax /* old */ - movq 24(%esp),%rcx /* new */ + movq 8(%rsp),%rdx /* dst */ + movq 16(%rsp),%rax /* old */ + movq 24(%rsp),%rcx /* new */ cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address is valid */ ja fusufault @@ -210,7 +210,7 @@ ENTRY(fuword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) - movq 8(%rsp),%edx /* from */ + movq 8(%rsp),%rdx /* from */ cmpq $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ ja fusufault @@ -258,7 +258,7 @@ ENTRY(fubyte) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) - movq 8(%rsp),%edx + movq 8(%rsp),%rdx cmpq $VM_MAXUSER_ADDRESS-1,%rdx ja fusufault @@ -266,7 +266,7 @@ # XXX use the 64 extend xorq %rax, %rax movzbl (%rdx),%eax - movl $0,PCB_ONFAULT(%rcx) + movq $0,PCB_ONFAULT(%rcx) ret ALIGN_TEXT @@ -285,12 +285,12 @@ ENTRY(suword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) - movq 8(%rsp),%edx + movq 8(%rsp),%rdx cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address validity */ ja fusufault - movl 16(%rsp),%rax + movq 16(%rsp),%rax movl %eax,(%rdx) xorq %rax,%rax movq PCPU(CURPCB),%rcx @@ -345,32 +345,32 @@ * return the actual length in *lencopied. */ ENTRY(copyinstr) - pushl %esi - pushl %edi - movl PCPU(CURPCB),%ecx - movl $cpystrflt,PCB_ONFAULT(%ecx) + pushq %rsi + pushq %rdi + movq PCPU(CURPCB),%rcx + movq $cpystrflt,PCB_ONFAULT(%rcx) - movl 12(%esp),%esi /* %esi = from */ - movl 16(%esp),%edi /* %edi = to */ - movl 20(%esp),%edx /* %edx = maxlen */ + movq 24(%rsp),%rsi /* %esi = from */ + movq 32(%rsp),%rdi /* %edi = to */ + movq 40(%rsp),%rdx /* %edx = maxlen */ - movl $VM_MAXUSER_ADDRESS,%eax + movq $VM_MAXUSER_ADDRESS,%rax /* make sure 'from' is within bounds */ - subl %esi,%eax + subq %rsi,%rax jbe cpystrflt /* restrict maxlen to <= VM_MAXUSER_ADDRESS-from */ - cmpl %edx,%eax + cmpq %rdx,%rax jae 1f - movl %eax,%edx - movl %eax,20(%esp) + movq %rax,%rdx + movq %rax,40(%rsp) 1: - incl %edx + incq %rdx cld 2: - decl %edx + decq %rdx jz 3f lodsb @@ -379,33 +379,33 @@ jnz 2b /* Success -- 0 byte reached */ - decl %edx - xorl %eax,%eax + decq %rdx + xorq %rax,%rax jmp cpystrflt_x 3: - /* edx is zero - return ENAMETOOLONG or EFAULT */ - cmpl $VM_MAXUSER_ADDRESS,%esi + /* rdx is zero - return ENAMETOOLONG or EFAULT */ + cmpq $VM_MAXUSER_ADDRESS,%rsi jae cpystrflt 4: - movl $ENAMETOOLONG,%eax + movq $ENAMETOOLONG,%rax jmp cpystrflt_x cpystrflt: - movl $EFAULT,%eax + movq $EFAULT,%rax cpystrflt_x: /* set *lencopied and return %eax */ - movl PCPU(CURPCB),%ecx - movl $0,PCB_ONFAULT(%ecx) - movl 20(%esp),%ecx - subl %edx,%ecx - movl 24(%esp),%edx - testl %edx,%edx + movq PCPU(CURPCB),%rcx + movq $0,PCB_ONFAULT(%rcx) + movq 40(%rsp),%rcx + subq %rdx,%rcx + movq 48(%rsp),%rdx + testq %rdx,%rdx jz 1f - movl %ecx,(%edx) + movq %rcx,(%rdx) 1: - popl %edi - popl %esi + popq %rdi + popq %rsi ret @@ -413,16 +413,16 @@ * copystr(from, to, maxlen, int *lencopied) - MP SAFE */ ENTRY(copystr) - pushl %esi - pushl %edi + pushq %rsi + pushq %rdi - movl 12(%esp),%esi /* %esi = from */ - movl 16(%esp),%edi /* %edi = to */ - movl 20(%esp),%edx /* %edx = maxlen */ - incl %edx + movq 24(%rsp),%rsi /* %esi = from */ + movq 32(%rsp),%rdi /* %edi = to */ + movq 40(%rsp),%rdx /* %edx = maxlen */ + incq %rdx cld 1: - decl %edx + decq %rdx jz 4f lodsb stosb @@ -430,24 +430,24 @@ jnz 1b /* Success -- 0 byte reached */ - decl %edx - xorl %eax,%eax + decq %rdx + xorq %rax,%rax jmp 6f 4: - /* edx is zero -- return ENAMETOOLONG */ - movl $ENAMETOOLONG,%eax + /* rdx is zero -- return ENAMETOOLONG */ + movq $ENAMETOOLONG,%rax 6: - /* set *lencopied and return %eax */ - movl 20(%esp),%ecx - subl %edx,%ecx - movl 24(%esp),%edx - testl %edx,%edx + /* set *lencopied and return %rax */ + movq 40(%rsp),%rcx + subq %rdx,%rcx + movq 48(%rsp),%rdx + testq %rdx,%rdx jz 7f - movl %ecx,(%edx) + movq %rcx,(%rdx) 7: - popl %edi - popl %esi + popq %rdi + popq %rsi ret /* From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:13:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5B8E37B404; Fri, 4 Apr 2003 22:13:05 -0800 (PST) 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 4E17237B401 for ; Fri, 4 Apr 2003 22:13:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC8C943FAF for ; Fri, 4 Apr 2003 22:13:04 -0800 (PST) (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 h356D40U019357 for ; Fri, 4 Apr 2003 22:13:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356D46d019354 for perforce@freebsd.org; Fri, 4 Apr 2003 22:13:04 -0800 (PST) Date: Fri, 4 Apr 2003 22:13:04 -0800 (PST) Message-Id: <200304050613.h356D46d019354@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 28179 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, 05 Apr 2003 06:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=28179 Change 28179 by peter@peter_overcee on 2003/04/04 22:12:22 Dont use the non-existing cmpq imm64,reg64 instruction. Discretely dispose of some other bugs while here. :-) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#14 (text+ko) ==== @@ -95,7 +95,8 @@ * looks like there is an off by one error, and of course it caused an off * by one error in several places. */ - cmpq $VM_MAXUSER_ADDRESS,%rax + movq $VM_MAXUSER_ADDRESS,%rcx + cmpq %rcx,%rax ja copyout_fault /* bcopy(%rsi, %rdi, %rbx) */ @@ -147,7 +148,8 @@ movq %rsi,%rdx addq %rcx,%rdx jc copyin_fault - cmpq $VM_MAXUSER_ADDRESS,%rdx + movq $VM_MAXUSER_ADDRESS,%rax + cmpq %rax,%rdx ja copyin_fault movb %cl,%al @@ -183,12 +185,13 @@ movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx /* dst */ - movq 16(%rsp),%rax /* old */ - movq 24(%rsp),%rcx /* new */ - cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address is valid */ + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rdx /* verify address is valid */ ja fusufault + movq 16(%rsp),%rax /* old */ + movq 24(%rsp),%rcx /* new */ cmpxchgq %rcx, (%rdx) /* @@ -212,7 +215,8 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx /* from */ - cmpq $VM_MAXUSER_ADDRESS-4,%edx /* verify address is valid */ + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rdx /* verify address is valid */ ja fusufault # XXX use the 64 extend @@ -243,7 +247,8 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx - cmpq $VM_MAXUSER_ADDRESS-2,%rdx + movq $VM_MAXUSER_ADDRESS-2,%rax + cmpq %rax,%rdx ja fusufault # XXX use the 64 extend @@ -260,7 +265,8 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx - cmpq $VM_MAXUSER_ADDRESS-1,%rdx + movq $VM_MAXUSER_ADDRESS-1,%rax + cmpq %rax,%rdx ja fusufault # XXX use the 64 extend @@ -287,10 +293,11 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx - cmpq $VM_MAXUSER_ADDRESS-4,%rdx /* verify address validity */ + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rdx /* verify address validity */ ja fusufault - movq 16(%rsp),%rax + movl 16(%rsp),%eax movl %eax,(%rdx) xorq %rax,%rax movq PCPU(CURPCB),%rcx @@ -308,7 +315,8 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx - cmpq $VM_MAXUSER_ADDRESS-2,%rdx /* verify address validity */ + movq $VM_MAXUSER_ADDRESS-2,%rax + cmpq %rax,%rdx /* verify address validity */ ja fusufault movw 16(%rsp),%ax @@ -326,10 +334,11 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx - cmpq $VM_MAXUSER_ADDRESS-1,%rdx /* verify address validity */ + movq $VM_MAXUSER_ADDRESS-1,%rax + cmpq %rax,%rdx /* verify address validity */ ja fusufault - movb 18(%rsp),%al + movb 16(%rsp),%al movb %al,(%rdx) xorq %rax,%rax movq PCPU(CURPCB),%rcx /* restore trashed register */ @@ -384,7 +393,8 @@ jmp cpystrflt_x 3: /* rdx is zero - return ENAMETOOLONG or EFAULT */ - cmpq $VM_MAXUSER_ADDRESS,%rsi + movq $VM_MAXUSER_ADDRESS,%rax + cmpq %rax,%rsi jae cpystrflt 4: movq $ENAMETOOLONG,%rax From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:21:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5469737B404; Fri, 4 Apr 2003 22:21:16 -0800 (PST) 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 CB32637B401 for ; Fri, 4 Apr 2003 22:21:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65AD943FB1 for ; Fri, 4 Apr 2003 22:21:15 -0800 (PST) (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 h356LF0U019981 for ; Fri, 4 Apr 2003 22:21:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356LE0N019978 for perforce@freebsd.org; Fri, 4 Apr 2003 22:21:14 -0800 (PST) Date: Fri, 4 Apr 2003 22:21:14 -0800 (PST) Message-Id: <200304050621.h356LE0N019978@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 28180 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, 05 Apr 2003 06:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=28180 Change 28180 by peter@peter_overcee on 2003/04/04 22:21:05 use longer registers for %cr* send more dr*() functions to sleep with the fishes Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#8 (text+ko) ==== @@ -370,7 +370,7 @@ load_cr0(u_long data) { - __asm __volatile("movl %0,%%cr0" : : "r" (data)); + __asm __volatile("movq %0,%%cr0" : : "r" (data)); } static __inline u_long @@ -378,7 +378,7 @@ { u_long data; - __asm __volatile("movl %%cr0,%0" : "=r" (data)); + __asm __volatile("movq %%cr0,%0" : "=r" (data)); return (data); } @@ -387,7 +387,7 @@ { u_long data; - __asm __volatile("movl %%cr2,%0" : "=r" (data)); + __asm __volatile("movq %%cr2,%0" : "=r" (data)); return (data); } @@ -395,7 +395,7 @@ load_cr3(u_long data) { - __asm __volatile("movl %0,%%cr3" : : "r" (data) : "memory"); + __asm __volatile("movq %0,%%cr3" : : "r" (data) : "memory"); } static __inline u_long @@ -403,14 +403,14 @@ { u_long data; - __asm __volatile("movl %%cr3,%0" : "=r" (data)); + __asm __volatile("movq %%cr3,%0" : "=r" (data)); return (data); } static __inline void load_cr4(u_long data) { - __asm __volatile("movl %0,%%cr4" : : "r" (data)); + __asm __volatile("movq %0,%%cr4" : : "r" (data)); } static __inline u_long @@ -418,7 +418,7 @@ { u_long data; - __asm __volatile("movl %%cr4,%0" : "=r" (data)); + __asm __volatile("movq %%cr4,%0" : "=r" (data)); return (data); } @@ -493,118 +493,6 @@ __asm __volatile("ltr %0" : : "r" (sel)); } -static __inline u_int -rdr0(void) -{ - u_int data; - __asm __volatile("movl %%dr0,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr0(u_int dr0) -{ - __asm __volatile("movl %0,%%dr0" : : "r" (dr0)); -} - -static __inline u_int -rdr1(void) -{ - u_int data; - __asm __volatile("movl %%dr1,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr1(u_int dr1) -{ - __asm __volatile("movl %0,%%dr1" : : "r" (dr1)); -} - -static __inline u_int -rdr2(void) -{ - u_int data; - __asm __volatile("movl %%dr2,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr2(u_int dr2) -{ - __asm __volatile("movl %0,%%dr2" : : "r" (dr2)); -} - -static __inline u_int -rdr3(void) -{ - u_int data; - __asm __volatile("movl %%dr3,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr3(u_int dr3) -{ - __asm __volatile("movl %0,%%dr3" : : "r" (dr3)); -} - -static __inline u_int -rdr4(void) -{ - u_int data; - __asm __volatile("movl %%dr4,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr4(u_int dr4) -{ - __asm __volatile("movl %0,%%dr4" : : "r" (dr4)); -} - -static __inline u_int -rdr5(void) -{ - u_int data; - __asm __volatile("movl %%dr5,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr5(u_int dr5) -{ - __asm __volatile("movl %0,%%dr5" : : "r" (dr5)); -} - -static __inline u_int -rdr6(void) -{ - u_int data; - __asm __volatile("movl %%dr6,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr6(u_int dr6) -{ - __asm __volatile("movl %0,%%dr6" : : "r" (dr6)); -} - -static __inline u_int -rdr7(void) -{ - u_int data; - __asm __volatile("movl %%dr7,%0" : "=r" (data)); - return (data); -} - -static __inline void -load_dr7(u_int dr7) -{ - __asm __volatile("movl %0,%%dr7" : : "r" (dr7)); -} - static __inline register_t intr_disable(void) { @@ -671,21 +559,6 @@ void wbinvd(void); void write_rflags(u_int ef); void wrmsr(u_int msr, u_int64_t newval); -u_int rdr0(void); -void load_dr0(u_int dr0); -u_int rdr1(void); -void load_dr1(u_int dr1); -u_int rdr2(void); -void load_dr2(u_int dr2); -u_int rdr3(void); -void load_dr3(u_int dr3); -u_int rdr4(void); -void load_dr4(u_int dr4); -u_int rdr5(void); -void load_dr5(u_int dr5); -u_int rdr6(void); -void load_dr6(u_int dr6); -u_int rdr7(void); void load_dr7(u_int dr7); register_t intr_disable(void); void intr_restore(register_t ef); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:22:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA8137B404; Fri, 4 Apr 2003 22:22:18 -0800 (PST) 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 DE09A37B401 for ; Fri, 4 Apr 2003 22:22:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6671443F93 for ; Fri, 4 Apr 2003 22:22:17 -0800 (PST) (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 h356MH0U020013 for ; Fri, 4 Apr 2003 22:22:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356MGNk020010 for perforce@freebsd.org; Fri, 4 Apr 2003 22:22:16 -0800 (PST) Date: Fri, 4 Apr 2003 22:22:16 -0800 (PST) Message-Id: <200304050622.h356MGNk020010@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 28181 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, 05 Apr 2003 06:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=28181 Change 28181 by peter@peter_overcee on 2003/04/04 22:21:32 make this compile. Not finished by a long shot. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#13 (text+ko) ==== @@ -41,7 +41,6 @@ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.204 2003/03/30 05:24:52 jake Exp $ */ -#include "opt_reset.h" #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -127,9 +126,9 @@ td2->td_frame = (struct trapframe *)td2->td_pcb - 1; bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); - td2->td_frame->tf_eax = 0; /* Child returns zero */ - td2->td_frame->tf_eflags &= ~PSL_C; /* success */ - td2->td_frame->tf_edx = 1; + td2->td_frame->tf_rax = 0; /* Child returns zero */ + td2->td_frame->tf_rflags &= ~PSL_C; /* success */ + td2->td_frame->tf_rdx = 1; /* * Set registers for trampoline to user mode. Leave space for the @@ -143,10 +142,10 @@ pcb2->pcb_edi = 0; pcb2->pcb_esi = (int)fork_return; /* fork_trampoline argument */ pcb2->pcb_ebp = 0; - pcb2->pcb_esp = (int)td2->td_frame - sizeof(void *); - pcb2->pcb_ebx = (int)td2; /* fork_trampoline argument */ - pcb2->pcb_eip = (int)fork_trampoline; - pcb2->pcb_psl = td2->td_frame->tf_eflags & ~PSL_I; /* ints disabled */ + pcb2->pcb_esp = (long)td2->td_frame - sizeof(void *); + pcb2->pcb_ebx = (long)td2; /* fork_trampoline argument */ + pcb2->pcb_eip = (long)fork_trampoline; + pcb2->pcb_psl = td2->td_frame->tf_rflags & ~PSL_I; /* ints disabled */ /*- * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. @@ -181,8 +180,8 @@ * Note that the trap frame follows the args, so the function * is really called like this: func(arg, frame); */ - td->td_pcb->pcb_esi = (int) func; /* function */ - td->td_pcb->pcb_ebx = (int) arg; /* first arg */ + td->td_pcb->pcb_esi = (long) func; /* function */ + td->td_pcb->pcb_ebx = (long) arg; /* first arg */ } void @@ -196,7 +195,6 @@ void cpu_thread_exit(struct thread *td) { - struct pcb *pcb = td->td_pcb; npxexit(td); } @@ -269,14 +267,12 @@ * to do the reset here would then end up in no man's land. */ -#if !defined(BROKEN_KEYBOARD_RESET) outb(IO_KBD + 4, 0xFE); DELAY(500000); /* wait 0.5 sec to see if that did it */ printf("Keyboard reset did not work, attempting CPU shutdown\n"); DELAY(1000000); /* wait 1 sec for printf to complete */ -#endif /* force a shutdown by unmapping entire address space ! */ - bzero((caddr_t)PTD, NBPTD); + bzero((caddr_t)PML4, NBPML4T); /* "good night, sweet prince .... " */ invltlb(); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:28:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7779F37B404; Fri, 4 Apr 2003 22:28:26 -0800 (PST) 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 166EE37B401 for ; Fri, 4 Apr 2003 22:28:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87F2143F93 for ; Fri, 4 Apr 2003 22:28:25 -0800 (PST) (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 h356SP0U020284 for ; Fri, 4 Apr 2003 22:28:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356SOkT020275 for perforce@freebsd.org; Fri, 4 Apr 2003 22:28:24 -0800 (PST) Date: Fri, 4 Apr 2003 22:28:24 -0800 (PST) Message-Id: <200304050628.h356SOkT020275@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 28182 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, 05 Apr 2003 06:28:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=28182 Change 28182 by peter@peter_overcee on 2003/04/04 22:27:39 some initial cleanups. s/tf_e*/tf_r*/ remove some cruft - POWERFAIL_NMI certainly qualifies Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#18 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#18 (text+ko) ==== @@ -47,7 +47,6 @@ #include "opt_ddb.h" #include "opt_isa.h" #include "opt_ktrace.h" -#include "opt_trap.h" #include #include @@ -85,11 +84,6 @@ #include #include -#ifdef POWERFAIL_NMI -#include -#include -#endif - #include #include @@ -170,9 +164,6 @@ u_int sticks = 0; int i = 0, ucode = 0, type, code; vm_offset_t eva; -#ifdef POWERFAIL_NMI - static int lastalert = 0; -#endif atomic_add_int(&cnt.v_trap, 1); type = frame.tf_trapno; @@ -185,7 +176,7 @@ } #endif - if ((frame.tf_eflags & PSL_I) == 0) { + if ((frame.tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled * interrupts and then trapped. Enabling interrupts @@ -263,7 +254,7 @@ case T_BPTFLT: /* bpt instruction fault */ case T_TRCTRAP: /* trace trap */ - frame.tf_eflags &= ~PSL_T; + frame.tf_rflags &= ~PSL_T; i = SIGTRAP; break; @@ -301,19 +292,6 @@ #ifdef DEV_ISA case T_NMI: -#ifdef POWERFAIL_NMI -#ifndef TIMER_FREQ -# define TIMER_FREQ 1193182 -#endif - mtx_lock(&Giant); - if (time_second - lastalert > 10) { - log(LOG_WARNING, "NMI: power fail\n"); - sysbeep(TIMER_FREQ/880, hz); - lastalert = time_second; - } - mtx_unlock(&Giant); - goto userout; -#else /* !POWERFAIL_NMI */ /* machine/parity/power fail/"kitchen sink" faults */ /* XXX Giant */ if (isa_nmi(code) == 0) { @@ -331,7 +309,6 @@ } else if (panic_on_nmi) panic("NMI indicates hardware failure"); break; -#endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ case T_OFLOW: /* integer overflow fault */ @@ -401,7 +378,7 @@ * (XXX) so that we can continue, and generate * a signal. */ - if (frame.tf_eip == (int)cpu_switch_load_gs) { + if (frame.tf_rip == (long)cpu_switch_load_gs) { PCPU_GET(curpcb)->pcb_gs = 0; PROC_LOCK(p); psignal(p, SIGBUS); @@ -419,26 +396,26 @@ * selectors and pointers when the user changes * them. */ - if (frame.tf_eip == (int)doreti_iret) { - frame.tf_eip = (int)doreti_iret_fault; + if (frame.tf_rip == (long)doreti_iret) { + frame.tf_rip = (long)doreti_iret_fault; goto out; } - if (frame.tf_eip == (int)doreti_popl_ds) { - frame.tf_eip = (int)doreti_popl_ds_fault; + if (frame.tf_rip == (long)doreti_popl_ds) { + frame.tf_rip = (long)doreti_popl_ds_fault; goto out; } - if (frame.tf_eip == (int)doreti_popl_es) { - frame.tf_eip = (int)doreti_popl_es_fault; + if (frame.tf_rip == (long)doreti_popl_es) { + frame.tf_rip = (long)doreti_popl_es_fault; goto out; } - if (frame.tf_eip == (int)doreti_popl_fs) { - frame.tf_eip = (int)doreti_popl_fs_fault; + if (frame.tf_rip == (long)doreti_popl_fs) { + frame.tf_rip = (long)doreti_popl_fs_fault; goto out; } if (PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { - frame.tf_eip = - (int)PCPU_GET(curpcb)->pcb_onfault; + frame.tf_rip = + (long)PCPU_GET(curpcb)->pcb_onfault; goto out; } break; @@ -453,14 +430,14 @@ * problem here and not every time the kernel is * entered. */ - if (frame.tf_eflags & PSL_NT) { - frame.tf_eflags &= ~PSL_NT; + if (frame.tf_rflags & PSL_NT) { + frame.tf_rflags &= ~PSL_NT; goto out; } break; case T_TRCTRAP: /* trace trap */ - if (frame.tf_eip == (int)IDTVEC(lcall_syscall)) { + if (frame.tf_rip == (long)IDTVEC(lcall_syscall)) { /* * We've just entered system mode via the * syscall lcall. Continue single stepping @@ -469,12 +446,12 @@ */ goto out; } - if (frame.tf_eip == (int)IDTVEC(lcall_syscall) + 1) { + if (frame.tf_rip == (long)IDTVEC(lcall_syscall) + 1) { /* * The syscall handler has now saved the * flags. Stop single stepping it. */ - frame.tf_eflags &= ~PSL_T; + frame.tf_rflags &= ~PSL_T; goto out; } /* @@ -494,16 +471,6 @@ #ifdef DEV_ISA case T_NMI: -#ifdef POWERFAIL_NMI - mtx_lock(&Giant); - if (time_second - lastalert > 10) { - log(LOG_WARNING, "NMI: power fail\n"); - sysbeep(TIMER_FREQ/880, hz); - lastalert = time_second; - } - mtx_unlock(&Giant); - goto out; -#else /* !POWERFAIL_NMI */ /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { @@ -521,7 +488,6 @@ } else if (panic_on_nmi == 0) goto out; /* FALLTHROUGH */ -#endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ } @@ -630,7 +596,7 @@ if (td->td_intr_nesting_level == 0 && PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { - frame->tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault; + frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; return (0); } trap_fatal(frame, eva); @@ -667,31 +633,31 @@ code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%x:0x%x\n", - frame->tf_cs & 0xffff, frame->tf_eip); + frame->tf_cs & 0xffff, frame->tf_rip); if (ISPL(frame->tf_cs) == SEL_UPL) { ss = frame->tf_ss & 0xffff; - esp = frame->tf_esp; + esp = frame->tf_rsp; } else { ss = GSEL(GDATA_SEL, SEL_KPL); - esp = (int)&frame->tf_esp; + esp = (long)&frame->tf_rsp; } printf("stack pointer = 0x%x:0x%x\n", ss, esp); - printf("frame pointer = 0x%x:0x%x\n", ss, frame->tf_ebp); + printf("frame pointer = 0x%x:0x%x\n", ss, frame->tf_rbp); printf("code segment = base 0x%x, limit 0x%x, type 0x%x\n", softseg.ssd_base, softseg.ssd_limit, softseg.ssd_type); printf(" = DPL %d, pres %d, def32 %d, gran %d\n", softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_def32, softseg.ssd_gran); printf("processor eflags = "); - if (frame->tf_eflags & PSL_T) + if (frame->tf_rflags & PSL_T) printf("trace trap, "); - if (frame->tf_eflags & PSL_I) + if (frame->tf_rflags & PSL_I) printf("interrupt enabled, "); - if (frame->tf_eflags & PSL_NT) + if (frame->tf_rflags & PSL_NT) printf("nested task, "); - if (frame->tf_eflags & PSL_RF) + if (frame->tf_rflags & PSL_RF) printf("resume, "); - printf("IOPL = %d\n", (frame->tf_eflags & PSL_IOPL) >> 12); + printf("IOPL = %d\n", (frame->tf_rflags & PSL_IOPL) >> 12); printf("current process = "); if (curproc) { printf("%lu (%s)\n", @@ -751,7 +717,7 @@ struct sysent *callp; struct thread *td = curthread; struct proc *p = td->td_proc; - register_t orig_tf_eflags; + register_t orig_tf_rflags; u_int sticks; int error; int narg; @@ -779,9 +745,9 @@ cred_update_thread(td); if (p->p_flag & P_THREADED) thread_user_enter(p, td); - params = (caddr_t)frame.tf_esp + sizeof(int); - code = frame.tf_eax; - orig_tf_eflags = frame.tf_eflags; + params = (caddr_t)frame.tf_rsp + sizeof(int); + code = frame.tf_rax; + orig_tf_rflags = frame.tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* @@ -842,7 +808,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_edx; + td->td_retval[1] = frame.tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -851,9 +817,9 @@ switch (error) { case 0: - frame.tf_eax = td->td_retval[0]; - frame.tf_edx = td->td_retval[1]; - frame.tf_eflags &= ~PSL_C; + frame.tf_rax = td->td_retval[0]; + frame.tf_rdx = td->td_retval[1]; + frame.tf_rflags &= ~PSL_C; break; case ERESTART: @@ -861,7 +827,7 @@ * Reconstruct pc, assuming lcall $X,y is 7 bytes, * int 0x80 is 2 bytes. We saved this in tf_err. */ - frame.tf_eip -= frame.tf_err; + frame.tf_rip -= frame.tf_err; break; case EJUSTRETURN: @@ -874,8 +840,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_eax = error; - frame.tf_eflags |= PSL_C; + frame.tf_rax = error; + frame.tf_rflags |= PSL_C; break; } @@ -888,8 +854,8 @@ /* * Traced syscall. */ - if (orig_tf_eflags & PSL_T) { - frame.tf_eflags &= ~PSL_T; + if (orig_tf_rflags & PSL_T) { + frame.tf_rflags &= ~PSL_T; trapsignal(td, SIGTRAP, 0); } From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:30:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925C937B405; Fri, 4 Apr 2003 22:30:29 -0800 (PST) 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 2565337B401 for ; Fri, 4 Apr 2003 22:30:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B05D643F3F for ; Fri, 4 Apr 2003 22:30:28 -0800 (PST) (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 h356US0U020502 for ; Fri, 4 Apr 2003 22:30:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356USF0020497 for perforce@freebsd.org; Fri, 4 Apr 2003 22:30:28 -0800 (PST) Date: Fri, 4 Apr 2003 22:30:28 -0800 (PST) Message-Id: <200304050630.h356USF0020497@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 28183 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, 05 Apr 2003 06:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=28183 Change 28183 by peter@peter_overcee on 2003/04/04 22:29:29 argh. remove vm86.o from compile list. There is no vm86 in long mode. Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#7 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#7 (text+ko) ==== @@ -46,7 +46,6 @@ x86_64/x86_64/swtch.s standard x86_64/x86_64/sys_machdep.c standard x86_64/x86_64/trap.c standard -x86_64/x86_64/vm86.c standard x86_64/x86_64/vm_machdep.c standard x86_64/isa/clock.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:30:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 039E537B40B; Fri, 4 Apr 2003 22:30:29 -0800 (PST) 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 8F40D37B404 for ; Fri, 4 Apr 2003 22:30:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2497743FBD for ; Fri, 4 Apr 2003 22:30:29 -0800 (PST) (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 h356US0U020511 for ; Fri, 4 Apr 2003 22:30:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356USgt020507 for perforce@freebsd.org; Fri, 4 Apr 2003 22:30:28 -0800 (PST) Date: Fri, 4 Apr 2003 22:30:28 -0800 (PST) Message-Id: <200304050630.h356USgt020507@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 28184 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, 05 Apr 2003 06:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=28184 Change 28184 by peter@peter_overcee on 2003/04/04 22:30:22 another bit of vm86 crept back in here. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#35 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#35 (text+ko) ==== @@ -877,10 +877,6 @@ for (pa = trunc_page(basemem * 1024); pa < ISA_HOLE_START; pa += PAGE_SIZE) pmap_kenter(KERNBASE + pa, pa); - - pte = (pt_entry_t *)vm86paddr; - for (i = basemem / 4; i < 160; i++) - pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; } if (physmap[1] != 0) From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:36:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B2BF37B404; Fri, 4 Apr 2003 22:36:38 -0800 (PST) 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 16A1E37B401 for ; Fri, 4 Apr 2003 22:36:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0A8043FA3 for ; Fri, 4 Apr 2003 22:36:37 -0800 (PST) (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 h356ab0U020982 for ; Fri, 4 Apr 2003 22:36:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356abZg020979 for perforce@freebsd.org; Fri, 4 Apr 2003 22:36:37 -0800 (PST) Date: Fri, 4 Apr 2003 22:36:37 -0800 (PST) Message-Id: <200304050636.h356abZg020979@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 28186 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, 05 Apr 2003 06:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=28186 Change 28186 by peter@peter_overcee on 2003/04/04 22:36:29 nuke opt_pmap.h remove I686 workarounds Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#12 (text+ko) ==== @@ -99,7 +99,6 @@ * and to when physical maps must be made correct. */ -#include "opt_pmap.h" #include "opt_msgbuf.h" #include "opt_kstack_pages.h" @@ -261,13 +260,6 @@ { vm_offset_t newaddr = addr; -#ifdef I686_CPU_not /* Problem seems to have gone away */ - /* Deal with un-resolved Pentium4 issues */ - if (cpu_class == CPUCLASS_686 && - strcmp(cpu_vendor, "GenuineIntel") == 0 && - (cpu_id & 0xf00) == 0xf00) - return newaddr; -#endif #ifndef DISABLE_PSE if (cpu_feature & CPUID_PSE) newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); @@ -384,15 +376,6 @@ if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif -#ifdef I686_CPU_not /* Problem seems to have gone away */ - /* Deal with un-resolved Pentium4 issues */ - if (cpu_class == CPUCLASS_686 && - strcmp(cpu_vendor, "GenuineIntel") == 0 && - (cpu_id & 0xf00) == 0xf00) { - printf("Warning: Pentium 4 cpu: PG_G disabled (global flag)\n"); - pgeflag = 0; - } -#endif /* * Initialize the 4MB page size flag @@ -408,15 +391,6 @@ if (cpu_feature & CPUID_PSE) pseflag = PG_PS; #endif -#ifdef I686_CPU_not /* Problem seems to have gone away */ - /* Deal with un-resolved Pentium4 issues */ - if (cpu_class == CPUCLASS_686 && - strcmp(cpu_vendor, "GenuineIntel") == 0 && - (cpu_id & 0xf00) == 0xf00) { - printf("Warning: Pentium 4 cpu: PG_PS disabled (4MB pages)\n"); - pseflag = 0; - } -#endif #ifndef DISABLE_PSE if (pseflag) { pd_entry_t ptditmp; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:53:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4132A37B404; Fri, 4 Apr 2003 22:53:00 -0800 (PST) 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 AE4BF37B401 for ; Fri, 4 Apr 2003 22:52:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21B1E43FAF for ; Fri, 4 Apr 2003 22:52:59 -0800 (PST) (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 h356qw0U022250 for ; Fri, 4 Apr 2003 22:52:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356qwiD022247 for perforce@freebsd.org; Fri, 4 Apr 2003 22:52:58 -0800 (PST) Date: Fri, 4 Apr 2003 22:52:58 -0800 (PST) Message-Id: <200304050652.h356qwiD022247@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 28188 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, 05 Apr 2003 06:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=28188 Change 28188 by peter@peter_overcee on 2003/04/04 22:52:14 Apply blunt force to make pmap.c compile. There's still a bit of linkage to do and some fixes to make while aiming for the lower 4G VM target. (eg: PML4pml4e -> PTDpde needs to be dealt with in pmap_is_current()) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#10 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#10 (text+ko) ==== @@ -151,9 +151,13 @@ extern pd_entry_t PDmap[]; extern pdp_entry_t PDPmap[]; extern pml4_entry_t PML4[]; +extern pdp_entry_t PDP[]; +extern pd_entry_t PTD[]; extern pd_entry_t PML4pml4e[]; -extern pd_entry_t *IdlePML4; /* physical address of "Idle" state directory */ +extern pml4_entry_t *IdlePML4; /* physical address of "Idle" state directory */ +extern pdp_entry_t *IdlePDP; /* physical address of "Idle" state directory */ +extern pd_entry_t *IdlePTD; /* physical address of "Idle" state directory */ #endif #ifdef _KERNEL @@ -209,10 +213,8 @@ u_long pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ -#ifdef PAE - pdpt_entry_t *pm_pdpt; /* KVA of page director pointer - table */ -#endif + pdp_entry_t *pm_pdp; /* KVA of level 3 page table */ + pml4_entry_t *pm_pml4; /* KVA of level 4 page table */ }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#13 (text+ko) ==== @@ -187,9 +187,8 @@ vm_offset_t kernel_vm_end; u_int32_t KERNend; /* Written in 32 bit mode */ -#ifdef PAE -static uma_zone_t pdptzone; -#endif +static uma_zone_t pdpzone; +static uma_zone_t pml4zone; /* * Data for the pv entry allocation mechanism @@ -240,11 +239,8 @@ static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); static void *pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); -#ifdef PAE -static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); -#endif - -static pd_entry_t pdir4mb; +static void *pmap_pdp_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); +static void *pmap_pml4_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); @@ -260,10 +256,6 @@ { vm_offset_t newaddr = addr; -#ifndef DISABLE_PSE - if (cpu_feature & CPUID_PSE) - newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); -#endif return newaddr; } @@ -309,10 +301,9 @@ /* * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + (u_int)IdlePTD); -#ifdef PAE - kernel_pmap->pm_pdpt = (pdpt_entry_t *) (KERNBASE + (u_int)IdlePDPT); -#endif + kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + (u_long)IdlePTD); + kernel_pmap->pm_pdp = (pdp_entry_t *) (KERNBASE + (u_long)IdlePDP); + kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + (u_long)IdlePML4); kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); @@ -372,37 +363,12 @@ PTD[i] = 0; pgeflag = 0; -#ifndef DISABLE_PG_G - if (cpu_feature & CPUID_PGE) - pgeflag = PG_G; -#endif /* * Initialize the 4MB page size flag */ pseflag = 0; -/* - * The 4MB page version of the initial - * kernel page mapping. - */ - pdir4mb = 0; -#ifndef DISABLE_PSE - if (cpu_feature & CPUID_PSE) - pseflag = PG_PS; -#endif -#ifndef DISABLE_PSE - if (pseflag) { - pd_entry_t ptditmp; - /* - * Note that we have enabled PSE mode - */ - ptditmp = *(PTmap + i386_btop(KERNBASE)); - ptditmp &= ~(NBPDR - 1); - ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; - pdir4mb = ptditmp; - } -#endif /* * Turn on PGE/PSE. */ @@ -424,28 +390,10 @@ load_cr4(rcr4() | CR4_PGE); invltlb(); /* Insurance */ } -#ifndef DISABLE_PSE - if (pseflag && (cpu_feature & CPUID_PSE)) { - load_cr4(rcr4() | CR4_PSE); - invltlb(); /* Insurance */ - } -#endif if (PCPU_GET(cpuid) == 0) { -#ifndef DISABLE_PSE - if (pdir4mb) { - kernel_pmap->pm_pdir[KPTDI] = PTD[KPTDI] = pdir4mb; - invltlb(); /* Insurance */ - } -#endif if (pgeflag) { /* Turn on PG_G for text, data, bss pages. */ va = (vm_offset_t)btext; -#ifndef DISABLE_PSE - if (pseflag && (cpu_feature & CPUID_PSE)) { - if (va < KERNBASE + (1 << PDRSHIFT)) - va = KERNBASE + (1 << PDRSHIFT); - } -#endif endva = KERNBASE + KERNend; while (va < endva) { pte = vtopte(va); @@ -470,14 +418,19 @@ return (void *)kmem_alloc(kernel_map, bytes); } -#ifdef PAE +static void * +pmap_pdp_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + *flags = UMA_SLAB_PRIV; + return (void *)kmem_alloc(kernel_map, bytes); +} + static void * -pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +pmap_pml4_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { *flags = UMA_SLAB_PRIV; - return (contigmalloc(PAGE_SIZE, NULL, 0, 0x0ULL, 0xffffffffULL, 1, 0)); + return (void *)kmem_alloc(kernel_map, bytes); } -#endif /* * Initialize the pmap module. @@ -517,11 +470,13 @@ uma_zone_set_allocf(pvzone, pmap_pv_allocf); uma_prealloc(pvzone, initial_pvs); -#ifdef PAE - pdptzone = uma_zcreate("PDPT", NPGPTD * sizeof(pdpt_entry_t), NULL, - NULL, NULL, NULL, (NPGPTD * sizeof(pdpt_entry_t)) - 1, 0); - uma_zone_set_allocf(pdptzone, pmap_pdpt_allocf); -#endif + pdpzone = uma_zcreate("PDPT", NPGPTD * sizeof(pdp_entry_t), NULL, + NULL, NULL, NULL, (NPGPTD * sizeof(pdp_entry_t)) - 1, 0); + uma_zone_set_allocf(pdpzone, pmap_pdp_allocf); + + pml4zone = uma_zcreate("PML4", sizeof(pml4_entry_t), NULL, + NULL, NULL, NULL, sizeof(pml4_entry_t) - 1, 0); + uma_zone_set_allocf(pml4zone, pmap_pml4_allocf); /* * Now it is safe to enable pv_table recording. @@ -622,7 +577,7 @@ pmap_is_current(pmap_t pmap) { return (pmap == kernel_pmap || - (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME)); + (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); } /* @@ -652,7 +607,7 @@ *PMAP1 = newpf | PG_RW | PG_V; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR1); } - return PADDR1 + (i386_btop(va) & (NPTEPG - 1)); + return PADDR1 + (x86_64_btop(va) & (NPTEPG - 1)); } return (0); } @@ -1037,7 +992,7 @@ * Do an invltlb to make the invalidated mapping * take effect immediately. */ - pteva = VM_MAXUSER_ADDRESS + i386_ptob(m->pindex); + pteva = VM_MAXUSER_ADDRESS + x86_64_ptob(m->pindex); pmap_invalidate_page(pmap, pteva); } @@ -1097,9 +1052,8 @@ { pmap->pm_pdir = (pd_entry_t *)(KERNBASE + (vm_offset_t)IdlePTD); -#ifdef PAE - pmap->pm_pdpt = (pdpt_entry_t *)(KERNBASE + (vm_offset_t)IdlePDPT); -#endif + pmap->pm_pdp = (pdp_entry_t *)(KERNBASE + (vm_offset_t)IdlePDP); + pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + (vm_offset_t)IdlePML4); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1127,14 +1081,10 @@ if (pmap->pm_pdir == NULL) { pmap->pm_pdir = (pd_entry_t *)kmem_alloc_pageable(kernel_map, NBPTD); -#ifdef PAE - pmap->pm_pdpt = uma_zalloc(pdptzone, M_WAITOK | M_ZERO); - KASSERT(((vm_offset_t)pmap->pm_pdpt & - ((NPGPTD * sizeof(pdpt_entry_t)) - 1)) == 0, - ("pmap_pinit: pdpt misaligned")); - KASSERT(pmap_kextract((vm_offset_t)pmap->pm_pdpt) < (4ULL<<30), - ("pmap_pinit: pdpt above 4g")); -#endif + pmap->pm_pdp = (pdp_entry_t *)kmem_alloc_pageable(kernel_map, + PAGE_SIZE); + pmap->pm_pml4 = (pml4_entry_t *)kmem_alloc_pageable(kernel_map, + PAGE_SIZE); } /* @@ -1175,7 +1125,7 @@ pa = VM_PAGE_TO_PHYS(ptdpg[i]); pmap->pm_pdir[PTDPTDI + i] = pa | PG_V | PG_RW | PG_A | PG_M; #ifdef PAE - pmap->pm_pdpt[i] = pa | PG_V; + pmap->pm_pdp[i] = pa | PG_V; #endif } @@ -1242,7 +1192,7 @@ */ if ((m->flags & PG_ZERO) == 0) { if (pmap_is_current(pmap)) { - pteva = VM_MAXUSER_ADDRESS + i386_ptob(ptepindex); + pteva = VM_MAXUSER_ADDRESS + x86_64_ptob(ptepindex); bzero((caddr_t) pteva, PAGE_SIZE); } else { pmap_zero_page(m); @@ -1347,7 +1297,7 @@ for (i = 0; i < NPGPTD; i++) { m = TAILQ_FIRST(&object->memq); #ifdef PAE - KASSERT(VM_PAGE_TO_PHYS(m) == (pmap->pm_pdpt[i] & PG_FRAME), + KASSERT(VM_PAGE_TO_PHYS(m) == (pmap->pm_pdp[i] & PG_FRAME), ("pmap_release: got wrong ptd page")); #endif m->wire_count--; @@ -2203,7 +2153,7 @@ return; } - psize = i386_btop(size); + psize = x86_64_btop(size); if ((object->type != OBJT_VNODE) || ((limit & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) && @@ -2251,7 +2201,7 @@ vm_page_busy(p); vm_page_unlock_queues(); mpte = pmap_enter_quick(pmap, - addr + i386_ptob(tmpidx), p, mpte); + addr + x86_64_ptob(tmpidx), p, mpte); vm_page_lock_queues(); vm_page_wakeup(p); } @@ -2506,7 +2456,7 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; - invlpg((u_int)CADDR2); + invlpg((u_long)CADDR2); pagezero(CADDR2); *CMAP2 = 0; mtx_unlock(&CMAPCADDR12_lock); @@ -2526,7 +2476,7 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; - invlpg((u_int)CADDR2); + invlpg((u_long)CADDR2); if (off == 0 && size == PAGE_SIZE) pagezero(CADDR2); else @@ -2548,7 +2498,7 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); *CMAP3 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; - invlpg((u_int)CADDR3); + invlpg((u_long)CADDR3); pagezero(CADDR3); *CMAP3 = 0; } @@ -2570,8 +2520,8 @@ panic("pmap_copy_page: CMAP2 busy"); *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; - invlpg((u_int)CADDR1); - invlpg((u_int)CADDR2); + invlpg((u_long)CADDR1); + invlpg((u_long)CADDR2); bcopy(CADDR1, CADDR2, PAGE_SIZE); *CMAP1 = 0; *CMAP2 = 0; @@ -3052,16 +3002,12 @@ { struct proc *p = td->td_proc; pmap_t pmap; - u_int32_t cr3; + u_int64_t cr3; critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); pmap->pm_active |= PCPU_GET(cpumask); -#ifdef PAE - cr3 = vtophys(pmap->pm_pdpt); -#else - cr3 = vtophys(pmap->pm_pdir); -#endif + cr3 = vtophys(pmap->pm_pml4); /* XXXKSE this is wrong. * pmap_activate is for the current thread on the current cpu */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 23:03:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2F5937B404; Fri, 4 Apr 2003 23:03:12 -0800 (PST) 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 65B4037B401 for ; Fri, 4 Apr 2003 23:03:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11B8543F3F for ; Fri, 4 Apr 2003 23:03:12 -0800 (PST) (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 h3573B0U023928 for ; Fri, 4 Apr 2003 23:03:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3573BiU023925 for perforce@freebsd.org; Fri, 4 Apr 2003 23:03:11 -0800 (PST) Date: Fri, 4 Apr 2003 23:03:11 -0800 (PST) Message-Id: <200304050703.h3573BiU023925@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 28189 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, 05 Apr 2003 07:03:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=28189 Change 28189 by peter@peter_overcee on 2003/04/04 23:02:12 Hook up level 3 and level 4 page directory glue (stolen from Jake's PAE diffs) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#23 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#23 (text+ko) ==== @@ -298,9 +298,10 @@ movl %esi,R(KPTphys) /* Allocate Page Table Directory */ - /* XXX only need 32 bytes (easier for now) */ ALLOCPAGES(1) movl %esi,R(IdlePML4) + ALLOCPAGES(1) + movl %esi,R(IdlePDP) ALLOCPAGES(NPGPTD) movl %esi,R(IdlePTD) @@ -338,6 +339,10 @@ movl $1, %ecx fillkptphys($PG_RW) + movl R(IdlePDP), %eax + movl $1, %ecx + fillkptphys($PG_RW) + movl R(IdlePTD), %eax movl $NPGPTD, %ecx fillkptphys($PG_RW) @@ -378,6 +383,11 @@ movl R(IdlePTD), %eax xorl %ebx, %ebx movl $NPGPTD, %ecx + fillkpt(R(IdlePDP), $0x0) + + movl R(IdlePDP), %eax + xorl %ebx, %ebx + movl $1, %ecx fillkpt(R(IdlePML4), $0x0) ret From owner-p4-projects@FreeBSD.ORG Sat Apr 5 00:50:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0794337B404; Sat, 5 Apr 2003 00:50:27 -0800 (PST) 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 97EAD37B401 for ; Sat, 5 Apr 2003 00:50:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA8BF43F3F for ; Sat, 5 Apr 2003 00:50:25 -0800 (PST) (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 h358oP0U037540 for ; Sat, 5 Apr 2003 00:50:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h358oPCC037534 for perforce@freebsd.org; Sat, 5 Apr 2003 00:50:25 -0800 (PST) Date: Sat, 5 Apr 2003 00:50:25 -0800 (PST) Message-Id: <200304050850.h358oPCC037534@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 28196 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, 05 Apr 2003 08:50:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=28196 Change 28196 by peter@peter_overcee on 2003/04/05 00:50:22 More hack-n-slash to get more things to compile. Wimp out on the XMM fpu regs stuff though. procfs is the last thing I'm worried about right now. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/reg.h#5 edit .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#36 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#19 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/reg.h#5 (text+ko) ==== @@ -85,19 +85,19 @@ unsigned int r_fs; unsigned int r_es; unsigned int r_ds; - unsigned int r_edi; - unsigned int r_esi; - unsigned int r_ebp; - unsigned int r_ebx; - unsigned int r_edx; - unsigned int r_ecx; - unsigned int r_eax; + unsigned int r_rdi; + unsigned int r_rsi; + unsigned int r_rbp; + unsigned int r_rbx; + unsigned int r_rdx; + unsigned int r_rcx; + unsigned int r_rax; unsigned int r_trapno; unsigned int r_err; - unsigned int r_eip; + unsigned int r_rip; unsigned int r_cs; - unsigned int r_eflags; - unsigned int r_esp; + unsigned int r_rflags; + unsigned int r_rsp; unsigned int r_ss; unsigned int r_gs; }; @@ -111,30 +111,15 @@ * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long fpr_env[7]; - unsigned char fpr_acc[8][10]; - unsigned long fpr_ex_sw; - unsigned char fpr_pad[64]; + unsigned long fpr_env[4]; + unsigned char fpr_acc[8][16]; + unsigned char fpr_xacc[16][16]; }; -/* - * Register set accessible via /proc/$pid/dbregs. - */ struct dbreg { - unsigned int dr[8]; /* debug registers */ - /* Index 0-3: debug address registers */ - /* Index 4-5: reserved */ - /* Index 6: debug status */ - /* Index 7: debug control */ + unsigned long grrr; }; -#define DBREG_DR7_EXEC 0x00 /* break on execute */ -#define DBREG_DR7_WRONLY 0x01 /* break on write */ -#define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr7 by - register number */ - - #ifdef _KERNEL /* * XXX these interfaces are MI, so they should be declared in a MI place. ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#8 (text+ko) ==== @@ -37,41 +37,40 @@ * sigcontext. So that we can support sigcontext * and ucontext_t at the same time. */ - int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; /* machine state (struct trapframe) */ - int mc_fs; - int mc_es; - int mc_ds; - int mc_edi; - int mc_esi; - int mc_ebp; - int mc_ebx; - int mc_edx; - int mc_ecx; - int mc_eax; - int mc_trapno; - int mc_err; - int mc_eip; - int mc_cs; - int mc_eflags; - int mc_esp; - int mc_ss; + long mc_onstack; /* XXX - sigcontext compat. */ + long mc_gs; /* machine state (struct trapframe) */ + long mc_fs; + long mc_es; + long mc_ds; + long mc_rdi; + long mc_rsi; + long mc_rbp; + long mc_rbx; + long mc_rdx; + long mc_rcx; + long mc_rax; + long mc_trapno; + long mc_err; + long mc_rip; + long mc_cs; + long mc_rflags; + long mc_rsp; + long mc_ss; - int mc_len; /* sizeof(mcontext_t) */ + long mc_len; /* sizeof(mcontext_t) */ #define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */ -#define _MC_FPFMT_387 0x10001 #define _MC_FPFMT_XMM 0x10002 - int mc_fpformat; + long mc_fpformat; #define _MC_FPOWNED_NONE 0x20000 /* FP state not used */ #define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */ #define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */ - int mc_ownedfp; - int mc_spare1[1]; /* align next field to 16 bytes */ + long mc_ownedfp; + long mc_spare1[1]; /* align next field to 16 bytes */ /* * See for the internals of mc_fpstate[]. */ - int mc_fpstate[128] __aligned(16); - int mc_spare2[8]; + long mc_fpstate[128] __aligned(16); + long mc_spare2[8]; } mcontext_t; #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#12 (text+ko) ==== @@ -166,9 +166,11 @@ jmp doreti /* - * SYSCALL CALL GATE (old entry point for a.out binaries) + * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80) * - * The intersegment call has been set up to specify one dummy parameter. + * Even though the name says 'int0x80', this is actually a TGT (trap gate) + * rather then an IGT (interrupt gate). Thus interrupts are enabled on + * entry just as they are for a normal syscall. * * This leaves a place to put eflags so that the call frame can be * converted to a trap frame. Note that the eflags is (semi-)bogusly @@ -178,48 +180,6 @@ * and clobber the saved cs/eip. */ SUPERALIGN_TEXT -IDTVEC(lcall_syscall) - pushfq /* save eflags */ - popq 16(%rsp) /* shuffle into tf_eflags */ - pushq $7 /* sizeof "lcall 7,0" */ - subq $8,%rsp /* skip over tf_trapno */ - pushq %rax - pushq %rcx - pushq %rdx - pushq %rbx - pushq %rbp - pushq %rsi - pushq %rdi - pushq %r8 - pushq %r9 - pushq %r10 - pushq %r11 - pushq %r12 - pushq %r13 - pushq %r14 - pushq %r15 - pushq %ds - pushq %ds - pushq %es - pushq %fs - mov $KDSEL,%ax /* switch to kernel segments */ - mov %ax,%ds - mov %ax,%es - mov $KPSEL,%ax - mov %ax,%fs - FAKE_MCOUNT(13*4(%rsp)) - call syscall - MEXITCOUNT - jmp doreti - -/* - * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80) - * - * Even though the name says 'int0x80', this is actually a TGT (trap gate) - * rather then an IGT (interrupt gate). Thus interrupts are enabled on - * entry just as they are for a normal syscall. - */ - SUPERALIGN_TEXT IDTVEC(int0x80_syscall) pushq $2 /* sizeof "int 0x80" */ subq $8,%rsp /* skip over tf_trapno */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#36 (text+ko) ==== @@ -125,8 +125,6 @@ static void fpstate_drop(struct thread *td); static void get_fpcontext(struct thread *td, mcontext_t *mcp); static int set_fpcontext(struct thread *td, const mcontext_t *mcp); -static void set_fpregs_xmm(struct save87 *, struct savexmm *); -static void fill_fpregs_xmm(struct savexmm *, struct save87 *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) int _udatasel, _ucodesel; @@ -134,7 +132,9 @@ /* These are written in 32 bit mode */ u_int32_t modulep; /* phys addr of metadata table */ -u_int32_t IdlePTD; /* phys addr of kernel PTD */ +pd_entry_t *IdlePTD; /* phys addr of kernel PTD */ +pdp_entry_t *IdlePDP; /* phys addr of kernel level 3 */ +pml4_entry_t *IdlePML4; /* phys addr of kernel level 4 */ struct user *proc0uarea; /* address of proc 0 uarea space */ vm_offset_t proc0kstack; /* address of proc 0 kstack space */ @@ -234,7 +234,7 @@ PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; regs = td->td_frame; - oonstack = sigonstack(regs->tf_esp); + oonstack = sigonstack(regs->tf_rsp); /* Save user context. */ bzero(&sf, sizeof(sf)); @@ -258,9 +258,9 @@ p->p_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sp = (char *)regs->tf_esp - sizeof(struct sigframe); + sp = (char *)regs->tf_rsp - sizeof(struct sigframe); /* Align to 16 bytes. */ - sfp = (struct sigframe *)((unsigned int)sp & ~0xF); + sfp = (struct sigframe *)((unsigned long)sp & ~0xF); PROC_UNLOCK(p); /* Translate the signal if appropriate. */ @@ -299,9 +299,9 @@ sigexit(td, SIGILL); } - regs->tf_esp = (int)sfp; - regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~PSL_T; + regs->tf_rsp = (long)sfp; + regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); + regs->tf_rflags &= ~PSL_T; regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -332,29 +332,30 @@ struct proc *p = td->td_proc; struct trapframe *regs; const ucontext_t *ucp; - int cs, eflags, error, ret; + long rflags; + int cs, error, ret; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) return (error); ucp = &uc; regs = td->td_frame; - eflags = ucp->uc_mcontext.mc_eflags; + rflags = ucp->uc_mcontext.mc_rflags; /* * Don't allow users to change privileged or reserved flags. */ /* * XXX do allow users to change the privileged flag PSL_RF. - * The cpu sets PSL_RF in tf_eflags for faults. Debuggers - * should sometimes set it there too. tf_eflags is kept in + * The cpu sets PSL_RF in tf_rflags for faults. Debuggers + * should sometimes set it there too. tf_rflags is kept in * the signal context during signal handling and there is no * other place to remember it, so the PSL_RF bit may be * corrupted by the signal handler without us knowing. * Corruption of the PSL_RF bit at worst causes one more or * one less debugger trap, so allowing it is fairly harmless. */ - if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) { - printf("sigreturn: eflags = 0x%x\n", eflags); + if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { + printf("sigreturn: rflags = 0x%x\n", rflags); return (EINVAL); } @@ -366,7 +367,7 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("sigreturn: cs = 0x%x\n", cs); - trapsignal(p, SIGBUS, T_PROTFLT); + trapsignal(td, SIGBUS, T_PROTFLT); return (EINVAL); } @@ -473,27 +474,15 @@ load_gs(_udatasel); bzero((char *)regs, sizeof(struct trapframe)); - regs->tf_eip = entry; - regs->tf_esp = stack; - regs->tf_eflags = PSL_USER | (regs->tf_eflags & PSL_T); + regs->tf_rip = entry; + regs->tf_rsp = stack; + regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T); regs->tf_ss = _udatasel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; regs->tf_fs = _udatasel; regs->tf_cs = _ucodesel; - /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ - regs->tf_ebx = ps_strings; - - /* - * Initialize the math emulator (if any) for the current process. - * Actually, just clear the bit that says that the emulator has - * been initialized. Initialization is delayed until the process - * traps to the emulator (if it is done at all) mainly because - * emulators don't provide an entry point for initialization. - */ - td->td_pcb->pcb_flags &= ~FP_SOFTFP; - /* * Arrange to trap the next npx or `fwait' instruction (see npx.c * for why fwait must be trapped at least if there is an npx or an @@ -518,13 +507,6 @@ * soon. */ fpstate_drop(td); - - /* - * XXX - Linux emulator - * Make sure sure edx is 0x0 on entry. Linux binaries depend - * on it. - */ - td->td_retval[1] = 0; } void @@ -568,11 +550,9 @@ * Initialize segments & interrupt table */ -int _default_ldt; union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ int private_tss; /* flag indicating private tss */ @@ -620,25 +600,7 @@ 0, 0, 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, -/* GLDT_SEL 4 LDT Descriptor */ -{ (int) ldt, /* segment base address */ - sizeof(ldt)-1, /* length - all address space */ - SDT_SYSLDT, /* segment type */ - SEL_UPL, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 0, 0, - 0, /* unused - default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, -/* GUSERLDT_SEL 5 User LDT Descriptor per process */ -{ (int) ldt, /* segment base address */ - (512 * sizeof(union descriptor)-1), /* length */ - SDT_SYSLDT, /* segment type */ - 0, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 0, 0, - 0, /* unused - default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, -/* GPANIC_SEL 6 Panic Tss Descriptor */ +/* GPANIC_SEL 4 Panic Tss Descriptor */ { (int) &dblfault_tss, /* segment base address */ sizeof(struct i386tss)-1,/* length - all address space */ SDT_SYSTSS, /* segment type */ @@ -649,63 +611,6 @@ 0 /* limit granularity (byte/page units)*/ }, }; -static struct soft_segment_descriptor ldt_segs[] = { - /* Null Descriptor - overwritten by call gate */ -{ 0x0, /* segment base address */ - 0x0, /* length - all address space */ - 0, /* segment type */ - 0, /* segment descriptor priority level */ - 0, /* segment descriptor present */ - 0, 0, - 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, - /* Null Descriptor - overwritten by call gate */ -{ 0x0, /* segment base address */ - 0x0, /* length - all address space */ - 0, /* segment type */ - 0, /* segment descriptor priority level */ - 0, /* segment descriptor present */ - 0, 0, - 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, - /* Null Descriptor - overwritten by call gate */ -{ 0x0, /* segment base address */ - 0x0, /* length - all address space */ - 0, /* segment type */ - 0, /* segment descriptor priority level */ - 0, /* segment descriptor present */ - 0, 0, - 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, - /* Code Descriptor for user */ -{ 0x0, /* segment base address */ - 0xfffff, /* length - all address space */ - SDT_MEMERA, /* segment type */ - SEL_UPL, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 0, 0, - 1, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, - /* Null Descriptor - overwritten by call gate */ -{ 0x0, /* segment base address */ - 0x0, /* length - all address space */ - 0, /* segment type */ - 0, /* segment descriptor priority level */ - 0, /* segment descriptor present */ - 0, 0, - 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, - /* Data Descriptor for user */ -{ 0x0, /* segment base address */ - 0xfffff, /* length - all address space */ - SDT_MEMRWA, /* segment type */ - SEL_UPL, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 0, 0, - 1, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, -}; - void setidt(idx, func, typ, dpl, selec) int idx; @@ -734,7 +639,7 @@ IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), IDTVEC(tss), IDTVEC(missing), IDTVEC(stk), IDTVEC(prot), IDTVEC(page), IDTVEC(mchk), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align), - IDTVEC(xmm), IDTVEC(lcall_syscall), IDTVEC(int0x80_syscall); + IDTVEC(xmm), IDTVEC(int0x80_syscall); void sdtossd(sd, ssd) @@ -820,14 +725,6 @@ if (smap->length == 0) goto next_run; -#ifndef PAE - if (smap->base >= 0xffffffff) { - printf("%uK of memory above 4GB ignored\n", - (u_int)(smap->length / 1024)); - goto next_run; - } -#endif - for (i = 0; i <= physmap_idx; i += 2) { if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) @@ -851,7 +748,8 @@ physmap[physmap_idx] = smap->base; physmap[physmap_idx + 1] = smap->base + smap->length; next_run: ; - } #error "while not end of smap table from loader" + } while (1 /* XXX more to go */); +#error "while not end of smap table from loader" /* * Perform "base memory" related probes & setup based on SMAP @@ -885,7 +783,7 @@ /* * If we failed above, try memory map with INT 15:E801 */ -#error get smap from loader +#error "get smap from loader" else { /* * Prefer the RTC value for extended memory. @@ -1090,7 +988,6 @@ init386(first) int first; { - struct gate_descriptor *gdp; caddr_t kmdp; int gsel_tss, off, x; struct region_descriptor r_gdt, r_idt; @@ -1154,20 +1051,6 @@ mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); - /* make ldt memory segments */ - /* - * XXX - VM_MAXUSER_ADDRESS is an end address, not a max. And it - * should be spelled ...MAX_USER... - */ - ldt_segs[LUCODE_SEL].ssd_limit = atop(VM_MAXUSER_ADDRESS - 1); - ldt_segs[LUDATA_SEL].ssd_limit = atop(VM_MAXUSER_ADDRESS - 1); - for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) - ssdtosd(&ldt_segs[x], &ldt[x].sd); - - _default_ldt = GSEL(GLDT_SEL, SEL_KPL); - lldt(_default_ldt); - PCPU_SET(currentldt, _default_ldt); - /* exceptions */ for (x = 0; x < NIDT; x++) setidt(x, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, @@ -1261,11 +1144,10 @@ dblfault_tss.tss_cr3 = (int)IdlePTD; #endif dblfault_tss.tss_eip = (int)dblfault_handler; - dblfault_tss.tss_eflags = PSL_KERNEL; + dblfault_tss.tss_rflags = PSL_KERNEL; dblfault_tss.tss_ds = dblfault_tss.tss_es = dblfault_tss.tss_fs = dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); - dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); getmemsize(first); init_param2(physmem); @@ -1278,27 +1160,6 @@ msgbufinit(msgbufp, MSGBUF_SIZE); - /* make a call gate to reenter kernel with */ - gdp = &ldt[LSYS5CALLS_SEL].gd; - - x = (int) &IDTVEC(lcall_syscall); - gdp->gd_looffset = x; - gdp->gd_selector = GSEL(GCODE_SEL,SEL_KPL); - gdp->gd_stkcpy = 1; - gdp->gd_type = SDT_SYS386CGT; - gdp->gd_dpl = SEL_UPL; - gdp->gd_p = 1; - gdp->gd_hioffset = x >> 16; - - /* XXX does this work? */ - ldt[LBSDICALLS_SEL] = ldt[LSYS5CALLS_SEL]; - ldt[LSOL26CALLS_SEL] = ldt[LSYS5CALLS_SEL]; - - /* transfer to user mode */ - - _ucodesel = LSEL(LUCODE_SEL, SEL_UPL); - _udatasel = LSEL(LUDATA_SEL, SEL_UPL); - /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ #ifdef PAE @@ -1317,14 +1178,14 @@ int ptrace_set_pc(struct thread *td, unsigned long addr) { - td->td_frame->tf_eip = addr; + td->td_frame->tf_rip = addr; return (0); } int ptrace_single_step(struct thread *td) { - td->td_frame->tf_eflags |= PSL_T; + td->td_frame->tf_rflags |= PSL_T; return (0); } @@ -1338,17 +1199,17 @@ regs->r_fs = tp->tf_fs; regs->r_es = tp->tf_es; regs->r_ds = tp->tf_ds; - regs->r_edi = tp->tf_edi; - regs->r_esi = tp->tf_esi; - regs->r_ebp = tp->tf_ebp; - regs->r_ebx = tp->tf_ebx; - regs->r_edx = tp->tf_edx; - regs->r_ecx = tp->tf_ecx; - regs->r_eax = tp->tf_eax; - regs->r_eip = tp->tf_eip; + regs->r_rdi = tp->tf_rdi; + regs->r_rsi = tp->tf_rsi; + regs->r_rbp = tp->tf_rbp; + regs->r_rbx = tp->tf_rbx; + regs->r_rdx = tp->tf_rdx; + regs->r_rcx = tp->tf_rcx; + regs->r_rax = tp->tf_rax; + regs->r_rip = tp->tf_rip; regs->r_cs = tp->tf_cs; - regs->r_eflags = tp->tf_eflags; - regs->r_esp = tp->tf_esp; + regs->r_rflags = tp->tf_rflags; + regs->r_rsp = tp->tf_rsp; regs->r_ss = tp->tf_ss; pcb = td->td_pcb; regs->r_gs = pcb->pcb_gs; @@ -1362,23 +1223,23 @@ struct trapframe *tp; tp = td->td_frame; - if (!EFL_SECURE(regs->r_eflags, tp->tf_eflags) || + if (!EFL_SECURE(regs->r_rflags, tp->tf_rflags) || !CS_SECURE(regs->r_cs)) return (EINVAL); tp->tf_fs = regs->r_fs; tp->tf_es = regs->r_es; tp->tf_ds = regs->r_ds; - tp->tf_edi = regs->r_edi; - tp->tf_esi = regs->r_esi; - tp->tf_ebp = regs->r_ebp; - tp->tf_ebx = regs->r_ebx; - tp->tf_edx = regs->r_edx; - tp->tf_ecx = regs->r_ecx; - tp->tf_eax = regs->r_eax; - tp->tf_eip = regs->r_eip; + tp->tf_rdi = regs->r_rdi; + tp->tf_rsi = regs->r_rsi; + tp->tf_rbp = regs->r_rbp; + tp->tf_rbx = regs->r_rbx; + tp->tf_rdx = regs->r_rdx; + tp->tf_rcx = regs->r_rcx; + tp->tf_rax = regs->r_rax; + tp->tf_rip = regs->r_rip; tp->tf_cs = regs->r_cs; - tp->tf_eflags = regs->r_eflags; - tp->tf_esp = regs->r_esp; + tp->tf_rflags = regs->r_rflags; + tp->tf_rsp = regs->r_rsp; tp->tf_ss = regs->r_ss; pcb = td->td_pcb; pcb->pcb_gs = regs->r_gs; @@ -1386,15 +1247,15 @@ } static void -fill_fpregs_xmm(sv_xmm, sv_87) - struct savexmm *sv_xmm; - struct save87 *sv_87; +fill_fpregs_xmm(struct savefpu *sv_xmm, struct fpreg *fpregs) { - register struct env87 *penv_87 = &sv_87->sv_env; +#if 0 + register struct env87 *penv_87 = &fpregs->sv_env; register struct envxmm *penv_xmm = &sv_xmm->sv_env; int i; - bzero(sv_87, sizeof(*sv_87)); + /* pcb -> fpregs */ + bzero(fpregs, sizeof(*fpregs)); /* FPU control/status */ penv_87->en_cw = penv_xmm->en_cw; @@ -1409,17 +1270,19 @@ /* FPU registers */ for (i = 0; i < 8; ++i) sv_87->sv_ac[i] = sv_xmm->sv_fp[i].fp_acc; +#endif + printf("implement fill_fpregs_xmm\n"); } static void -set_fpregs_xmm(sv_87, sv_xmm) - struct save87 *sv_87; - struct savexmm *sv_xmm; +set_fpregs_xmm(struct fpreg *fpregs, struct savefpu *sv_xmm) { - register struct env87 *penv_87 = &sv_87->sv_env; +#if 0 + register struct env87 *penv_87 = &fpregs->sv_env; register struct envxmm *penv_xmm = &sv_xmm->sv_env; int i; + /* fpregs -> pcb */ /* FPU control/status */ penv_xmm->en_cw = penv_87->en_cw; penv_xmm->en_sw = penv_87->en_sw; @@ -1433,13 +1296,15 @@ /* FPU registers */ for (i = 0; i < 8; ++i) sv_xmm->sv_fp[i].fp_acc = sv_87->sv_ac[i]; +#endif + printf("implement set_fpregs_xmm\n"); } int fill_fpregs(struct thread *td, struct fpreg *fpregs) { - fill_fpregs_xmm(&td->td_pcb->pcb_save.sv_xmm, (struct save87 *)fpregs); + fill_fpregs_xmm(&td->td_pcb->pcb_save, fpregs); return (0); } @@ -1447,7 +1312,7 @@ set_fpregs(struct thread *td, struct fpreg *fpregs) { - set_fpregs_xmm((struct save87 *)fpregs, &td->td_pcb->pcb_save.sv_xmm); + set_fpregs_xmm(fpregs, &td->td_pcb->pcb_save); return (0); } @@ -1461,22 +1326,22 @@ tp = td->td_frame; - mcp->mc_onstack = sigonstack(tp->tf_esp); + mcp->mc_onstack = sigonstack(tp->tf_rsp); mcp->mc_gs = td->td_pcb->pcb_gs; mcp->mc_fs = tp->tf_fs; mcp->mc_es = tp->tf_es; mcp->mc_ds = tp->tf_ds; - mcp->mc_edi = tp->tf_edi; - mcp->mc_esi = tp->tf_esi; - mcp->mc_ebp = tp->tf_ebp; - mcp->mc_ebx = tp->tf_ebx; - mcp->mc_edx = tp->tf_edx; - mcp->mc_ecx = tp->tf_ecx; - mcp->mc_eax = tp->tf_eax; - mcp->mc_eip = tp->tf_eip; + mcp->mc_rdi = tp->tf_rdi; + mcp->mc_rsi = tp->tf_rsi; + mcp->mc_rbp = tp->tf_rbp; + mcp->mc_rbx = tp->tf_rbx; + mcp->mc_rdx = tp->tf_rdx; + mcp->mc_rcx = tp->tf_rcx; + mcp->mc_rax = tp->tf_rax; + mcp->mc_rip = tp->tf_rip; mcp->mc_cs = tp->tf_cs; - mcp->mc_eflags = tp->tf_eflags; - mcp->mc_esp = tp->tf_esp; + mcp->mc_rflags = tp->tf_rflags; + mcp->mc_rsp = tp->tf_rsp; mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); get_fpcontext(td, mcp); @@ -1493,27 +1358,28 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tp; - int eflags, ret; + long rflags; + int ret; tp = td->td_frame; if (mcp->mc_len != sizeof(*mcp)) return (EINVAL); - eflags = (mcp->mc_eflags & PSL_USERCHANGE) | - (tp->tf_eflags & ~PSL_USERCHANGE); + rflags = (mcp->mc_rflags & PSL_USERCHANGE) | + (tp->tf_rflags & ~PSL_USERCHANGE); if ((ret = set_fpcontext(td, mcp)) == 0) { tp->tf_fs = mcp->mc_fs; tp->tf_es = mcp->mc_es; tp->tf_ds = mcp->mc_ds; - tp->tf_edi = mcp->mc_edi; - tp->tf_esi = mcp->mc_esi; - tp->tf_ebp = mcp->mc_ebp; - tp->tf_ebx = mcp->mc_ebx; - tp->tf_edx = mcp->mc_edx; - tp->tf_ecx = mcp->mc_ecx; - tp->tf_eax = mcp->mc_eax; - tp->tf_eip = mcp->mc_eip; - tp->tf_eflags = eflags; - tp->tf_esp = mcp->mc_esp; + tp->tf_rdi = mcp->mc_rdi; + tp->tf_rsi = mcp->mc_rsi; + tp->tf_rbp = mcp->mc_rbp; + tp->tf_rbx = mcp->mc_rbx; + tp->tf_rdx = mcp->mc_rdx; + tp->tf_rcx = mcp->mc_rcx; + tp->tf_rax = mcp->mc_rax; + tp->tf_rip = mcp->mc_rip; + tp->tf_rflags = rflags; + tp->tf_rsp = mcp->mc_rsp; tp->tf_ss = mcp->mc_ss; td->td_pcb->pcb_gs = mcp->mc_gs; ret = 0; ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#19 (text+ko) ==== @@ -95,8 +95,6 @@ static void trap_fatal(struct trapframe *, vm_offset_t); void dblfault_handler(void); -extern inthand_t IDTVEC(lcall_syscall); - #define MAX_TRAP_MSG 28 static char *trap_msg[] = { "", /* 0 unused */ @@ -437,23 +435,6 @@ break; case T_TRCTRAP: /* trace trap */ - if (frame.tf_rip == (long)IDTVEC(lcall_syscall)) { - /* - * We've just entered system mode via the - * syscall lcall. Continue single stepping - * silently until the syscall handler has - * saved the flags. - */ - goto out; - } - if (frame.tf_rip == (long)IDTVEC(lcall_syscall) + 1) { - /* - * The syscall handler has now saved the - * flags. Stop single stepping it. - */ - frame.tf_rflags &= ~PSL_T; - goto out; - } /* * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:57:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B8DE37B404; Sat, 5 Apr 2003 01:57:52 -0800 (PST) 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 0E47737B401 for ; Sat, 5 Apr 2003 01:57:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F38D843FA3 for ; Sat, 5 Apr 2003 01:57:50 -0800 (PST) (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 h359vo0U043267 for ; Sat, 5 Apr 2003 01:57:50 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h359vo8Z043264 for perforce@freebsd.org; Sat, 5 Apr 2003 01:57:50 -0800 (PST) Date: Sat, 5 Apr 2003 01:57:50 -0800 (PST) Message-Id: <200304050957.h359vo8Z043264@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 28202 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, 05 Apr 2003 09:57:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=28202 Change 28202 by peter@peter_overcee on 2003/04/05 01:57:16 get machdep.c and trap.c to compile.. Worry about 'work' later. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#12 edit .. //depot/projects/hammer/sys/x86_64/include/tss.h#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#37 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#20 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#12 (text+ko) ==== @@ -72,7 +72,7 @@ u_int64_t sd_p:1; /* segment descriptor present */ u_int64_t sd_hilimit:4; /* segment extent (msb) */ u_int64_t sd_xx:1; /* unused */ - u_int64_t sd_l:2; /* long mode (cs only) */ + u_int64_t sd_long:1; /* long mode (cs only) */ u_int64_t sd_def32:1; /* default 32 vs 16 bit size */ u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/ u_int64_t sd_hibase:8; /* segment base address (msb) */ @@ -108,10 +108,8 @@ u_int64_t gd_type:5; /* segment type */ u_int64_t gd_dpl:2; /* segment descriptor priority level */ u_int64_t gd_p:1; /* segment descriptor present */ - u_int64_t gd_hioffset:38; /* gate offset (msb) */ - u_int64_t sd_xx1:8; - u_int64_t sd_mbz:5; /* MUST be zero */ - u_int64_t sd_xx2:19; + u_int64_t gd_hioffset:48; /* gate offset (msb) */ + u_int64_t sd_xx1:32; }; /* system segments and gate types */ @@ -147,24 +145,23 @@ * when needed to be used by the 386 hardware */ -struct soft_segment_descriptor32 { - unsigned ssd_base; /* segment base address */ - unsigned ssd_limit; /* segment extent */ - unsigned ssd_type:5; /* segment type */ - unsigned ssd_dpl:2; /* segment descriptor priority level */ - unsigned ssd_p:1; /* segment descriptor present */ - unsigned ssd_xx:4; /* unused */ - unsigned ssd_xx1:2; /* unused */ - unsigned ssd_def32:1; /* default 32 vs 16 bit size */ - unsigned ssd_gran:1; /* limit granularity (byte/page units)*/ +struct soft_segment_descriptor { + unsigned long ssd_base; /* segment base address */ + unsigned long ssd_limit; /* segment extent */ + unsigned long ssd_type:5; /* segment type */ + unsigned long ssd_dpl:2; /* segment descriptor priority level */ + unsigned long ssd_p:1; /* segment descriptor present */ + unsigned long ssd_long:1; /* long mode (for %cs) */ + unsigned long ssd_def32:1; /* default 32 vs 16 bit size */ + unsigned long ssd_gran:1; /* limit granularity (byte/page units)*/ }; /* * region descriptors, used to load gdt/idt tables before segments yet exist. */ struct region_descriptor { - unsigned rd_limit:16; /* segment extent */ - unsigned rd_base:32 __packed; /* base address */ + unsigned long rd_limit:16; /* segment extent */ + unsigned long rd_base:64 __packed; /* base address */ }; /* @@ -180,39 +177,21 @@ #define GCODE_SEL 1 /* Kernel Code Descriptor */ #define GDATA_SEL 2 /* Kernel Data Descriptor */ #define GPROC0_SEL 3 /* Task state process slot zero and up */ -#define GLDT_SEL 4 /* LDT - eventually one per process */ -#define GUSERLDT_SEL 5 /* User LDT */ -#define GPANIC_SEL 6 /* Task state to consider panic from */ -#define NGDT 7 +/* slot 4 is second half of GPROC0_SEL */ +#define NGDT 5 -/* - * Entries in the Local Descriptor Table (LDT) - */ -#define LSYS5CALLS_SEL 0 /* forced by intel BCS */ -#define LSYS5SIGR_SEL 1 -#define L43BSDCALLS_SEL 2 /* notyet */ -#define LUCODE_SEL 3 -#define LSOL26CALLS_SEL 4 /* Solaris >= 2.6 system call gate */ -#define LUDATA_SEL 5 -/* separate stack, es,fs,gs sels ? */ -/* #define LPOSIXCALLS_SEL 5*/ /* notyet */ -#define LBSDICALLS_SEL 16 /* BSDI system call gate */ -#define NLDT (LBSDICALLS_SEL + 1) - #ifdef _KERNEL -extern int _default_ldt; -extern union descriptor gdt[]; +extern struct user_segment_descriptor gdt[]; extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; -extern union descriptor ldt[NLDT]; void lgdt(struct region_descriptor *rdp); -#if 0 -void sdtossd(struct segment_descriptor *sdp, +void sdtossd(struct user_segment_descriptor *sdp, struct soft_segment_descriptor *ssdp); void ssdtosd(struct soft_segment_descriptor *ssdp, - struct segment_descriptor *sdp); -#endif + struct user_segment_descriptor *sdp); +void ssdtosyssd(struct soft_segment_descriptor *ssdp, + struct system_segment_descriptor *sdp); #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ ==== //depot/projects/hammer/sys/x86_64/include/tss.h#5 (text+ko) ==== @@ -70,4 +70,13 @@ }; #pragma pack() +#ifdef _KERNEL +/* Hack to fight with the crazy alignment */ +struct aligned_tss { + u_int32_t pad; + struct x86_64tss tss __packed; +}; +extern struct aligned_tss common_tss; +#endif + #endif /* _MACHINE_TSS_H_ */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#37 (text+ko) ==== @@ -111,7 +111,9 @@ #include extern void init386(int first); +#if 0 extern void dblfault_handler(void); +#endif extern void printcpuinfo(void); /* XXX header file */ extern void finishidentcpu(void); @@ -550,15 +552,20 @@ * Initialize segments & interrupt table */ -union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +struct user_segment_descriptor gdt[NGDT];/* global descriptor table */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -int private_tss; /* flag indicating private tss */ - -static struct i386tss dblfault_tss; +#if 0 +static struct x86_64tss dblfault_tss; static char dblfault_stack[PAGE_SIZE]; +#endif +/* + * Nasty hack to arrange internal longword alignment. + * Probably not necessary. + */ +static struct aligned_tss common_tss; /* software prototypes -- in more palatable form */ @@ -569,7 +576,7 @@ 0, /* segment type */ 0, /* segment descriptor priority level */ 0, /* segment descriptor present */ - 0, 0, + 0, /* long */ 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, /* GCODE_SEL 1 Code Descriptor for kernel */ @@ -578,7 +585,7 @@ SDT_MEMERA, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ - 0, 0, + 1, /* long */ 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, /* GDATA_SEL 2 Data Descriptor for kernel */ @@ -587,28 +594,39 @@ SDT_MEMRWA, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ - 0, 0, + 1, /* long */ 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, /* GPROC0_SEL 3 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct i386tss)-1,/* length - all address space */ + sizeof(struct x86_64tss)-1,/* length - all address space */ SDT_SYSTSS, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ - 0, 0, + 0, /* long */ 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +/* Actually, the TSS is a system descriptor which is double size */ +{ 0x0, /* segment base address */ + 0x0, /* length */ + 0, /* segment type */ + 0, /* segment descriptor priority level */ + 0, /* segment descriptor present */ + 0, /* long */ + 0, /* default 32 vs 16 bit size */ + 0 /* limit granularity (byte/page units)*/ }, +#if 0 /* GPANIC_SEL 4 Panic Tss Descriptor */ { (int) &dblfault_tss, /* segment base address */ - sizeof(struct i386tss)-1,/* length - all address space */ + sizeof(struct x86_64tss)-1,/* length - all address space */ SDT_SYSTSS, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ - 0, 0, + 0, /* long */ 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif }; void @@ -622,14 +640,14 @@ struct gate_descriptor *ip; ip = idt + idx; - ip->gd_looffset = (int)func; + ip->gd_looffset = (uintptr_t)func; ip->gd_selector = selec; - ip->gd_stkcpy = 0; + ip->gd_ist = 0; ip->gd_xx = 0; ip->gd_type = typ; ip->gd_dpl = dpl; ip->gd_p = 1; - ip->gd_hioffset = ((int)func)>>16 ; + ip->gd_hioffset = ((uintptr_t)func)>>16 ; } #define IDTVEC(name) __CONCAT(X,name) @@ -643,15 +661,16 @@ void sdtossd(sd, ssd) - struct segment_descriptor *sd; + struct user_segment_descriptor *sd; struct soft_segment_descriptor *ssd; { ssd->ssd_base = (sd->sd_hibase << 24) | sd->sd_lobase; - ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_Lolimit; + ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit; ssd->ssd_type = sd->sd_type; ssd->ssd_dpl = sd->sd_dpl; ssd->ssd_p = sd->sd_p; + ssd->ssd_long = sd->sd_long; ssd->ssd_def32 = sd->sd_def32; ssd->ssd_gran = sd->sd_gran; } @@ -659,23 +678,46 @@ void ssdtosd(ssd, sd) struct soft_segment_descriptor *ssd; - struct segment_descriptor *sd; + struct user_segment_descriptor *sd; { sd->sd_lobase = (ssd->ssd_base) & 0xffffff; - sd->sd_hibase = (ssd->ssd_base >> 24) & 0xff + sd->sd_hibase = (ssd->ssd_base >> 24) & 0xff; sd->sd_lolimit = (ssd->ssd_limit) & 0xffff; sd->sd_hilimit = (ssd->ssd_limit >> 16) & 0xf; sd->sd_type = ssd->ssd_type; sd->sd_dpl = ssd->ssd_dpl; sd->sd_p = ssd->ssd_p; + sd->sd_long = ssd->ssd_long; sd->sd_def32 = ssd->ssd_def32; sd->sd_gran = ssd->ssd_gran; } + +void +ssdtosyssd(ssd, sd) + struct soft_segment_descriptor *ssd; + struct system_segment_descriptor *sd; +{ + + sd->sd_lobase = (ssd->ssd_base) & 0xffffff; + sd->sd_hibase = (ssd->ssd_base >> 24) & 0xffffff; + sd->sd_lolimit = (ssd->ssd_limit) & 0xffff; + sd->sd_hilimit = (ssd->ssd_limit >> 16) & 0xf; + sd->sd_type = ssd->ssd_type; + sd->sd_dpl = ssd->ssd_dpl; + sd->sd_p = ssd->ssd_p; + sd->sd_gran = ssd->ssd_gran; +} #define PHYSMAP_SIZE (2 * 8) +struct bios_smap { + u_int64_t base; + u_int64_t length; + u_int32_t type; +} __packed; + /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -711,7 +753,7 @@ /* * get memory map with INT 15:E820 */ -#error "smap = fetch from loader metadata" +/* #error "smap = fetch from loader metadata" */ physmap_idx = 0; do { @@ -749,7 +791,7 @@ physmap[physmap_idx + 1] = smap->base + smap->length; next_run: ; } while (1 /* XXX more to go */); -#error "while not end of smap table from loader" +/* #error "while not end of smap table from loader" */ /* * Perform "base memory" related probes & setup based on SMAP @@ -783,7 +825,7 @@ /* * If we failed above, try memory map with INT 15:E801 */ -#error "get smap from loader" +/* #error "get smap from loader" */ else { /* * Prefer the RTC value for extended memory. @@ -1005,7 +1047,7 @@ */ proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); - preload_metadata = modulep + KERNBASE; + preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); kmdp = preload_search_by_type("elf kernel"); boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); @@ -1023,15 +1065,18 @@ * XXX text protection is temporarily (?) disabled. The limit was * i386_btop(round_page(etext)) - 1. */ - gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1); - gdt_segs[GDATA_SEL].ssd_limit = atop(0 - 1); - gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; + gdt_segs[GCODE_SEL].ssd_limit = -1; + gdt_segs[GDATA_SEL].ssd_limit = -1; + gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&common_tss.tss; - for (x = 0; x < NGDT; x++) - ssdtosd(&gdt_segs[x], &gdt[x].sd); + for (x = 0; x < NGDT; x++) { + if (x != GPROC0_SEL) + ssdtosd(&gdt_segs[x], &gdt[x]); + } + ssdtosyssd(&gdt_segs[GPROC0_SEL], (struct system_segment_descriptor *)&gdt[GPROC0_SEL]); r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; - r_gdt.rd_base = (int) gdt; + r_gdt.rd_base = (long) gdt; lgdt(&r_gdt); pc = &__pcpu; @@ -1053,52 +1098,54 @@ /* exceptions */ for (x = 0; x < NIDT; x++) - setidt(x, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, + setidt(x, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(0, &IDTVEC(div), SDT_SYS386TGT, SEL_KPL, + setidt(0, &IDTVEC(div), SDT_SYSTGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + setidt(1, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(1, &IDTVEC(dbg), SDT_SYS386IGT, SEL_KPL, + setidt(2, &IDTVEC(nmi), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(2, &IDTVEC(nmi), SDT_SYS386TGT, SEL_KPL, + setidt(3, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(3, &IDTVEC(bpt), SDT_SYS386IGT, SEL_UPL, + setidt(4, &IDTVEC(ofl), SDT_SYSTGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(4, &IDTVEC(ofl), SDT_SYS386TGT, SEL_UPL, + setidt(5, &IDTVEC(bnd), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(5, &IDTVEC(bnd), SDT_SYS386TGT, SEL_KPL, + setidt(6, &IDTVEC(ill), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + setidt(7, &IDTVEC(dna), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(7, &IDTVEC(dna), SDT_SYS386TGT, SEL_KPL - , GSEL(GCODE_SEL, SEL_KPL)); +#if 0 setidt(8, 0, SDT_SYSTASKGT, SEL_KPL, GSEL(GPANIC_SEL, SEL_KPL)); - setidt(9, &IDTVEC(fpusegm), SDT_SYS386TGT, SEL_KPL, +#endif + setidt(9, &IDTVEC(fpusegm), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(10, &IDTVEC(tss), SDT_SYS386TGT, SEL_KPL, + setidt(10, &IDTVEC(tss), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(11, &IDTVEC(missing), SDT_SYS386TGT, SEL_KPL, + setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(12, &IDTVEC(stk), SDT_SYS386TGT, SEL_KPL, + setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(14, &IDTVEC(page), SDT_SYS386TGT, SEL_KPL, + setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, + setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL, + setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL, + setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(18, &IDTVEC(mchk), SDT_SYS386TGT, SEL_KPL, + setidt(18, &IDTVEC(mchk), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(19, &IDTVEC(xmm), SDT_SYS386TGT, SEL_KPL, + setidt(19, &IDTVEC(xmm), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(0x80, &IDTVEC(int0x80_syscall), SDT_SYS386TGT, SEL_UPL, + setidt(0x80, &IDTVEC(int0x80_syscall), SDT_SYSTGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL)); r_idt.rd_limit = sizeof(idt0) - 1; - r_idt.rd_base = (int) idt; + r_idt.rd_base = (long) idt; lidt(&r_idt); /* @@ -1117,23 +1164,21 @@ #endif finishidentcpu(); /* Final stage of CPU initialization */ - setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + setidt(6, &IDTVEC(ill), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); initializecpu(); /* Initialize CPU registers */ /* make an initial tss so cpu can get interrupt stack on syscall! */ +#if 0 PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb)); - PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); +#endif gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); - private_tss = 0; - PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd); - PCPU_SET(common_tssd, *PCPU_GET(tss_gdt)); - PCPU_SET(common_tss.tss_ioopt, (sizeof (struct i386tss)) << 16); ltr(gsel_tss); +#if 0 dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 = dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = @@ -1148,6 +1193,7 @@ dblfault_tss.tss_ds = dblfault_tss.tss_es = dblfault_tss.tss_fs = dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); +#endif getmemsize(first); init_param2(physmem); @@ -1162,11 +1208,7 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ -#ifdef PAE - thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; -#else - thread0.td_pcb->pcb_cr3 = (int)IdlePTD; -#endif + thread0.td_pcb->pcb_cr3 = (long)IdlePML4; thread0.td_frame = &proc0_tf; } ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#20 (text+ko) ==== @@ -600,7 +600,7 @@ code = frame->tf_err; type = frame->tf_trapno; - sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)].sd, &softseg); + sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg); if (type <= MAX_TRAP_MSG) printf("\n\nFatal trap %d: %s while in %s mode\n", @@ -626,8 +626,8 @@ printf("frame pointer = 0x%x:0x%x\n", ss, frame->tf_rbp); printf("code segment = base 0x%x, limit 0x%x, type 0x%x\n", softseg.ssd_base, softseg.ssd_limit, softseg.ssd_type); - printf(" = DPL %d, pres %d, def32 %d, gran %d\n", - softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_def32, + printf(" = DPL %d, pres %d, long %d, def32 %d, gran %d\n", + softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_long, softseg.ssd_def32, softseg.ssd_gran); printf("processor eflags = "); if (frame->tf_rflags & PSL_T) @@ -663,6 +663,7 @@ panic("unknown/reserved trap"); } +#if 0 /* * Double fault handler. Called when a fault occurs while writing * a frame for a trap/exception onto the stack. This usually occurs @@ -679,11 +680,12 @@ dblfault_handler() { printf("\nFatal double fault:\n"); - printf("eip = 0x%x\n", PCPU_GET(common_tss.tss_eip)); - printf("esp = 0x%x\n", PCPU_GET(common_tss.tss_esp)); - printf("ebp = 0x%x\n", PCPU_GET(common_tss.tss_ebp)); + printf("eip = 0x%x\n", common_tss.tss_rip); + printf("esp = 0x%x\n", common_tss.tss_rsp); + printf("ebp = 0x%x\n", common_tss.tss_rbp); panic("double fault"); } +#endif /* * syscall - system call request C handler From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:02:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C284937B404; Sat, 5 Apr 2003 02:02:58 -0800 (PST) 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 5D6D037B401 for ; Sat, 5 Apr 2003 02:02:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E041043F3F for ; Sat, 5 Apr 2003 02:02:57 -0800 (PST) (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 h35A2v0U043792 for ; Sat, 5 Apr 2003 02:02:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35A2vOS043789 for perforce@freebsd.org; Sat, 5 Apr 2003 02:02:57 -0800 (PST) Date: Sat, 5 Apr 2003 02:02:57 -0800 (PST) Message-Id: <200304051002.h35A2vOS043789@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 28203 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, 05 Apr 2003 10:02:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=28203 Change 28203 by peter@peter_overcee on 2003/04/05 02:02:57 update include paths update segment names Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#10 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#9 edit .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#4 edit .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#3 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#18 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#38 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#21 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#10 (text+ko) ==== @@ -71,15 +71,15 @@ #include #include -#include -#include +#include +#include #include #ifdef DEV_ISA #include #endif -#include +#include -#include +#include /* * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#9 (text+ko) ==== @@ -37,7 +37,6 @@ * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ */ -#include "opt_auto_eoi.h" #include "opt_isa.h" #include @@ -58,13 +57,13 @@ #include #include -#include -#include +#include +#include #ifdef DEV_ISA #include #endif -#include +#include #include /* @@ -387,7 +386,7 @@ intr_unit[intr] = arg; setidt(ICU_OFFSET + intr, flags & INTR_FAST ? fastintr[intr] : slowintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + SDT_SYSIGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); INTREN(1 << intr); mtx_unlock_spin(&icu_lock); intr_restore(crit); @@ -415,7 +414,7 @@ intr_countp[intr] = &intrcnt[1 + intr]; intr_handler[intr] = isa_strayintr; intr_unit[intr] = &intr_unit[intr]; - setidt(ICU_OFFSET + intr, slowintr[intr], SDT_SYS386IGT, SEL_KPL, + setidt(ICU_OFFSET + intr, slowintr[intr], SDT_SYSIGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); mtx_unlock_spin(&icu_lock); intr_restore(crit); ==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/hammer/sys/x86_64/isa/ithread.c#3 (text+ko) ==== @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include struct int_entropy { struct proc *p; ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#18 (text+ko) ==== @@ -67,7 +67,7 @@ #include #include -#include +#include #ifdef DEV_ISA #include #endif ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#6 (text+ko) ==== @@ -3,9 +3,9 @@ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ -#include -#include -#include +#include +#include +#include #define FAST_INTR_HANDLER_USES_ES 1 #ifdef FAST_INTR_HANDLER_USES_ES ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#6 (text+ko) ==== @@ -74,7 +74,7 @@ #include #include -#include +#include #ifdef DEV_ISA #include ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#38 (text+ko) ==== @@ -104,8 +104,8 @@ #include #endif -#include -#include +#include +#include #include #include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#8 (text+ko) ==== @@ -61,10 +61,10 @@ #ifdef DEV_ISA #include -#include +#include #endif -#include -#include +#include +#include #include static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#21 (text+ko) ==== @@ -81,8 +81,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ #include -#include +#include static void cpu_reset_real(void); extern int _ucodesel, _udatasel; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:09:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFCE837B404; Sat, 5 Apr 2003 02:09:06 -0800 (PST) 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 5E21C37B401 for ; Sat, 5 Apr 2003 02:09:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7AB443F75 for ; Sat, 5 Apr 2003 02:09:05 -0800 (PST) (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 h35A950U044935 for ; Sat, 5 Apr 2003 02:09:05 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35A95L3044932 for perforce@freebsd.org; Sat, 5 Apr 2003 02:09:05 -0800 (PST) Date: Sat, 5 Apr 2003 02:09:05 -0800 (PST) Message-Id: <200304051009.h35A95L3044932@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 28204 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, 05 Apr 2003 10:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=28204 Change 28204 by peter@peter_overcee on 2003/04/05 02:08:34 just generate an executable for now Affected files ... .. //depot/projects/hammer/sys/conf/ldscript.x86_64#2 edit Differences ... ==== //depot/projects/hammer/sys/conf/ldscript.x86_64#2 (text+ko) ==== @@ -6,7 +6,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = kernbase + 0x01000000 + SIZEOF_HEADERS; + . = 0x400000 + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:13:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21C8437B404; Sat, 5 Apr 2003 02:13:12 -0800 (PST) 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 CBEC737B401 for ; Sat, 5 Apr 2003 02:13:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7579A43FBD for ; Sat, 5 Apr 2003 02:13:11 -0800 (PST) (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 h35ADB0U045431 for ; Sat, 5 Apr 2003 02:13:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35ADABK045428 for perforce@freebsd.org; Sat, 5 Apr 2003 02:13:10 -0800 (PST) Date: Sat, 5 Apr 2003 02:13:10 -0800 (PST) Message-Id: <200304051013.h35ADABK045428@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 28205 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, 05 Apr 2003 10:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=28205 Change 28205 by peter@peter_overcee on 2003/04/05 02:12:29 npx would be helpful Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#8 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#19 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#8 (text+ko) ==== @@ -52,3 +52,4 @@ x86_64/isa/intr_machdep.c standard x86_64/isa/isa.c standard x86_64/isa/ithread.c standard +x86_64/isa/npx.c standard ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#19 (text+ko) ==== @@ -103,8 +103,8 @@ #endif /* __GNUC__ */ -#define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_cw) -#define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_sw) +#define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) +#define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) typedef u_char bool_t; @@ -668,13 +668,13 @@ static devclass_t npx_devclass; -#ifdef DEV_ISA /* * We prefer to attach to the root nexus so that the usual case (exception 16) * doesn't describe the processor as being `on isa'. */ DRIVER_MODULE(npx, nexus, npx_driver, npx_devclass, 0, 0); +#ifdef DEV_ISA /* * This sucks up the legacy ISA support assignments from PNPBIOS/ACPI. */ From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:14:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F8D37B404; Sat, 5 Apr 2003 02:14:14 -0800 (PST) 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 B515537B401 for ; Sat, 5 Apr 2003 02:14:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6088843F93 for ; Sat, 5 Apr 2003 02:14:13 -0800 (PST) (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 h35AED0U045499 for ; Sat, 5 Apr 2003 02:14:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AECmU045496 for perforce@freebsd.org; Sat, 5 Apr 2003 02:14:12 -0800 (PST) Date: Sat, 5 Apr 2003 02:14:12 -0800 (PST) Message-Id: <200304051014.h35AECmU045496@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 28206 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, 05 Apr 2003 10:14:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=28206 Change 28206 by peter@peter_overcee on 2003/04/05 02:13:28 nix fastunpend stuff Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#10 (text+ko) ==== @@ -87,17 +87,6 @@ IDTVEC(fastintr14), IDTVEC(fastintr15), }; -static unpendhand_t *fastunpend[ICU_LEN] = { - IDTVEC(fastunpend0), IDTVEC(fastunpend1), - IDTVEC(fastunpend2), IDTVEC(fastunpend3), - IDTVEC(fastunpend4), IDTVEC(fastunpend5), - IDTVEC(fastunpend6), IDTVEC(fastunpend7), - IDTVEC(fastunpend8), IDTVEC(fastunpend9), - IDTVEC(fastunpend10), IDTVEC(fastunpend11), - IDTVEC(fastunpend12), IDTVEC(fastunpend13), - IDTVEC(fastunpend14), IDTVEC(fastunpend15), -}; - static inthand_t *slowintr[ICU_LEN] = { IDTVEC(intr0), IDTVEC(intr1), IDTVEC(intr2), IDTVEC(intr3), IDTVEC(intr4), IDTVEC(intr5), IDTVEC(intr6), IDTVEC(intr7), @@ -532,10 +521,3 @@ return (ithread_remove_handler(cookie)); } - -void -call_fast_unpend(int irq) -{ - fastunpend[irq](); -} - From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:31:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEAF537B404; Sat, 5 Apr 2003 02:31:35 -0800 (PST) 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 6FD6B37B401 for ; Sat, 5 Apr 2003 02:31:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07B8F43F85 for ; Sat, 5 Apr 2003 02:31:35 -0800 (PST) (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 h35AVY0U046765 for ; Sat, 5 Apr 2003 02:31:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AVYG0046760 for perforce@freebsd.org; Sat, 5 Apr 2003 02:31:34 -0800 (PST) Date: Sat, 5 Apr 2003 02:31:34 -0800 (PST) Message-Id: <200304051031.h35AVYG0046760@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 28207 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, 05 Apr 2003 10:31:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=28207 Change 28207 by peter@peter_overcee on 2003/04/05 02:31:19 add SCHED_4BSD Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:34:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325B437B404; Sat, 5 Apr 2003 02:34:40 -0800 (PST) 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 C715137B401 for ; Sat, 5 Apr 2003 02:34:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B8143FB1 for ; Sat, 5 Apr 2003 02:34:39 -0800 (PST) (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 h35AYd0U046853 for ; Sat, 5 Apr 2003 02:34:39 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AYc1h046850 for perforce@freebsd.org; Sat, 5 Apr 2003 02:34:38 -0800 (PST) Date: Sat, 5 Apr 2003 02:34:38 -0800 (PST) Message-Id: <200304051034.h35AYc1h046850@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 28208 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, 05 Apr 2003 10:34:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=28208 Change 28208 by peter@peter_overcee on 2003/04/05 02:33:40 add [fs]uword64() for imgact_elf64.c Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#15 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#15 (text+ko) ==== @@ -210,7 +210,20 @@ * * Fetch a byte (sword, word) from user memory */ -ENTRY(fuword) +ENTRY(fuword64) + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%rdx /* from */ + + movq $VM_MAXUSER_ADDRESS-8,%rax + cmpq %rax,%rdx /* verify address is valid */ + ja fusufault + + movq (%rdx),%rax + movq $0,PCB_ONFAULT(%rcx) + ret + +ENTRY(fuword32) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx /* from */ @@ -225,8 +238,8 @@ movq $0,PCB_ONFAULT(%rcx) ret -ENTRY(fuword32) - jmp fuword +ENTRY(fuword) + jmp fuword32 /* * These two routines are called from the profiling code, potentially @@ -288,7 +301,23 @@ * * Write a byte (word, longword) to user memory */ -ENTRY(suword) +ENTRY(suword64) + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + movq 8(%rsp),%rdx + + movq $VM_MAXUSER_ADDRESS-8,%rax + cmpq %rax,%rdx /* verify address validity */ + ja fusufault + + movq 16(%rsp),%rax + movq %rax,(%rdx) + xorq %rax,%rax + movq PCPU(CURPCB),%rcx + movq %rax,PCB_ONFAULT(%rcx) + ret + +ENTRY(suword32) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) movq 8(%rsp),%rdx @@ -304,8 +333,8 @@ movq %rax,PCB_ONFAULT(%rcx) ret -ENTRY(suword32) - jmp suword +ENTRY(suword) + jmp suword32 /* * suword16 - MP SAFE From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:37:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B162437B404; Sat, 5 Apr 2003 02:37:44 -0800 (PST) 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 6966237B401 for ; Sat, 5 Apr 2003 02:37:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FF3943FAF for ; Sat, 5 Apr 2003 02:37:44 -0800 (PST) (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 h35Abh0U047045 for ; Sat, 5 Apr 2003 02:37:43 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Abh8g047042 for perforce@freebsd.org; Sat, 5 Apr 2003 02:37:43 -0800 (PST) Date: Sat, 5 Apr 2003 02:37:43 -0800 (PST) Message-Id: <200304051037.h35Abh8g047042@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 28209 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, 05 Apr 2003 10:37:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=28209 Change 28209 by peter@peter_overcee on 2003/04/05 02:36:49 kill pmap_set_opt - it'll be done right instead of this hack Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#11 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#11 (text+ko) ==== @@ -266,7 +266,6 @@ void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); pt_entry_t *pmap_pte_quick(pmap_t, vm_offset_t) __pure2; -void pmap_set_opt(void); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); void pmap_invalidate_all(pmap_t); ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#14 (text+ko) ==== @@ -369,48 +369,9 @@ */ pseflag = 0; - /* - * Turn on PGE/PSE. - */ - pmap_set_opt(); invltlb(); } -/* - * Enable 4MB page mode for MP startup. Turn on PG_G support. - * BSP will run this after all the AP's have started up. - */ -void -pmap_set_opt(void) -{ - pt_entry_t *pte; - vm_offset_t va, endva; - - if (pgeflag && (cpu_feature & CPUID_PGE)) { - load_cr4(rcr4() | CR4_PGE); - invltlb(); /* Insurance */ - } - if (PCPU_GET(cpuid) == 0) { - if (pgeflag) { - /* Turn on PG_G for text, data, bss pages. */ - va = (vm_offset_t)btext; - endva = KERNBASE + KERNend; - while (va < endva) { - pte = vtopte(va); - if (*pte) - *pte |= pgeflag; - va += PAGE_SIZE; - } - invltlb(); /* Insurance */ - } - /* - * We do not need to broadcast the invltlb here, because - * each AP does it the moment it is released from the boot - * lock. See ap_init(). - */ - } -} - static void * pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:37:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB2E937B407; Sat, 5 Apr 2003 02:37:45 -0800 (PST) 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 1D8DA37B41A for ; Sat, 5 Apr 2003 02:37:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 981BB43FB1 for ; Sat, 5 Apr 2003 02:37:44 -0800 (PST) (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 h35Abi0U047051 for ; Sat, 5 Apr 2003 02:37:44 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AbilM047048 for perforce@freebsd.org; Sat, 5 Apr 2003 02:37:44 -0800 (PST) Date: Sat, 5 Apr 2003 02:37:44 -0800 (PST) Message-Id: <200304051037.h35AbilM047048@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 28210 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, 05 Apr 2003 10:37:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=28210 Change 28210 by peter@peter_overcee on 2003/04/05 02:37:28 stub out cpu identification, there's nothing to identify yet. trivial b*, mem* implementations Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#39 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#39 (text+ko) ==== @@ -115,10 +115,12 @@ extern void dblfault_handler(void); #endif +#if 0 extern void printcpuinfo(void); /* XXX header file */ extern void finishidentcpu(void); extern void panicifcpuunsupported(void); extern void initializecpu(void); +#endif #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) @@ -164,8 +166,10 @@ * Good {morning,afternoon,evening,night}. */ startrtclock(); +#if 0 printcpuinfo(); panicifcpuunsupported(); +#endif #ifdef PERFMON perfmon_init(); #endif @@ -1163,12 +1167,16 @@ Debugger("Boot flags requested debugger"); #endif +#if 0 finishidentcpu(); /* Final stage of CPU initialization */ +#endif setidt(6, &IDTVEC(ill), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); +#if 0 initializecpu(); /* Initialize CPU registers */ +#endif /* make an initial tss so cpu can get interrupt stack on syscall! */ #if 0 @@ -1587,3 +1595,64 @@ } #endif /* DDB */ + +void +bcopy(const void *src, void *dest, size_t len) +{ + const char *csrc; + char *cdest; + size_t i; + + csrc = (const char *)src; + cdest = (char *)dest; + if (src > dest) { + for (i = len - 1; i >= 0; i--) + cdest[i] = csrc[i]; + } else { + for (i = 0; i < len; i++) + cdest[i] = csrc[i]; + } +} + +void * +memcpy(void *dest, const void *src, size_t len) +{ + + bcopy(src, dest, len); + return dest; +} + +void +bzero(void *buf, size_t len) +{ + char *cbuf; + size_t i; + + cbuf = (char *)buf; + for (i = len - 1; i >= 0; i--) + cbuf[i] = 0; +} + +void +pagezero(void *buf) +{ + + bzero(buf, PAGE_SIZE); +} + +int +bcmp(const void *s1, const void *s2, size_t len) +{ + const char *cs1, *cs2; + int diff; + size_t i; + + cs1 = (const char *)s1; + cs2 = (const char *)s2; + for (i = 0; i < len; i++) { + diff = *cs2 - *cs1; + if (diff) + return diff; + } + return 0; +} From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:38:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE6D637B404; Sat, 5 Apr 2003 02:38:47 -0800 (PST) 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 762D437B401 for ; Sat, 5 Apr 2003 02:38:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ABA243FBD for ; Sat, 5 Apr 2003 02:38:47 -0800 (PST) (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 h35Ack0U047100 for ; Sat, 5 Apr 2003 02:38:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AckAm047097 for perforce@freebsd.org; Sat, 5 Apr 2003 02:38:46 -0800 (PST) Date: Sat, 5 Apr 2003 02:38:46 -0800 (PST) Message-Id: <200304051038.h35AckAm047097@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 28212 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, 05 Apr 2003 10:38:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=28212 Change 28212 by peter@peter_overcee on 2003/04/05 02:38:36 add sigtramp.s (oops) Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#9 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#9 (text+ko) ==== @@ -42,6 +42,7 @@ x86_64/x86_64/mem.c standard x86_64/x86_64/nexus.c standard x86_64/x86_64/pmap.c standard +x86_64/x86_64/sigtramp.s standard x86_64/x86_64/support.s standard x86_64/x86_64/swtch.s standard x86_64/x86_64/sys_machdep.c standard From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:42:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84EEC37B404; Sat, 5 Apr 2003 02:42:53 -0800 (PST) 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 22CDD37B401 for ; Sat, 5 Apr 2003 02:42:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B071E43F75 for ; Sat, 5 Apr 2003 02:42:52 -0800 (PST) (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 h35Agq0U047655 for ; Sat, 5 Apr 2003 02:42:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AgqGd047652 for perforce@freebsd.org; Sat, 5 Apr 2003 02:42:52 -0800 (PST) Date: Sat, 5 Apr 2003 02:42:52 -0800 (PST) Message-Id: <200304051042.h35AgqGd047652@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 28213 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, 05 Apr 2003 10:42:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=28213 Change 28213 by peter@peter_overcee on 2003/04/05 02:42:00 suck in tsc.c Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/tsc.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:44:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7A137B404; Sat, 5 Apr 2003 02:44:56 -0800 (PST) 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 5283037B401 for ; Sat, 5 Apr 2003 02:44:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D28B043F75 for ; Sat, 5 Apr 2003 02:44:55 -0800 (PST) (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 h35Ait0U047767 for ; Sat, 5 Apr 2003 02:44:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AitT4047764 for perforce@freebsd.org; Sat, 5 Apr 2003 02:44:55 -0800 (PST) Date: Sat, 5 Apr 2003 02:44:55 -0800 (PST) Message-Id: <200304051044.h35AitT4047764@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 28214 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, 05 Apr 2003 10:44:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=28214 Change 28214 by peter@peter_overcee on 2003/04/05 02:44:16 hack for x86-64 Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/tsc.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/tsc.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ uint64_t tsc_freq; int tsc_is_broken; -u_int tsc_present; +u_int tsc_present = 1; static unsigned tsc_get_timecount(struct timecounter *tc); @@ -58,14 +58,6 @@ { u_int64_t tscval[2]; - if (cpu_feature & CPUID_TSC) - tsc_present = 1; - else - tsc_present = 0; - - if (!tsc_present) - return; - if (bootverbose) printf("Calibrating TSC clock ... "); @@ -75,35 +67,9 @@ tsc_freq = tscval[1] - tscval[0]; if (bootverbose) - printf("TSC clock: %ju Hz\n", (intmax_t)tsc_freq); + printf("TSC clock: %lu Hz\n", tsc_freq); -#if defined(SMP) && !defined(SMP_TSC) - /* - * We can not use the TSC in SMP mode, until we figure out a - * cheap (impossible), reliable and precise (yeah right!) way - * to synchronize the TSCs of all the CPUs. - * Modern SMP hardware has the ACPI timer and we use that. - */ - return; -#endif - - /* - * We can not use the TSC if we support APM. Precise timekeeping - * on an APM'ed machine is at best a fools pursuit, since - * any and all of the time spent in various SMM code can't - * be reliably accounted for. Reading the RTC is your only - * source of reliable time info. The i8254 looses too of course - * but we need to have some kind of time... - * We don't know at this point whether APM is going to be used - * or not, nor when it might be activated. Play it safe. - */ - if (power_pm_get_type() == POWER_PM_TYPE_APM) { - if (bootverbose) - printf("TSC timecounter disabled: APM enabled.\n"); - return; - } - - if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { + if (tsc_freq != 0 && !tsc_is_broken) { tsc_timecounter.tc_frequency = tsc_freq; tc_init(&tsc_timecounter); } @@ -128,7 +94,7 @@ return (error); } -SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW, +SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_LONG | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); static unsigned From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:44:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D089937B404; Sat, 5 Apr 2003 02:44:57 -0800 (PST) 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 C253837B40F for ; Sat, 5 Apr 2003 02:44:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56B0A43F75 for ; Sat, 5 Apr 2003 02:44:56 -0800 (PST) (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 h35Aiu0U047773 for ; Sat, 5 Apr 2003 02:44:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AitFd047770 for perforce@freebsd.org; Sat, 5 Apr 2003 02:44:55 -0800 (PST) Date: Sat, 5 Apr 2003 02:44:55 -0800 (PST) Message-Id: <200304051044.h35AitFd047770@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 28215 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, 05 Apr 2003 10:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=28215 Change 28215 by peter@peter_overcee on 2003/04/05 02:44:33 add tsc.c Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#10 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#10 (text+ko) ==== @@ -47,6 +47,7 @@ x86_64/x86_64/swtch.s standard x86_64/x86_64/sys_machdep.c standard x86_64/x86_64/trap.c standard +x86_64/x86_64/tsc.c standard x86_64/x86_64/vm_machdep.c standard x86_64/isa/clock.c standard From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:46:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EB0837B405; Sat, 5 Apr 2003 02:45:59 -0800 (PST) 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 0425637B401 for ; Sat, 5 Apr 2003 02:45:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46C6E43FBF for ; Sat, 5 Apr 2003 02:45:58 -0800 (PST) (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 h35Ajw0U047881 for ; Sat, 5 Apr 2003 02:45:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AjvIT047878 for perforce@freebsd.org; Sat, 5 Apr 2003 02:45:57 -0800 (PST) Date: Sat, 5 Apr 2003 02:45:57 -0800 (PST) Message-Id: <200304051045.h35AjvIT047878@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 28216 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, 05 Apr 2003 10:46:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=28216 Change 28216 by peter@peter_overcee on 2003/04/05 02:45:23 stub out KPSEL - we cannot do it this way. Well, maybe we can, but the MSR access method is saner. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#5 (text+ko) ==== @@ -48,7 +48,7 @@ mov $KDSEL,%ax ; \ mov %ax,%ds ; \ mov %ax,%es ; \ - mov $KPSEL,%ax ; \ +#XXX mov $KPSEL,%ax ; \ mov %ax,%fs ; \ FAKE_MCOUNT((12+ACTUALLY_PUSHED)*4(%rsp)) ; \ call critical_enter ; \ @@ -103,7 +103,7 @@ mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ mov %ax,%ds ; \ mov %ax,%es ; \ - mov $KPSEL,%ax ; \ +#XXX mov $KPSEL,%ax ; \ mov %ax,%fs ; \ maybe_extra_ipending ; \ movb imen + IRQ_BYTE(irq_num),%al ; \ ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#13 (text+ko) ==== @@ -152,7 +152,7 @@ mov $KDSEL,%ax mov %ax,%ds mov %ax,%es - mov $KPSEL,%ax +#XXX mov $KPSEL,%ax mov %ax,%fs FAKE_MCOUNT(13*4(%rsp)) calltrap: @@ -204,7 +204,7 @@ mov $KDSEL,%ax /* switch to kernel segments */ mov %ax,%ds mov %ax,%es - mov $KPSEL,%ax +#XXX mov $KPSEL,%ax mov %ax,%fs FAKE_MCOUNT(13*4(%rsp)) call syscall From owner-p4-projects@FreeBSD.ORG Sat Apr 5 03:15:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16B9D37B404; Sat, 5 Apr 2003 03:15:36 -0800 (PST) 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 A7C9C37B401 for ; Sat, 5 Apr 2003 03:15:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E37F43F3F for ; Sat, 5 Apr 2003 03:15:35 -0800 (PST) (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 h35BFZ0U051099 for ; Sat, 5 Apr 2003 03:15:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35BFY31051096 for perforce@freebsd.org; Sat, 5 Apr 2003 03:15:34 -0800 (PST) Date: Sat, 5 Apr 2003 03:15:34 -0800 (PST) Message-Id: <200304051115.h35BFY31051096@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 28218 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, 05 Apr 2003 11:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=28218 Change 28218 by peter@peter_overcee on 2003/04/05 03:15:15 temporarily use another symbol for the page table array Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#15 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#12 (text+ko) ==== @@ -153,7 +153,7 @@ extern pml4_entry_t PML4[]; extern pdp_entry_t PDP[]; extern pd_entry_t PTD[]; -extern pd_entry_t PML4pml4e[]; +extern pd_entry_t PTDpde[]; extern pml4_entry_t *IdlePML4; /* physical address of "Idle" state directory */ extern pdp_entry_t *IdlePDP; /* physical address of "Idle" state directory */ ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#15 (text+ko) ==== @@ -538,7 +538,7 @@ pmap_is_current(pmap_t pmap) { return (pmap == kernel_pmap || - (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); + (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME)); } /* ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 (text+ko) ==== @@ -272,7 +272,7 @@ printf("Keyboard reset did not work, attempting CPU shutdown\n"); DELAY(1000000); /* wait 1 sec for printf to complete */ /* force a shutdown by unmapping entire address space ! */ - bzero((caddr_t)PML4, NBPML4T); + bzero((caddr_t)PTD, NBPTD); /* "good night, sweet prince .... " */ invltlb(); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 03:30:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C482137B404; Sat, 5 Apr 2003 03:30:56 -0800 (PST) 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 6510A37B401 for ; Sat, 5 Apr 2003 03:30:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED54F43FBD for ; Sat, 5 Apr 2003 03:30:55 -0800 (PST) (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 h35BUt0U052223 for ; Sat, 5 Apr 2003 03:30:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35BUtjw052220 for perforce@freebsd.org; Sat, 5 Apr 2003 03:30:55 -0800 (PST) Date: Sat, 5 Apr 2003 03:30:55 -0800 (PST) Message-Id: <200304051130.h35BUtjw052220@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 28221 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, 05 Apr 2003 11:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=28221 Change 28221 by peter@peter_overcee on 2003/04/05 03:30:38 tidy up pcb_e* and a few stragglers of mc_e* Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcb.h#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#14 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#16 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcb.h#8 (text+ko) ==== @@ -47,12 +47,12 @@ struct pcb { long pcb_cr3; - long pcb_edi; - long pcb_esi; - long pcb_ebp; - long pcb_esp; - long pcb_ebx; - long pcb_eip; + long pcb_rdi; + long pcb_rsi; + long pcb_rbp; + long pcb_rsp; + long pcb_rbx; + long pcb_rip; struct savefpu pcb_save; u_long pcb_flags; ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#14 (text+ko) ==== @@ -114,12 +114,12 @@ ASSYM(KERNBASE, KERNBASE); ASSYM(MCLBYTES, MCLBYTES); ASSYM(PCB_CR3, offsetof(struct pcb, pcb_cr3)); -ASSYM(PCB_EDI, offsetof(struct pcb, pcb_edi)); -ASSYM(PCB_ESI, offsetof(struct pcb, pcb_esi)); -ASSYM(PCB_EBP, offsetof(struct pcb, pcb_ebp)); -ASSYM(PCB_ESP, offsetof(struct pcb, pcb_esp)); -ASSYM(PCB_EBX, offsetof(struct pcb, pcb_ebx)); -ASSYM(PCB_EIP, offsetof(struct pcb, pcb_eip)); +ASSYM(PCB_RDI, offsetof(struct pcb, pcb_rdi)); +ASSYM(PCB_RSI, offsetof(struct pcb, pcb_rsi)); +ASSYM(PCB_RBP, offsetof(struct pcb, pcb_rbp)); +ASSYM(PCB_RSP, offsetof(struct pcb, pcb_rsp)); +ASSYM(PCB_RBX, offsetof(struct pcb, pcb_rbx)); +ASSYM(PCB_RIP, offsetof(struct pcb, pcb_rip)); ASSYM(PCB_GS, offsetof(struct pcb, pcb_gs)); ASSYM(PCB_PSL, offsetof(struct pcb, pcb_psl)); @@ -134,10 +134,10 @@ ASSYM(TF_TRAPNO, offsetof(struct trapframe, tf_trapno)); ASSYM(TF_ERR, offsetof(struct trapframe, tf_err)); ASSYM(TF_CS, offsetof(struct trapframe, tf_cs)); -ASSYM(TF_EFLAGS, offsetof(struct trapframe, tf_rflags)); +ASSYM(TF_RFLAGS, offsetof(struct trapframe, tf_rflags)); ASSYM(SIGF_HANDLER, offsetof(struct sigframe, sf_ahu.sf_handler)); ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); -ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc_mcontext.mc_eflags)); +ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc_mcontext.mc_rflags)); ASSYM(UC_GS, offsetof(ucontext_t, uc_mcontext.mc_gs)); ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#12 (text+ko) ==== @@ -101,12 +101,12 @@ movq TD_PCB(%rcx),%rdx movq (%rsp),%rax /* Hardware registers */ - movq %rax,PCB_EIP(%rdx) - movq %rbx,PCB_EBX(%rdx) - movq %rsp,PCB_ESP(%rdx) - movq %rbp,PCB_EBP(%rdx) - movq %rsi,PCB_ESI(%rdx) - movq %rdi,PCB_EDI(%rdx) + movq %rax,PCB_RIP(%rdx) + movq %rbx,PCB_RBX(%rdx) + movq %rsp,PCB_RSP(%rdx) + movq %rbp,PCB_RBP(%rdx) + movq %rsi,PCB_RSI(%rdx) + movq %rdi,PCB_RDI(%rdx) #XXX movq %gs,PCB_GS(%rdx) pushfq /* PSL */ popq PCB_PSL(%rdx) @@ -151,12 +151,12 @@ * to load up the rest of the next context. */ /* Restore context. */ - movq PCB_EBX(%rdx),%rbx - movq PCB_ESP(%rdx),%rsp - movq PCB_EBP(%rdx),%rbp - movq PCB_ESI(%rdx),%rsi - movq PCB_EDI(%rdx),%rdi - movq PCB_EIP(%rdx),%rax + movq PCB_RBX(%rdx),%rbx + movq PCB_RSP(%rdx),%rsp + movq PCB_RBP(%rdx),%rbp + movq PCB_RSI(%rdx),%rsi + movq PCB_RDI(%rdx),%rdi + movq PCB_RIP(%rdx),%rax movq %rax,(%rsp) pushq PCB_PSL(%rdx) popfq @@ -242,16 +242,16 @@ /* Save caller's return address. Child won't execute this routine. */ movq (%rsp),%rax - movq %rax,PCB_EIP(%rcx) + movq %rax,PCB_RIP(%rcx) movq %cr3,%rax movq %rax,PCB_CR3(%rcx) - movq %rbx,PCB_EBX(%rcx) - movq %rsp,PCB_ESP(%rcx) - movq %rbp,PCB_EBP(%rcx) - movq %rsi,PCB_ESI(%rcx) - movq %rdi,PCB_EDI(%rcx) + movq %rbx,PCB_RBX(%rcx) + movq %rsp,PCB_RSP(%rcx) + movq %rbp,PCB_RBP(%rcx) + movq %rsi,PCB_RSI(%rcx) + movq %rdi,PCB_RDI(%rcx) #XXX movq %gs,PCB_GS(%rcx) pushfq popq PCB_PSL(%rcx) ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#16 (text+ko) ==== @@ -139,12 +139,12 @@ #else pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdir); #endif - pcb2->pcb_edi = 0; - pcb2->pcb_esi = (int)fork_return; /* fork_trampoline argument */ - pcb2->pcb_ebp = 0; - pcb2->pcb_esp = (long)td2->td_frame - sizeof(void *); - pcb2->pcb_ebx = (long)td2; /* fork_trampoline argument */ - pcb2->pcb_eip = (long)fork_trampoline; + pcb2->pcb_rdi = 0; + pcb2->pcb_rsi = (int)fork_return; /* fork_trampoline argument */ + pcb2->pcb_rbp = 0; + pcb2->pcb_rsp = (long)td2->td_frame - sizeof(void *); + pcb2->pcb_rbx = (long)td2; /* fork_trampoline argument */ + pcb2->pcb_rip = (long)fork_trampoline; pcb2->pcb_psl = td2->td_frame->tf_rflags & ~PSL_I; /* ints disabled */ /*- * pcb2->pcb_savefpu: cloned above. @@ -155,7 +155,7 @@ /* * Now, cpu_switch() can schedule the new process. - * pcb_esp is loaded pointing to the cpu_switch() stack frame + * pcb_rsp is loaded pointing to the cpu_switch() stack frame * containing the return address when exiting cpu_switch. * This will normally be to fork_trampoline(), which will have * %ebx loaded with the new proc's pointer. fork_trampoline() @@ -180,8 +180,8 @@ * Note that the trap frame follows the args, so the function * is really called like this: func(arg, frame); */ - td->td_pcb->pcb_esi = (long) func; /* function */ - td->td_pcb->pcb_ebx = (long) arg; /* first arg */ + td->td_pcb->pcb_rsi = (long) func; /* function */ + td->td_pcb->pcb_rbx = (long) arg; /* first arg */ } void From owner-p4-projects@FreeBSD.ORG Sat Apr 5 03:37:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D62437B404; Sat, 5 Apr 2003 03:37:05 -0800 (PST) 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 9C1D337B401 for ; Sat, 5 Apr 2003 03:37:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 400A843F75 for ; Sat, 5 Apr 2003 03:37:04 -0800 (PST) (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 h35Bb30U052433 for ; Sat, 5 Apr 2003 03:37:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Bb3Ls052430 for perforce@freebsd.org; Sat, 5 Apr 2003 03:37:03 -0800 (PST) Date: Sat, 5 Apr 2003 03:37:03 -0800 (PST) Message-Id: <200304051137.h35Bb3Ls052430@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 28222 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, 05 Apr 2003 11:37:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=28222 Change 28222 by peter@peter_overcee on 2003/04/05 03:36:32 make the kernel link, by any means necessary. peter@overcee[3:34am]~/fbp4/hammer/sys/x86_64/compile/GENERIC-593> ls -l kernel -rwxr-xr-x 1 peter peter 1866185 Apr 5 03:32 kernel* peter@overcee[3:34am]~/fbp4/hammer/sys/x86_64/compile/GENERIC-594> file kernel kernel: ELF 64-bit LSB executable, AMD x86-64, version 1 (FreeBSD), not stripped Obviously, do not try booting it. There are a boatload of known-wrong things. Not that anybody could, because the i386 loader doesn't understand elf64. But this seems like a good point to get some sleep. Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#25 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#6 (text+ko) ==== @@ -21,7 +21,7 @@ CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -ffreestanding -Wno-format -CC= x86_64-unknown-freebsd5.0-gcc +CC= x86_64-unknown-freebsd5.0-gcc -mcmodel=medium LD= x86_64-unknown-freebsd5.0-ld NM= x86_64-unknown-freebsd5.0-nm SIZE= x86_64-unknown-freebsd5.0-size ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#25 (text+ko) ==== @@ -131,7 +131,7 @@ movw $0x1234,0x472 /* Get onto a stack that we can trust and set up a real frame. */ - movl $R(HIDENAME(tmpstk)),%esp +# movl $R(HIDENAME(tmpstk)),%esp pushl %ebp movl %esp, %ebp From owner-p4-projects@FreeBSD.ORG Sat Apr 5 10:51:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1114937B404; Sat, 5 Apr 2003 10:51:38 -0800 (PST) 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 8E95037B401 for ; Sat, 5 Apr 2003 10:51:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E195843F93 for ; Sat, 5 Apr 2003 10:51:34 -0800 (PST) (envelope-from jmallett@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 h35IpY0U001933 for ; Sat, 5 Apr 2003 10:51:34 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35IpRVK001930 for perforce@freebsd.org; Sat, 5 Apr 2003 10:51:27 -0800 (PST) Date: Sat, 5 Apr 2003 10:51:27 -0800 (PST) Message-Id: <200304051851.h35IpRVK001930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 28240 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, 05 Apr 2003 18:51:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=28240 Change 28240 by jmallett@jmallett_dalek on 2003/04/05 10:51:14 IFC. Affected files ... .. //depot/projects/mips/Makefile#6 integrate .. //depot/projects/mips/Makefile.inc1#13 integrate .. //depot/projects/mips/Makefile.upgrade#2 delete .. //depot/projects/mips/UPDATING#9 integrate .. //depot/projects/mips/contrib/gcc/FAQ#2 delete .. //depot/projects/mips/contrib/gcc/GNATS#2 delete .. //depot/projects/mips/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/mips/contrib/gcc/bugs.html#2 delete .. //depot/projects/mips/contrib/gcc/config-ml.in#2 delete .. //depot/projects/mips/contrib/gcc/config.if#2 delete .. //depot/projects/mips/contrib/gcc/config.sub#2 delete .. //depot/projects/mips/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/mips/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/mips/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/mips/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/mips/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/mips/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/mips/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/mips/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/mips/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/mips/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/mips/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/mips/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/mips/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/mips/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/mips/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/mips/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/mips/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/mips/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/mips/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/mips/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/mips/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/mips/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/mips/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/mips/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/mips/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/mips/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/mips/contrib/gcc/faq.html#2 delete .. //depot/projects/mips/contrib/gcc/gnats.html#2 delete .. //depot/projects/mips/contrib/gcc/include/COPYING#2 delete .. //depot/projects/mips/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/mips/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/mips/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/mips/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/mips/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/mips/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/mips/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/mips/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/mips/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/mips/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/mips/contrib/gcc/include/md5.h#2 delete .. //depot/projects/mips/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/mips/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/mips/contrib/gcc/include/partition.h#2 delete .. //depot/projects/mips/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/mips/contrib/gcc/include/sort.h#2 delete .. //depot/projects/mips/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/mips/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/mips/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/mips/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/mips/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/mips/contrib/gcc/install-sh#2 delete .. //depot/projects/mips/contrib/gcc/libtool.m4#2 delete .. //depot/projects/mips/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/mips/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/mips/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/mips/contrib/gcc/ltconfig#2 delete .. //depot/projects/mips/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/mips/contrib/gcc/missing#2 delete .. //depot/projects/mips/contrib/gcc/mkdep#2 delete .. //depot/projects/mips/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/mips/contrib/gcc/symlink-tree#2 delete .. //depot/projects/mips/contrib/gcc/ylwrap#2 delete .. //depot/projects/mips/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/mips/contrib/sendmail/FREEBSD-upgrade#4 integrate .. //depot/projects/mips/contrib/sendmail/RELEASE_NOTES#4 integrate .. //depot/projects/mips/contrib/sendmail/cf/README#4 integrate .. //depot/projects/mips/contrib/sendmail/cf/cf/submit.cf#4 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/cfhead.m4#3 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/version.m4#4 integrate .. //depot/projects/mips/contrib/sendmail/cf/mailer/usenet.m4#2 integrate .. //depot/projects/mips/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/mips/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/mips/contrib/sendmail/editmap/editmap.8#2 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/conf.h#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/clock.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/mips/contrib/sendmail/mail.local/mail.local.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/README#4 integrate .. //depot/projects/mips/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/mips/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/deliver.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/milter.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/queue.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/mips/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/mips/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/mips/contrib/sendmail/src/srvrsmtp.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/tls.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/mips/contrib/sendmail/src/version.c#4 integrate .. //depot/projects/mips/crypto/openssh/auth-chall.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth.h#3 integrate .. //depot/projects/mips/crypto/openssh/auth1.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/mips/etc/Makefile#8 integrate .. //depot/projects/mips/etc/defaults/pccard.conf#5 integrate .. //depot/projects/mips/etc/defaults/periodic.conf#4 integrate .. //depot/projects/mips/etc/disktab#1 branch .. //depot/projects/mips/etc/etc.alpha/disktab#2 delete .. //depot/projects/mips/etc/etc.i386/disktab#2 delete .. //depot/projects/mips/etc/etc.ia64/disktab#2 delete .. //depot/projects/mips/etc/etc.sparc64/disktab#2 delete .. //depot/projects/mips/etc/periodic/daily/220.backup-distfile#2 delete .. //depot/projects/mips/etc/periodic/daily/320.rdist#2 delete .. //depot/projects/mips/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/mips/etc/rc.d/ipfw#4 integrate .. //depot/projects/mips/etc/syslog.conf#2 integrate .. //depot/projects/mips/games/grdc/grdc.6#3 integrate .. //depot/projects/mips/games/grdc/grdc.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/mips/include/signal.h#4 integrate .. //depot/projects/mips/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#3 integrate .. //depot/projects/mips/lib/libc/i386/string/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/i386/string/wcschr.S#1 branch .. //depot/projects/mips/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/mips/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/sparc64/gen/_ctx_start.S#1 branch .. //depot/projects/mips/lib/libc/sparc64/gen/makecontext.c#1 branch .. //depot/projects/mips/lib/libc/stdlib/Makefile.inc#7 integrate .. //depot/projects/mips/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/mips/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/mips/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/mips/lib/libc/sys/connect.2#3 integrate .. //depot/projects/mips/lib/libc/sys/madvise.2#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_spinlock.c#2 integrate .. //depot/projects/mips/lib/libdisk/create_chunk.c#9 integrate .. //depot/projects/mips/lib/libdisk/disk.c#12 integrate .. //depot/projects/mips/lib/libdisk/rules.c#6 integrate .. //depot/projects/mips/lib/libdisk/write_alpha_disk.c#6 integrate .. //depot/projects/mips/lib/libdisk/write_disk.c#5 integrate .. //depot/projects/mips/lib/libdisk/write_i386_disk.c#5 integrate .. //depot/projects/mips/lib/libdisk/write_ia64_disk.c#5 integrate .. //depot/projects/mips/lib/libdisk/write_pc98_disk.c#7 integrate .. //depot/projects/mips/lib/libfetch/http.c#7 integrate .. //depot/projects/mips/lib/libgeom/geom_ctl.c#2 integrate .. //depot/projects/mips/lib/libgeom/libgeom.h#4 integrate .. //depot/projects/mips/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/mips/lib/libncp/ncpl_conn.c#2 integrate .. //depot/projects/mips/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_chroot/Makefile#1 branch .. //depot/projects/mips/lib/libpam/modules/pam_chroot/pam_chroot.8#1 branch .. //depot/projects/mips/lib/libpam/modules/pam_chroot/pam_chroot.c#1 branch .. //depot/projects/mips/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/mips/lib/libthr/Makefile#1 branch .. //depot/projects/mips/lib/libthr/arch/i386/Makefile.inc#1 branch .. //depot/projects/mips/lib/libthr/arch/i386/i386/_curthread.S#1 branch .. //depot/projects/mips/lib/libthr/arch/i386/i386/_setcurthread.c#1 branch .. //depot/projects/mips/lib/libthr/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/mips/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#1 branch .. //depot/projects/mips/lib/libthr/sys/Makefile.inc#1 branch .. //depot/projects/mips/lib/libthr/sys/thr_error.c#1 branch .. //depot/projects/mips/lib/libthr/thread/Makefile.inc#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_attr.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_autoinit.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_cancel.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_clean.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_cond.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_condattr_init.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_create.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_detach.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_equal.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_exit.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_find_thread.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_gc.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_getprio.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_getschedparam.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_info.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_init.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_join.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_kern.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_main_np.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mattr_init.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_multi_np.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_once.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_printf.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_private.h#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_resume_np.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_rwlock.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_rwlockattr.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_self.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_sem.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_seterrno.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_setprio.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_setschedparam.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_sig.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_spec.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_spinlock.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_stack.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_suspend_np.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_syscalls.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_yield.c#1 branch .. //depot/projects/mips/lib/libufs/block.c#6 integrate .. //depot/projects/mips/lib/libufs/type.c#5 integrate .. //depot/projects/mips/lib/msun/src/math.h#7 integrate .. //depot/projects/mips/libexec/ftpd/ftpd.8#7 integrate .. //depot/projects/mips/libexec/save-entropy/Makefile#2 integrate .. //depot/projects/mips/libexec/talkd/announce.c#2 integrate .. //depot/projects/mips/libexec/talkd/extern.h#2 integrate .. //depot/projects/mips/libexec/talkd/print.c#2 integrate .. //depot/projects/mips/libexec/talkd/table.c#2 integrate .. //depot/projects/mips/libexec/talkd/talkd.c#2 integrate .. //depot/projects/mips/release/Makefile#17 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#8 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/mips/release/ia64/doFS.sh#3 integrate .. //depot/projects/mips/release/pc98/dokern.sh#10 integrate .. //depot/projects/mips/release/picobsd/tinyware/simple_httpd/simple_httpd.c#3 integrate .. //depot/projects/mips/release/scripts/doFS.sh#6 integrate .. //depot/projects/mips/sbin/atm/ilmid/ilmid.c#5 integrate .. //depot/projects/mips/sbin/devd/Makefile#4 integrate .. //depot/projects/mips/sbin/disklabel/disklabel.8#8 integrate .. //depot/projects/mips/sbin/disklabel/disklabel.c#9 integrate .. //depot/projects/mips/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/mips/sbin/gbde/Makefile#4 integrate .. //depot/projects/mips/sbin/gbde/gbde.c#6 integrate .. //depot/projects/mips/sbin/init/init.8#3 integrate .. //depot/projects/mips/sbin/ipmon/Makefile#2 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/mips/sbin/ping/ping.8#6 integrate .. //depot/projects/mips/sbin/ping/ping.c#9 integrate .. //depot/projects/mips/sbin/reboot/reboot.c#3 integrate .. //depot/projects/mips/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/mips/secure/lib/Makefile#2 integrate .. //depot/projects/mips/share/examples/cvsup/refuse#4 integrate .. //depot/projects/mips/share/examples/cvsup/refuse.README#4 integrate .. //depot/projects/mips/share/man/man4/Makefile#12 integrate .. //depot/projects/mips/share/man/man4/amr.4#2 integrate .. //depot/projects/mips/share/man/man4/card.4#3 delete .. //depot/projects/mips/share/man/man4/inet.4#4 integrate .. //depot/projects/mips/share/man/man4/ip.4#4 integrate .. //depot/projects/mips/share/man/man4/mac.4#5 integrate .. //depot/projects/mips/share/man/man4/mac_biba.4#4 integrate .. //depot/projects/mips/share/man/man4/mac_bsdextended.4#3 integrate .. //depot/projects/mips/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_mls.4#4 integrate .. //depot/projects/mips/share/man/man4/mac_none.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/mips/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_test.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/mips/share/man/man4/oldcard.4#2 integrate .. //depot/projects/mips/share/man/man4/wi.4#8 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/mips/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/mips/share/man/man9/Makefile#7 integrate .. //depot/projects/mips/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/mips/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/mips/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/mips/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/mips/share/man/man9/byteorder.9#2 integrate .. //depot/projects/mips/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/mips/share/misc/bsd-family-tree#5 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/mips/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/mips/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#9 integrate .. //depot/projects/mips/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/mips/sys/alpha/alpha/trap.c#8 integrate .. //depot/projects/mips/sys/alpha/include/param.h#2 integrate .. //depot/projects/mips/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_signal.c#5 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/mips/sys/boot/common/commands.c#2 integrate .. //depot/projects/mips/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/mips/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efi_console.c#3 integrate .. //depot/projects/mips/sys/boot/efi/libefi/libefi.c#4 integrate .. //depot/projects/mips/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/mips/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/mips/sys/boot/efi/loader/main.c#5 integrate .. //depot/projects/mips/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/mips/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/mips/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/mips/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/copy.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/mips/sys/boot/ia64/skiload/conf.c#3 integrate .. //depot/projects/mips/sys/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/mips/sys/boot/pc98/boot2/disk.c#3 integrate .. //depot/projects/mips/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/mips/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/mips/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_cd.c#10 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/mips/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/mips/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/mips/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/mips/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/mips/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/mips/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_filio.c#4 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/mips/sys/conf/NOTES#16 integrate .. //depot/projects/mips/sys/conf/files#20 integrate .. //depot/projects/mips/sys/conf/options#18 integrate .. //depot/projects/mips/sys/conf/options.i386#8 integrate .. //depot/projects/mips/sys/conf/options.pc98#8 integrate .. //depot/projects/mips/sys/contrib/dev/fla/fla.c#7 integrate .. //depot/projects/mips/sys/ddb/db_input.c#2 integrate .. //depot/projects/mips/sys/dev/aac/aac.c#8 integrate .. //depot/projects/mips/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/mips/sys/dev/aac/aac_debug.c#4 integrate .. //depot/projects/mips/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/mips/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/mips/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/mips/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/mips/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/mips/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/mips/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/mips/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/mips/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/mips/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/mips/sys/dev/aha/aha.c#5 integrate .. //depot/projects/mips/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/mips/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/mips/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.reg#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/mips/sys/dev/amr/amr.c#7 integrate .. //depot/projects/mips/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/mips/sys/dev/amr/amr_disk.c#7 integrate .. //depot/projects/mips/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/mips/sys/dev/amr/amrvar.h#7 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#7 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#4 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#6 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/mips/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/mips/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/mips/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/mips/sys/dev/ata/atapi-all.c#4 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#8 integrate .. //depot/projects/mips/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/mips/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/mips/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/mips/sys/dev/ccd/ccd.c#8 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/mips/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/mips/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/mips/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/mips/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/mips/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/mips/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/mips/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/mips/sys/dev/ida/ida.c#6 integrate .. //depot/projects/mips/sys/dev/ida/ida_disk.c#5 integrate .. //depot/projects/mips/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/mips/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/mips/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/mips/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/mips/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/mips/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/mips/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/mips/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/mips/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/mips/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/mips/sys/dev/mcd/mcd.c#6 integrate .. //depot/projects/mips/sys/dev/md/md.c#12 integrate .. //depot/projects/mips/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/mips/sys/dev/mii/dcphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/exphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/lxtphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/mii.c#3 integrate .. //depot/projects/mips/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/mips/sys/dev/mii/nsgphy.c#5 integrate .. //depot/projects/mips/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/pnaphy.c#5 integrate .. //depot/projects/mips/sys/dev/mii/pnphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/qsphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/tdkphy.c#5 integrate .. //depot/projects/mips/sys/dev/mii/tlphy.c#4 integrate .. //depot/projects/mips/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/mips/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/mips/sys/dev/mii/xmphy.c#5 integrate .. //depot/projects/mips/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/mips/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/mips/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#7 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/mips/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/mips/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/mips/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/mips/sys/dev/pccard/devlist2h.awk#2 integrate .. //depot/projects/mips/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/mips/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/mips/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/mips/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/mips/sys/dev/raidframe/rf_freebsdkintf.c#6 integrate .. //depot/projects/mips/sys/dev/sab/sab.c#8 integrate .. //depot/projects/mips/sys/dev/scd/scd.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/mips/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/mips/sys/dev/syscons/apm/apm_saver.c#4 integrate .. //depot/projects/mips/sys/dev/twe/twe_freebsd.c#7 integrate .. //depot/projects/mips/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/mips/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/mips/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/mips/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/mips/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pccard.c#7 integrate .. //depot/projects/mips/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/mips/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/mips/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/mips/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/mips/sys/geom/geom.h#13 integrate .. //depot/projects/mips/sys/geom/geom_aes.c#6 integrate .. //depot/projects/mips/sys/geom/geom_apple.c#4 integrate .. //depot/projects/mips/sys/geom/geom_bsd.c#11 integrate .. //depot/projects/mips/sys/geom/geom_ctl.c#7 integrate .. //depot/projects/mips/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/mips/sys/geom/geom_dev.c#13 integrate .. //depot/projects/mips/sys/geom/geom_disk.c#12 integrate .. //depot/projects/mips/sys/geom/geom_disk.h#1 branch .. //depot/projects/mips/sys/geom/geom_dump.c#10 integrate .. //depot/projects/mips/sys/geom/geom_enc.c#4 delete .. //depot/projects/mips/sys/geom/geom_event.c#7 integrate .. //depot/projects/mips/sys/geom/geom_ext.h#2 integrate .. //depot/projects/mips/sys/geom/geom_int.h#6 integrate .. //depot/projects/mips/sys/geom/geom_io.c#12 integrate .. //depot/projects/mips/sys/geom/geom_kern.c#10 integrate .. //depot/projects/mips/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/mips/sys/geom/geom_pc98.c#8 integrate .. //depot/projects/mips/sys/geom/geom_slice.c#10 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#12 integrate .. //depot/projects/mips/sys/geom/geom_sunlabel.c#7 integrate .. //depot/projects/mips/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#11 integrate .. //depot/projects/mips/sys/i386/conf/SMP#2 integrate .. //depot/projects/mips/sys/i386/i386/bios.c#4 integrate .. //depot/projects/mips/sys/i386/i386/db_interface.c#4 integrate .. //depot/projects/mips/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/mips/sys/i386/i386/locore.s#7 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/mips/sys/i386/i386/mem.c#7 integrate .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/mips/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/mips/sys/i386/i386/support.s#2 integrate .. //depot/projects/mips/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/mips/sys/i386/i386/trap.c#10 integrate .. //depot/projects/mips/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/mips/sys/i386/i386/vm86bios.s#3 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/mips/sys/i386/ibcs2/ibcs2_signal.c#3 integrate .. //depot/projects/mips/sys/i386/include/_types.h#4 integrate .. //depot/projects/mips/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/mips/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/mips/sys/i386/include/md_var.h#5 integrate .. //depot/projects/mips/sys/i386/include/param.h#4 integrate .. //depot/projects/mips/sys/i386/include/physio_proc.h#2 integrate .. //depot/projects/mips/sys/i386/include/pmap.h#4 integrate .. //depot/projects/mips/sys/i386/include/smp.h#4 integrate .. //depot/projects/mips/sys/i386/isa/apic_vector.s#3 integrate .. //depot/projects/mips/sys/i386/isa/elink.c#2 integrate .. //depot/projects/mips/sys/i386/isa/elink.h#2 integrate .. //depot/projects/mips/sys/i386/isa/intr_machdep.h#2 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#6 integrate .. //depot/projects/mips/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/mips/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/mips/sys/i386/svr4/svr4_machdep.c#3 integrate .. //depot/projects/mips/sys/ia64/ia32/syscalls.master#7 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/mips/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/mips/sys/ia64/ia64/support.s#2 integrate .. //depot/projects/mips/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/mips/sys/ia64/include/float.h#3 integrate .. //depot/projects/mips/sys/isa/fd.c#6 integrate .. //depot/projects/mips/sys/kern/init_sysent.c#9 integrate .. //depot/projects/mips/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/mips/sys/kern/kern_context.c#2 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#14 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#13 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#14 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#14 integrate .. //depot/projects/mips/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/mips/sys/kern/kern_proc.c#9 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#10 integrate .. //depot/projects/mips/sys/kern/kern_switch.c#11 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#12 integrate .. //depot/projects/mips/sys/kern/kern_thr.c#1 branch .. //depot/projects/mips/sys/kern/kern_thread.c#15 integrate .. //depot/projects/mips/sys/kern/kern_umtx.c#1 branch .. //depot/projects/mips/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/mips/sys/kern/sched_ule.c#7 integrate .. //depot/projects/mips/sys/kern/subr_bus.c#8 integrate .. //depot/projects/mips/sys/kern/subr_disk.c#10 integrate .. //depot/projects/mips/sys/kern/subr_prf.c#9 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#4 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#11 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#14 integrate .. //depot/projects/mips/sys/kern/sys_pipe.c#8 integrate .. //depot/projects/mips/sys/kern/syscalls.c#9 integrate .. //depot/projects/mips/sys/kern/syscalls.master#11 integrate .. //depot/projects/mips/sys/kern/tty.c#7 integrate .. //depot/projects/mips/sys/kern/tty_pty.c#5 integrate .. //depot/projects/mips/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/mips/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/mips/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/mips/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/mips/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/mips/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/mips/sys/modules/Makefile#13 integrate .. //depot/projects/mips/sys/modules/atspeaker/Makefile#3 delete .. //depot/projects/mips/sys/modules/bios/Makefile#1 branch .. //depot/projects/mips/sys/modules/bios/smapi/Makefile#1 branch .. //depot/projects/mips/sys/modules/bios/smbios/Makefile#1 branch .. //depot/projects/mips/sys/modules/bios/vpd/Makefile#1 branch .. //depot/projects/mips/sys/modules/dpt/Makefile#1 branch .. //depot/projects/mips/sys/modules/elink/Makefile#1 branch .. //depot/projects/mips/sys/modules/ex/Makefile#1 branch .. //depot/projects/mips/sys/modules/ie/Makefile#1 branch .. //depot/projects/mips/sys/modules/mcd/Makefile#2 integrate .. //depot/projects/mips/sys/modules/pcspeaker/Makefile#2 delete .. //depot/projects/mips/sys/modules/smapi/Makefile#3 delete .. //depot/projects/mips/sys/modules/speaker/Makefile#1 branch .. //depot/projects/mips/sys/net/if_ppp.c#7 integrate .. //depot/projects/mips/sys/net/slcompress.c#2 integrate .. //depot/projects/mips/sys/netatm/spans/spans_kxdr.c#3 integrate .. //depot/projects/mips/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/mips/sys/netinet/in.h#5 integrate .. //depot/projects/mips/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/mips/sys/netinet/ip.h#4 integrate .. //depot/projects/mips/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/mips/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/mips/sys/netinet/ip_input.c#13 integrate .. //depot/projects/mips/sys/netinet/ip_output.c#11 integrate .. //depot/projects/mips/sys/netinet/ip_var.h#7 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/mips/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/mips/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/mips/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/mips/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/mips/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/mips/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/mips/sys/netncp/ncp_ncp.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/mips/sys/netsmb/smb_rq.c#4 integrate .. //depot/projects/mips/sys/netsmb/smb_subr.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/mips/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/mips/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/mips/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#12 integrate .. //depot/projects/mips/sys/pc98/pc98/fd.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/syscons.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/wd.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/wd_cd.c#4 integrate .. //depot/projects/mips/sys/pci/if_dc.c#11 integrate .. //depot/projects/mips/sys/pci/if_pcn.c#6 integrate .. //depot/projects/mips/sys/pci/if_rl.c#9 integrate .. //depot/projects/mips/sys/pci/if_sf.c#6 integrate .. //depot/projects/mips/sys/pci/if_sis.c#7 integrate .. //depot/projects/mips/sys/pci/if_sk.c#5 integrate .. //depot/projects/mips/sys/pci/if_ste.c#6 integrate .. //depot/projects/mips/sys/pci/if_ti.c#8 integrate .. //depot/projects/mips/sys/pci/if_tl.c#6 integrate .. //depot/projects/mips/sys/pci/if_vr.c#8 integrate .. //depot/projects/mips/sys/pci/if_wb.c#6 integrate .. //depot/projects/mips/sys/pci/if_xl.c#9 integrate .. //depot/projects/mips/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/mips/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/copystr.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/extintr.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/fpu.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/fuswintr.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#9 integrate .. //depot/projects/mips/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/mips/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/sys_machdep.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/mips/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/mips/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/mips/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/mips/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/mips/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/mips/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/mips/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/mips/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/mips/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/mips/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/mips/sys/sparc64/include/fp.h#2 integrate .. //depot/projects/mips/sys/sparc64/include/pcb.h#4 integrate .. //depot/projects/mips/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/mips/sys/sparc64/pci/ofw_pci.c#6 integrate .. //depot/projects/mips/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/mips/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/mips/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/mips/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/mips/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/mips/sys/sparc64/sparc64/tsb.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/mips/sys/sys/_types.h#6 integrate .. //depot/projects/mips/sys/sys/acct.h#2 integrate .. //depot/projects/mips/sys/sys/bio.h#5 integrate .. //depot/projects/mips/sys/sys/disk.h#6 integrate .. //depot/projects/mips/sys/sys/disklabel.h#8 integrate .. //depot/projects/mips/sys/sys/diskmbr.h#3 integrate .. //depot/projects/mips/sys/sys/diskslice.h#4 delete .. //depot/projects/mips/sys/sys/endian.h#2 integrate .. //depot/projects/mips/sys/sys/mac.h#10 integrate .. //depot/projects/mips/sys/sys/mac_policy.h#10 integrate .. //depot/projects/mips/sys/sys/mbuf.h#8 integrate .. //depot/projects/mips/sys/sys/mman.h#2 integrate .. //depot/projects/mips/sys/sys/mount.h#6 integrate .. //depot/projects/mips/sys/sys/msgbuf.h#3 integrate .. //depot/projects/mips/sys/sys/param.h#9 integrate .. //depot/projects/mips/sys/sys/proc.h#16 integrate .. //depot/projects/mips/sys/sys/reboot.h#2 integrate .. //depot/projects/mips/sys/sys/signal.h#7 integrate .. //depot/projects/mips/sys/sys/signalvar.h#3 integrate .. //depot/projects/mips/sys/sys/socketvar.h#6 integrate .. //depot/projects/mips/sys/sys/stat.h#6 integrate .. //depot/projects/mips/sys/sys/syscall.h#9 integrate .. //depot/projects/mips/sys/sys/syscall.mk#9 integrate .. //depot/projects/mips/sys/sys/sysctl.h#5 integrate .. //depot/projects/mips/sys/sys/sysproto.h#10 integrate .. //depot/projects/mips/sys/sys/systm.h#6 integrate .. //depot/projects/mips/sys/sys/thr.h#1 branch .. //depot/projects/mips/sys/sys/types.h#8 integrate .. //depot/projects/mips/sys/sys/ucred.h#2 integrate .. //depot/projects/mips/sys/sys/umtx.h#1 branch .. //depot/projects/mips/sys/ufs/ffs/ffs_rawread.c#1 branch .. //depot/projects/mips/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/mips/sys/vm/uma_core.c#11 integrate .. //depot/projects/mips/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/mips/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/mips/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/mips/tools/3.0-upgrade/Makefile#2 delete .. //depot/projects/mips/tools/3.0-upgrade/README#2 delete .. //depot/projects/mips/tools/3.0-upgrade/cvt-wtmp.c#2 delete .. //depot/projects/mips/tools/regression/lib/libc/gen/test-fpclassify.c#2 integrate .. //depot/projects/mips/usr.bin/Makefile#8 integrate .. //depot/projects/mips/usr.bin/alias/Makefile#2 integrate .. //depot/projects/mips/usr.bin/at/at.man#4 integrate .. //depot/projects/mips/usr.bin/du/du.c#4 integrate .. //depot/projects/mips/usr.bin/elf2aout/Makefile#4 integrate .. //depot/projects/mips/usr.bin/elf2aout/elf2aout.c#4 integrate .. //depot/projects/mips/usr.bin/finger/lprint.c#2 integrate .. //depot/projects/mips/usr.bin/finger/sprint.c#2 integrate .. //depot/projects/mips/usr.bin/finger/util.c#2 integrate .. //depot/projects/mips/usr.bin/make/main.c#5 integrate .. //depot/projects/mips/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/mips/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/mips/usr.bin/su/su.c#7 integrate .. //depot/projects/mips/usr.bin/tconv/Makefile#2 delete .. //depot/projects/mips/usr.bin/tconv/quit.c#2 delete .. //depot/projects/mips/usr.bin/tconv/tconv.1#2 delete .. //depot/projects/mips/usr.bin/tconv/tconv.c#2 delete .. //depot/projects/mips/usr.bin/xargs/Makefile#3 integrate .. //depot/projects/mips/usr.bin/xargs/xargs.c#6 integrate .. //depot/projects/mips/usr.sbin/amd/Makefile.inc#2 integrate .. //depot/projects/mips/usr.sbin/ancontrol/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/apm/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/arp/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/boot0cfg/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/cdcontrol/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/chown/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/chroot/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/crunch/crunchide/endian.h#4 delete .. //depot/projects/mips/usr.sbin/crunch/crunchide/exec_elf32.c#6 integrate .. //depot/projects/mips/usr.sbin/ctm/ctm/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ctm/ctm_rmail/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ctm/mkCTM/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/daemon/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/digictl/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/edquota/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/extattrctl/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/fdcontrol/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnmonitor/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ifmcstat/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/iostat/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/jail/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/jail/jail.8#5 integrate .. //depot/projects/mips/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/mips/usr.sbin/kbdcontrol/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/kldxref/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/lpr/common_source/lp.local.h#2 integrate .. //depot/projects/mips/usr.sbin/lpr/lpr/printcap.5#2 integrate .. //depot/projects/mips/usr.sbin/mergemaster/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/mountd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/mrouted/map-mbone/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/mrouted/mrinfo/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/named/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/named/Makefile.inc#2 integrate .. //depot/projects/mips/usr.sbin/ndc/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/nfsd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/nslookup/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ntp/libntp/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ntp/libparse/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ntp/ntp-genkeys/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/ofwdump/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardc/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pcvt/kcon/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/mips/usr.sbin/pnpinfo/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ppp/bundle.h#2 integrate .. //depot/projects/mips/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/datalink.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/iface.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/ip.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/ipv6cp.c#3 integrate .. //depot/projects/mips/usr.sbin/ppp/ncpaddr.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/mips/usr.sbin/ppp/prompt.c#2 integrate .. //depot/projects/mips/usr.sbin/pppctl/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pppd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pstat/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pw/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/pwd_mkdb/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/quot/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/repquota/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rmt/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rpc.lockd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rpc.statd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rpc.yppasswdd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rpc.ypupdated/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rpcbind/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rtadvd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/rtadvd/config.c#3 integrate .. //depot/projects/mips/usr.sbin/rtadvd/rtadvd.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/rwhod/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/sa/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/sendmail/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/setfmac/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/setfmac/setfsmac.8#2 integrate .. //depot/projects/mips/usr.sbin/slstat/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/syslogd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/trpt/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/tzsetup/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ugidfw/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/vipw/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/watch/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/wicontrol/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/yp_mkdb/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ypserv/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/mips/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.278 2003/02/27 13:11:33 ru Exp $ +# $FreeBSD: src/Makefile,v 1.280 2003/04/03 05:34:36 imp Exp $ # # The user-driven targets are: # @@ -14,16 +14,8 @@ # reinstallkernel - Reinstall the kernel and the kernel-modules. # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). -# upgrade - Upgrade a.out (2.2.x/3.0) system to the new ELF way # most - Build user commands, no libraries or include files. # installmost - Install user commands, no libraries or include files. -# aout-to-elf - Upgrade a system from a.out to elf format (see below). -# aout-to-elf-build - Build everything required to upgrade a system from -# a.out to elf format (see below). -# aout-to-elf-install - Install everything built by aout-to-elf-build (see -# below). -# move-aout-libs - Move the a.out libraries into an aout sub-directory -# of each elf library sub-directory. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -63,28 +55,6 @@ # and once the world is built you can cross build a kernel using the # buildkernel target. # -# ---------------------------------------------------------------------------- -# -# Upgrading an i386 system from a.out to elf format -# -# -# The aout->elf transition build is performed by doing a `make upgrade' (or -# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed -# by a `make aout-to-elf-install', depending on user preference. -# You need to have at least 320 MB of free space for the object tree. -# -# The upgrade process checks the installed release. If this is 3.0-CURRENT, -# it is assumed that your kernel contains all the syscalls required by the -# current sources. -# -# The upgrade procedure will stop and ask for confirmation to proceed -# several times. On each occasion, you can type Ctrl-C to abort the -# upgrade. Optionally, you can also start it with NOCONFIRM=yes and skip -# the confirmation steps. -# -# ---------------------------------------------------------------------------- -# -# # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # @@ -194,23 +164,6 @@ ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR= >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 10:59:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2285B37B404; Sat, 5 Apr 2003 10:59:46 -0800 (PST) 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 B96E937B401 for ; Sat, 5 Apr 2003 10:59:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6197B43F85 for ; Sat, 5 Apr 2003 10:59:45 -0800 (PST) (envelope-from jmallett@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 h35Ixj0U002211 for ; Sat, 5 Apr 2003 10:59:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Ixi64002208 for perforce@freebsd.org; Sat, 5 Apr 2003 10:59:44 -0800 (PST) Date: Sat, 5 Apr 2003 10:59:44 -0800 (PST) Message-Id: <200304051859.h35Ixi64002208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 28241 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, 05 Apr 2003 18:59:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=28241 Change 28241 by jmallett@jmallett_dalek on 2003/04/05 10:59:05 Catch up with endian function changes, clean up one style bogon. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#11 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#11 (text+ko) ==== @@ -33,6 +33,7 @@ #include +#include #ifndef _KERNEL #include #include @@ -62,9 +63,9 @@ static void g_fx_swap_volpart(struct volpart *vp) { - vp->vp_size = g_dec_be4((u_char *)&vp->vp_size); - vp->vp_begin = g_dec_be4((u_char *)&vp->vp_begin); - vp->vp_type = g_dec_be4((u_char *)&vp->vp_type); + vp->vp_size = be32dec((u_char *)&vp->vp_size); + vp->vp_begin = be32dec((u_char *)&vp->vp_begin); + vp->vp_type = be32dec((u_char *)&vp->vp_type); } static const char * @@ -89,8 +90,8 @@ words = (int32_t *)vh; for (i = 0; i < 512 / sizeof *words; i++) - sum += g_dec_be4((u_char *)&words[i]); - return sum; + sum += be32dec((u_char *)&words[i]); + return (sum); } static int @@ -161,7 +162,7 @@ if (buf == NULL || error != 0) break; label = (struct volhdr *)buf; - if (g_dec_be4((u_char *)&label->vh_magic) != FX_LABEL_MAGIC) + if (be32dec((u_char *)&label->vh_magic) != FX_LABEL_MAGIC) break; error = g_fx_cksum(label); if (error != 0) { From owner-p4-projects@FreeBSD.ORG Sat Apr 5 11:14:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39D9F37B404; Sat, 5 Apr 2003 11:14:04 -0800 (PST) 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 CD82E37B401 for ; Sat, 5 Apr 2003 11:14:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EA4A43FA3 for ; Sat, 5 Apr 2003 11:14:03 -0800 (PST) (envelope-from jmallett@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 h35JE30U004429 for ; Sat, 5 Apr 2003 11:14:03 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35JE2If004422 for perforce@freebsd.org; Sat, 5 Apr 2003 11:14:02 -0800 (PST) Date: Sat, 5 Apr 2003 11:14:02 -0800 (PST) Message-Id: <200304051914.h35JE2If004422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 28242 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, 05 Apr 2003 19:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28242 Change 28242 by jmallett@jmallett_dalek on 2003/04/05 11:13:45 Drag over the casuptr() stub. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#8 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#8 (text+ko) ==== @@ -141,3 +141,9 @@ { return (0); } + +intptr_t +casuptr(intptr_t *p, intptr_t old, intptr_t new) +{ + return (-1); +} From owner-p4-projects@FreeBSD.ORG Sat Apr 5 12:35:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C78A37B404; Sat, 5 Apr 2003 12:35:44 -0800 (PST) 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 2447337B401 for ; Sat, 5 Apr 2003 12:35:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD25643F85 for ; Sat, 5 Apr 2003 12:35:43 -0800 (PST) (envelope-from jmallett@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 h35KZh0U011062 for ; Sat, 5 Apr 2003 12:35:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35KZgXI011059 for perforce@freebsd.org; Sat, 5 Apr 2003 12:35:42 -0800 (PST) Date: Sat, 5 Apr 2003 12:35:42 -0800 (PST) Message-Id: <200304052035.h35KZgXI011059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 28245 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, 05 Apr 2003 20:35:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=28245 Change 28245 by jmallett@jmallett_dalek on 2003/04/05 12:35:30 Fix for Big-Endian with Werror. Affected files ... .. //depot/projects/mips/sys/libkern/bcmp.c#2 edit Differences ... ==== //depot/projects/mips/sys/libkern/bcmp.c#2 (text+ko) ==== @@ -134,12 +134,12 @@ & ((1L << (len << 3)) - 1)) != 0); } #else - register char *p1, *p2; + register const char *p1, *p2; if (length == 0) return(0); - p1 = (char *)b1; - p2 = (char *)b2; + p1 = (const char *)b1; + p2 = (const char *)b2; do if (*p1++ != *p2++) break; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:00:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C0F337B404; Sat, 5 Apr 2003 13:00:15 -0800 (PST) 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 DDC6137B407 for ; Sat, 5 Apr 2003 13:00:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A38743F85 for ; Sat, 5 Apr 2003 13:00:14 -0800 (PST) (envelope-from jmallett@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 h35L0E0U017829 for ; Sat, 5 Apr 2003 13:00:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35L0ERU017826 for perforce@freebsd.org; Sat, 5 Apr 2003 13:00:14 -0800 (PST) Date: Sat, 5 Apr 2003 13:00:14 -0800 (PST) Message-Id: <200304052100.h35L0ERU017826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 28247 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, 05 Apr 2003 21:00:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=28247 Change 28247 by jmallett@jmallett_dalek on 2003/04/05 12:59:40 Remove leftovers from stealing from PowerPC that are a bit too WARNS happy by virtue of not being in libkern headers. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#11 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#11 (text+ko) ==== @@ -29,12 +29,9 @@ dev/arcbios/arcbios.c optional arcbios dev/arcbios/arcbios_tty.c optional arcbios -libkern/ashldi3.c standard -libkern/ashrdi3.c standard libkern/bcmp.c standard libkern/divdi3.c standard libkern/ffs.c standard -libkern/lshrdi3.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:16:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F072837B404; Sat, 5 Apr 2003 13:16:36 -0800 (PST) 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 90A9B37B401 for ; Sat, 5 Apr 2003 13:16:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D6B543F85 for ; Sat, 5 Apr 2003 13:16:36 -0800 (PST) (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 h35LGa0U020397 for ; Sat, 5 Apr 2003 13:16:36 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35LGZNi020394 for perforce@freebsd.org; Sat, 5 Apr 2003 13:16:35 -0800 (PST) Date: Sat, 5 Apr 2003 13:16:35 -0800 (PST) Message-Id: <200304052116.h35LGZNi020394@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 28250 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, 05 Apr 2003 21:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=28250 Change 28250 by marcel@marcel_nfs on 2003/04/05 13:16:31 Fix SKI build. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#12 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#12 (text+ko) ==== @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #ifndef SKI_ROOT_FILESYSTEM #define SKI_ROOT_FILESYSTEM "ia64-root.fs" From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:18:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0526037B404; Sat, 5 Apr 2003 13:18:40 -0800 (PST) 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 AF9E137B401 for ; Sat, 5 Apr 2003 13:18:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C9ED43F3F for ; Sat, 5 Apr 2003 13:18:39 -0800 (PST) (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 h35LId0U020514 for ; Sat, 5 Apr 2003 13:18:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35LIcBr020511 for perforce@freebsd.org; Sat, 5 Apr 2003 13:18:38 -0800 (PST) Date: Sat, 5 Apr 2003 13:18:38 -0800 (PST) Message-Id: <200304052118.h35LIcBr020511@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 28251 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, 05 Apr 2003 21:18:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=28251 Change 28251 by marcel@marcel_nfs on 2003/04/05 13:17:53 IFia64 Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/sscdisk.c#5 integrate Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/sscdisk.c#5 (text+ko) ==== @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #ifndef SKI_ROOT_FILESYSTEM #define SKI_ROOT_FILESYSTEM "ia64-root.fs" From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:39:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D51C37B401; Sat, 5 Apr 2003 13:39:07 -0800 (PST) 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 2CF1337B409 for ; Sat, 5 Apr 2003 13:39:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2841943F93 for ; Sat, 5 Apr 2003 13:39:06 -0800 (PST) (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 h35Ld50U021904 for ; Sat, 5 Apr 2003 13:39:05 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Ld5qe021901 for perforce@freebsd.org; Sat, 5 Apr 2003 13:39:05 -0800 (PST) Date: Sat, 5 Apr 2003 13:39:05 -0800 (PST) Message-Id: <200304052139.h35Ld5qe021901@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 28254 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, 05 Apr 2003 21:39:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=28254 Change 28254 by peter@peter_overcee on 2003/04/05 13:38:52 Checkpoint. Evil hacks to fit an elf64 loader into an i386 loader. Not finished yet. Stolen from imgact_elf{,32,64}.c. Affected files ... .. //depot/projects/hammer/sys/boot/common/Makefile.inc#3 edit .. //depot/projects/hammer/sys/boot/common/load_elf.c#4 edit .. //depot/projects/hammer/sys/boot/common/load_elf32.c#1 add .. //depot/projects/hammer/sys/boot/common/load_elf64.c#1 add .. //depot/projects/hammer/sys/i386/include/elf.h#2 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/Makefile.inc#3 (text+ko) ==== @@ -1,9 +1,19 @@ # $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.14 2002/08/29 02:02:27 peter Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c -SRCS+= interp_backslash.c interp_parse.c load_elf.c ls.c misc.c +SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" +SRCS+= load_elf32.c load_elf64.c +.endif +.if ${MACHINE_ARCH} == "powerpc" +SRCS+= load_elf32.c +.endif +.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "alpha" +SRCS+= load_elf32.c +.endif + .if defined(LOADER_NET_SUPPORT) SRCS+= dev_net.c .endif ==== //depot/projects/hammer/sys/boot/common/load_elf.c#4 (text+ko) ==== @@ -62,17 +62,17 @@ vm_offset_t off; } *elf_file_t; -static int elf_loadimage(struct preloaded_file *mp, elf_file_t ef, vm_offset_t loadaddr); -static int elf_lookup_symbol(struct preloaded_file *mp, elf_file_t ef, const char* name, Elf_Sym* sym); +static int __elfN(loadimage)(struct preloaded_file *mp, elf_file_t ef, vm_offset_t loadaddr); +static int __elfN(lookup_symbol)(struct preloaded_file *mp, elf_file_t ef, const char* name, Elf_Sym* sym); #ifdef __sparc__ -static void elf_reloc_ptr(struct preloaded_file *mp, elf_file_t ef, +static void __elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, void *p, void *val, size_t len); #endif -static int elf_parse_modmetadata(struct preloaded_file *mp, elf_file_t ef); +static int __elfN(parse_modmetadata)(struct preloaded_file *mp, elf_file_t ef); static char *fake_modname(const char *name); -const char *elf_kerneltype = "elf kernel"; -const char *elf_moduletype = "elf module"; +const char *__elfN(kerneltype) = __XSTRING(__ELF_WORD_SIZE) "kernel"; +const char *__elfN(moduletype) = __XSTRING(__ELF_WORD_SIZE) "module"; /* * Attempt to load the file (file) as an ELF module. It will be stored at @@ -80,7 +80,7 @@ * will be saved in (result). */ int -elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result) +__elfN(loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result) { struct preloaded_file *fp, *kfp; struct elf_file ef; @@ -134,12 +134,12 @@ if (ehdr->e_type == ET_DYN) { /* Looks like a kld module */ if (kfp == NULL) { - printf("elf_loadfile: can't load module before kernel\n"); + printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module before kernel\n"); err = EPERM; goto oerr; } - if (strcmp(elf_kerneltype, kfp->f_type)) { - printf("elf_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); + if (strcmp(__elfN(kerneltype), kfp->f_type)) { + printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); err = EPERM; goto oerr; } @@ -155,7 +155,7 @@ } else if (ehdr->e_type == ET_EXEC) { /* Looks like a kernel */ if (kfp != NULL) { - printf("elf_loadfile: kernel already loaded\n"); + printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: kernel already loaded\n"); err = EPERM; goto oerr; } @@ -164,7 +164,7 @@ */ dest = (vm_offset_t) ehdr->e_entry; if (dest == 0) { - printf("elf_loadfile: not a kernel (maybe static binary?)\n"); + printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: not a kernel (maybe static binary?)\n"); err = EPERM; goto oerr; } @@ -180,14 +180,14 @@ */ fp = file_alloc(); if (fp == NULL) { - printf("elf_loadfile: cannot allocate module info\n"); + printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: cannot allocate module info\n"); err = EPERM; goto out; } if (ef.kernel) setenv("kernelname", filename, 1); fp->f_name = strdup(filename); - fp->f_type = strdup(ef.kernel ? elf_kerneltype : elf_moduletype); + fp->f_type = strdup(ef.kernel ? __elfN(kerneltype) : __elfN(moduletype)); #ifdef ELF_VERBOSE if (ef.kernel) @@ -196,7 +196,7 @@ printf("%s ", filename); #endif - fp->f_size = elf_loadimage(fp, &ef, dest); + fp->f_size = __elfN(loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) goto ioerr; @@ -224,7 +224,7 @@ * the Elf header, load the image at (off) */ static int -elf_loadimage(struct preloaded_file *fp, elf_file_t ef, vm_offset_t off) +__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, vm_offset_t off) { int i; u_int j; @@ -261,7 +261,7 @@ ef->off = off; if ((ehdr->e_phoff + ehdr->e_phnum * sizeof(*phdr)) > ef->firstlen) { - printf("elf_loadimage: program header not within first page\n"); + printf(__XSTRING(__ELF_WORD_SIZE) "_loadimage: program header not within first page\n"); goto out; } phdr = (Elf_Phdr *)(ef->firstpage + ehdr->e_phoff); @@ -295,12 +295,12 @@ if (phdr[i].p_filesz > fpcopy) { if (lseek(ef->fd, (off_t)(phdr[i].p_offset + fpcopy), SEEK_SET) == -1) { - printf("\nelf_loadexec: cannot seek\n"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadexec: cannot seek\n"); goto out; } if (archsw.arch_readin(ef->fd, phdr[i].p_vaddr + off + fpcopy, phdr[i].p_filesz - fpcopy) != (ssize_t)(phdr[i].p_filesz - fpcopy)) { - printf("\nelf_loadexec: archsw.readin failed\n"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadexec: archsw.readin failed\n"); goto out; } } @@ -315,7 +315,7 @@ /* no archsw.arch_bzero */ buf = malloc(PAGE_SIZE); if (buf == NULL) { - printf("\nelf_loadimage: malloc() failed\n"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: malloc() failed\n"); goto out; } bzero(buf, PAGE_SIZE); @@ -353,12 +353,12 @@ if (shdr == NULL) goto nosyms; if (lseek(ef->fd, (off_t)ehdr->e_shoff, SEEK_SET) == -1) { - printf("\nelf_loadimage: cannot lseek() to section headers"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: cannot lseek() to section headers"); goto nosyms; } result = read(ef->fd, shdr, chunk); if (result < 0 || (size_t)result != chunk) { - printf("\nelf_loadimage: read section headers failed"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: read section headers failed"); goto nosyms; } symtabindex = -1; @@ -423,14 +423,14 @@ #endif if (lseek(ef->fd, (off_t)shdr[i].sh_offset, SEEK_SET) == -1) { - printf("\nelf_loadimage: could not seek for symbols - skipped!"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not seek for symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; } result = archsw.arch_readin(ef->fd, lastaddr, shdr[i].sh_size); if (result < 0 || (size_t)result != shdr[i].sh_size) { - printf("\nelf_loadimage: could not read symbols - skipped!"); + printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; @@ -513,7 +513,7 @@ COPYOUT(ef->hashtab + 1, &ef->nchains, sizeof(ef->nchains)); ef->buckets = ef->hashtab + 2; ef->chains = ef->buckets + ef->nbuckets; - if (elf_parse_modmetadata(fp, ef) == 0) + if (__elfN(parse_modmetadata)(fp, ef) == 0) goto out; if (ef->kernel) /* kernel must not depend on anything */ @@ -559,7 +559,7 @@ } int -elf_parse_modmetadata(struct preloaded_file *fp, elf_file_t ef) +__elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef) { struct mod_metadata md; struct mod_depend *mdepend; @@ -568,10 +568,10 @@ char *s, *v, **p, **p_stop; int modcnt, minfolen; - if (elf_lookup_symbol(fp, ef, "__start_set_modmetadata_set", &sym) != 0) + if (__elfN(lookup_symbol)(fp, ef, "__start_set_modmetadata_set", &sym) != 0) return ENOENT; p = (char **)(sym.st_value + ef->off); - if (elf_lookup_symbol(fp, ef, "__stop_set_modmetadata_set", &sym) != 0) + if (__elfN(lookup_symbol)(fp, ef, "__stop_set_modmetadata_set", &sym) != 0) return ENOENT; p_stop = (char **)(sym.st_value + ef->off); @@ -579,13 +579,13 @@ while (p < p_stop) { COPYOUT(p, &v, sizeof(v)); #ifdef __sparc64__ - elf_reloc_ptr(fp, ef, p, &v, sizeof(v)); + __elfN(reloc_ptr)(fp, ef, p, &v, sizeof(v)); #else v += ef->off; #endif COPYOUT(v, &md, sizeof(md)); #ifdef __sparc64__ - elf_reloc_ptr(fp, ef, v, &md, sizeof(md)); + __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); #else md.md_cval += ef->off; md.md_data += ef->off; @@ -639,9 +639,9 @@ return h; } -static const char elf_bad_symtable[] = "elf_lookup_symbol: corrupt symbol table\n"; +static const char __elfN(bad_symtable)[] = __XSTRING(__ELF_WORD_SIZE) "_lookup_symbol: corrupt symbol table\n"; int -elf_lookup_symbol(struct preloaded_file *fp, elf_file_t ef, const char* name, +__elfN(lookup_symbol)(struct preloaded_file *fp, elf_file_t ef, const char* name, Elf_Sym *symp) { Elf_Hashelt symnum; @@ -654,13 +654,13 @@ while (symnum != STN_UNDEF) { if (symnum >= ef->nchains) { - printf(elf_bad_symtable); + printf(__elfN(bad_symtable)); return ENOENT; } COPYOUT(ef->symtab + symnum, &sym, sizeof(sym)); if (sym.st_name == 0) { - printf(elf_bad_symtable); + printf(__elfN(bad_symtable)); return ENOENT; } @@ -688,7 +688,7 @@ * the image in-place, because this is done by kern_linker later on. */ static void -elf_reloc_ptr(struct preloaded_file *mp, elf_file_t ef, +__elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, void *p, void *val, size_t len) { Elf_Addr off = (Elf_Addr)p - ef->off, word; ==== //depot/projects/hammer/sys/i386/include/elf.h#2 (text+ko) ==== @@ -34,8 +34,12 @@ */ #include /* Definitions common to all 32 bit architectures. */ +#include /* Definitions common to all 64 bit architectures. */ +#ifndef __ELF_WORD_SIZE #define __ELF_WORD_SIZE 32 /* Used by */ +#endif + #include #define ELF_ARCH EM_386 @@ -58,6 +62,11 @@ } a_un; } Elf32_Auxinfo; +/* Fake for x86-64 loader support */ +typedef struct { + int fake; +} Elf64_Auxinfo; + __ElfType(Auxinfo); /* Values for a_type. */ From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:48:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8752137B405; Sat, 5 Apr 2003 13:48:19 -0800 (PST) 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 2422F37B404 for ; Sat, 5 Apr 2003 13:48:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61C0D43FBF for ; Sat, 5 Apr 2003 13:48:18 -0800 (PST) (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 h35LmI0U022655 for ; Sat, 5 Apr 2003 13:48:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35LmHMV022652 for perforce@freebsd.org; Sat, 5 Apr 2003 13:48:17 -0800 (PST) Date: Sat, 5 Apr 2003 13:48:17 -0800 (PST) Message-Id: <200304052148.h35LmHMV022652@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 28256 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, 05 Apr 2003 21:48:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=28256 Change 28256 by peter@peter_overcee on 2003/04/05 13:47:52 turn off stuff I dont need right now. Affected files ... .. //depot/projects/hammer/sys/boot/i386/Makefile#3 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/sys/boot/i386/Makefile,v 1.19 2002/12/31 02:29:03 obrien Exp $ -SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader +SUBDIR= btx libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr From owner-p4-projects@FreeBSD.ORG Sat Apr 5 13:48:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A5C137B416; Sat, 5 Apr 2003 13:48:20 -0800 (PST) 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 4033337B401 for ; Sat, 5 Apr 2003 13:48:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE19143FBD for ; Sat, 5 Apr 2003 13:48:17 -0800 (PST) (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 h35LmH0U022649 for ; Sat, 5 Apr 2003 13:48:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35LmHkr022646 for perforce@freebsd.org; Sat, 5 Apr 2003 13:48:17 -0800 (PST) Date: Sat, 5 Apr 2003 13:48:17 -0800 (PST) Message-Id: <200304052148.h35LmHkr022646@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 28255 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, 05 Apr 2003 21:48:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=28255 Change 28255 by peter@peter_overcee on 2003/04/05 13:47:29 tidy up some stray bits Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#3 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#3 (text+ko) ==== @@ -256,8 +256,9 @@ int bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t *modulep) { - struct preloaded_file *xp; + struct preloaded_file *xp, *kfp; struct i386_devdesc *rootdev; + struct file_metadata *md; vm_offset_t addr; vm_offset_t kernend; vm_offset_t envp; @@ -267,7 +268,7 @@ char *kernelname; const char *kernelpath; - howtop = bi_getboothowto(args); + *howtop = bi_getboothowto(args); /* * Allow the environment variable 'rootdev' to override the supplied device @@ -330,7 +331,9 @@ /* pad to a page boundary */ addr = roundup(addr, PAGE_SIZE); - kfp = file_findfile(NULL, "elf kernel"); + kfp = file_findfile(NULL, "elf64 kernel"); + if (kfp == NULL) + kfp = file_findfile(NULL, "elf32 kernel"); if (kfp == NULL) panic("can't find kernel file"); kernend = 0; /* fill it in later */ From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:22:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C15537B404; Sat, 5 Apr 2003 14:22:01 -0800 (PST) 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 3D7D337B401 for ; Sat, 5 Apr 2003 14:22:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAB9E43F75 for ; Sat, 5 Apr 2003 14:22:00 -0800 (PST) (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 h35MM00U030468 for ; Sat, 5 Apr 2003 14:22:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MM0pQ030465 for perforce@freebsd.org; Sat, 5 Apr 2003 14:22:00 -0800 (PST) Date: Sat, 5 Apr 2003 14:22:00 -0800 (PST) Message-Id: <200304052222.h35MM0pQ030465@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 28259 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, 05 Apr 2003 22:22:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=28259 Change 28259 by peter@peter_overcee on 2003/04/05 14:21:48 support multiple elf types Affected files ... .. //depot/projects/hammer/sys/boot/common/bootstrap.h#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#5 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/bootstrap.h#2 (text+ko) ==== @@ -234,7 +234,9 @@ int aout_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result); vm_offset_t aout_findsym(char *name, struct preloaded_file *fp); -int elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result); +#ifdef __elfN +int __elfN(loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result); +#endif /* * Support for commands ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#5 (text+ko) ==== @@ -38,9 +38,9 @@ #include "libi386.h" #include "btxv86.h" -static int elf_exec(struct preloaded_file *amp); +static int elf32_exec(struct preloaded_file *amp); -struct file_format i386_elf = { elf_loadfile, elf_exec }; +struct file_format i386_elf = { elf32_loadfile, elf32_exec }; /* * There is an a.out kernel and one or more a.out modules loaded. @@ -48,7 +48,7 @@ * preparations as are required, and do so. */ static int -elf_exec(struct preloaded_file *fp) +elf32_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *ehdr; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:24:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA40837B404; Sat, 5 Apr 2003 14:24:04 -0800 (PST) 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 5E07837B401 for ; Sat, 5 Apr 2003 14:24:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A97543FBD for ; Sat, 5 Apr 2003 14:24:04 -0800 (PST) (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 h35MO30U030634 for ; Sat, 5 Apr 2003 14:24:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MO3Tv030631 for perforce@freebsd.org; Sat, 5 Apr 2003 14:24:03 -0800 (PST) Date: Sat, 5 Apr 2003 14:24:03 -0800 (PST) Message-Id: <200304052224.h35MO3Tv030631@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 28260 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, 05 Apr 2003 22:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=28260 Change 28260 by peter@peter_overcee on 2003/04/05 14:23:12 elf32/elf64 branched from elf_freebsd Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#3 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#1 branch Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#3 (text+ko) ==== @@ -4,7 +4,8 @@ INTERNALLIB= true SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ - biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \ + biospci.c bootinfo.c comconsole.c devicename.c elf32_freebsd.c \ + elf64_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:27:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DAD237B404; Sat, 5 Apr 2003 14:27:09 -0800 (PST) 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 C1AC637B401 for ; Sat, 5 Apr 2003 14:27:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A02043F85 for ; Sat, 5 Apr 2003 14:27:08 -0800 (PST) (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 h35MR80U030869 for ; Sat, 5 Apr 2003 14:27:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MR76c030866 for perforce@freebsd.org; Sat, 5 Apr 2003 14:27:07 -0800 (PST) Date: Sat, 5 Apr 2003 14:27:07 -0800 (PST) Message-Id: <200304052227.h35MR76c030866@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 28261 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, 05 Apr 2003 22:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=28261 Change 28261 by peter@peter_overcee on 2003/04/05 14:26:26 add elf64 and connect it Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/i386/loader/conf.c#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ==== @@ -26,6 +26,7 @@ * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ */ +#define __ELF_WORD_SIZE 64 #include #include #include @@ -38,9 +39,9 @@ #include "libi386.h" #include "btxv86.h" -static int elf32_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); -struct file_format i386_elf = { elf32_loadfile, elf32_exec }; +struct file_format x86_64_elf = { elf64_loadfile, elf64_exec }; /* * There is an a.out kernel and one or more a.out modules loaded. @@ -48,7 +49,7 @@ * preparations as are required, and do so. */ static int -elf32_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *ehdr; ==== //depot/projects/hammer/sys/boot/i386/loader/conf.c#4 (text+ko) ==== @@ -82,9 +82,11 @@ * rather than reading the file go first. */ extern struct file_format i386_elf; +extern struct file_format x86_64_elf; struct file_format *file_formats[] = { &i386_elf, + &x86_64_elf, NULL }; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:44:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CE6137B404; Sat, 5 Apr 2003 14:44:31 -0800 (PST) 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 3BB6D37B401 for ; Sat, 5 Apr 2003 14:44:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF81A43F85 for ; Sat, 5 Apr 2003 14:44:30 -0800 (PST) (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 h35MiU0U032255 for ; Sat, 5 Apr 2003 14:44:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MiUwF032252 for perforce@freebsd.org; Sat, 5 Apr 2003 14:44:30 -0800 (PST) Date: Sat, 5 Apr 2003 14:44:30 -0800 (PST) Message-Id: <200304052244.h35MiUwF032252@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 28263 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, 05 Apr 2003 22:44:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=28263 Change 28263 by peter@peter_overcee on 2003/04/05 14:44:07 Deal with the Joy of 64 bit stuff on a 32 bit platform Affected files ... .. //depot/projects/hammer/sys/boot/common/bootstrap.h#3 edit .. //depot/projects/hammer/sys/boot/common/load_elf.c#5 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/bootstrap.h#3 (text+ko) ==== @@ -210,7 +210,7 @@ struct file_format { /* Load function must return EFTYPE if it can't handle the module supplied */ - int (* l_load)(char *filename, vm_offset_t dest, struct preloaded_file **result); + int (* l_load)(char *filename, u_int64_t dest, struct preloaded_file **result); /* Only a loader that will load a kernel (first module) should have an exec handler */ int (* l_exec)(struct preloaded_file *mp); }; @@ -231,11 +231,8 @@ /* MI module loaders */ -int aout_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result); -vm_offset_t aout_findsym(char *name, struct preloaded_file *fp); - #ifdef __elfN -int __elfN(loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result); +int __elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result); #endif /* ==== //depot/projects/hammer/sys/boot/common/load_elf.c#5 (text+ko) ==== @@ -59,10 +59,10 @@ caddr_t firstpage; size_t firstlen; int kernel; - vm_offset_t off; + u_int64_t off; } *elf_file_t; -static int __elfN(loadimage)(struct preloaded_file *mp, elf_file_t ef, vm_offset_t loadaddr); +static int __elfN(loadimage)(struct preloaded_file *mp, elf_file_t ef, u_int64_t loadaddr); static int __elfN(lookup_symbol)(struct preloaded_file *mp, elf_file_t ef, const char* name, Elf_Sym* sym); #ifdef __sparc__ static void __elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, @@ -80,7 +80,7 @@ * will be saved in (result). */ int -__elfN(loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result) +__elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result) { struct preloaded_file *fp, *kfp; struct elf_file ef; @@ -162,7 +162,7 @@ /* * Calculate destination address based on kernel entrypoint */ - dest = (vm_offset_t) ehdr->e_entry; + dest = ehdr->e_entry; if (dest == 0) { printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: not a kernel (maybe static binary?)\n"); err = EPERM; @@ -191,7 +191,7 @@ #ifdef ELF_VERBOSE if (ef.kernel) - printf("%s entry at %p\n", filename, (void *) dest); + printf("%s entry at 0x%jx\n", filename, (uintmax_t)dest); #else printf("%s ", filename); #endif @@ -224,7 +224,7 @@ * the Elf header, load the image at (off) */ static int -__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, vm_offset_t off) +__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off) { int i; u_int j; @@ -240,6 +240,7 @@ vm_offset_t dest; vm_offset_t ssym, esym; Elf_Dyn *dp; + Elf_Addr adp; int ndp; int symstrindex; int symtabindex; @@ -253,7 +254,11 @@ ehdr = ef->ehdr; if (ef->kernel) { #ifdef __i386__ +#if __ELF_WORD_SIZE == 64 + off = - (off & 0xffffffffff000000u);/* x86_64 relocates after locore */ +#else off = - (off & 0xff000000u); /* i386 relocates after locore */ +#endif #else off = 0; /* alpha is direct mapped for kernels */ #endif @@ -461,9 +466,8 @@ for (i = 0; i < ehdr->e_phnum; i++) { if (phdr[i].p_type == PT_DYNAMIC) { php = phdr + i; - dp = (Elf_Dyn *)(php->p_vaddr); - file_addmetadata(fp, MODINFOMD_DYNAMIC, sizeof(dp), &dp); - dp = NULL; + adp = php->p_vaddr; + file_addmetadata(fp, MODINFOMD_DYNAMIC, sizeof(adp), &adp); break; } } @@ -485,19 +489,19 @@ break; switch (dp[i].d_tag) { case DT_HASH: - ef->hashtab = (Elf_Hashelt*)(dp[i].d_un.d_ptr + off); + ef->hashtab = (Elf_Hashelt*)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_STRTAB: - ef->strtab = (char *)(dp[i].d_un.d_ptr + off); + ef->strtab = (char *)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_STRSZ: ef->strsz = dp[i].d_un.d_val; break; case DT_SYMTAB: - ef->symtab = (Elf_Sym*)(dp[i].d_un.d_ptr + off); + ef->symtab = (Elf_Sym*)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_RELA: - ef->rela = (Elf_Rela *)(dp[i].d_un.d_ptr + off); + ef->rela = (Elf_Rela *)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_RELASZ: ef->relasz = dp[i].d_un.d_val; @@ -565,15 +569,16 @@ struct mod_depend *mdepend; struct mod_version mver; Elf_Sym sym; - char *s, *v, **p, **p_stop; + char *s, **p, **p_stop; int modcnt, minfolen; + Elf_Addr v; if (__elfN(lookup_symbol)(fp, ef, "__start_set_modmetadata_set", &sym) != 0) return ENOENT; - p = (char **)(sym.st_value + ef->off); + p = (char **)(uintptr_t)(sym.st_value + ef->off); if (__elfN(lookup_symbol)(fp, ef, "__stop_set_modmetadata_set", &sym) != 0) return ENOENT; - p_stop = (char **)(sym.st_value + ef->off); + p_stop = (char **)(uintptr_t)(sym.st_value + ef->off); modcnt = 0; while (p < p_stop) { From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:50:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CA9E37B404; Sat, 5 Apr 2003 14:50:40 -0800 (PST) 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 8A56B37B401 for ; Sat, 5 Apr 2003 14:50:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2501B43FAF for ; Sat, 5 Apr 2003 14:50:39 -0800 (PST) (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 h35Moc0U032724 for ; Sat, 5 Apr 2003 14:50:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35MocaN032716 for perforce@freebsd.org; Sat, 5 Apr 2003 14:50:38 -0800 (PST) Date: Sat, 5 Apr 2003 14:50:38 -0800 (PST) Message-Id: <200304052250.h35MocaN032716@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 28264 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, 05 Apr 2003 22:50:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=28264 Change 28264 by peter@peter_overcee on 2003/04/05 14:50:01 Update other platforms for elf32/64 stuff. Just an initial guess so far. Affected files ... .. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#4 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#6 edit .. //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#3 edit .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#2 edit Differences ... ==== //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *afp); +static int elf64_exec(struct preloaded_file *afp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { static struct bootinfo_v1 bootinfo_v1; struct file_metadata *md; ==== //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { #if 0 static struct bootinfo_v1 bootinfo_v1; ==== //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#4 (text+ko) ==== @@ -94,9 +94,9 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); -struct file_format ia64_elf = { elf_loadfile, elf_exec }; +struct file_format ia64_elf = { elf64_loadfile, elf64_exec }; static __inline u_int64_t disable_ic() @@ -136,7 +136,7 @@ } static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *hdr; ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#3 (text+ko) ==== @@ -91,9 +91,9 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); -struct file_format ia64_elf = { elf_loadfile, elf_exec }; +struct file_format ia64_elf = { elf64_loadfile, elf64_exec }; #define PTE_MA_WB 0 #define PTE_MA_UC 4 @@ -154,7 +154,7 @@ } static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *hdr; ==== //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#2 (text+ko) ==== @@ -42,13 +42,13 @@ extern vm_offset_t reloc; /* From /conf.c */ int -ofw_elf_loadfile(char *filename, vm_offset_t dest, +__elfN(ofw_loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result) { int r; void *addr; - r = elf_loadfile(filename, dest, result); + r = __elfN(loadfile)(filename, dest, result); if (r != 0) return (r); @@ -56,7 +56,7 @@ } int -ofw_elf_exec(struct preloaded_file *fp) +__elfN(ofw_exec)(struct preloaded_file *fp) { struct file_metadata *fmp; vm_offset_t mdp; @@ -83,6 +83,6 @@ struct file_format ofw_elf = { - ofw_elf_loadfile, - ofw_elf_exec + __elfN(ofw_loadfile), + __elfN(ofw_exec) }; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 15:18:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1379C37B404; Sat, 5 Apr 2003 15:18:17 -0800 (PST) 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 9960E37B401 for ; Sat, 5 Apr 2003 15:18:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41CB843F3F for ; Sat, 5 Apr 2003 15:18:16 -0800 (PST) (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 h35NIG0U035806 for ; Sat, 5 Apr 2003 15:18:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35NIF8H035803 for perforce@freebsd.org; Sat, 5 Apr 2003 15:18:15 -0800 (PST) Date: Sat, 5 Apr 2003 15:18:15 -0800 (PST) Message-Id: <200304052318.h35NIF8H035803@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 28269 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, 05 Apr 2003 23:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=28269 Change 28269 by marcel@marcel_nfs on 2003/04/05 15:17:36 Adopt the new cpu_switch() where the old and new threads are being passed in. We will probably end up with a C version for cpu_switch() that will call swapctx(), where swapctx() will take pointers to PCBs. In combination with savectx() and restorectx() this mirrors the system calls we have and limits the amount of tedious assembly that has to be written and maintained. Affected files ... .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#7 edit .. //depot/projects/ia64_epc/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/ia64_epc/sys/kern/kern_synch.c#7 (text+ko) ==== @@ -516,7 +516,7 @@ thread_switchout(td); sched_switchout(td); -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__ia64__) newtd = choosethread(); if (td != newtd) cpu_switch(td, newtd); /* SHAZAM!! */ ==== //depot/projects/ia64_epc/sys/sys/proc.h#5 (text+ko) ==== @@ -889,7 +889,7 @@ void sleepinit(void); void stopevent(struct proc *, u_int, u_int); void cpu_idle(void); -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__ia64__) void cpu_switch(struct thread *old, struct thread *new); void cpu_throw(struct thread *old, struct thread *new) __dead2; #else From owner-p4-projects@FreeBSD.ORG Sat Apr 5 15:54:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8BB37B404; Sat, 5 Apr 2003 15:54:03 -0800 (PST) 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 DF20737B401 for ; Sat, 5 Apr 2003 15:54:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67BDB43F75 for ; Sat, 5 Apr 2003 15:54:02 -0800 (PST) (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 h35Ns20U038291 for ; Sat, 5 Apr 2003 15:54:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Ns153038288 for perforce@freebsd.org; Sat, 5 Apr 2003 15:54:01 -0800 (PST) Date: Sat, 5 Apr 2003 15:54:01 -0800 (PST) Message-Id: <200304052354.h35Ns153038288@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 28273 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, 05 Apr 2003 23:54:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=28273 Change 28273 by peter@peter_overcee on 2003/04/05 15:53:34 Bring printf kicking and screaming up to 2003 (translation: sync with kernel printf for things like %j, %q/%ll etc) Affected files ... .. //depot/projects/hammer/lib/libstand/printf.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libstand/printf.c#3 (text+ko) ==== @@ -45,7 +45,10 @@ * Standaloneified version of the FreeBSD kernel printf family. */ +#include #include +#include +#include #include #include #include "stand.h" @@ -56,7 +59,9 @@ */ #include -static char *ksprintn (u_long num, int base, int *len); +#define MAXNBUF (sizeof(intmax_t) * NBBY + 1) + +static char *ksprintn (char *buf, uintmax_t num, int base, int *len); static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap); int @@ -101,24 +106,23 @@ } /* - * Put a number (base <= 16) in a buffer in reverse order; return an - * optional length and a pointer to the NULL terminated (preceded?) - * buffer. + * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse + * order; return an optional length and a pointer to the last character + * written in the buffer (i.e., the first character of the string). + * The buffer pointed to by `nbuf' must have length >= MAXNBUF. */ static char * -ksprintn(ul, base, lenp) - u_long ul; - int base, *lenp; -{ /* A long in base 8, plus NULL. */ - static char buf[sizeof(long) * CHAR_BIT / 3 + 2]; +ksprintn(char *nbuf, uintmax_t num, int base, int *lenp) +{ char *p; - p = buf; + p = nbuf; + *p = '\0'; do { - *++p = hex2ascii(ul % base); - } while (ul /= base); + *++p = hex2ascii(num % base); + } while (num /= base); if (lenp) - *lenp = p - buf; + *lenp = p - nbuf; return (p); } @@ -152,15 +156,19 @@ kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap) { #define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; } - char *p, *q, *d; + char nbuf[MAXNBUF]; + char *d; + const char *p, *percent, *q; u_char *up; int ch, n; - u_long ul; - int base, lflag, tmp, width, ladjust, sharpflag, neg, sign, dot; + uintmax_t num; + int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot; + int jflag, tflag, zflag; int dwidth; char padc; int retval = 0; + num = 0; if (!func) d = (char *) arg; else @@ -176,12 +184,14 @@ padc = ' '; width = 0; while ((ch = (u_char)*fmt++) != '%') { - if (ch == '\0') - return retval; + if (ch == '\0') + return (retval); PCHAR(ch); } - lflag = 0; ladjust = 0; sharpflag = 0; neg = 0; + percent = fmt - 1; + qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0; sign = 0; dot = 0; dwidth = 0; + jflag = 0; tflag = 0; zflag = 0; reswitch: switch (ch = (u_char)*fmt++) { case '.': dot = 1; @@ -228,17 +238,17 @@ width = n; goto reswitch; case 'b': - ul = va_arg(ap, int); + num = va_arg(ap, int); p = va_arg(ap, char *); - for (q = ksprintn(ul, *p++, NULL); *q;) + for (q = ksprintn(nbuf, num, *p++, NULL); *q;) PCHAR(*q--); - if (!ul) + if (num == 0) break; for (tmp = 0; *p;) { n = *p++; - if (ul & (1 << (n - 1))) { + if (num & (1 << (n - 1))) { PCHAR(tmp ? ',' : '<'); for (; (n = *p) > ' '; ++p) PCHAR(n); @@ -268,26 +278,49 @@ } break; case 'd': - ul = lflag ? va_arg(ap, long) : va_arg(ap, int); + case 'i': + base = 10; sign = 1; - base = 10; - goto number; + goto handle_sign; + case 'j': + jflag = 1; + goto reswitch; case 'l': - lflag = 1; + if (lflag) { + lflag = 0; + qflag = 1; + } else + lflag = 1; goto reswitch; case 'n': - ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int); - base = radix; - goto number; + if (jflag) + *(va_arg(ap, intmax_t *)) = retval; + else if (qflag) + *(va_arg(ap, quad_t *)) = retval; + else if (lflag) + *(va_arg(ap, long *)) = retval; + else if (zflag) + *(va_arg(ap, size_t *)) = retval; + else + *(va_arg(ap, int *)) = retval; + break; case 'o': - ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int); base = 8; - goto number; + goto handle_nosign; case 'p': - ul = (u_long)va_arg(ap, void *); base = 16; - sharpflag = 1; + sharpflag = (width == 0); + sign = 0; + num = (uintptr_t)va_arg(ap, void *); goto number; + case 'q': + qflag = 1; + goto reswitch; + case 'r': + base = radix; + if (sign) + goto handle_sign; + goto handle_nosign; case 's': p = va_arg(ap, char *); if (p == NULL) @@ -309,19 +342,58 @@ while (width--) PCHAR(padc); break; + case 't': + tflag = 1; + goto reswitch; case 'u': - ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int); base = 10; - goto number; + goto handle_nosign; case 'x': - ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int); + case 'X': + base = 16; + goto handle_nosign; + case 'y': base = 16; -number: if (sign && (long)ul < 0L) { + sign = 1; + goto handle_sign; + case 'z': + zflag = 1; + goto reswitch; +handle_nosign: + sign = 0; + if (jflag) + num = va_arg(ap, uintmax_t); + else if (qflag) + num = va_arg(ap, u_quad_t); + else if (tflag) + num = va_arg(ap, ptrdiff_t); + else if (lflag) + num = va_arg(ap, u_long); + else if (zflag) + num = va_arg(ap, size_t); + else + num = va_arg(ap, u_int); + goto number; +handle_sign: + if (jflag) + num = va_arg(ap, intmax_t); + else if (qflag) + num = va_arg(ap, quad_t); + else if (tflag) + num = va_arg(ap, ptrdiff_t); + else if (lflag) + num = va_arg(ap, long); + else if (zflag) + num = va_arg(ap, size_t); + else + num = va_arg(ap, int); +number: + if (sign && (intmax_t)num < 0) { neg = 1; - ul = -(long)ul; + num = -(intmax_t)num; } - p = ksprintn(ul, base, &tmp); - if (sharpflag && ul != 0) { + p = ksprintn(nbuf, num, base, &tmp); + if (sharpflag && num != 0) { if (base == 8) tmp++; else if (base == 16) @@ -335,7 +407,7 @@ PCHAR(padc); if (neg) PCHAR('-'); - if (sharpflag && ul != 0) { + if (sharpflag && num != 0) { if (base == 8) { PCHAR('0'); } else if (base == 16) { @@ -353,13 +425,10 @@ break; default: - PCHAR('%'); - if (lflag) - PCHAR('l'); - PCHAR(ch); + while (percent < fmt) + PCHAR(*percent++); break; } } #undef PCHAR } - From owner-p4-projects@FreeBSD.ORG Sat Apr 5 16:07:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C416537B404; Sat, 5 Apr 2003 16:07:19 -0800 (PST) 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 78E4C37B401 for ; Sat, 5 Apr 2003 16:07:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21B5E43F93 for ; Sat, 5 Apr 2003 16:07:19 -0800 (PST) (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 h3607I0U040075 for ; Sat, 5 Apr 2003 16:07:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3607IPF040072 for perforce@freebsd.org; Sat, 5 Apr 2003 16:07:18 -0800 (PST) Date: Sat, 5 Apr 2003 16:07:18 -0800 (PST) Message-Id: <200304060007.h3607IPF040072@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 28274 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, 06 Apr 2003 00:07:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=28274 Change 28274 by marcel@marcel_nfs on 2003/04/05 16:07:07 More defines needed for the new and improved cpu_switch() and cpu_throw(). Affected files ... .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#8 edit .. //depot/projects/ia64_epc/sys/kern/kern_thr.c#2 edit .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#7 edit Differences ... ==== //depot/projects/ia64_epc/sys/kern/kern_synch.c#8 (text+ko) ==== @@ -456,7 +456,7 @@ { struct bintime new_switchtime; struct thread *td; -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__ia64__) struct thread *newtd; #endif struct proc *p; ==== //depot/projects/ia64_epc/sys/kern/kern_thr.c#2 (text+ko) ==== @@ -106,7 +106,7 @@ td->td_last_kse = NULL; thread_stash(td); -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__ia64__) cpu_throw(td, choosethread()); #else cpu_throw(); ==== //depot/projects/ia64_epc/sys/kern/kern_thread.c#7 (text+ko) ==== @@ -1251,7 +1251,7 @@ } /* XXX Shouldn't cpu_throw() here. */ mtx_assert(&sched_lock, MA_OWNED); -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__ia64__) cpu_throw(td, choosethread()); #else cpu_throw(); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 17:28:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1792837B404; Sat, 5 Apr 2003 17:28:02 -0800 (PST) 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 988AE37B401 for ; Sat, 5 Apr 2003 17:28:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2690343F3F for ; Sat, 5 Apr 2003 17:28:01 -0800 (PST) (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 h361S00U051900 for ; Sat, 5 Apr 2003 17:28:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h361S0oo051897 for perforce@freebsd.org; Sat, 5 Apr 2003 17:28:00 -0800 (PST) Date: Sat, 5 Apr 2003 17:28:00 -0800 (PST) Message-Id: <200304060128.h361S0oo051897@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 28280 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, 06 Apr 2003 01:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=28280 Change 28280 by peter@peter_overcee on 2003/04/05 17:27:31 Use the correct strings. It's elf32_foo, not 32_foo. Affected files ... .. //depot/projects/hammer/sys/boot/common/load_elf.c#6 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/load_elf.c#6 (text+ko) ==== @@ -71,8 +71,8 @@ static int __elfN(parse_modmetadata)(struct preloaded_file *mp, elf_file_t ef); static char *fake_modname(const char *name); -const char *__elfN(kerneltype) = __XSTRING(__ELF_WORD_SIZE) "kernel"; -const char *__elfN(moduletype) = __XSTRING(__ELF_WORD_SIZE) "module"; +const char *__elfN(kerneltype) = "elf" __XSTRING(__ELF_WORD_SIZE) " kernel"; +const char *__elfN(moduletype) = "elf" __XSTRING(__ELF_WORD_SIZE) " module"; /* * Attempt to load the file (file) as an ELF module. It will be stored at @@ -134,12 +134,12 @@ if (ehdr->e_type == ET_DYN) { /* Looks like a kld module */ if (kfp == NULL) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module before kernel\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module before kernel\n"); err = EPERM; goto oerr; } if (strcmp(__elfN(kerneltype), kfp->f_type)) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); err = EPERM; goto oerr; } @@ -155,7 +155,7 @@ } else if (ehdr->e_type == ET_EXEC) { /* Looks like a kernel */ if (kfp != NULL) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: kernel already loaded\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: kernel already loaded\n"); err = EPERM; goto oerr; } @@ -164,7 +164,7 @@ */ dest = ehdr->e_entry; if (dest == 0) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: not a kernel (maybe static binary?)\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: not a kernel (maybe static binary?)\n"); err = EPERM; goto oerr; } @@ -180,7 +180,7 @@ */ fp = file_alloc(); if (fp == NULL) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadfile: cannot allocate module info\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: cannot allocate module info\n"); err = EPERM; goto out; } @@ -266,7 +266,7 @@ ef->off = off; if ((ehdr->e_phoff + ehdr->e_phnum * sizeof(*phdr)) > ef->firstlen) { - printf(__XSTRING(__ELF_WORD_SIZE) "_loadimage: program header not within first page\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: program header not within first page\n"); goto out; } phdr = (Elf_Phdr *)(ef->firstpage + ehdr->e_phoff); @@ -300,12 +300,12 @@ if (phdr[i].p_filesz > fpcopy) { if (lseek(ef->fd, (off_t)(phdr[i].p_offset + fpcopy), SEEK_SET) == -1) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadexec: cannot seek\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadexec: cannot seek\n"); goto out; } if (archsw.arch_readin(ef->fd, phdr[i].p_vaddr + off + fpcopy, phdr[i].p_filesz - fpcopy) != (ssize_t)(phdr[i].p_filesz - fpcopy)) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadexec: archsw.readin failed\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadexec: archsw.readin failed\n"); goto out; } } @@ -320,7 +320,7 @@ /* no archsw.arch_bzero */ buf = malloc(PAGE_SIZE); if (buf == NULL) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: malloc() failed\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: malloc() failed\n"); goto out; } bzero(buf, PAGE_SIZE); @@ -358,12 +358,12 @@ if (shdr == NULL) goto nosyms; if (lseek(ef->fd, (off_t)ehdr->e_shoff, SEEK_SET) == -1) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: cannot lseek() to section headers"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: cannot lseek() to section headers"); goto nosyms; } result = read(ef->fd, shdr, chunk); if (result < 0 || (size_t)result != chunk) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: read section headers failed"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: read section headers failed"); goto nosyms; } symtabindex = -1; @@ -428,14 +428,14 @@ #endif if (lseek(ef->fd, (off_t)shdr[i].sh_offset, SEEK_SET) == -1) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not seek for symbols - skipped!"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not seek for symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; } result = archsw.arch_readin(ef->fd, lastaddr, shdr[i].sh_size); if (result < 0 || (size_t)result != shdr[i].sh_size) { - printf("\n" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped!"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; @@ -644,7 +644,7 @@ return h; } -static const char __elfN(bad_symtable)[] = __XSTRING(__ELF_WORD_SIZE) "_lookup_symbol: corrupt symbol table\n"; +static const char __elfN(bad_symtable)[] = "elf" __XSTRING(__ELF_WORD_SIZE) "_lookup_symbol: corrupt symbol table\n"; int __elfN(lookup_symbol)(struct preloaded_file *fp, elf_file_t ef, const char* name, Elf_Sym *symp) From owner-p4-projects@FreeBSD.ORG Sat Apr 5 19:05:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08A8E37B404; Sat, 5 Apr 2003 19:05:02 -0800 (PST) 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 AFE3437B401 for ; Sat, 5 Apr 2003 19:05:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AE8B43F85 for ; Sat, 5 Apr 2003 19:05:01 -0800 (PST) (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 h363510U060319 for ; Sat, 5 Apr 2003 19:05:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h36350b7060316 for perforce@freebsd.org; Sat, 5 Apr 2003 19:05:00 -0800 (PST) Date: Sat, 5 Apr 2003 19:05:00 -0800 (PST) Message-Id: <200304060305.h36350b7060316@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 28285 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, 06 Apr 2003 03:05:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=28285 Change 28285 by peter@peter_overcee on 2003/04/05 19:04:49 add sysctl knob for turning the usertrap print on/off Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/trap.c#46 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#46 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -71,6 +72,10 @@ #include #endif +static int print_usertrap = 0; +SYSCTL_INT(_machdep, CPU_UNALIGNED_PRINT, print_usertrap, + CTLFLAG_RW, &print_usertrap, 0, ""); + extern int unaligned_fixup(struct trapframe *framep, struct thread *td); static void ia32_syscall(struct trapframe *framep); @@ -737,9 +742,8 @@ goto dopanic; } -#if 1 - printtrap(vector, imm, framep, 1, user); -#endif + if (print_usertrap) + printtrap(vector, imm, framep, 1, user); trapsignal(td, i, ucode); out: if (user) { From owner-p4-projects@FreeBSD.ORG Sat Apr 5 20:02:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3E3637B404; Sat, 5 Apr 2003 20:02:13 -0800 (PST) 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 69BB037B401 for ; Sat, 5 Apr 2003 20:02:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F31443F93 for ; Sat, 5 Apr 2003 20:02:13 -0800 (PST) (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 h3642C0U064258 for ; Sat, 5 Apr 2003 20:02:12 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3642C2q064255 for perforce@freebsd.org; Sat, 5 Apr 2003 20:02:12 -0800 (PST) Date: Sat, 5 Apr 2003 20:02:12 -0800 (PST) Message-Id: <200304060402.h3642C2q064255@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 28289 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, 06 Apr 2003 04:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=28289 Change 28289 by marcel@marcel_nfs on 2003/04/05 20:01:58 Replace my homegrown GCC patch with the real thing (as committed to the GCC trees). Affected files ... .. //depot/projects/ia64/contrib/gcc/ifcvt.c#5 edit Differences ... ==== //depot/projects/ia64/contrib/gcc/ifcvt.c#5 (text+ko) ==== @@ -1934,10 +1934,9 @@ is more than one remaining edge, it must come from elsewhere. There may be zero incoming edges if the THEN block didn't actually join back up (as with a call to abort). */ - else if ((join_bb->pred == NULL || join_bb->pred->pred_next == NULL) - && join_bb != EXIT_BLOCK_PTR - && (NEXT_INSN(combo_bb->end) == join_bb->head - || GET_CODE(NEXT_INSN(combo_bb->end)) != CODE_LABEL)) + else if ((join_bb->pred == NULL + || join_bb->pred->pred_next == NULL) + && join_bb != EXIT_BLOCK_PTR) { /* We can merge the JOIN. */ if (life_data_ok) @@ -2046,7 +2045,8 @@ /* The THEN block of an IF-THEN combo must have zero or one successors. */ if (then_succ != NULL_EDGE && (then_succ->succ_next != NULL_EDGE - || (then_succ->flags & EDGE_COMPLEX))) + || (then_succ->flags & EDGE_COMPLEX) + || (flow2_completed && tablejump_p (then_bb->end)))) return FALSE; /* If the THEN block has no successors, conditional execution can still @@ -2093,7 +2093,8 @@ && then_succ->dest == else_succ->dest && else_bb->pred->pred_next == NULL_EDGE && else_succ->succ_next == NULL_EDGE - && ! (else_succ->flags & EDGE_COMPLEX)) + && ! (else_succ->flags & EDGE_COMPLEX) + && ! (flow2_completed && tablejump_p (else_bb->end))) join_bb = else_succ->dest; /* Otherwise it is not an IF-THEN or IF-THEN-ELSE combination. */ From owner-p4-projects@FreeBSD.ORG Sat Apr 5 20:32:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EEC237B404; Sat, 5 Apr 2003 20:32:52 -0800 (PST) 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 C32CE37B401 for ; Sat, 5 Apr 2003 20:32:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DE5F43FB1 for ; Sat, 5 Apr 2003 20:32:51 -0800 (PST) (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 h364Wp0U067210 for ; Sat, 5 Apr 2003 20:32:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h364WooD067207 for perforce@freebsd.org; Sat, 5 Apr 2003 20:32:50 -0800 (PST) Date: Sat, 5 Apr 2003 20:32:50 -0800 (PST) Message-Id: <200304060432.h364WooD067207@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 28291 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, 06 Apr 2003 04:32:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=28291 Change 28291 by peter@peter_overcee on 2003/04/05 20:31:57 make this actually work, at least for the i386 case. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#4 (text+ko) ==== @@ -268,7 +268,7 @@ char *kernelname; const char *kernelpath; - *howtop = bi_getboothowto(args); + howto = bi_getboothowto(args); /* * Allow the environment variable 'rootdev' to override the supplied device @@ -370,7 +370,7 @@ bi.bi_basemem = bios_basemem / 1024; bi.bi_extmem = bios_extmem / 1024; bi.bi_envp = envp; - bi.bi_modulep = envp; + bi.bi_modulep = *modulep; bi.bi_kernend = kernend; bi.bi_kernelname = VTOP(kernelpath); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 20:38:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 273D337B404; Sat, 5 Apr 2003 20:38:00 -0800 (PST) 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 BB7A137B401 for ; Sat, 5 Apr 2003 20:37:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64FF543FBD for ; Sat, 5 Apr 2003 20:37:59 -0800 (PST) (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 h364bx0U067425 for ; Sat, 5 Apr 2003 20:37:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h364bwCY067422 for perforce@freebsd.org; Sat, 5 Apr 2003 20:37:58 -0800 (PST) Date: Sat, 5 Apr 2003 20:37:58 -0800 (PST) Message-Id: <200304060437.h364bwCY067422@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 28294 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, 06 Apr 2003 04:38:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=28294 Change 28294 by peter@peter_overcee on 2003/04/05 20:37:47 look for "elf32 *" before "elf *" Affected files ... .. //depot/projects/hammer/sys/kern/link_elf.c#10 edit Differences ... ==== //depot/projects/hammer/sys/kern/link_elf.c#10 (text+ko) ==== @@ -258,7 +258,9 @@ dp = (Elf_Dyn*) &_DYNAMIC; modname = NULL; - modptr = preload_search_by_type("elf kernel"); + modptr = preload_search_by_type("elf" __XSTRING(__ELF_WORD_SIZE) " kernel"); + if (modptr == NULL) + modptr = preload_search_by_type("elf kernel"); if (modptr) modname = (char *)preload_search_info(modptr, MODINFO_NAME); if (modname == NULL) @@ -462,7 +464,9 @@ baseptr = preload_search_info(modptr, MODINFO_ADDR); sizeptr = preload_search_info(modptr, MODINFO_SIZE); dynptr = preload_search_info(modptr, MODINFO_METADATA|MODINFOMD_DYNAMIC); - if (type == NULL || strcmp(type, "elf module") != 0) + if (type == NULL || + (strcmp(type, "elf" __XSTRING(__ELF_WORD_SIZE) " module") != 0 && + strcmp(type, "elf module") != 0)) return (EFTYPE); if (baseptr == NULL || sizeptr == NULL || dynptr == NULL) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 21:36:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE75D37B404; Sat, 5 Apr 2003 21:36:13 -0800 (PST) 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 7073137B401 for ; Sat, 5 Apr 2003 21:36:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1BE943FCB for ; Sat, 5 Apr 2003 21:36:12 -0800 (PST) (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 h365aC0U077717 for ; Sat, 5 Apr 2003 21:36:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h365aCrh077714 for perforce@freebsd.org; Sat, 5 Apr 2003 21:36:12 -0800 (PST) Date: Sat, 5 Apr 2003 21:36:12 -0800 (PST) Message-Id: <200304060536.h365aCrh077714@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 28298 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, 06 Apr 2003 05:36:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=28298 Change 28298 by peter@peter_overcee on 2003/04/05 21:35:35 sync with committed Affected files ... .. //depot/projects/hammer/lib/libstand/printf.c#4 edit Differences ... ==== //depot/projects/hammer/lib/libstand/printf.c#4 (text+ko) ==== @@ -45,7 +45,6 @@ * Standaloneified version of the FreeBSD kernel printf family. */ -#include #include #include #include @@ -59,7 +58,7 @@ */ #include -#define MAXNBUF (sizeof(intmax_t) * NBBY + 1) +#define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) static char *ksprintn (char *buf, uintmax_t num, int base, int *len); static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 21:38:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D047737B404; Sat, 5 Apr 2003 21:38:17 -0800 (PST) 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 6BBFB37B401 for ; Sat, 5 Apr 2003 21:38:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4953F43FB1 for ; Sat, 5 Apr 2003 21:38:16 -0800 (PST) (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 h365cG0U077791 for ; Sat, 5 Apr 2003 21:38:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h365cFp6077788 for perforce@freebsd.org; Sat, 5 Apr 2003 21:38:15 -0800 (PST) Date: Sat, 5 Apr 2003 21:38:15 -0800 (PST) Message-Id: <200304060538.h365cFp6077788@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 28299 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, 06 Apr 2003 05:38:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=28299 Change 28299 by peter@peter_overcee on 2003/04/05 21:37:34 IFC @28297 Affected files ... .. //depot/projects/hammer/Makefile.inc1#9 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/hammer/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#4 integrate .. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#1 branch .. //depot/projects/hammer/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/i386/string/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/i386/string/wcschr.S#1 branch .. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/stdtime/strptime.c#5 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#8 integrate .. //depot/projects/hammer/lib/libstand/printf.c#5 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#3 integrate .. //depot/projects/hammer/sbin/ipmon/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/smapi.4#1 branch .. //depot/projects/hammer/share/man/man4/wi.4#6 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#1 branch .. //depot/projects/hammer/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/hammer/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/hammer/sys/conf/options.i386#7 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#11 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#5 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#4 integrate .. //depot/projects/hammer/tools/build/Makefile#1 branch .. //depot/projects/hammer/tools/build/Makefile.boot#1 branch .. //depot/projects/hammer/tools/build/dummy.c#1 branch .. //depot/projects/hammer/tools/build/endian.h#1 branch .. //depot/projects/hammer/tools/build/langinfo.h#1 branch .. //depot/projects/hammer/tools/build/progname.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#1 branch .. //depot/projects/hammer/usr.bin/xargs/xargs.c#6 integrate .. //depot/projects/hammer/usr.bin/xinstall/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#4 integrate .. //depot/projects/hammer/usr.sbin/rtadvd/config.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.330 2003/04/01 11:39:04 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.333 2003/04/06 03:50:28 imp Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -159,6 +159,9 @@ # # Building a world goes through the following stages # +# 1. libbuild stage [BMAKE] +# This stage is responsible for creating compatibility shims that are +# needed by the bootstrap-tool, build-tool and cross-tool stages. # 1. bootstrap-tool stage [BMAKE] # This stage is responsible for creating programs that # are needed for backward compatibility reasons. They @@ -187,19 +190,20 @@ GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac # bootstrap-tool stage -BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ - DESTDIR= \ - INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ +BMAKEENV= DESTDIR= \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + __MAKE_CONF=${.CURDIR}/tools/build/Makefile.boot \ + OLD_MAKE_CONF=${__MAKE_CONF} \ + WORLDTMP=${WORLDTMP} +BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ + ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WARNS # build-tool stage -TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ - DESTDIR= \ - INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ +TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ + ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS # cross-tool stage @@ -275,6 +279,15 @@ mkdir -p ${WORLDTMP}/usr/include/${_dir} .endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} +.for _dir in lib include include/sys + mkdir -p ${WORLDTMP}/build/usr/${_dir} +.endfor +_libbuild: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 1: libbuild" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${BMAKE} libbuild _bootstrap-tools: @echo @echo "--------------------------------------------------------------" @@ -335,7 +348,7 @@ WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) -WMAKE_TGTS+= _worldtmp _bootstrap-tools +WMAKE_TGTS+= _worldtmp _libbuild _bootstrap-tools .endif WMAKE_TGTS+= _cleanobj _obj _build-tools .if !defined(SUBDIR_OVERRIDE) @@ -609,13 +622,23 @@ _strfile= games/fortune/strfile .endif +libbuild: +.for _tool in tools/build + @${ECHODIR} "===> ${_tool}"; \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/build install +.endfor + bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ usr.bin/makewhatis usr.bin/rpcgen usr.bin/uudecode \ usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo - ${ECHODIR} "===> ${_tool}"; \ + @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ @@ -648,7 +671,7 @@ .for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_libkrb5} lib/libncurses ${_share} \ ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall - ${ECHODIR} "===> ${_tool}"; \ + @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ build-tools @@ -682,7 +705,7 @@ .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ gnu/usr.bin/binutils ${_crunchide} \ gnu/usr.bin/cc ${_xlint} ${_kgzip} - ${ECHODIR} "===> ${_tool}"; \ + @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ @@ -764,7 +787,7 @@ .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) - ${ECHODIR} "===> ${_lib}"; \ + @${ECHODIR} "===> ${_lib}"; \ cd ${.CURDIR}/${_lib}; \ ${MAKE} DIRPRFX=${_lib}/ depend; \ ${MAKE} DIRPRFX=${_lib}/ all; \ @@ -776,7 +799,7 @@ # static PAM library, and dynamic PAM library before dynamic PAM # modules. lib/libpam__L: .PHONY - ${ECHODIR} "===> lib/libpam"; \ + @${ECHODIR} "===> lib/libpam"; \ cd ${.CURDIR}/lib/libpam; \ ${MAKE} DIRPRFX=lib/libpam/ depend; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ==== //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.3 2003/03/19 20:25:45 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.4 2003/04/05 22:09:26 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -600,6 +600,8 @@ extern Bigint *diff ANSI((Bigint*, Bigint*)); extern char *dtoa ANSI((double d, int mode, int ndigits, int *decpt, int *sign, char **rve)); + extern char *gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp, + int mode, int ndigits, int *decpt, char **rve)); extern char *g__fmt ANSI((char*, char*, char*, int, ULong)); extern int gethex ANSI((CONST char**, FPI*, Long*, Bigint**, int)); extern void hexdig_init_D2A(Void); ==== //depot/projects/hammer/contrib/ipfilter/Makefile#3 (text+ko) ==== @@ -3,6 +3,7 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.2 2003/04/05 09:25:19 darrenr Exp $ # $Id: Makefile,v 2.11.2.15 2002/12/02 04:22:56 darrenr Exp $ # BINDEST=/usr/local/bin @@ -29,7 +30,7 @@ # # The facility you wish to log messages from ipmon to syslogd with. # -LOGFAC=-DLOGFAC=LOG_LOCAL0 +LOGFAC=-DLOGFAC=LOG_SECURITY # # Uncomment the next 3 lines if you want to view the state table a la top(1) ==== //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.12 2003/02/15 06:32:48 darrenr Exp $ +.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.13 2003/04/05 21:12:58 darrenr Exp $ .TH ipmon 8 .SH NAME ipmon \- monitors /dev/ipl for logged packets @@ -126,7 +126,7 @@ .B \-s Packet information read in will be sent through syslogd rather than saved to a file. The default facility when compiled and installed is -\fBlocal0\fP. The following levels are used: +\fBsecurity\fP. The following levels are used: .IP .B LOG_INFO \- packets logged using the "log" keyword as the action rather ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.23 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.24 2003/04/05 20:30:29 imp Exp $ .include "../Makefile.inc0" @@ -10,20 +10,12 @@ ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \ ldver.c ldwrite.c lexsup.c mri.c -.if defined(BOOTSTRAPPING) && !exists(/usr/include/elf-hints.h) -SRCS+= elf-hints.h -CLEANFILES+= elf-hints.h - -elf-hints.h: - ln -sf ${.CURDIR}/../../../../include/${.TARGET} . -.endif - WARNS= 1 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd NOSHARED?= yes -DPADD= ${RELTOP}/libbfd/libbfd.a +DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} CLEANDIRS+= ldscripts ==== //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.18 2003/04/05 20:30:29 imp Exp $ .include "../Makefile.inc0" @@ -10,11 +10,6 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) && \ - ( ${BOOTSTRAPPING} < 440000 || \ - ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) -SRCS+= basename.c -.endif WARNS= 1 CFLAGS+= -DHAVE_CONFIG_H INTERNALLIB= true ==== //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.18 2003/04/05 20:30:29 imp Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -104,13 +104,7 @@ print_version.o \ get_window_size.c \ strupr.c - ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} - -.if defined(BOOTSTRAPPING) && \ - ( ${BOOTSTRAPPING} < 440001 || \ - ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) -asn1_compile: getprogname.c setprogname.c -.endif + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD} parse.o: parse.c roken.h ==== //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.11 2003/04/05 20:30:29 imp Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -59,13 +59,7 @@ gen_encode.c gen_decode.c gen_free.c gen_length.c \ gen_copy.c gen_glue.c getarg.c warnerr.c print_version.o \ get_window_size.c strupr.c - ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} - -.if defined(BOOTSTRAPPING) && \ - ( ${BOOTSTRAPPING} < 440001 || \ - ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) -asn1_compile: getprogname.c setprogname.c -.endif + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD} parse.o: parse.c ==== //depot/projects/hammer/lib/libc/alpha/_fpmath.h#2 (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/libc/alpha/_fpmath.h,v 1.2 2003/02/11 15:19:31 des Exp $ + * $FreeBSD: src/lib/libc/alpha/_fpmath.h,v 1.3 2003/04/05 22:10:13 das Exp $ */ union IEEEl2bits { @@ -37,3 +37,9 @@ }; #define mask_nbit_l(u) ((void)0) +#define LDBL_IMPLICIT_NBIT + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)(u).bits.manh; \ +} while(0) ==== //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.2 2003/03/13 18:55:14 obrien Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.3 2003/04/05 22:10:13 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=glue.c +MISRCS+=_ldtoa.c glue.c GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/hammer/lib/libc/i386/_fpmath.h#2 (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/libc/i386/_fpmath.h,v 1.1 2003/02/08 20:37:52 mike Exp $ + * $FreeBSD: src/lib/libc/i386/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ */ union IEEEl2bits { @@ -38,3 +38,8 @@ }; #define mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff) + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)(u).bits.manh; \ +} while(0) ==== //depot/projects/hammer/lib/libc/i386/string/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,7 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/string/Makefile.inc,v 1.12 2003/03/14 11:01:12 tjr Exp $ +# $FreeBSD: src/lib/libc/i386/string/Makefile.inc,v 1.13 2003/04/05 04:17:05 tjr Exp $ MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memcpy.S \ memmove.S memset.S rindex.S strcat.S strchr.S strcmp.S strcpy.S \ - strlen.S strncmp.S strrchr.S swab.S wcscmp.S wcslen.S wmemchr.S + strlen.S strncmp.S strrchr.S swab.S wcschr.S wcscmp.S wcslen.S \ + wmemchr.S ==== //depot/projects/hammer/lib/libc/ia64/_fpmath.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/lib/libc/ia64/_fpmath.h,v 1.2 2003/02/26 16:04:34 mike Exp $ + * $FreeBSD: src/lib/libc/ia64/_fpmath.h,v 1.3 2003/04/05 22:10:13 das Exp $ */ #include @@ -53,3 +53,8 @@ #else /* _BIG_ENDIAN */ #define mask_nbit_l(u) ((u).bits.manh &= 0xffffff7f) #endif + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)(u).bits.manh; \ +} while(0) ==== //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#2 (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/libc/powerpc/_fpmath.h,v 1.1 2003/02/08 20:37:53 mike Exp $ + * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ */ union IEEEl2bits { @@ -38,3 +38,11 @@ /* XXX does powerpc have a normalization bit? */ #define mask_nbit_l(u) ((void)0) +#define LDBL_IMPLICIT_NBIT + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)((u).bits.manl >> 32); \ + (a)[2] = (uint32_t)(u).bits.manh; \ + (a)[3] = (uint32_t)((u).bits.manh >> 32); \ +} while(0) ==== //depot/projects/hammer/lib/libc/sparc64/_fpmath.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/lib/libc/sparc64/_fpmath.h,v 1.1 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/lib/libc/sparc64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ */ union IEEEl2bits { @@ -38,3 +38,11 @@ }; #define mask_nbit_l(u) ((void)0) +#define LDBL_IMPLICIT_NBIT + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)((u).bits.manl >> 32); \ + (a)[2] = (uint32_t)(u).bits.manh; \ + (a)[3] = (uint32_t)((u).bits.manh >> 32); \ +} while(0) ==== //depot/projects/hammer/lib/libc/stdio/floatio.h#2 (text+ko) ==== @@ -34,14 +34,23 @@ * SUCH DAMAGE. * * @(#)floatio.h 8.1 (Berkeley) 6/4/93 - * $FreeBSD: src/lib/libc/stdio/floatio.h,v 1.2 2002/03/22 23:42:01 obrien Exp $ + * $FreeBSD: src/lib/libc/stdio/floatio.h,v 1.4 2003/04/05 22:11:42 das Exp $ */ /* * Floating point scanf/printf (input/output) definitions. */ -/* 11-bit exponent (VAX G floating point) is 308 decimal digits */ -#define MAXEXP 308 -/* 128 bit fraction takes up 39 decimal digits; max reasonable precision */ -#define MAXFRACT 39 +/* + * MAXEXPDIG is the maximum number of decimal digits needed to store a + * floating point exponent in the largest supported format. It should + * be ceil(log10(LDBL_MAX_10_EXP)) or, if hexadecimal floating point + * conversions are supported, ceil(log10(LDBL_MAX_EXP)). But since it + * is presently never greater than 5 in practice, we fudge it. + */ +#define MAXEXPDIG 6 +#if LDBL_MAX_EXP > 999999 +#error "floating point buffers too small" +#endif + +char *__ldtoa(long double *, int, int, int *, int *, char **); ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.52 2003/03/14 04:48:09 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.54 2003/04/05 22:11:42 das Exp $"); /* * Actual printf innards. @@ -111,9 +111,9 @@ static int __sprint(FILE *, struct __suio *); static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0); -static char *__ujtoa(uintmax_t, char *, int, int, char *, int, char, +static char *__ujtoa(uintmax_t, char *, int, int, const char *, int, char, const char *); -static char *__ultoa(u_long, char *, int, int, char *, int, char, +static char *__ultoa(u_long, char *, int, int, const char *, int, char, const char *); static char *__wcsconv(wchar_t *, int); static void __find_arguments(const char *, va_list, union arg **); @@ -185,7 +185,7 @@ * use the given digits. */ static char * -__ultoa(u_long val, char *endp, int base, int octzero, char *xdigs, +__ultoa(u_long val, char *endp, int base, int octzero, const char *xdigs, int needgrp, char thousep, const char *grp) { char *cp = endp; @@ -262,7 +262,7 @@ /* Identical to __ultoa, but for intmax_t. */ static char * -__ujtoa(uintmax_t val, char *endp, int base, int octzero, char *xdigs, +__ujtoa(uintmax_t val, char *endp, int base, int octzero, const char *xdigs, int needgrp, char thousep, const char *grp) { char *cp = endp; @@ -407,31 +407,36 @@ } #ifdef FLOATING_POINT + +#define dtoa __dtoa +#define freedtoa __freedtoa + +#include #include #include "floatio.h" +#include "gdtoa.h" -#define BUF ((MAXEXP*2)+MAXFRACT+1) /* + decimal point */ #define DEFPREC 6 -extern char *__dtoa(double, int, int, int *, int *, char **); -extern void __freedtoa(char *s); - -static char *cvt(double, int, int, char *, int *, int, int *); static int exponent(char *, int, int); -#else /* no FLOATING_POINT */ +#endif /* FLOATING_POINT */ -#define BUF 136 +/* + * The size of the buffer we use as scratch space for integer + * conversions, among other things. Technically, we would need the + * most space for base 10 conversions with thousands' grouping + * characters between each pair of digits. 100 bytes is a + * conservative overestimate even for a 128-bit uintmax_t. + */ +#define BUF 100 -#endif /* FLOATING_POINT */ - #define STATIC_ARG_TBL_SIZE 8 /* Size of static argument table. */ /* * Flags used during conversion. */ #define ALT 0x001 /* alternate form */ -#define HEXPREFIX 0x002 /* add 0x or 0X prefix */ #define LADJUST 0x004 /* left adjustment */ #define LONGDBL 0x008 /* long double */ #define LONGINT 0x010 /* long integer */ @@ -460,19 +465,41 @@ int flags; /* flags as above */ int ret; /* return value accumulator */ int width; /* width from format (%8d), or 0 */ - int prec; /* precision from format (%.3d), or -1 */ + int prec; /* precision from format; <0 for N/A */ char sign; /* sign prefix (' ', '+', '-', or \0) */ char thousands_sep; /* locale specific thousands separator */ const char *grouping; /* locale specific numeric grouping rules */ #ifdef FLOATING_POINT + /* + * We can decompose the printed representation of floating + * point numbers into several parts, some of which may be empty: + * + * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ + * A B ---C--- D E F + * + * A: 'sign' holds this value if present; '\0' otherwise + * B: ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal + * C: cp points to the string MMMNNN. Leading and trailing + * zeros are not in the string and must be added. + * D: expchar holds this character; '\0' if no exponent, e.g. %f + * F: at least two digits for decimal, at least one digit for hex + */ char *decimal_point; /* locale specific decimal point */ - char softsign; /* temporary negative sign for floats */ - double _double; /* double precision arguments %[eEfgG] */ + int signflag; /* true if float is negative */ + union { /* floating point arguments %[aAeEfFgG] */ + double dbl; + long double ldbl; + } fparg; int expt; /* integer value of exponent */ + char expchar; /* exponent character: [eEpP\0] */ + char *dtoaend; /* pointer to end of converted digits */ int expsize; /* character count for expstr */ - int ndig; /* actual number of digits returned by cvt */ - char expstr[7]; /* buffer for exponent string */ + int lead; /* sig figs before decimal or group sep */ + int ndig; /* actual number of digits returned by dtoa */ + char expstr[MAXEXPDIG+2]; /* buffer for exponent string: e+ZZZ */ char *dtoaresult; /* buffer allocated by dtoa */ + int nseps; /* number of group separators with ' */ + int nrepeats; /* number of repeats of the last group */ #endif u_long ulval; /* integer arguments %[diouxX] */ uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */ @@ -481,12 +508,12 @@ int realsz; /* field size expanded by dprec, sign, etc */ int size; /* size of converted field or string */ int prsize; /* max size of printed field */ - char *xdigs; /* digits for [xX] conversion */ + const char *xdigs; /* digits for %[xX] conversion */ #define NIOV 8 struct __suio uio; /* output information: summary */ struct __siov iov[NIOV];/* ... and individual io vectors */ - char buf[BUF]; /* space for %c, %[diouxX], %[eEfFgG] */ - char ox[2]; /* space for 0x hex-prefix */ + char buf[BUF]; /* buffer with space for digits of uintmax_t */ + char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */ union arg *argtable; /* args, built due to positional arg */ union arg statargtable [STATIC_ARG_TBL_SIZE]; int nextarg; /* 1-based argument index */ @@ -504,6 +531,9 @@ static char zeroes[PADSIZE] = {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'}; + static const char xdigs_lower[16] = "0123456789abcdef"; + static const char xdigs_upper[16] = "0123456789ABCDEF"; + /* * BEWARE, these `goto error' on error, and PAD uses `n'. */ @@ -643,6 +673,7 @@ width = 0; prec = -1; sign = '\0'; + ox[1] = '\0'; rflag: ch = *fmt++; reswitch: switch (ch) { @@ -797,86 +828,122 @@ #ifdef HEXFLOAT case 'a': case 'A': + if (ch == 'a') { + ox[1] = 'x'; + xdigs = xdigs_lower; + expchar = 'p'; + } else { + ox[1] = 'X'; + xdigs = xdigs_upper; + expchar = 'P'; + } + /* + * XXX We don't actually have a conversion + * XXX routine for this yet. + */ + if (flags & LONGDBL) { + fparg.ldbl = (double)GETARG(long double); + dtoaresult = cp = + __hldtoa(fparg.ldbl, xdigs, prec, + &expt, &signflag, &dtoaend); + } else { + fparg.dbl = GETARG(double); + dtoaresult = cp = + __hdtoa(fparg.dbl, xdigs, prec, + &expt, &signflag, &dtoaend); + } + goto fp_begin; #endif case 'e': case 'E': - /*- - * Grouping apply to %i, %d, %u, %f, %F, %g, %G - * conversion specifiers only. For other conversions - * behavior is undefined. - * -- POSIX - */ - flags &= ~GROUPING; - /*FALLTHROUGH*/ + expchar = ch; + if (prec < 0) /* account for digit before decpt */ + prec = DEFPREC + 1; + else + prec++; + goto fp_begin; case 'f': case 'F': + expchar = '\0'; goto fp_begin; case 'g': case 'G': + expchar = ch - ('g' - 'e'); if (prec == 0) prec = 1; -fp_begin: if (prec == -1) +fp_begin: + if (prec < 0) prec = DEFPREC; - if (flags & LONGDBL) - /* XXX this loses precision. */ - _double = (double)GETARG(long double); - else - _double = GETARG(double); - /* do this before tricky precision changes */ - if (isinf(_double)) { - if (_double < 0) - sign = '-'; - if (isupper(ch)) - cp = "INF"; - else - cp = "inf"; - size = 3; - break; + if (dtoaresult != NULL) + freedtoa(dtoaresult); + if (flags & LONGDBL) { + fparg.ldbl = GETARG(long double); + dtoaresult = cp = + __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec, + &expt, &signflag, &dtoaend); + } else { + fparg.dbl = GETARG(double); + dtoaresult = cp = + dtoa(fparg.dbl, expchar ? 2 : 3, prec, + &expt, &signflag, &dtoaend); + if (expt == 9999) + expt = INT_MAX; } - if (isnan(_double)) { - if (isupper(ch)) - cp = "NAN"; - else - cp = "nan"; + if (signflag) + sign = '-'; + if (expt == INT_MAX) { /* inf or nan */ + if (*cp == 'N') { + cp = (ch >= 'a') ? "nan" : "NAN"; + sign = '\0'; + } else + cp = (ch >= 'a') ? "inf" : "INF"; size = 3; break; } flags |= FPT; - if (dtoaresult != NULL) { - __freedtoa(dtoaresult); - dtoaresult = NULL; - } - dtoaresult = cp = cvt(_double, prec, flags, &softsign, - &expt, ch, &ndig); + ndig = dtoaend - cp; if (ch == 'g' || ch == 'G') { - if (expt <= -4 || expt > prec) - ch = (ch == 'g') ? 'e' : 'E'; - else - ch = 'g'; + if (expt > -4 && expt <= prec) { + /* Make %[gG] smell like %[fF] */ + expchar = '\0'; + if (flags & ALT) + prec -= expt; + else + prec = ndig - expt; + if (prec < 0) + prec = 0; + } } - if (ch == 'e' || ch == 'E') { - --expt; - expsize = exponent(expstr, expt, ch); - size = expsize + ndig; - if (ndig > 1 || flags & ALT) + if (expchar) { + expsize = exponent(expstr, expt - 1, expchar); + size = expsize + prec; + if (prec || flags & ALT) ++size; - } else if (ch == 'f' || ch == 'F') { + } else { if (expt > 0) { size = expt; if (prec || flags & ALT) size += prec + 1; } else /* "0.X" */ size = prec + 2; - } else if (expt >= ndig) { /* fixed g fmt */ - size = expt; - if (flags & ALT) - ++size; - } else - size = ndig + (expt > 0 ? - 1 : 2 - expt); - - if (softsign) - sign = '-'; + if (grouping && expt > 0) { + /* space for thousands' grouping */ + nseps = nrepeats = 0; + lead = expt; + while (*grouping != CHAR_MAX) { + if (lead <= *grouping) + break; + lead -= *grouping; + if (*(grouping+1)) { + nseps++; + grouping++; + } else + nrepeats++; + } + size += nseps + nrepeats; + } else + lead = (expt < ndig) ? expt : ndig; + } break; #endif /* FLOATING_POINT */ case 'n': @@ -922,9 +989,9 @@ */ ujval = (uintmax_t)(uintptr_t)GETARG(void *); base = 16; - xdigs = "0123456789abcdef"; - flags = flags | INTMAXT | HEXPREFIX; - ch = 'x'; + xdigs = xdigs_lower; + flags = flags | INTMAXT; + ox[1] = 'x'; goto nosign; case 'S': flags |= LONGINT; @@ -976,10 +1043,10 @@ base = 10; goto nosign; case 'X': - xdigs = "0123456789ABCDEF"; + xdigs = xdigs_upper; goto hex; case 'x': - xdigs = "0123456789abcdef"; + xdigs = xdigs_lower; hex: if (flags & INTMAX_SIZE) ujval = UJARG(); @@ -989,7 +1056,7 @@ /* leading 0x/X only if non-zero */ if (flags & ALT && (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0)) - flags |= HEXPREFIX; + ox[1] = ch; flags &= ~GROUPING; /* unsigned conversions */ @@ -1022,6 +1089,8 @@ grouping); } size = buf + BUF - cp; + if (size > BUF) /* should never happen */ + abort(); break; default: /* "%?" prints ?, unless ? is NUL */ if (ch == '\0') @@ -1051,7 +1120,7 @@ realsz = dprec > size ? dprec : size; if (sign) realsz++; - else if (flags & HEXPREFIX) + else if (ox[1]) realsz += 2; prsize = width > realsz ? width : realsz; @@ -1067,9 +1136,8 @@ /* prefix */ if (sign) { PRINT(&sign, 1); - } else if (flags & HEXPREFIX) { + } else if (ox[1]) { /* ox[1] is either x, X, or \0 */ ox[0] = '0'; - ox[1] = ch; PRINT(ox, 2); } @@ -1085,42 +1153,49 @@ if ((flags & FPT) == 0) { PRINT(cp, size); } else { /* glue together f_p fragments */ - if (ch >= 'f') { /* 'f' or 'g' */ - if (_double == 0) { - /* kludge for __dtoa irregularity */ - PRINT("0", 1); - if (expt < ndig || (flags & ALT) != 0) { - PRINT(decimal_point, 1); - PAD(ndig - 1, zeroes); - } - } else if (expt <= 0) { - PRINT("0", 1); - PRINT(decimal_point, 1); + if (!expchar) { /* %[fF] or sufficiently short %[gG] */ + if (expt <= 0) { + buf[0] = '0'; + buf[1] = *decimal_point; + PRINT(buf, 2); PAD(-expt, zeroes); - PRINT(cp, ndig); - } else if (expt >= ndig) { - PRINT(cp, ndig); - PAD(expt - ndig, zeroes); - if (flags & ALT) - PRINT(decimal_point, 1); + if (ndig > 0) + PRINT(cp, ndig); } else { - PRINT(cp, expt); - cp += expt; - PRINT(decimal_point, 1); - PRINT(cp, ndig-expt); + PRINT(cp, lead); + cp += lead; + if (grouping) { + while (nseps>0 || nrepeats>0) { + if (nrepeats > 0) + nrepeats--; + else { + grouping--; + nseps--; + } + PRINT(&thousands_sep, + 1); + PRINT(cp, *grouping); + cp += *grouping; + } + } else { + PAD(expt - lead, zeroes); + } + if (prec || flags & ALT) + PRINT(decimal_point,1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 21:39:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 713BB37B404; Sat, 5 Apr 2003 21:39:19 -0800 (PST) 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 107FE37B401 for ; Sat, 5 Apr 2003 21:39:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 733F343F3F for ; Sat, 5 Apr 2003 21:39:18 -0800 (PST) (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 h365dI0U077827 for ; Sat, 5 Apr 2003 21:39:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h365dHNo077824 for perforce@freebsd.org; Sat, 5 Apr 2003 21:39:17 -0800 (PST) Date: Sat, 5 Apr 2003 21:39:17 -0800 (PST) Message-Id: <200304060539.h365dHNo077824@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 28300 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, 06 Apr 2003 05:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=28300 Change 28300 by peter@peter_overcee on 2003/04/05 21:38:34 integ i386_hammer @28297 (null change, just keep in sync) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#13 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#13 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.136 2003/04/02 23:53:28 peter Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.137 2003/04/05 22:18:14 peter Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Sat Apr 5 23:14:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E1E137B404; Sat, 5 Apr 2003 23:14:35 -0800 (PST) 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 1284A37B401 for ; Sat, 5 Apr 2003 23:14:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 933C343FBD for ; Sat, 5 Apr 2003 23:14:34 -0800 (PST) (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 h367EY0U085953 for ; Sat, 5 Apr 2003 23:14:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h367EYSw085950 for perforce@freebsd.org; Sat, 5 Apr 2003 23:14:34 -0800 (PST) Date: Sat, 5 Apr 2003 23:14:34 -0800 (PST) Message-Id: <200304060714.h367EYSw085950@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 28304 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, 06 Apr 2003 07:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=28304 Change 28304 by peter@peter_overcee on 2003/04/05 23:14:03 lets try for something easy.. 1G user, 3G kernel. That puts all the symbols below the 2G mark. Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#7 edit .. //depot/projects/hammer/sys/x86_64/include/pmap.h#13 edit .. //depot/projects/hammer/sys/x86_64/include/vmparam.h#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#7 (text+ko) ==== @@ -21,7 +21,7 @@ CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -ffreestanding -Wno-format -CC= x86_64-unknown-freebsd5.0-gcc -mcmodel=medium +CC= x86_64-unknown-freebsd5.0-gcc LD= x86_64-unknown-freebsd5.0-ld NM= x86_64-unknown-freebsd5.0-nm SIZE= x86_64-unknown-freebsd5.0-size ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#13 (text+ko) ==== @@ -87,7 +87,7 @@ * entries. We use half of them for the kernel due to the 48 bit * virtual address sign extension. */ -#define KVA_PAGES 512 +#define KVA_PAGES 1536 /* * Pte related macros. This is complicated by having to deal with @@ -106,7 +106,7 @@ #define NKPT 120 /* initial number of kernel page tables */ #endif #ifndef NKPDE -#define NKPDE (KVA_PAGES - 1) /* number of page tables/pde's */ +#define NKPDE (KVA_PAGES) /* number of page tables/pde's */ #endif #define NKPML4E (1) /* addressable number of page tables/pde's */ #define NKPDPE (1) /* addressable number of page tables/pde's */ @@ -114,7 +114,7 @@ /* * The *PTDI values control the layout of virtual memory */ -#define KPTDI ((NPDEPTD-1)-NKPDE)/* start of kernel virtual pde's */ +#define KPTDI (NPDEPTD-NKPDE) /* start of kernel virtual pde's */ #define PTDPTDI (KPTDI-NPGPTD) /* ptd entry that points to ptd! */ /* ==== //depot/projects/hammer/sys/x86_64/include/vmparam.h#5 (text+ko) ==== @@ -89,7 +89,7 @@ #define VM_MAX_KERNEL_ADDRESS VADDR(0, 0, KPTDI+NKPDE, 0) #define VM_MIN_KERNEL_ADDRESS VADDR(0, 0, PTDPTDI, PTDPTDI) -#define KERNBASE VM_MIN_KERNEL_ADDRESS +#define KERNBASE VADDR(0, 0, KPTDI, 0) #define UPT_MAX_ADDRESS VADDR(0, 0, PTDPTDI, PTDPTDI) #define UPT_MIN_ADDRESS VADDR(0, 0, PTDPTDI, 0)