PERFORCE change 212869 for review
Robert Watson
rwatson at FreeBSD.org
Thu Jun 14 22:34:13 UTC 2012
http://p4web.freebsd.org/@@212869?ac=10
Change 212869 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/06/14 22:33:30
Integrate FreeBSD/CHERI development brnch to pick up a variety of
FreeBSD/BERI fixes and improvements, including the isf driver, MTL
JTAG UART, and SD card driver improvements, MIPS pmap fixes for
uncached page attributes, and demo application parts.
Affected files ...
.. //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile.inc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/de4tc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/de4tc.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/ANNOUNCE#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/CHANGES#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/INSTALL#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/KNOWNBUG#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/LICENSE#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/README#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/TODO#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Y2KINFO#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/configure#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/LICENSE#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.sgi#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.unx#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.w32#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/README#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/makevms.com#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.o#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-win.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.o#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-win.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-x.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/toucan.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/wpng.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/README.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsw#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/README#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.std#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.tc3#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makevms.com#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.bat#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.sh#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.bat#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.sh#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.bat#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.sh#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/README#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g01.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g02.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g04.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g08.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g16.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c08.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c16.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p01.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p02.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p04.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p08.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a08.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a16.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a08.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a16.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/README.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsw#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.ico#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.rc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/cexcept.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/resource.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/example.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpng.3#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpng.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpngpf.3#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/makefile.gcc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.5#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngasmrd.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngbar.jpg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngbar.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngconf.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngerror.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pnggccrd.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngget.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngmem.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngnow.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngpread.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngread.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrio.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrtran.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrutil.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngset.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtest.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtest.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtrans.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngvcrd.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwio.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwrite.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwtran.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwutil.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.proj#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.proj#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpf#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpr#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.cpp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.readme.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpf#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpr#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib+libpng.bpg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpf#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpr#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.cpp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpf#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpr#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/README.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsw#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png.rc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png32ms.def#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.def#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.dsp#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/netware.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/wince.txt#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/SCOPTIONS.ppc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/descrip.mms#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-body.in#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-head.in#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.icc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.pc.in#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.32sunu#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.64sunu#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.acorn#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.aix#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.amiga#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.atari#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bc32#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bd32#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.beos#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bor#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.cygwin#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.darwin#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dec#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dj2#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.freebsd#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcmmx#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpgcc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpux#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ibmc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.intel#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.knr#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.linux#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.macosx#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.mips#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.msc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ne12bsd#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.netbsd#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.openbsd#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.os2#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sco#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sggcc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sgi#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.so9#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.solaris#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.std#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sunos#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.tc3#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcawin32#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcwin32#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.watcom#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makevms.com#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/pngdef.pas#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/pngos2.def#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/smakefile.ppc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile.inc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-3816.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-4717.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-5487.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/CatSword.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Quill.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Terminal.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy0.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy0.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy1.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy1.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardA.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardA.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardC.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardC.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardN.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardN.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardS.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardS.svg#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf_nexus.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_map.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI.hints#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_SDROOT#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_MDROOT#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SDROOT#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TEMPLATE#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TPAD.hints#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/trap.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/Makefile#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/isfctl/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/isfctl/isfctl.c#1 branch
Differences ...
==== //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#2 (text+ko) ====
@@ -15,6 +15,7 @@
# -DNO_WWWUPDATE do not update www in ${MAKE} update
# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries
# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
# list
# TARGET="machine" to crossbuild world for a different machine type
@@ -88,7 +89,7 @@
# These are last, since it is nice to at least get the base system
# rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
.if exists(${.CURDIR}/${_DIR}/Makefile)
SUBDIR+= ${_DIR}
.endif
@@ -1269,6 +1270,11 @@
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
lib/libopie__L lib/libtacplus__L: lib/libmd__L
==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#2 (text+ko) ====
@@ -54,6 +54,7 @@
#include <dev/altera/sdcard/altera_sdcard.h>
int altera_sdcard_ignore_crc_errors = 1;
+int altera_sdcard_verify_rxtx_writes = 1;
/*
* Low-level I/O routines for the Altera SD Card University IP Core driver.
@@ -231,14 +232,69 @@
altera_sdcard_write_rxtx_buffer(struct altera_sdcard_softc *sc, void *data,
size_t len)
{
+ u_int corrections, differences, i, retry_counter;
+ uint16_t d, v;
KASSERT((uintptr_t)data % 2 == 0,
("%s: unaligned data %p", __func__, data));
KASSERT((len <= ALTERA_SDCARD_SECTORSIZE) && (len % 2 == 0),
("%s: invalid length %ju", __func__, len));
- bus_write_region_2(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER,
- (uint16_t *)data, len / 2);
+ retry_counter = 0;
+ do {
+ bus_write_region_2(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER,
+ (uint16_t *)data, len / 2);
+
+ /*
+ * XXXRW: Due to a possible hardware bug, the above call to
+ * bus_write_region_2() might not succeed. If the workaround
+ * is enabled, verify each write and retry until it succeeds.
+ *
+ * XXXRW: Do we want a limit counter for retries here?
+ */
+recheck:
+ corrections = 0;
+ differences = 0;
+ if (altera_sdcard_verify_rxtx_writes) {
+ for (i = 0; i < ALTERA_SDCARD_SECTORSIZE; i += 2) {
+ v = bus_read_2(sc->as_res,
+ ALTERA_SDCARD_OFF_RXTX_BUFFER + i);
+ d = *(uint16_t *)((uint8_t *)data + i);
+ if (v != d) {
+ if (retry_counter == 0) {
+ bus_write_2(sc->as_res,
+ ALTERA_SDCARD_OFF_RXTX_BUFFER + i,
+ d);
+ v = bus_read_2(sc->as_res,
+ ALTERA_SDCARD_OFF_RXTX_BUFFER + i);
+ if (v == d) {
+ corrections++;
+ device_printf(sc->as_dev,
+ "%s: single word rewrite worked"
+ " at offset %u\n",
+ __func__, i);
+ continue;
+ }
+ }
+ differences++;
+ device_printf(sc->as_dev,
+ "%s: retrying write -- difference"
+ " %u at offset %u, retry %u\n",
+ __func__, differences, i,
+ retry_counter);
+ }
+ }
+ if (differences != 0) {
+ retry_counter++;
+ if (retry_counter == 1 &&
+ corrections == differences)
+ goto recheck;
+ }
+ }
+ } while (differences != 0);
+ if (retry_counter)
+ device_printf(sc->as_dev, "%s: succeeded after %u retries\n",
+ __func__, retry_counter);
}
static void
==== //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 (text+ko) ====
@@ -141,6 +141,7 @@
/*
* Constants to help interpret the text frame buffer.
*/
+#define TERASIC_MTL_TEXTFRAMEBUF_EXPECTED_ADDR 0x0177000
#define TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT 0
#define TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT 8
==== //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 (text+ko) ====
@@ -154,32 +154,17 @@
bus_write_2(sc->mtl_text_res, offset, v);
}
-/*
- * XXXRW: Work around a feature in which the default address of the text frame
- * buffer is not initialised at reset as expected.
- */
-#define TERASIC_MTL_TEXT_EXPECTED_ADDR 0x0177000
-static void
-terasic_mtl_text_workaround(struct terasic_mtl_softc *sc)
+int
+terasic_mtl_text_attach(struct terasic_mtl_softc *sc)
{
uint32_t v;
terasic_mtl_reg_textframebufaddr_get(sc, &v);
- if (v == TERASIC_MTL_TEXT_EXPECTED_ADDR)
- return;
- device_printf(sc->mtl_dev,
- "%s: adjusting text frame buffer reg from 0x%x to 0x%x\n",
- __func__, v, TERASIC_MTL_TEXT_EXPECTED_ADDR);
- terasic_mtl_reg_textframebufaddr_set(sc,
- TERASIC_MTL_TEXT_EXPECTED_ADDR);
-}
-
-int
-terasic_mtl_text_attach(struct terasic_mtl_softc *sc)
-{
-
- /* XXXRW: To go away. */
- terasic_mtl_text_workaround(sc);
+ if (v != TERASIC_MTL_TEXTFRAMEBUF_EXPECTED_ADDR) {
+ device_printf(sc->mtl_dev, "%s: unexpected text frame buffer "
+ "address (%08x); cannot attach\n", __func__, v);
+ return (ENXIO);
+ }
sc->mtl_text_cdev = make_dev(&terasic_mtl_text_cdevsw, sc->mtl_unit,
UID_ROOT, GID_WHEEL, 0400, "mtl_text%d", sc->mtl_unit);
==== //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_map.c#2 (text+ko) ====
@@ -119,13 +119,13 @@
g_slice_dumpconf(sb, indent, gp, cp, pp);
if (pp != NULL) {
if (indent == NULL) {
- sbuf_printf(sb, " entry %lld", sc->entry[pp->index]);
- sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]);
+ sbuf_printf(sb, " entry %jd", (intmax_t)sc->entry[pp->index]);
+ sbuf_printf(sb, " dsize %jd", (intmax_t)sc->dsize[pp->index]);
} else {
- sbuf_printf(sb, "%s<entry>%lld</entry>\n", indent,
- sc->entry[pp->index]);
- sbuf_printf(sb, "%s<dsize>%lld</dsize>\n", indent,
- sc->dsize[pp->index]);
+ sbuf_printf(sb, "%s<entry>%jd</entry>\n", indent,
+ (intmax_t)sc->entry[pp->index]);
+ sbuf_printf(sb, "%s<dsize>%jd</dsize>\n", indent,
+ (intmax_t)sc->dsize[pp->index]);
}
}
}
@@ -153,8 +153,8 @@
return (1);
if (bootverbose) {
- printf("MAP: search key \"%s\" from 0x%llx, step 0x%llx\n",
- search_key, search_start, search_step);
+ printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n",
+ search_key, (intmax_t)search_start, (intmax_t)search_step);
}
/* error if search_key is empty */
@@ -321,9 +321,10 @@
}
if (bootverbose) {
- printf("MAP: %llxx%llx, data=%llxx%llx "
+ printf("MAP: %lxx%lx, data=%lxx%lx "
"\"/dev/map/%s\"\n",
- start, size, offset, dsize, name);
+ (intmax_t)start, (intmax_t)size, (intmax_t)offset,
+ (intmax_t)dsize, name);
}
sc->offset[i] = start;
==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#4 (text+ko) ====
@@ -1,6 +1,8 @@
# $FreeBSD$
dev/altera/avgen/altera_avgen.c optional altera_avgen
-dev/altera/jtag_uart/altera_jtag_uart.c optional altera_jtag_uart
+dev/altera/jtag_uart/altera_jtag_uart_cons.c optional altera_jtag_uart
+dev/altera/jtag_uart/altera_jtag_uart_tty.c optional altera_jtag_uart
+dev/altera/jtag_uart/altera_jtag_uart_nexus.c optional altera_jtag_uart
dev/altera/sdcard/altera_sdcard.c optional altera_sdcard
dev/altera/sdcard/altera_sdcard_disk.c optional altera_sdcard
dev/altera/sdcard/altera_sdcard_io.c optional altera_sdcard
@@ -13,6 +15,8 @@
dev/terasic/mtl/terasic_mtl_reg.c optional terasic_mtl
dev/terasic/mtl/terasic_mtl_syscons.c optional terasic_mtl
dev/terasic/mtl/terasic_mtl_text.c optional terasic_mtl
+dev/isf/isf.c optional isf
+dev/isf/isf_nexus.c optional isf
mips/beri/beri_machdep.c standard
mips/cheri/cp2.c optional cpu_cheri
mips/mips/intr_machdep.c standard
==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pmap.c#2 (text+ko) ====
@@ -3144,16 +3144,16 @@
pt_entry_t rw;
if (!(prot & VM_PROT_WRITE))
- rw = PTE_V | PTE_RO | PTE_C_CACHE;
+ rw = PTE_V | PTE_RO;
else if ((m->oflags & VPO_UNMANAGED) == 0) {
if ((m->md.pv_flags & PV_TABLE_MOD) != 0)
- rw = PTE_V | PTE_D | PTE_C_CACHE;
+ rw = PTE_V | PTE_D;
else
- rw = PTE_V | PTE_C_CACHE;
+ rw = PTE_V;
vm_page_aflag_set(m, PGA_WRITEABLE);
} else
/* Needn't emulate a modified bit for unmanaged pages. */
- rw = PTE_V | PTE_D | PTE_C_CACHE;
+ rw = PTE_V | PTE_D;
return (rw);
}
==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/trap.c#4 (text+ko) ====
@@ -1388,15 +1388,17 @@
read_or_write = "read";
break;
default:
- read_or_write = "";
+ read_or_write = "unknown";
}
pc = frame->pc + (DELAYBRANCH(frame->cause) ? 4 : 0);
- log(LOG_ERR, "%s: pid %d (%s), uid %d: pc %#jx got a %s fault at %#jx\n",
+ log(LOG_ERR, "%s: pid %d (%s), uid %d: pc %#jx got a %s fault "
+ "(type %#x) at %#jx\n",
msg, p->p_pid, p->p_comm,
p->p_ucred ? p->p_ucred->cr_uid : -1,
(intmax_t)pc,
read_or_write,
+ trap_type,
(intmax_t)frame->badvaddr);
/* log registers in trap frame */
==== //depot/projects/ctsrd/cheribsd/src/usr.sbin/Makefile#2 (text+ko) ====
@@ -34,6 +34,7 @@
ifmcstat \
inetd \
iostat \
+ isfctl \
kldxref \
mailwrapper \
makefs \
More information about the p4-projects
mailing list