CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: msaitoh
Date: Fri Nov 9 09:04:20 UTC 2012
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
Add MVGBE_EVENT_COUNTERS for debugging. Count rxoverrrun and wdogsoft.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/marvell/if_mvgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.31 src/sys/dev/marvell/if_mvgbe.c:1.32
--- src/sys/dev/marvell/if_mvgbe.c:1.31 Thu Nov 8 15:39:29 2012
+++ src/sys/dev/marvell/if_mvgbe.c Fri Nov 9 09:04:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.31 2012/11/08 15:39:29 msaitoh Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.32 2012/11/09 09:04:19 msaitoh Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.31 2012/11/08 15:39:29 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.32 2012/11/09 09:04:19 msaitoh Exp $);
#include sys/param.h
#include sys/bus.h
@@ -33,6 +33,7 @@ __KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v
#include sys/device.h
#include sys/endian.h
#include sys/errno.h
+#include sys/evcnt.h
#include sys/kernel.h
#include sys/kmem.h
#include sys/mutex.h
@@ -145,6 +146,14 @@ do { \
#define MVGBE_IPGINTTX_DEFAULT 768
#define MVGBE_IPGINTRX_DEFAULT 768
+#ifdef MVGBE_EVENT_COUNTERS
+#define MVGBE_EVCNT_INCR(ev) (ev)-ev_count++
+#define MVGBE_EVCNT_ADD(ev, val) (ev)-ev_count += (val)
+#else
+#define MVGBE_EVCNT_INCR(ev) /* nothing */
+#define MVGBE_EVCNT_ADD(ev, val) /* nothing */
+#endif
+
struct mvgbe_jpool_entry {
int slot;
LIST_ENTRY(mvgbe_jpool_entry) jpool_entries;
@@ -225,6 +234,10 @@ struct mvgbe_softc {
krndsource_t sc_rnd_source;
struct sysctllog *mvgbe_clog;
+#ifdef MVGBE_EVENT_COUNTERS
+ struct evcnt sc_ev_rxoverrun;
+ struct evcnt sc_ev_wdogsoft;
+#endif
};
@@ -807,6 +820,13 @@ mvgbe_attach(device_t parent, device_t s
ether_set_ifflags_cb(sc-sc_ethercom, mvgbe_ifflags_cb);
sysctl_mvgbe_init(sc);
+#ifdef MVGBE_EVENT_COUNTERS
+ /* Attach event counters. */
+ evcnt_attach_dynamic(sc-sc_ev_rxoverrun, EVCNT_TYPE_MISC,
+ NULL, device_xname(sc-sc_dev), rxoverrrun);
+ evcnt_attach_dynamic(sc-sc_ev_wdogsoft, EVCNT_TYPE_MISC,
+ NULL, device_xname(sc-sc_dev), wdogsoft);
+#endif
rnd_attach_source(sc-sc_rnd_source, device_xname(sc-sc_dev),
RND_TYPE_NET, 0);
@@ -883,6 +903,7 @@ mvgbe_tick(void *arg)
s = splnet();
mii_tick(mii);
/* Need more work */
+ MVGBE_EVCNT_ADD(sc-sc_ev_rxoverrun, MVGBE_READ(sc, MVGBE_POFC));
splx(s);
callout_schedule(sc-sc_tick_ch, hz);
@@ -1286,6 +1307,7 @@ mvgbe_watchdog(struct ifnet *ifp)
MVGBE_WRITE(sc, MVGBE_TQC, MVGBE_TQC_ENQ);
ifp-if_timer = 5;
sc-sc_wdogsoft = 0;
+ MVGBE_EVCNT_INCR(sc-sc_ev_wdogsoft);
} else {
aprint_error_ifnet(ifp, watchdog timeout\n);
CVS commit: xsrc/external/mit/xf86-video-xgi/dist/src
Module Name:xsrc
Committed By: apb
Date: Fri Nov 9 09:28:52 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-xgi/dist/src: xgi_accel.c
Log Message:
Adjust previous: the cast should be to (unsigned long), not (long),
since the value is printed in hex and we don't want sign extension.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c
diff -u xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.5 xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.6
--- xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.5 Fri Nov 9 07:00:21 2012
+++ xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c Fri Nov 9 09:28:52 2012
@@ -1744,7 +1744,8 @@ void XGIDumpCMDQueue(ScrnInfoPtr pScrn)
ErrorF(pXGI-cmdQueueBase=%p\n, pXGI-cmdQueueBase) ;
for( i = 0 ; i SwWP ; i+=0x04 )
{
- ErrorF([%04X]: %08lX\n,i, (long)*(CARD32 *)(pXGI-cmdQueueBase+i));
+ ErrorF([%04X]: %08lX\n,i,
+ (unsigned long)*(CARD32 *)(pXGI-cmdQueueBase+i));
}
}
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Fri Nov 9 10:06:00 UTC 2012
Modified Files:
src/sys/arch/sparc64/include: cpu.h psl.h
src/sys/arch/sparc64/sparc64: locore.s
Log Message:
Make setstick() and getstick() to inline functions.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/include/psl.h
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/sparc64/sparc64/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.99 src/sys/arch/sparc64/include/cpu.h:1.100
--- src/sys/arch/sparc64/include/cpu.h:1.99 Thu Nov 8 00:34:37 2012
+++ src/sys/arch/sparc64/include/cpu.h Fri Nov 9 10:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.99 2012/11/08 00:34:37 macallan Exp $ */
+/* $NetBSD: cpu.h,v 1.100 2012/11/09 10:05:59 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -376,9 +376,6 @@ void switchtoctx_us(int);
void switchtoctx_usiii(int);
void next_tick(long);
void next_stick(long);
-void setstick(long);
-long getstick(void);
-
/* trap.c */
void cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
int rwindow_save(struct lwp *);
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.51 src/sys/arch/sparc64/include/psl.h:1.52
--- src/sys/arch/sparc64/include/psl.h:1.51 Thu Nov 8 16:30:12 2012
+++ src/sys/arch/sparc64/include/psl.h Fri Nov 9 10:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.51 2012/11/08 16:30:12 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.52 2012/11/09 10:05:59 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -285,60 +285,71 @@
#if defined(_KERNEL) !defined(_LOCORE)
/*
- * Inlines for manipulating privileged registers
+ * Inlines for manipulating privileged and ancillary state registers
*/
-#define SPARC64_GETPR_DEF(pr, type) \
-static __inline type get##pr(void) \
+#define SPARC64_RD_DEF(rd, name, reg, type)\
+static __inline type get##name(void) \
{ \
- type pr; \
- __asm volatile(rdpr %% #pr ,%0 : =r (pr)); \
- return pr; \
+ type _val; \
+ __asm volatile(#rd % #reg ,%0 : =r (_val)); \
+ return _val; \
}
-#define SPARC64_SETPR_DEF(pr, type) \
-static __inline void set##pr(type pr) \
+#define SPARC64_WR_DEF(wr, name, reg, type)\
+static __inline void set##name(type _val)\
{ \
- __asm volatile(wrpr %0,0,%% #pr : : r (pr) : memory); \
+ __asm volatile(#wr %0,0,% #reg : : r (_val) : memory); \
}
#ifdef __arch64__
-#define SPARC64_GETPR64_DEF(pr) SPARC64_GETPR_DEF(pr, uint64_t)
-#define SPARC64_SETPR64_DEF(pr) SPARC64_SETPR_DEF(pr, uint64_t)
+#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
+#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
#else
-#define SPARC64_GETPR64_DEF(pr) \
-static __inline uint64_t get##pr(void) \
+#define SPARC64_RD64_DEF(rd, name, reg) \
+static __inline uint64_t get##name(void)\
{ \
uint32_t _hi, _lo; \
- __asm volatile(rdpr %% #pr ,%0; srl %0,0,%1; srlx %0,32,%0 \
+ __asm volatile(#rd % #reg ,%0; srl %0,0,%1; srlx %0,32,%0 \
: =r (_hi), =r (_lo));\
return ((uint64_t)_hi 32) | _lo;\
}
-#define SPARC64_SETPR64_DEF(pr) \
-static __inline void set##pr(uint64_t pr)\
+#define SPARC64_WR64_DEF(wr, name, reg) \
+static __inline void set##name(uint64_t _val)\
{ \
- uint32_t _hi = pr 32, _lo = pr;\
- __asm volatile(sllx %1,32,%0; or %0,%2,%0; wrpr %0,0,%% #pr \
+ uint32_t _hi = _val 32, _lo = _val;\
+ __asm volatile(sllx %1,32,%0; or %0,%2,%0; #wr %0,0,% #reg\
: =r (_hi) /* scratch register */ \
: r (_hi), r (_lo) : memory); \
}
#endif
+#define SPARC64_RDPR_DEF(name, reg, type) SPARC64_RD_DEF(rdpr, name, reg, type)
+#define SPARC64_WRPR_DEF(name, reg, type) SPARC64_WR_DEF(wrpr, name, reg, type)
+#define SPARC64_RDPR64_DEF(name, reg) SPARC64_RD64_DEF(rdpr, name, reg)
+#define SPARC64_WRPR64_DEF(name, reg) SPARC64_WR64_DEF(wrpr, name, reg)
+#define SPARC64_RDASR64_DEF(name, reg) SPARC64_RD64_DEF(rd, name, reg)
+#define SPARC64_WRASR64_DEF(name, reg) SPARC64_WR64_DEF(wr, name, reg)
+
/* Tick Register (PR 4) */
-SPARC64_GETPR64_DEF(tick) /* gettick() */
-SPARC64_SETPR64_DEF(tick) /* settick() */
+SPARC64_RDPR64_DEF(tick, %tick) /* gettick() */
+SPARC64_WRPR64_DEF(tick, %tick) /* settick() */
/* Processor State Register (PR 6) */
-SPARC64_GETPR_DEF(pstate, int) /* getpstate() */
-SPARC64_SETPR_DEF(pstate, int) /* setpstate() */
+SPARC64_RDPR_DEF(pstate, %pstate, int) /* getpstate() */
+SPARC64_WRPR_DEF(pstate, %pstate, int) /* setpstate() */
/* Trap Level Register (PR 7) */
-SPARC64_GETPR_DEF(tl, int) /* gettl() */
+SPARC64_RDPR_DEF(tl, %tl, int) /* gettl() */
/* Current
CVS commit: xsrc/external/mit/xorg-server/dist/exa
Module Name:xsrc
Committed By: abs
Date: Fri Nov 9 10:27:33 UTC 2012
Modified Files:
xsrc/external/mit/xorg-server/dist/exa: exa_priv.h exa_unaccel.c
Log Message:
Apply patch https://bugs.freedesktop.org/attachment.cgi?id=68718
(with whitespace tweaks) from
https://bugs.freedesktop.org/show_bug.cgi?id=47266
to address graphics corruption using recent Cairo, manifested most
commonly by certain rendered text sections appearing as solid rectangular
blocks of colour.
Should be pulled up to netbsd-6 (and probably -5)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/exa/exa_priv.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/exa/exa_priv.h
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.2
--- xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.1.1.4 Tue Nov 23 05:21:03 2010
+++ xsrc/external/mit/xorg-server/dist/exa/exa_priv.h Fri Nov 9 10:27:33 2012
@@ -206,6 +206,7 @@ typedef struct {
RegionRec srcReg;
RegionRec maskReg;
PixmapPtr srcPix;
+PixmapPtr maskPix;
} ExaScreenPrivRec, *ExaScreenPrivPtr;
Index: xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.2
--- xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.1.1.6 Tue Aug 2 06:56:46 2011
+++ xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c Fri Nov 9 10:27:33 2012
@@ -449,6 +449,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
RegionPtr dst;
int xoff, yoff;
+if (pExaScr-srcPix == pPix)
+dst = pExaScr-srcReg;
+else if (pExaScr-maskPix == pPix)
+dst = pExaScr-maskReg;
+else
+return;
+
exaGetDrawableDeltas(pDrawable, pPix, xoff, yoff);
box.x1 = x + xoff;
@@ -456,9 +463,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
box.x2 = box.x1 + width;
box.y2 = box.y1 + height;
-dst = (pExaScr-srcPix == pPix) ? pExaScr-srcReg :
- pExaScr-maskReg;
-
RegionInit(reg, box, 1);
RegionUnion(dst, dst, reg);
RegionUninit(reg);
@@ -507,17 +511,20 @@ ExaPrepareCompositeReg(ScreenPtr pScree
RegionTranslate(pSrc-pCompositeClip,
-pSrc-pDrawable-x,
-pSrc-pDrawable-y);
-}
+} else
+pExaScr-srcPix = NULL;
if (pMask pMask-pDrawable) {
pMaskPix = exaGetDrawablePixmap(pMask-pDrawable);
RegionNull(pExaScr-maskReg);
maskReg = pExaScr-maskReg;
+pExaScr-maskPix = pMaskPix;
if (pMask != pDst pMask != pSrc)
RegionTranslate(pMask-pCompositeClip,
-pMask-pDrawable-x,
-pMask-pDrawable-y);
-}
+} else
+pExaScr-maskPix = NULL;
RegionTranslate(pDst-pCompositeClip,
-pDst-pDrawable-x,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: rkujawa Date: Fri Nov 9 11:28:40 UTC 2012 Modified Files: src/sys/dev/pci: voodoofb.c Log Message: The voodoofb driver also works with Voodoo Banshee. Tested using card from martin@. Should be modified to take different MAX_CLOCK value into account. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/voodoofb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/voodoofb.c diff -u src/sys/dev/pci/voodoofb.c:1.41 src/sys/dev/pci/voodoofb.c:1.42 --- src/sys/dev/pci/voodoofb.c:1.41 Mon Apr 23 11:51:56 2012 +++ src/sys/dev/pci/voodoofb.c Fri Nov 9 11:28:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofb.c,v 1.41 2012/04/23 11:51:56 macallan Exp $ */ +/* $NetBSD: voodoofb.c,v 1.42 2012/11/09 11:28:40 rkujawa Exp $ */ /* * Copyright (c) 2005, 2006, 2012 Michael Lorenz @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.41 2012/04/23 11:51:56 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.42 2012/11/09 11:28:40 rkujawa Exp $); #include sys/param.h #include sys/systm.h @@ -339,6 +339,11 @@ voodoofb_match(device_t parent, cfdata_t if ((PCI_VENDOR(pa-pa_id)==PCI_VENDOR_3DFX) (PCI_PRODUCT(pa-pa_id)=PCI_PRODUCT_3DFX_VOODOO3)) return 100; + + /* XXX: Banshee has different MAX_CLOCK, but otherwise is almost same */ + if ((PCI_VENDOR(pa-pa_id)==PCI_VENDOR_3DFX) + (PCI_PRODUCT(pa-pa_id)=PCI_PRODUCT_3DFX_BANSHEE)) + return 100; return 0; }
CVS commit: src/sys/arch/ofppc/conf
Module Name:src Committed By: rkujawa Date: Fri Nov 9 12:52:33 UTC 2012 Modified Files: src/sys/arch/ofppc/conf: GENERIC Log Message: Add tdvfb - tested and works. Also add commented out TDVFB_CONSOLE option. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/arch/ofppc/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ofppc/conf/GENERIC diff -u src/sys/arch/ofppc/conf/GENERIC:1.144 src/sys/arch/ofppc/conf/GENERIC:1.145 --- src/sys/arch/ofppc/conf/GENERIC:1.144 Wed Oct 17 14:48:15 2012 +++ src/sys/arch/ofppc/conf/GENERIC Fri Nov 9 12:52:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.144 2012/10/17 14:48:15 apb Exp $ +# $NetBSD: GENERIC,v 1.145 2012/11/09 12:52:33 rkujawa Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/ofppc/conf/std.ofppc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.144 $ +#ident GENERIC-$Revision: 1.145 $ maxusers 32 @@ -211,6 +211,8 @@ isa* at pcib? genfb* at pci? dev ? function ? #radeonfb* at pci? dev ? function ? #voodoofb* at pci? dev ? function ? # 3Dfx Voodoo3 +tdvfb* at pci? dev ? function ? # 3Dfx Voodoo1/Voodoo2 +#options TDVFB_CONSOLE pckbc0 at isa? # pc keyboard controller pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: bouyer
Date: Fri Nov 9 18:46:54 UTC 2012
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
MFI_STATE_BOOT_MESSAGE_PENDING also needs to be handed for non-TBOLT
controllers, from FreeBSD. tested by Hugo Silva against a GEN2 controller.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/mfi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.47 src/sys/dev/ic/mfi.c:1.48
--- src/sys/dev/ic/mfi.c:1.47 Wed Sep 19 21:24:29 2012
+++ src/sys/dev/ic/mfi.c Fri Nov 9 18:46:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.47 2012/09/19 21:24:29 bouyer Exp $ */
+/* $NetBSD: mfi.c,v 1.48 2012/11/09 18:46:54 bouyer Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.47 2012/09/19 21:24:29 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.48 2012/11/09 18:46:54 bouyer Exp $);
#include bio.h
@@ -587,12 +587,14 @@ mfi_transition_firmware(struct mfi_softc
max_wait = 20;
break;
case MFI_STATE_BOOT_MESSAGE_PENDING:
- if (sc-sc_ioptype == MFI_IOP_TBOLT) {
+ if (sc-sc_ioptype == MFI_IOP_SKINNY ||
+ sc-sc_ioptype == MFI_IOP_TBOLT) {
mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_HOTPLUG);
-max_wait = 180;
-break;
+ } else {
+mfi_write(sc, MFI_IDB, MFI_INIT_HOTPLUG);
}
- /* FALLTHROUGH */
+ max_wait = 180;
+ break;
default:
aprint_error_dev(sc-sc_dev,
unknown firmware state %d\n, fw_state);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Fri Nov 9 18:53:05 UTC 2012
Modified Files:
src/usr.bin/make: make.c
Log Message:
Do not stop looking for children, just because one has a .ORDER dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/make/make.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.87 src/usr.bin/make/make.c:1.88
--- src/usr.bin/make/make.c:1.87 Tue Jun 12 19:21:51 2012
+++ src/usr.bin/make/make.c Fri Nov 9 18:53:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $ */
+/* $NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $;
+static char rcsid[] = $NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)make.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $);
+__RCSID($NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -1032,7 +1032,7 @@ MakeBuildChild(void *v_cn, void *toBeMad
if (cn-order_pred Lst_ForEach(cn-order_pred, MakeCheckOrder, 0)) {
/* Can't build this (or anything else in this child list) yet */
cn-made = DEFERRED;
- return 1;
+ return 0; /* but keep looking */
}
if (DEBUG(MAKE))
@@ -1055,7 +1055,7 @@ MakeBuildChild(void *v_cn, void *toBeMad
return cn-type OP_WAIT cn-unmade 0;
}
-/* When a .ORDER RHS node completes we do this on each LHS */
+/* When a .ORDER LHS node completes we do this on each RHS */
static int
MakeBuildParent(void *v_pn, void *toBeMade_next)
{
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Fri Nov 9 19:08:29 UTC 2012
Modified Files:
src/usr.bin/make/unit-tests: Makefile test.exp
Added Files:
src/usr.bin/make/unit-tests: order
Log Message:
Add a unit-test for .ORDER
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/order
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/make/unit-tests/test.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.34 src/usr.bin/make/unit-tests/Makefile:1.35
--- src/usr.bin/make/unit-tests/Makefile:1.34 Tue Jun 19 23:25:53 2012
+++ src/usr.bin/make/unit-tests/Makefile Fri Nov 9 19:08:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $
+# $NetBSD: Makefile,v 1.35 2012/11/09 19:08:28 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -36,6 +36,7 @@ SUBFILES= \
modorder \
modts \
modword \
+ order \
phony-end \
posix \
qequals \
@@ -48,6 +49,7 @@ SUBFILES= \
all: ${SUBFILES}
flags.doterror=
+flags.order=-j1
# the tests are actually done with sub-makes.
.PHONY: ${SUBFILES}
Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.40 src/usr.bin/make/unit-tests/test.exp:1.41
--- src/usr.bin/make/unit-tests/test.exp:1.40 Tue Jun 19 23:25:53 2012
+++ src/usr.bin/make/unit-tests/test.exp Fri Nov 9 19:08:28 2012
@@ -310,6 +310,9 @@ LIST:tw:C/ /,/g=one two three four five
LIST:tw:C/ /,/1g=one two three four five six
LIST:tw:tW:C/ /,/=one,two three four five six
LIST:tW:tw:C/ /,/=one two three four five six
+Making the.c
+Making the.h
+Making the.o from the.h the.c
.TARGET=phony .PREFIX=phony .IMPSRC=
.TARGET=all .PREFIX=all .IMPSRC=
.TARGET=ok .PREFIX=ok .IMPSRC=
Added files:
Index: src/usr.bin/make/unit-tests/order
diff -u /dev/null src/usr.bin/make/unit-tests/order:1.1
--- /dev/null Fri Nov 9 19:08:29 2012
+++ src/usr.bin/make/unit-tests/order Fri Nov 9 19:08:28 2012
@@ -0,0 +1,20 @@
+# $NetBSD: order,v 1.1 2012/11/09 19:08:28 sjg Exp $
+
+# Test that .ORDER is handled correctly.
+# The explicit dependency the.o: the.h will make us examine the.h
+# the .ORDER will prevent us building it immediately,
+# we should then examine the.c rather than stop.
+
+all: the.o
+
+.ORDER: the.c the.h
+
+the.c the.h:
+ @echo Making $@
+
+.SUFFIXES: .o .c
+
+.c.o:
+ @echo Making $@ from $?
+
+the.o: the.h
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: skrll Date: Fri Nov 9 19:47:16 UTC 2012 Modified Files: src/distrib/sets/lists/comp: mi Log Message: tcsd is part of TPM To generate a diff of this commit: cvs rdiff -u -r1.1787 -r1.1788 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1787 src/distrib/sets/lists/comp/mi:1.1788 --- src/distrib/sets/lists/comp/mi:1.1787 Sun Nov 4 16:26:53 2012 +++ src/distrib/sets/lists/comp/mi Fri Nov 9 19:47:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1787 2012/11/04 16:26:53 christos Exp $ +# $NetBSD: mi,v 1.1788 2012/11/09 19:47:11 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4339,7 +4339,7 @@ ./usr/libdata/debug/usr/sbin/tcpdmatch.debug comp-netutil-debug debug ./usr/libdata/debug/usr/sbin/tcpdrop.debug comp-netutil-debug debug ./usr/libdata/debug/usr/sbin/tcpdump.debug comp-netutil-debug debug -./usr/libdata/debug/usr/sbin/tcsd.debug comp-tpm-debug debug +./usr/libdata/debug/usr/sbin/tcsd.debug comp-tpm-debug tpm,debug ./usr/libdata/debug/usr/sbin/timed.debug comp-timed-debug debug ./usr/libdata/debug/usr/sbin/timedc.debug comp-timed-debug debug ./usr/libdata/debug/usr/sbin/tpm_changeownerauth.debug comp-tpm-debug tpm,debug
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: rkujawa
Date: Fri Nov 9 19:50:22 UTC 2012
Modified Files:
src/sys/dev/pci: voodoofb.c
Log Message:
Differentiate between Voodoo 3 and Voodoo Banshee (MAX_CLOCK).
Ok'd by macallan@.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/voodoofb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.42 src/sys/dev/pci/voodoofb.c:1.43
--- src/sys/dev/pci/voodoofb.c:1.42 Fri Nov 9 11:28:40 2012
+++ src/sys/dev/pci/voodoofb.c Fri Nov 9 19:50:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.42 2012/11/09 11:28:40 rkujawa Exp $ */
+/* $NetBSD: voodoofb.c,v 1.43 2012/11/09 19:50:22 rkujawa Exp $ */
/*
* Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.42 2012/11/09 11:28:40 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.43 2012/11/09 19:50:22 rkujawa Exp $);
#include sys/param.h
#include sys/systm.h
@@ -82,6 +82,11 @@ struct voodoofb_softc {
bus_size_t sc_regsize, sc_fbsize, sc_ioregsize;
void *sc_ih;
+
+#define MAX_CLOCK_VB 27 /* Voodoo Banshee */
+#define MAX_CLOCK_V3 30 /* Voodoo3 */
+#define MAX_CLOCK_V45 35 /* Voodoo4/5 (not yet) */
+ uint32_t sc_max_clock;
size_t sc_memsize;
int sc_memtype;
@@ -340,7 +345,6 @@ voodoofb_match(device_t parent, cfdata_t
(PCI_PRODUCT(pa-pa_id)=PCI_PRODUCT_3DFX_VOODOO3))
return 100;
- /* XXX: Banshee has different MAX_CLOCK, but otherwise is almost same */
if ((PCI_VENDOR(pa-pa_id)==PCI_VENDOR_3DFX)
(PCI_PRODUCT(pa-pa_id)=PCI_PRODUCT_3DFX_BANSHEE))
return 100;
@@ -376,6 +380,11 @@ voodoofb_attach(device_t parent, device_
sc-sc_iot = pa-pa_iot;
sc-sc_pa = *pa;
+ if (PCI_PRODUCT(pa-pa_id)=PCI_PRODUCT_3DFX_BANSHEE)
+ sc-sc_max_clock = MAX_CLOCK_VB;
+ else
+ sc-sc_max_clock = MAX_CLOCK_V3;
+
/* the framebuffer */
if (pci_mapreg_info(sc-sc_pc, sc-sc_pcitag, 0x14, PCI_MAPREG_TYPE_MEM,
sc-sc_fb, sc-sc_fbsize, flags)) {
@@ -1663,7 +1672,6 @@ voodoofb_init(struct voodoofb_softc *sc)
voodoofb_wait_idle(sc);
}
-#define MAX_CLOCK 25 /* all Voodoo3 should support that */
#define MAX_HRES 1700 /*
* XXX in theory we can go higher but I
* couldn't get anything above 1680 x 1200
@@ -1671,7 +1679,7 @@ voodoofb_init(struct voodoofb_softc *sc)
* disabled so people won't end up with a
* blank screen
*/
-#define MODE_IS_VALID(m) (((m)-dot_clock = MAX_CLOCK) \
+#define MODE_IS_VALID(m, mclk) (((m)-dot_clock = (mclk)) \
((m)-hdisplay MAX_HRES))
static void
voodoofb_setup_i2c(struct voodoofb_softc *sc)
@@ -1719,7 +1727,7 @@ voodoofb_setup_i2c(struct voodoofb_softc
if ((sc-sc_edid_info.edid_preferred_mode != NULL)) {
struct videomode *m =
sc-sc_edid_info.edid_preferred_mode;
-if (MODE_IS_VALID(m)) {
+if (MODE_IS_VALID(m, sc-sc_max_clock)) {
sc-sc_videomode = m;
} else {
aprint_error_dev(sc-sc_dev,
@@ -1740,7 +1748,8 @@ voodoofb_setup_i2c(struct voodoofb_softc
sc-sc_edid_info.edid_nmodes);
while ((sc-sc_videomode == NULL)
(n sc-sc_edid_info.edid_nmodes)) {
- if (MODE_IS_VALID(m[n])) {
+ if (MODE_IS_VALID(m[n],
+ sc-sc_max_clock)) {
sc-sc_videomode = m[n];
}
n++;
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Fri Nov 9 19:53:17 UTC 2012 Modified Files: src/share/man/man4: voodoofb.4 Log Message: Note Voodoo Banshee support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/voodoofb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/voodoofb.4 diff -u src/share/man/man4/voodoofb.4:1.2 src/share/man/man4/voodoofb.4:1.3 --- src/share/man/man4/voodoofb.4:1.2 Fri Jul 13 23:16:13 2012 +++ src/share/man/man4/voodoofb.4 Fri Nov 9 19:53:17 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: voodoofb.4,v 1.2 2012/07/13 23:16:13 wiz Exp $ +.\ $NetBSD: voodoofb.4,v 1.3 2012/11/09 19:53:17 rkujawa Exp $ .\ .\ Copyright (c) 2012 Radoslaw Kujawa .\ All rights reserved. @@ -24,20 +24,20 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd July 13, 2012 +.Dd November 9, 2012 .Dt VOODOOFB 4 .Os .Sh NAME .Nm voodoofb -.Nd 3Dfx Voodoo 3 framebuffer driver +.Nd 3Dfx Voodoo 3 / Voodoo Banshee framebuffer driver .Sh SYNOPSIS .Cd voodoofb* at pci? .Cd wsdisplay* at voodoofb? .Sh DESCRIPTION The .Nm -driver provides support for the 3Dfx Voodoo 3 series of graphics cards -and provides an interface for machine independent +driver provides support for the 3Dfx Voodoo 3 and 3Dfx Voodoo Banshee series of +graphics cards and provides an interface for machine independent .Xr wscons 4 driver. .Pp
CVS commit: src/doc
Module Name:src Committed By: rkujawa Date: Fri Nov 9 19:59:42 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Note 3Dfx Voodoo Banshee support. To generate a diff of this commit: cvs rdiff -u -r1.1756 -r1.1757 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1756 src/doc/CHANGES:1.1757 --- src/doc/CHANGES:1.1756 Sun Nov 4 18:03:23 2012 +++ src/doc/CHANGES Fri Nov 9 19:59:41 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1756 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1757 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -137,3 +137,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: flock(1): Add a utility to provide locks to shell scripts similar to shlock(1) [christos 20121101] zoneinfo: Import tzdata2012i. [apb 20121104] + voodoofb(4): Add 3Dfx Voodoo Banshee support. [rkujawa 20121109]
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: pgoyette
Date: Fri Nov 9 20:13:24 UTC 2012
Modified Files:
src/tests/lib/libc/gen: t_sleep.c
Log Message:
More clean-up, and adjust timing of kevent test to avoid issues with
PR kern/43887
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/gen/t_sleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_sleep.c
diff -u src/tests/lib/libc/gen/t_sleep.c:1.4 src/tests/lib/libc/gen/t_sleep.c:1.5
--- src/tests/lib/libc/gen/t_sleep.c:1.4 Fri Nov 9 04:43:25 2012
+++ src/tests/lib/libc/gen/t_sleep.c Fri Nov 9 20:13:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sleep.c,v 1.4 2012/11/09 04:43:25 pgoyette Exp $ */
+/* $NetBSD: t_sleep.c,v 1.5 2012/11/09 20:13:24 pgoyette Exp $ */
/*-
* Copyright (c) 2006 Frank Kardel
@@ -42,10 +42,10 @@
#define BILLION 10LL /* nano-seconds per second */
#define MILLION 100LL /* nano-seconds per milli-second */
-#define ALARM 12 /* SIGALRM after this many seconds */
-#define KEVNT_TIMEOUT 16300 /* measured in milli-seconds */
+#define ALARM 6 /* SIGALRM after this many seconds */
+#define MAXSLEEP 22 /* Maximum delay in seconds */
+#define KEVNT_TIMEOUT 10300 /* measured in milli-seconds */
#define FUZZ (40 * MILLION) /* scheduling fuzz accepted - 40 ms */
-#define MAXSLEEP (22 * BILLION) /* 22 seconds */
/*
* Timer notes
@@ -54,18 +54,21 @@
* starts at 1sec (since it cannot handle sub-second intervals).
* Subsequent passes double the previous interval, up to MAXSLEEP.
*
- * The ALARM is only set if the current pass's delay is larger.
+ * The current values result in 5 passes for the 'sleep' test (at 1,
+ * 2, 4, 8, and 16 seconds) and 10 passes for the other tests (at
+ * 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, and 20.48
+ * seconds).
*
- * The 'kevent' test expects the ALARM to be set on the same pass
- * where the delay is larger than the KEVNT_TIMEOUT. The ALARM
- * needs to fire before the timeout.
+ * The ALARM is only set if the current pass's delay is longer, and
+ * only if the ALARM has not already been triggered.
*
- * So, ALARM must be less than KEVNT_TIMEOUT, and both must be
- * large enough to occur on the final pass; ie, delay MAXSLEEP
- * but 2*delay = MAXSLEEP
- *
- * The above values should result in 5 passes for the 'sleep' test
- * and 10 passes for the other tests.
+ * The 'kevent' test needs the ALARM to be set on a different pass
+ * from when the KEVNT_TIMEOUT fires. So set ALARM to fire on the
+ * penultimate pass, and the KEVNT_TIMEOUT on the final pass. We
+ * set KEVNT_TIMEOUT just barely long enough to put it into the
+ * last test pass, and set MAXSLEEP a couple seconds longer than
+ * necessary,in order to avoid a QEMU bug which nearly doubles
+ * some timers.
*/
static volatile int sig;
@@ -148,6 +151,16 @@ do_kevent(struct timespec *delay, struct
ATF_REQUIRE_MSG((kq = kqueue()) != -1, kqueue: %s, strerror(errno));
tmo = KEVNT_TIMEOUT;
+
+ /*
+ * If we expect the KEVNT_TIMEOUT to fire, and we're running
+ * under QEMU, make sure the delay is long enough to account
+ * for the effects of PR kern/43997 !
+ */
+ if (system(cpuctl identify 0 | grep -q QEMU) == 0
+ tmo/1000 delay-tv_sec tmo/500 delay-tv_sec)
+ delay-tv_sec = MAXSLEEP;
+
EV_SET(ktimer, 1, EVFILT_TIMER, EV_ADD, 0, tmo, 0);
rtc = kevent(kq, ktimer, 1, kresult, 1, delay);
@@ -162,7 +175,7 @@ do_kevent(struct timespec *delay, struct
if (delay-tv_sec * BILLION + delay-tv_nsec tmo * MILLION)
ATF_REQUIRE_MSG(rtc 0,
- kevent: ALARM did not cause EVFILT_TIMER event);
+ kevent: KEVNT_TIMEOUT did not cause EVFILT_TIMER event);
return 0;
}
@@ -258,11 +271,11 @@ sleeptest(int (*test)(struct timespec *,
tslp.tv_sec = delta3 / 10;
tslp.tv_nsec = delta3 % 10;
- while (delta3 = MAXSLEEP) {
+ while (tslp.tv_sec = MAXSLEEP) {
/*
* disturb sleep by signal on purpose
*/
- if (delta3 ALARM * BILLION sig == 0)
+ if (tslp.tv_sec ALARM sig == 0)
alarm(ALARM);
clock_gettime(CLOCK_REALTIME, tsa);
CVS commit: src/sys/external/bsd/sljit/dist/sljit_src
Module Name:src
Committed By: alnsn
Date: Fri Nov 9 23:09:32 UTC 2012
Modified Files:
src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h
sljitConfigInternal.h
Log Message:
Apply adapted patch from joerg@ to fix clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.5 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.6
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.5 Sun Oct 28 09:38:59 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h Fri Nov 9 23:09:31 2012
@@ -74,11 +74,16 @@
#endif
#ifdef _KERNEL
+
#ifdef DIAGNOSTIC
#define SLJIT_DEBUG 1
#else
#define SLJIT_DEBUG 0
#endif
+
+#define SLJIT_ASSERT(x) KASSERT(x)
+#define SLJIT_ASSERT_STOP() \
+ panic(Should never been reached __FILE__ :%d\n, __LINE__)
#endif
#ifdef _KERNEL
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.4 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.5
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.4 Sun Oct 28 09:38:59 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h Fri Nov 9 23:09:32 2012
@@ -415,16 +415,12 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free
/* Feel free to redefine these two macros. */
#ifndef SLJIT_ASSERT
-#define SLJIT_HALT_PROCESS() \
- *((int*)0) = 0
+#include assert.h
+#include stdlib.h
-#define SLJIT_ASSERT(x) \
- do { \
- if (SLJIT_UNLIKELY(!(x))) { \
- printf(Assertion failed at __FILE__ :%d\n, __LINE__); \
- SLJIT_HALT_PROCESS(); \
- } \
- } while (0)
+#define SLJIT_HALT_PROCESS() abort()
+
+#define SLJIT_ASSERT(x) assert(x)
#endif /* !SLJIT_ASSERT */
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Sat Nov 10 01:35:15 UTC 2012 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Use macro instead of magic number. To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.343 src/sys/arch/sparc64/sparc64/locore.s:1.344 --- src/sys/arch/sparc64/sparc64/locore.s:1.343 Fri Nov 9 10:06:00 2012 +++ src/sys/arch/sparc64/sparc64/locore.s Sat Nov 10 01:35:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.343 2012/11/09 10:06:00 nakayama Exp $ */ +/* $NetBSD: locore.s,v 1.344 2012/11/10 01:35:14 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3275,7 +3275,7 @@ ENTRY_NOPROFILE(sparc_interrupt) * time. */ rd SOFTINT, %g1 - set 0x10001, %g5 + set TICK_INT|STICK_INT, %g5 andcc %g5, %g1, %g5 bz,pt %icc, 0f sethi %hi(CPUINFO_VA+CI_TICK_IH), %g3
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Sat Nov 10 01:47:25 UTC 2012 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Revise comment. To generate a diff of this commit: cvs rdiff -u -r1.344 -r1.345 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.344 src/sys/arch/sparc64/sparc64/locore.s:1.345 --- src/sys/arch/sparc64/sparc64/locore.s:1.344 Sat Nov 10 01:35:14 2012 +++ src/sys/arch/sparc64/sparc64/locore.s Sat Nov 10 01:47:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.344 2012/11/10 01:35:14 nakayama Exp $ */ +/* $NetBSD: locore.s,v 1.345 2012/11/10 01:47:25 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3206,9 +3206,9 @@ ret_from_intr_vector: /* * Ultra1 and Ultra2 CPUs use soft interrupts for everything. What we do - * on a soft interrupt, is we should check which bits in ASR_SOFTINT(0x16) + * on a soft interrupt, is we should check which bits in SOFTINT(%asr22) * are set, handle those interrupts, then clear them by setting the - * appropriate bits in ASR_CLEAR_SOFTINT(0x15). + * appropriate bits in CLEAR_SOFTINT(%asr21). * * We have an array of 8 interrupt vector slots for each of 15 interrupt * levels. If a vectored interrupt can be dispatched, the dispatch
