svn commit: r258803 - in projects/random_number_generator: . bin/sh bin/test lib lib/libc/sparc64/fpu lib/libc/sys lib/libc/xdr lib/libpjdlog release sbin share/mk sys/amd64/pci sys/amd64/vmm/intel...
Mark Murray
markm at FreeBSD.org
Sun Dec 1 17:37:12 UTC 2013
Author: markm
Date: Sun Dec 1 17:37:03 2013
New Revision: 258803
URL: http://svnweb.freebsd.org/changeset/base/258803
Log:
MFC - tracking commit.
Added:
projects/random_number_generator/lib/libpjdlog/
- copied from r258802, head/lib/libpjdlog/
projects/random_number_generator/sys/sys/sf_sync.h
- copied unchanged from r258802, head/sys/sys/sf_sync.h
Modified:
projects/random_number_generator/Makefile.inc1
projects/random_number_generator/bin/sh/cd.c
projects/random_number_generator/bin/sh/exec.c
projects/random_number_generator/bin/sh/expand.c
projects/random_number_generator/bin/sh/memalloc.c
projects/random_number_generator/bin/sh/mystring.c
projects/random_number_generator/bin/sh/mystring.h
projects/random_number_generator/bin/sh/show.c
projects/random_number_generator/bin/sh/var.c
projects/random_number_generator/bin/test/test.c
projects/random_number_generator/lib/Makefile
projects/random_number_generator/lib/libc/sparc64/fpu/fpu.c
projects/random_number_generator/lib/libc/sparc64/fpu/fpu_sqrt.c
projects/random_number_generator/lib/libc/sys/chmod.2
projects/random_number_generator/lib/libc/sys/wait.2
projects/random_number_generator/lib/libc/xdr/xdr_rec.c
projects/random_number_generator/release/Makefile
projects/random_number_generator/release/release.sh
projects/random_number_generator/sbin/Makefile
projects/random_number_generator/share/mk/bsd.libnames.mk
projects/random_number_generator/sys/amd64/pci/pci_cfgreg.c
projects/random_number_generator/sys/amd64/vmm/intel/vmcs.h
projects/random_number_generator/sys/amd64/vmm/intel/vmx_controls.h
projects/random_number_generator/sys/amd64/vmm/intel/vtd.c
projects/random_number_generator/sys/arm/arm/db_trace.c
projects/random_number_generator/sys/arm/arm/pl190.c
projects/random_number_generator/sys/arm/at91/if_macbvar.h
projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_dma.c
projects/random_number_generator/sys/arm/econa/if_ece.c
projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopreg.h
projects/random_number_generator/sys/arm/freescale/imx/imx6_usbphy.c
projects/random_number_generator/sys/arm/freescale/imx/imx_gptreg.h
projects/random_number_generator/sys/arm/freescale/vybrid/vf_anadig.c
projects/random_number_generator/sys/arm/freescale/vybrid/vf_ccm.c
projects/random_number_generator/sys/arm/freescale/vybrid/vf_ehci.c
projects/random_number_generator/sys/arm/include/armreg.h
projects/random_number_generator/sys/arm/lpc/if_lpereg.h
projects/random_number_generator/sys/arm/lpc/lpcreg.h
projects/random_number_generator/sys/arm/mv/mv_pci.c
projects/random_number_generator/sys/arm/samsung/exynos/ehci_exynos5.c
projects/random_number_generator/sys/arm/xscale/i8134x/i81342reg.h
projects/random_number_generator/sys/arm/xscale/ixp425/ixp425reg.h
projects/random_number_generator/sys/boot/arm/at91/libat91/mci_device.h
projects/random_number_generator/sys/boot/i386/libfirewire/fwohci.h
projects/random_number_generator/sys/boot/i386/libfirewire/fwohcireg.h
projects/random_number_generator/sys/compat/freebsd32/freebsd32_misc.c
projects/random_number_generator/sys/conf/files.powerpc
projects/random_number_generator/sys/dev/aac/aacvar.h
projects/random_number_generator/sys/dev/acpica/acpi_video.c
projects/random_number_generator/sys/dev/agp/agp_i810.c
projects/random_number_generator/sys/dev/ahci/ahci.h
projects/random_number_generator/sys/dev/bktr/bktr_core.c
projects/random_number_generator/sys/dev/cesa/cesa.h
projects/random_number_generator/sys/dev/drm/i915_reg.h
projects/random_number_generator/sys/dev/drm/mach64_drv.h
projects/random_number_generator/sys/dev/drm/mga_drv.h
projects/random_number_generator/sys/dev/drm/r128_drv.h
projects/random_number_generator/sys/dev/drm/r300_reg.h
projects/random_number_generator/sys/dev/drm/r600_blit.c
projects/random_number_generator/sys/dev/drm/radeon_cp.c
projects/random_number_generator/sys/dev/drm/radeon_drv.h
projects/random_number_generator/sys/dev/drm/via_irq.c
projects/random_number_generator/sys/dev/drm2/i915/i915_reg.h
projects/random_number_generator/sys/dev/drm2/radeon/evergreen_blit_kms.c
projects/random_number_generator/sys/dev/drm2/radeon/evergreen_cs.c
projects/random_number_generator/sys/dev/drm2/radeon/evergreend.h
projects/random_number_generator/sys/dev/drm2/radeon/nid.h
projects/random_number_generator/sys/dev/drm2/radeon/r200.c
projects/random_number_generator/sys/dev/drm2/radeon/r300.c
projects/random_number_generator/sys/dev/drm2/radeon/r300_reg.h
projects/random_number_generator/sys/dev/drm2/radeon/r500_reg.h
projects/random_number_generator/sys/dev/drm2/radeon/r600_blit.c
projects/random_number_generator/sys/dev/drm2/radeon/r600_blit_kms.c
projects/random_number_generator/sys/dev/drm2/radeon/r600_cs.c
projects/random_number_generator/sys/dev/drm2/radeon/r600d.h
projects/random_number_generator/sys/dev/drm2/radeon/radeon_cp.c
projects/random_number_generator/sys/dev/drm2/radeon/radeon_drv.h
projects/random_number_generator/sys/dev/drm2/radeon/radeon_reg.h
projects/random_number_generator/sys/dev/drm2/radeon/rv770d.h
projects/random_number_generator/sys/dev/drm2/radeon/sid.h
projects/random_number_generator/sys/dev/drm2/ttm/ttm_bo.c
projects/random_number_generator/sys/dev/e1000/e1000_82575.h
projects/random_number_generator/sys/dev/e1000/e1000_ich8lan.c
projects/random_number_generator/sys/dev/e1000/e1000_regs.h
projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitchreg.h
projects/random_number_generator/sys/dev/ffec/if_ffecreg.h
projects/random_number_generator/sys/dev/firewire/firewire.c
projects/random_number_generator/sys/dev/firewire/fwohci.c
projects/random_number_generator/sys/dev/firewire/fwohcireg.h
projects/random_number_generator/sys/dev/firewire/sbp.c
projects/random_number_generator/sys/dev/firewire/sbp.h
projects/random_number_generator/sys/dev/firewire/sbp_targ.c
projects/random_number_generator/sys/dev/hatm/if_hatmreg.h
projects/random_number_generator/sys/dev/hwpmc/hwpmc_piv.h
projects/random_number_generator/sys/dev/iscsi/iscsi.c
projects/random_number_generator/sys/dev/iwn/if_iwnreg.h
projects/random_number_generator/sys/dev/mge/if_mgevar.h
projects/random_number_generator/sys/dev/mpt/mpt_cam.c
projects/random_number_generator/sys/dev/msk/if_mskreg.h
projects/random_number_generator/sys/dev/mvs/mvs.h
projects/random_number_generator/sys/dev/mxge/mxge_mcp.h
projects/random_number_generator/sys/dev/qlxge/qls_dump.c
projects/random_number_generator/sys/dev/ral/rt2560reg.h
projects/random_number_generator/sys/dev/ral/rt2661reg.h
projects/random_number_generator/sys/dev/ral/rt2860reg.h
projects/random_number_generator/sys/dev/sound/pci/hda/hdaa.h
projects/random_number_generator/sys/dev/uart/uart_cpu_powerpc.c
projects/random_number_generator/sys/dev/usb/controller/ehci.h
projects/random_number_generator/sys/dev/usb/wlan/if_rumreg.h
projects/random_number_generator/sys/dev/usb/wlan/if_runreg.h
projects/random_number_generator/sys/dev/usb/wlan/if_uralreg.h
projects/random_number_generator/sys/dev/usb/wlan/if_urtwreg.h
projects/random_number_generator/sys/dev/usb/wlan/if_zydreg.h
projects/random_number_generator/sys/dev/wpi/if_wpireg.h
projects/random_number_generator/sys/geom/raid/tr_raid1e.c
projects/random_number_generator/sys/i386/pci/pci_cfgreg.c
projects/random_number_generator/sys/kern/kern_descrip.c
projects/random_number_generator/sys/kern/uipc_syscalls.c
projects/random_number_generator/sys/mips/atheros/ar71xxreg.h
projects/random_number_generator/sys/mips/atheros/ar934xreg.h
projects/random_number_generator/sys/mips/atheros/if_argevar.h
projects/random_number_generator/sys/mips/malta/gt_pci.c
projects/random_number_generator/sys/mips/nlm/dev/net/nae.c
projects/random_number_generator/sys/mips/nlm/xlp_machdep.c
projects/random_number_generator/sys/mips/rmi/pic.h
projects/random_number_generator/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
projects/random_number_generator/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
projects/random_number_generator/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
projects/random_number_generator/sys/ofed/drivers/net/mlx4/mcg.c
projects/random_number_generator/sys/powerpc/aim/trap_subr32.S
projects/random_number_generator/sys/powerpc/aim/trap_subr64.S
projects/random_number_generator/sys/powerpc/fpu/fpu_emu.c
projects/random_number_generator/sys/powerpc/fpu/fpu_sqrt.c
projects/random_number_generator/sys/powerpc/ofw/ofw_machdep.c
projects/random_number_generator/sys/powerpc/powermac/nvbl.c
projects/random_number_generator/sys/powerpc/powerpc/copyinout.c
projects/random_number_generator/sys/sys/consio.h
projects/random_number_generator/sys/sys/file.h
projects/random_number_generator/sys/ufs/ffs/ffs_softdep.c
projects/random_number_generator/sys/x86/iommu/intel_reg.h
projects/random_number_generator/usr.sbin/bluetooth/bthidd/kbd.c
projects/random_number_generator/usr.sbin/bsdconfig/includes/includes
Directory Properties:
projects/random_number_generator/ (props changed)
projects/random_number_generator/lib/libc/ (props changed)
projects/random_number_generator/sbin/ (props changed)
projects/random_number_generator/sys/ (props changed)
projects/random_number_generator/sys/amd64/vmm/ (props changed)
projects/random_number_generator/sys/boot/ (props changed)
projects/random_number_generator/sys/conf/ (props changed)
Modified: projects/random_number_generator/Makefile.inc1
==============================================================================
--- projects/random_number_generator/Makefile.inc1 Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/Makefile.inc1 Sun Dec 1 17:37:03 2013 (r258803)
@@ -1505,7 +1505,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libradius lib/libsbuf lib/libtacplus \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libzfs_core} \
- lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
+ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1521,6 +1521,8 @@ _lib_libthr= lib/libthr
_ofed_lib= contrib/ofed/usr.lib/
.endif
+lib/libpjdlog__L: lib/libutil__L
+
_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)
Modified: projects/random_number_generator/bin/sh/cd.c
==============================================================================
--- projects/random_number_generator/bin/sh/cd.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/cd.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -182,6 +182,7 @@ cdlogical(char *dest)
struct stat statb;
int first;
int badstat;
+ size_t len;
/*
* Check each component of the path. If we find a symlink or
@@ -189,8 +190,9 @@ cdlogical(char *dest)
* next time we get the value of the current directory.
*/
badstat = 0;
- cdcomppath = stalloc(strlen(dest) + 1);
- scopy(dest, cdcomppath);
+ len = strlen(dest);
+ cdcomppath = stalloc(len + 1);
+ memcpy(cdcomppath, dest, len + 1);
STARTSTACKSTR(p);
if (*dest == '/') {
STPUTC('/', p);
@@ -275,6 +277,7 @@ findcwd(char *dir)
{
char *new;
char *p;
+ size_t len;
/*
* If our argument is NULL, we don't know the current directory
@@ -283,8 +286,9 @@ findcwd(char *dir)
*/
if (dir == NULL || curdir == NULL)
return getpwd2();
- cdcomppath = stalloc(strlen(dir) + 1);
- scopy(dir, cdcomppath);
+ len = strlen(dir);
+ cdcomppath = stalloc(len + 1);
+ memcpy(cdcomppath, dir, len + 1);
STARTSTACKSTR(new);
if (*dir != '/') {
STPUTS(curdir, new);
Modified: projects/random_number_generator/bin/sh/exec.c
==============================================================================
--- projects/random_number_generator/bin/sh/exec.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/exec.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -187,14 +187,15 @@ padvance(const char **path, const char *
{
const char *p, *start;
char *q;
- size_t len;
+ size_t len, namelen;
if (*path == NULL)
return NULL;
start = *path;
for (p = start; *p && *p != ':' && *p != '%'; p++)
; /* nothing */
- len = p - start + strlen(name) + 2; /* "2" is for '/' and '\0' */
+ namelen = strlen(name);
+ len = p - start + namelen + 2; /* "2" is for '/' and '\0' */
STARTSTACKSTR(q);
CHECKSTRSPACE(len, q);
if (p != start) {
@@ -202,7 +203,7 @@ padvance(const char **path, const char *
q += p - start;
*q++ = '/';
}
- strcpy(q, name);
+ memcpy(q, name, namelen + 1);
pathopt = NULL;
if (*p == '%') {
pathopt = ++p;
@@ -527,6 +528,7 @@ cmdlookup(const char *name, int add)
const char *p;
struct tblentry *cmdp;
struct tblentry **pp;
+ size_t len;
p = name;
hashval = *p << 4;
@@ -541,11 +543,11 @@ cmdlookup(const char *name, int add)
}
if (add && cmdp == NULL) {
INTOFF;
- cmdp = *pp = ckmalloc(sizeof (struct tblentry)
- + strlen(name) + 1);
+ len = strlen(name);
+ cmdp = *pp = ckmalloc(sizeof (struct tblentry) + len + 1);
cmdp->next = NULL;
cmdp->cmdtype = CMDUNKNOWN;
- strcpy(cmdp->cmdname, name);
+ memcpy(cmdp->cmdname, name, len + 1);
INTON;
}
lastcmdentry = pp;
Modified: projects/random_number_generator/bin/sh/expand.c
==============================================================================
--- projects/random_number_generator/bin/sh/expand.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/expand.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -1307,9 +1307,11 @@ addfname(char *name)
{
char *p;
struct strlist *sp;
+ size_t len;
- p = stalloc(strlen(name) + 1);
- scopy(name, p);
+ len = strlen(name);
+ p = stalloc(len + 1);
+ memcpy(p, name, len + 1);
sp = (struct strlist *)stalloc(sizeof *sp);
sp->text = p;
*exparg.lastp = sp;
Modified: projects/random_number_generator/bin/sh/memalloc.c
==============================================================================
--- projects/random_number_generator/bin/sh/memalloc.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/memalloc.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -98,9 +98,11 @@ char *
savestr(const char *s)
{
char *p;
+ size_t len;
- p = ckmalloc(strlen(s) + 1);
- scopy(s, p);
+ len = strlen(s);
+ p = ckmalloc(len + 1);
+ memcpy(p, s, len + 1);
return p;
}
Modified: projects/random_number_generator/bin/sh/mystring.c
==============================================================================
--- projects/random_number_generator/bin/sh/mystring.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/mystring.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
* String functions.
*
* equal(s1, s2) Return true if strings are equal.
- * scopy(from, to) Copy a string.
* number(s) Convert a string of digits to an integer.
* is_number(s) Return true if s is a string of digits.
*/
@@ -60,10 +59,6 @@ char nullstr[1]; /* zero length string
* equal - #defined in mystring.h
*/
-/*
- * scopy - #defined in mystring.h
- */
-
/*
* prefix -- see if pfx is a prefix of string.
Modified: projects/random_number_generator/bin/sh/mystring.h
==============================================================================
--- projects/random_number_generator/bin/sh/mystring.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/mystring.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -40,4 +40,3 @@ int number(const char *);
int is_number(const char *);
#define equal(s1, s2) (strcmp(s1, s2) == 0)
-#define scopy(s1, s2) ((void)strcpy(s2, s1))
Modified: projects/random_number_generator/bin/sh/show.c
==============================================================================
--- projects/random_number_generator/bin/sh/show.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/show.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -390,11 +390,11 @@ opentrace(void)
else
p = "/tmp";
}
- scopy(p, s);
+ strcpy(s, p);
strcat(s, "/trace");
}
#else
- scopy("./trace", s);
+ strcpy(s, "./trace");
#endif /* not_this_way */
if ((tracefile = fopen(s, "a")) == NULL) {
fprintf(stderr, "Can't open %s: %s\n", s, strerror(errno));
Modified: projects/random_number_generator/bin/sh/var.c
==============================================================================
--- projects/random_number_generator/bin/sh/var.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/sh/var.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -224,8 +224,9 @@ void
setvar(const char *name, const char *val, int flags)
{
const char *p;
- int len;
- int namelen;
+ size_t len;
+ size_t namelen;
+ size_t vallen;
char *nameeq;
int isbad;
@@ -244,18 +245,20 @@ setvar(const char *name, const char *val
}
namelen = p - name;
if (isbad)
- error("%.*s: bad variable name", namelen, name);
+ error("%.*s: bad variable name", (int)namelen, name);
len = namelen + 2; /* 2 is space for '=' and '\0' */
if (val == NULL) {
flags |= VUNSET;
+ vallen = 0;
} else {
- len += strlen(val);
+ vallen = strlen(val);
+ len += vallen;
}
nameeq = ckmalloc(len);
memcpy(nameeq, name, namelen);
nameeq[namelen] = '=';
if (val)
- scopy(val, nameeq + namelen + 1);
+ memcpy(nameeq + namelen + 1, val, vallen + 1);
else
nameeq[namelen + 1] = '\0';
setvareq(nameeq, flags);
Modified: projects/random_number_generator/bin/test/test.c
==============================================================================
--- projects/random_number_generator/bin/test/test.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/bin/test/test.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -67,9 +67,18 @@ error(const char *msg, ...)
operand ::= <any legal UNIX file name>
*/
+enum token_types {
+ UNOP = 0x100,
+ BINOP = 0x200,
+ BUNOP = 0x300,
+ BBINOP = 0x400,
+ PAREN = 0x500
+};
+
enum token {
EOI,
- FILRD,
+ OPERAND,
+ FILRD = UNOP + 1,
FILWR,
FILEX,
FILEXIST,
@@ -85,13 +94,13 @@ enum token {
FILSUID,
FILSGID,
FILSTCK,
- FILNT,
- FILOT,
- FILEQ,
- FILUID,
- FILGID,
STREZ,
STRNZ,
+ FILUID,
+ FILGID,
+ FILNT = BINOP + 1,
+ FILOT,
+ FILEQ,
STREQ,
STRNE,
STRLT,
@@ -102,70 +111,62 @@ enum token {
INTGT,
INTLE,
INTLT,
- UNOT,
- BAND,
+ UNOT = BUNOP + 1,
+ BAND = BBINOP + 1,
BOR,
- LPAREN,
- RPAREN,
- OPERAND
+ LPAREN = PAREN + 1,
+ RPAREN
};
-enum token_types {
- UNOP,
- BINOP,
- BUNOP,
- BBINOP,
- PAREN
-};
+#define TOKEN_TYPE(token) ((token) & 0xff00)
static struct t_op {
char op_text[4];
- short op_num, op_type;
+ short op_num;
} const ops [] = {
- {"-r", FILRD, UNOP},
- {"-w", FILWR, UNOP},
- {"-x", FILEX, UNOP},
- {"-e", FILEXIST,UNOP},
- {"-f", FILREG, UNOP},
- {"-d", FILDIR, UNOP},
- {"-c", FILCDEV,UNOP},
- {"-b", FILBDEV,UNOP},
- {"-p", FILFIFO,UNOP},
- {"-u", FILSUID,UNOP},
- {"-g", FILSGID,UNOP},
- {"-k", FILSTCK,UNOP},
- {"-s", FILGZ, UNOP},
- {"-t", FILTT, UNOP},
- {"-z", STREZ, UNOP},
- {"-n", STRNZ, UNOP},
- {"-h", FILSYM, UNOP}, /* for backwards compat */
- {"-O", FILUID, UNOP},
- {"-G", FILGID, UNOP},
- {"-L", FILSYM, UNOP},
- {"-S", FILSOCK,UNOP},
- {"=", STREQ, BINOP},
- {"==", STREQ, BINOP},
- {"!=", STRNE, BINOP},
- {"<", STRLT, BINOP},
- {">", STRGT, BINOP},
- {"-eq", INTEQ, BINOP},
- {"-ne", INTNE, BINOP},
- {"-ge", INTGE, BINOP},
- {"-gt", INTGT, BINOP},
- {"-le", INTLE, BINOP},
- {"-lt", INTLT, BINOP},
- {"-nt", FILNT, BINOP},
- {"-ot", FILOT, BINOP},
- {"-ef", FILEQ, BINOP},
- {"!", UNOT, BUNOP},
- {"-a", BAND, BBINOP},
- {"-o", BOR, BBINOP},
- {"(", LPAREN, PAREN},
- {")", RPAREN, PAREN},
- {"", 0, 0}
+ {"-r", FILRD},
+ {"-w", FILWR},
+ {"-x", FILEX},
+ {"-e", FILEXIST},
+ {"-f", FILREG},
+ {"-d", FILDIR},
+ {"-c", FILCDEV},
+ {"-b", FILBDEV},
+ {"-p", FILFIFO},
+ {"-u", FILSUID},
+ {"-g", FILSGID},
+ {"-k", FILSTCK},
+ {"-s", FILGZ},
+ {"-t", FILTT},
+ {"-z", STREZ},
+ {"-n", STRNZ},
+ {"-h", FILSYM}, /* for backwards compat */
+ {"-O", FILUID},
+ {"-G", FILGID},
+ {"-L", FILSYM},
+ {"-S", FILSOCK},
+ {"=", STREQ},
+ {"==", STREQ},
+ {"!=", STRNE},
+ {"<", STRLT},
+ {">", STRGT},
+ {"-eq", INTEQ},
+ {"-ne", INTNE},
+ {"-ge", INTGE},
+ {"-gt", INTGT},
+ {"-le", INTLE},
+ {"-lt", INTLT},
+ {"-nt", FILNT},
+ {"-ot", FILOT},
+ {"-ef", FILEQ},
+ {"!", UNOT},
+ {"-a", BAND},
+ {"-o", BOR},
+ {"(", LPAREN},
+ {")", RPAREN},
+ {"", 0}
};
-static struct t_op const *t_wp_op;
static int nargc;
static char **t_wp;
static int parenlevel;
@@ -295,10 +296,10 @@ primary(enum token n)
parenlevel--;
return res;
}
- if (t_wp_op && t_wp_op->op_type == UNOP) {
+ if (TOKEN_TYPE(n) == UNOP) {
/* unary expression */
if (--nargc == 0)
- syntax(t_wp_op->op_text, "argument expected");
+ syntax(NULL, "argument expected"); /* impossible */
switch (n) {
case STREZ:
return strlen(*++t_wp) == 0;
@@ -311,10 +312,8 @@ primary(enum token n)
}
}
- if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type ==
- BINOP) {
+ if (TOKEN_TYPE(t_lex(nargc > 0 ? t_wp[1] : NULL)) == BINOP)
return binop();
- }
return strlen(*t_wp) > 0;
}
@@ -322,17 +321,17 @@ primary(enum token n)
static int
binop(void)
{
- const char *opnd1, *opnd2;
- struct t_op const *op;
+ const char *opnd1, *op, *opnd2;
+ enum token n;
opnd1 = *t_wp;
- (void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
- op = t_wp_op;
+ op = nargc > 0 ? t_wp[1] : NULL;
+ n = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL)
- syntax(op->op_text, "argument expected");
+ syntax(op, "argument expected");
- switch (op->op_num) {
+ switch (n) {
case STREQ:
return strcmp(opnd1, opnd2) == 0;
case STRNE:
@@ -424,22 +423,20 @@ t_lex(char *s)
struct t_op const *op = ops;
if (s == 0) {
- t_wp_op = NULL;
return EOI;
}
while (*op->op_text) {
if (strcmp(s, op->op_text) == 0) {
- if (((op->op_type == UNOP || op->op_type == BUNOP)
+ if (((TOKEN_TYPE(op->op_num) == UNOP ||
+ TOKEN_TYPE(op->op_num) == BUNOP)
&& isunopoperand()) ||
(op->op_num == LPAREN && islparenoperand()) ||
(op->op_num == RPAREN && isrparenoperand()))
break;
- t_wp_op = op;
return op->op_num;
}
op++;
}
- t_wp_op = NULL;
return OPERAND;
}
@@ -458,7 +455,7 @@ isunopoperand(void)
t = *(t_wp + 2);
while (*op->op_text) {
if (strcmp(s, op->op_text) == 0)
- return op->op_type == BINOP &&
+ return TOKEN_TYPE(op->op_num) == BINOP &&
(parenlevel == 0 || t[0] != ')' || t[1] != '\0');
op++;
}
@@ -480,7 +477,7 @@ islparenoperand(void)
return 0;
while (*op->op_text) {
if (strcmp(s, op->op_text) == 0)
- return op->op_type == BINOP;
+ return TOKEN_TYPE(op->op_num) == BINOP;
op++;
}
return 0;
Modified: projects/random_number_generator/lib/Makefile
==============================================================================
--- projects/random_number_generator/lib/Makefile Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/Makefile Sun Dec 1 17:37:03 2013 (r258803)
@@ -35,6 +35,8 @@ SUBDIR_ORDERED= ${_csu} \
libc_nonshared \
libbsm \
libauditd \
+ libutil \
+ libpjdlog \
libcompiler_rt \
libcrypt \
libelf \
@@ -49,7 +51,6 @@ SUBDIR_ORDERED= ${_csu} \
librpcsvc \
libsbuf \
libtacplus \
- libutil \
${_libypclnt} \
${_libcxxrt} \
${_libcplusplus}
Modified: projects/random_number_generator/lib/libc/sparc64/fpu/fpu.c
==============================================================================
--- projects/random_number_generator/lib/libc/sparc64/fpu/fpu.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/libc/sparc64/fpu/fpu.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -202,7 +202,7 @@ static const int opmask[] = {0, 0, 1, 3,
* Implement a move operation for all supported operand types. The additional
* nand and xor parameters will be applied to the upper 32 bit word of the
* source operand. This allows to implement fabs and fneg (for fp operands
- * only!) using this functions, too, by passing (1 << 31) for one of the
+ * only!) using this functions, too, by passing (1U << 31) for one of the
* parameters, and 0 for the other.
*/
static void
@@ -358,10 +358,10 @@ __fpu_execute(struct utrapframe *uf, str
__fpu_mov(fe, type, rd, rs2, 0, 0);
return (0);
case FOP(INS2_FPop1, INSFP1_FNEG):
- __fpu_mov(fe, type, rd, rs2, 0, (1 << 31));
+ __fpu_mov(fe, type, rd, rs2, 0, (1U << 31));
return (0);
case FOP(INS2_FPop1, INSFP1_FABS):
- __fpu_mov(fe, type, rd, rs2, (1 << 31), 0);
+ __fpu_mov(fe, type, rd, rs2, (1U << 31), 0);
return (0);
case FOP(INS2_FPop1, INSFP1_FSQRT):
__fpu_explode(fe, &fe->fe_f1, type, rs2);
Modified: projects/random_number_generator/lib/libc/sparc64/fpu/fpu_sqrt.c
==============================================================================
--- projects/random_number_generator/lib/libc/sparc64/fpu/fpu_sqrt.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/libc/sparc64/fpu/fpu_sqrt.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -257,7 +257,7 @@ __fpu_sqrt(fe)
* double x correctly while doing the `known q=1.0'.
*
* We do this one mantissa-word at a time, as noted above, to
- * save work. To avoid `(1 << 31) << 1', we also do the top bit
+ * save work. To avoid `(1U << 31) << 1', we also do the top bit
* outside of each per-word loop.
*
* The calculation `t = y + bit' breaks down into `t0 = y0, ...,
Modified: projects/random_number_generator/lib/libc/sys/chmod.2
==============================================================================
--- projects/random_number_generator/lib/libc/sys/chmod.2 Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/libc/sys/chmod.2 Sun Dec 1 17:37:03 2013 (r258803)
@@ -28,7 +28,7 @@
.\" @(#)chmod.2 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd April 10, 2008
+.Dd December 1, 2013
.Dt CHMOD 2
.Os
.Sh NAME
@@ -139,21 +139,24 @@ defined in
#define S_ISUID 0004000 /* set user id on execution */
#define S_ISGID 0002000 /* set group id on execution */
-#ifndef __BSD_VISIBLE
-#define S_ISTXT 0001000 /* sticky bit */
-#endif
+#define S_ISVTX 0001000 /* sticky bit */
.Ed
.Pp
+The non-standard
+.Dv S_ISTXT
+is a synonym for
+.Dv S_ISVTX .
+.Pp
The
.Fx
VM system totally ignores the sticky bit
-.Pq Dv ISTXT
+.Pq Dv S_ISVTX
for executables.
On UFS-based file systems (FFS, LFS) the sticky
bit may only be set upon directories.
.Pp
If mode
-.Dv ISTXT
+.Dv S_ISVTX
(the `sticky bit') is set on a directory,
an unprivileged user may not delete or rename
files of other users in that directory.
@@ -296,12 +299,15 @@ The
system call is expected to conform to
.St -p1003.1-90 ,
except for the return of
-.Er EFTYPE
-and the use of
-.Dv S_ISTXT .
+.Er EFTYPE .
+The
+.Dv S_ISVTX
+bit on directories is expected to conform to
+.St -susv3 .
The
.Fn fchmodat
-system call follows The Open Group Extended API Set 2 specification.
+system call is expected to conform to
+.St -p1003.1-2008 .
.Sh HISTORY
The
.Fn chmod
Modified: projects/random_number_generator/lib/libc/sys/wait.2
==============================================================================
--- projects/random_number_generator/lib/libc/sys/wait.2 Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/libc/sys/wait.2 Sun Dec 1 17:37:03 2013 (r258803)
@@ -48,7 +48,7 @@
.Fn wait "int *status"
.Ft pid_t
.Fn waitpid "pid_t wpid" "int *status" "int options"
-.In sys/signal.h
+.In signal.h
.Ft int
.Fn waitid "idtype_t idtype" "id_t id" "siginfo_t *info" "int options"
.In sys/time.h
Modified: projects/random_number_generator/lib/libc/xdr/xdr_rec.c
==============================================================================
--- projects/random_number_generator/lib/libc/xdr/xdr_rec.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/lib/libc/xdr/xdr_rec.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -106,7 +106,7 @@ static const struct xdr_ops xdrrec_ops
* meet the needs of xdr and rpc based on tcp.
*/
-#define LAST_FRAG ((u_int32_t)(1 << 31))
+#define LAST_FRAG ((u_int32_t)(1U << 31))
typedef struct rec_strm {
char *tcp_handle;
Modified: projects/random_number_generator/release/Makefile
==============================================================================
--- projects/random_number_generator/release/Makefile Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/release/Makefile Sun Dec 1 17:37:03 2013 (r258803)
@@ -16,6 +16,7 @@
# (by default, the directory above this one)
# PORTSDIR: location of ports tree to distribute (default: /usr/ports)
# DOCDIR: location of doc tree (default: /usr/doc)
+# NOPKG: if set, do not distribute third-party packages
# NOPORTS: if set, do not distribute ports tree
# NOSRC: if set, do not distribute source tree
# NODOC: if set, do not generate release documentation
@@ -28,11 +29,15 @@ PORTSDIR?= /usr/ports
DOCDIR?= /usr/doc
RELNOTES_LANG?= en_US.ISO8859-1
-TARGET?= ${MACHINE}
+.if !defined(TARGET) || empty(TARGET)
+TARGET= ${MACHINE}
+.endif
+.if !defined(TARGET_ARCH) || empty(TARGET_ARCH)
.if ${TARGET} == ${MACHINE}
-TARGET_ARCH?= ${MACHINE_ARCH}
+TARGET_ARCH= ${MACHINE_ARCH}
.else
-TARGET_ARCH?= ${TARGET}
+TARGET_ARCH= ${TARGET}
+.endif
.endif
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
DISTDIR= dist
@@ -74,7 +79,7 @@ IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
IMAGES+= disc1.iso bootonly.iso
-. if(!defined(NODVD))
+. if !defined(NODVD)
RELEASE_TARGETS+= dvdrom
IMAGES+= dvd1.iso
. endif
@@ -86,7 +91,12 @@ IMAGES+= memstick.img
IMAGES+= mini-memstick.img
.endif
+CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES}
+CLEANDIRS= dist ftp release bootonly dvd
+beforeclean:
+ chflags -R noschg .
.include <bsd.obj.mk>
+clean: beforeclean
base.txz:
mkdir -p ${DISTDIR}
@@ -212,7 +222,7 @@ packagesystem: base.txz kernel.txz ${EXT
touch ${.TARGET}
pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
+.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
${REVISION}
.endif
@@ -228,15 +238,6 @@ release:
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
-clean:
- chflags -R noschg .
- rm -rf dist ftp
- rm -f packagesystem
- rm -f *.txz MANIFEST
- rm -f system
- rm -rf release bootonly dvd
- rm -f ${IMAGES}
-
install:
.if defined(DESTDIR) && !empty(DESTDIR)
mkdir -p ${DESTDIR}
Modified: projects/random_number_generator/release/release.sh
==============================================================================
--- projects/random_number_generator/release/release.sh Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/release/release.sh Sun Dec 1 17:37:03 2013 (r258803)
@@ -176,9 +176,9 @@ build_doc_ports() {
_OSVERSION=$(sysctl -n kern.osreldate)
if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'"
+ PBUILD_FLAGS="${PBUILD_FLAGS}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} install clean distclean
+ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
fi
}
Modified: projects/random_number_generator/sbin/Makefile
==============================================================================
--- projects/random_number_generator/sbin/Makefile Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sbin/Makefile Sun Dec 1 17:37:03 2013 (r258803)
@@ -72,7 +72,7 @@ SUBDIR=adjkerntz \
swapon \
sysctl \
tunefs \
- umount \
+ umount
.if ${MK_ATM} != "no"
SUBDIR+= atm
Modified: projects/random_number_generator/share/mk/bsd.libnames.mk
==============================================================================
--- projects/random_number_generator/share/mk/bsd.libnames.mk Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/share/mk/bsd.libnames.mk Sun Dec 1 17:37:03 2013 (r258803)
@@ -127,6 +127,7 @@ MINUSLPAM+= -lypclnt
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a
+LIBPJDLOG?= ${DESTDIR}${LIBDIR}/libpjdlog.a
LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a
LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a
LIBPROCSTAT?= ${DESTDIR}${LIBDIR}/libprocstat.a
Modified: projects/random_number_generator/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- projects/random_number_generator/sys/amd64/pci/pci_cfgreg.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/amd64/pci/pci_cfgreg.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -184,7 +184,7 @@ pci_cfgenable(unsigned bus, unsigned slo
if (bus <= PCI_BUSMAX && slot <= PCI_SLOTMAX && func <= PCI_FUNCMAX &&
(unsigned)reg <= PCI_REGMAX && bytes != 3 &&
(unsigned)bytes <= 4 && (reg & (bytes - 1)) == 0) {
- outl(CONF1_ADDR_PORT, (1 << 31) | (bus << 16) | (slot << 11)
+ outl(CONF1_ADDR_PORT, (1U << 31) | (bus << 16) | (slot << 11)
| (func << 8) | (reg & ~0x03));
dataport = CONF1_DATA_PORT + (reg & 0x03);
}
Modified: projects/random_number_generator/sys/amd64/vmm/intel/vmcs.h
==============================================================================
--- projects/random_number_generator/sys/amd64/vmm/intel/vmcs.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/amd64/vmm/intel/vmcs.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -318,7 +318,7 @@ uint64_t vmcs_read(uint32_t encoding);
/*
* VMCS IDT-Vectoring information fields
*/
-#define VMCS_IDT_VEC_VALID (1 << 31)
+#define VMCS_IDT_VEC_VALID (1U << 31)
#define VMCS_IDT_VEC_ERRCODE_VALID (1 << 11)
/*
Modified: projects/random_number_generator/sys/amd64/vmm/intel/vmx_controls.h
==============================================================================
--- projects/random_number_generator/sys/amd64/vmm/intel/vmx_controls.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/amd64/vmm/intel/vmx_controls.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -56,7 +56,7 @@
#define PROCBASED_MSR_BITMAPS (1 << 28)
#define PROCBASED_MONITOR_EXITING (1 << 29)
#define PROCBASED_PAUSE_EXITING (1 << 30)
-#define PROCBASED_SECONDARY_CONTROLS (1 << 31)
+#define PROCBASED_SECONDARY_CONTROLS (1U << 31)
/* Secondary Processor-Based VM-Execution Controls */
#define PROCBASED2_VIRTUALIZE_APIC (1 << 0)
Modified: projects/random_number_generator/sys/amd64/vmm/intel/vtd.c
==============================================================================
--- projects/random_number_generator/sys/amd64/vmm/intel/vtd.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/amd64/vmm/intel/vtd.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -73,11 +73,11 @@ struct vtdmap {
#define VTD_GCR_WBF (1 << 27)
#define VTD_GCR_SRTP (1 << 30)
-#define VTD_GCR_TE (1 << 31)
+#define VTD_GCR_TE (1U << 31)
#define VTD_GSR_WBFS (1 << 27)
#define VTD_GSR_RTPS (1 << 30)
-#define VTD_GSR_TES (1 << 31)
+#define VTD_GSR_TES (1U << 31)
#define VTD_CCR_ICC (1UL << 63) /* invalidate context cache */
#define VTD_CCR_CIRG_GLOBAL (1UL << 61) /* global invalidation */
Modified: projects/random_number_generator/sys/arm/arm/db_trace.c
==============================================================================
--- projects/random_number_generator/sys/arm/arm/db_trace.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/arm/db_trace.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -376,7 +376,7 @@ db_stack_trace_cmd(struct unwind_state *
index = db_find_index(state->start_pc);
if (index->insn != EXIDX_CANTUNWIND) {
- if (index->insn & (1 << 31)) {
+ if (index->insn & (1U << 31)) {
/* The data is within the instruction */
state->insn = &index->insn;
} else {
Modified: projects/random_number_generator/sys/arm/arm/pl190.c
==============================================================================
--- projects/random_number_generator/sys/arm/arm/pl190.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/arm/pl190.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -113,7 +113,7 @@ pl190_intc_attach(device_t dev)
/* Disable all interrupts */
intc_vic_write_4(VICINTENCLEAR, 0xffffffff);
/* Enable INT31, SIC IRQ */
- intc_vic_write_4(VICINTENABLE, (1 << 31));
+ intc_vic_write_4(VICINTENABLE, (1U << 31));
id = 0;
for (i = 3; i >= 0; i--) {
Modified: projects/random_number_generator/sys/arm/at91/if_macbvar.h
==============================================================================
--- projects/random_number_generator/sys/arm/at91/if_macbvar.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/at91/if_macbvar.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -18,7 +18,7 @@
struct eth_tx_desc {
uint32_t addr;
uint32_t flags;
-#define TD_OWN (1 << 31)
+#define TD_OWN (1U << 31)
#define TD_LAST (1 << 15)
#define TD_WRAP_MASK (1 << 30)
};
@@ -30,7 +30,7 @@ struct eth_rx_desc {
#define RD_OWN 0x00000001
uint32_t flags;
-#define RD_BROADCAST (1 << 31)
+#define RD_BROADCAST (1U << 31)
#define RD_MULTICAST (1 << 30)
#define RD_UNICAST (1 << 29)
#define RD_EXTERNAL (1 << 28)
Modified: projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_dma.c
==============================================================================
--- projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_dma.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_dma.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#define CS_WAITWRT (1 << 28)
#define CS_DISDBG (1 << 29)
#define CS_ABORT (1 << 30)
-#define CS_RESET (1 << 31)
+#define CS_RESET (1U << 31)
#define BCM_DMA_CBADDR(n) (0x100*(n) + 0x04)
#define BCM_DMA_INFO(n) (0x100*(n) + 0x08)
#define INFO_INT_EN (1 << 0)
Modified: projects/random_number_generator/sys/arm/econa/if_ece.c
==============================================================================
--- projects/random_number_generator/sys/arm/econa/if_ece.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/econa/if_ece.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -1243,7 +1243,7 @@ configure_cpu_port(struct ece_softc *sc)
/* SA learning Disable */
cpu_port_config |= (SA_LEARNING_DISABLE);
/* set data offset + 2 */
- cpu_port_config &= ~(1 << 31);
+ cpu_port_config &= ~(1U << 31);
write_4(sc, CPU_PORT_CONFIG, cpu_port_config);
Modified: projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopreg.h
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopreg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopreg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -37,7 +37,7 @@
#define IMX6_ANALOG_CCM_PLL_USB1_SET 0x014
#define IMX6_ANALOG_CCM_PLL_USB1_CLR 0x018
#define IMX6_ANALOG_CCM_PLL_USB1_TOG 0x01C
-#define IMX6_ANALOG_CCM_PLL_USB_LOCK (1 << 31)
+#define IMX6_ANALOG_CCM_PLL_USB_LOCK (1U << 31)
#define IMX6_ANALOG_CCM_PLL_USB_BYPASS (1 << 16)
#define IMX6_ANALOG_CCM_PLL_USB_ENABLE (1 << 13)
#define IMX6_ANALOG_CCM_PLL_USB_POWER (1 << 12)
Modified: projects/random_number_generator/sys/arm/freescale/imx/imx6_usbphy.c
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/imx/imx6_usbphy.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/imx/imx6_usbphy.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#define CTRL_SET_REG 0x0034
#define CTRL_CLR_REG 0x0038
#define CTRL_TOGGLE_REG 0x003c
-#define CTRL_SFTRST (1 << 31)
+#define CTRL_SFTRST (1U << 31)
#define CTRL_CLKGATE (1 << 30)
#define CTRL_ENUTMILEVEL3 (1 << 15)
#define CTRL_ENUTMILEVEL2 (1 << 14)
Modified: projects/random_number_generator/sys/arm/freescale/imx/imx_gptreg.h
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/imx/imx_gptreg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/imx/imx_gptreg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -32,7 +32,7 @@
/* Registers definition for Freescale i.MX515 Generic Periodic Timer */
#define IMX_GPT_CR 0x0000 /* Control Register R/W */
-#define GPT_CR_FO3 (1 << 31)
+#define GPT_CR_FO3 (1U << 31)
#define GPT_CR_FO2 (1 << 30)
#define GPT_CR_FO1 (1 << 29)
#define GPT_CR_OM3_SHIFT 26
Modified: projects/random_number_generator/sys/arm/freescale/vybrid/vf_anadig.c
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/vybrid/vf_anadig.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/vybrid/vf_anadig.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -90,7 +90,7 @@ __FBSDID("$FreeBSD$");
#define USB_LOOPBACK(n) (0x1E0 + 0x60 * n)
#define USB_MISC(n) (0x1F0 + 0x60 * n)
-#define ANADIG_PLL_LOCKED (1 << 31)
+#define ANADIG_PLL_LOCKED (1U << 31)
#define ENABLE_LINREG (1 << 0)
#define EN_CLK_TO_UTMI (1 << 30)
Modified: projects/random_number_generator/sys/arm/freescale/vybrid/vf_ccm.c
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/vybrid/vf_ccm.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/vybrid/vf_ccm.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
#define CCM_CPPDSR 0x88 /* PLL PFD Disable Status Register */
#define CCM_CCOWR 0x8C /* CORE Wakeup Register */
-#define PLL3_PFD4_EN (1 << 31)
+#define PLL3_PFD4_EN (1U << 31)
#define PLL3_PFD3_EN (1 << 30)
#define PLL3_PFD2_EN (1 << 29)
#define PLL3_PFD1_EN (1 << 28)
Modified: projects/random_number_generator/sys/arm/freescale/vybrid/vf_ehci.c
==============================================================================
--- projects/random_number_generator/sys/arm/freescale/vybrid/vf_ehci.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/freescale/vybrid/vf_ehci.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -105,7 +105,7 @@ __FBSDID("$FreeBSD$");
#define USBPHY_IP_CLR 0x98 /* PHY IP Block Register */
#define USBPHY_IP_TOG 0x9C /* PHY IP Block Register */
-#define USBPHY_CTRL_SFTRST (1 << 31)
+#define USBPHY_CTRL_SFTRST (1U << 31)
#define USBPHY_CTRL_CLKGATE (1 << 30)
#define USBPHY_DEBUG_CLKGATE (1 << 30)
Modified: projects/random_number_generator/sys/arm/include/armreg.h
==============================================================================
--- projects/random_number_generator/sys/arm/include/armreg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/include/armreg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -360,7 +360,7 @@
#define CPU_CT_ARMV7 0x4
/* ARM v7 Cache type definitions */
-#define CPUV7_CT_CTYPE_WT (1 << 31)
+#define CPUV7_CT_CTYPE_WT (1U << 31)
#define CPUV7_CT_CTYPE_WB (1 << 30)
#define CPUV7_CT_CTYPE_RA (1 << 29)
#define CPUV7_CT_CTYPE_WA (1 << 28)
Modified: projects/random_number_generator/sys/arm/lpc/if_lpereg.h
==============================================================================
--- projects/random_number_generator/sys/arm/lpc/if_lpereg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/lpc/if_lpereg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -169,7 +169,7 @@ struct lpe_hwstatus {
/* These are valid for both Rx and Tx descriptors */
#define LPE_HWDESC_SIZE_MASK (1 << 10)
-#define LPE_HWDESC_INTERRUPT (1 << 31)
+#define LPE_HWDESC_INTERRUPT (1U << 31)
/* These are valid for Tx descriptors */
#define LPE_HWDESC_LAST (1 << 30)
@@ -186,7 +186,7 @@ struct lpe_hwstatus {
#define LPE_HWDESC_LATECOLL (1 << 28)
#define LPE_HWDESC_UNDERRUN (1 << 29)
#define LPE_HWDESC_TXNODESCR (1 << 30)
-#define LPE_HWDESC_ERROR (1 << 31)
+#define LPE_HWDESC_ERROR (1U << 31)
/* These are valid for Rx status descriptors */
#define LPE_HWDESC_CONTROL (1 << 18)
@@ -202,7 +202,7 @@ struct lpe_hwstatus {
#define LPE_HWDESC_OVERRUN (1 << 28)
#define LPE_HWDESC_RXNODESCR (1 << 29)
#define LPE_HWDESC_LASTFLAG (1 << 30)
-#define LPE_HWDESC_ERROR (1 << 31)
+#define LPE_HWDESC_ERROR (1U << 31)
#endif /* _ARM_LPC_IF_LPEREG_H */
Modified: projects/random_number_generator/sys/arm/lpc/lpcreg.h
==============================================================================
--- projects/random_number_generator/sys/arm/lpc/lpcreg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/lpc/lpcreg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -604,7 +604,7 @@
#define LPC_DMAC_CH_LLI 0x08
#define LPC_DMAC_CH_LLI_AHB1 (1 << 0)
#define LPC_DMAC_CH_CONTROL 0x0c
-#define LPC_DMAC_CH_CONTROL_I (1 << 31)
+#define LPC_DMAC_CH_CONTROL_I (1U << 31)
#define LPC_DMAC_CH_CONTROL_DI (1 << 27)
#define LPC_DMAC_CH_CONTROL_SI (1 << 26)
#define LPC_DMAC_CH_CONTROL_D (1 << 25)
Modified: projects/random_number_generator/sys/arm/mv/mv_pci.c
==============================================================================
--- projects/random_number_generator/sys/arm/mv/mv_pci.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/mv/mv_pci.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
#define debugf(fmt, args...)
#endif
-#define PCI_CFG_ENA (1 << 31)
+#define PCI_CFG_ENA (1U << 31)
#define PCI_CFG_BUS(bus) (((bus) & 0xff) << 16)
#define PCI_CFG_DEV(dev) (((dev) & 0x1f) << 11)
#define PCI_CFG_FUN(fun) (((fun) & 0x7) << 8)
Modified: projects/random_number_generator/sys/arm/samsung/exynos/ehci_exynos5.c
==============================================================================
--- projects/random_number_generator/sys/arm/samsung/exynos/ehci_exynos5.c Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/samsung/exynos/ehci_exynos5.c Sun Dec 1 17:37:03 2013 (r258803)
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
#define HOST_CTRL_SUSPEND (1 << 4)
#define HOST_CTRL_RESET_LINK (1 << 1)
#define HOST_CTRL_RESET_PHY (1 << 0)
-#define HOST_CTRL_RESET_PHY_ALL (1 << 31)
+#define HOST_CTRL_RESET_PHY_ALL (1U << 31)
/* Forward declarations */
static int exynos_ehci_attach(device_t dev);
Modified: projects/random_number_generator/sys/arm/xscale/i8134x/i81342reg.h
==============================================================================
--- projects/random_number_generator/sys/arm/xscale/i8134x/i81342reg.h Sun Dec 1 17:29:07 2013 (r258802)
+++ projects/random_number_generator/sys/arm/xscale/i8134x/i81342reg.h Sun Dec 1 17:37:03 2013 (r258803)
@@ -83,7 +83,7 @@
#define IOP34X_ADMA_PQTE (1 << 18) /* P+Q Transfer Enable */
#define IOP34X_ADMA_PTD (1 << 19) /* P Transfer Disable */
#define IOP34X_ADMA_ROE (1 << 30) /* Relaxed Ordering Enable */
-#define IOP34X_ADMA_NSE (1 << 31) /* No Snoop Enable */
+#define IOP34X_ADMA_NSE (1U << 31) /* No Snoop Enable */
#define IOP34X_PBBAR0 0x81588 /* PBI Base Address Register 0 */
#define IOP34X_PBBAR0_ADDRMASK 0xfffff000
@@ -113,7 +113,7 @@
#define SMC_SDBR 0x8180c /* Base Register */
#define SMC_SDBR_BASEADDR (1 << 27)
#define SMC_SDBR_BASEADDR_MASK ((1 << 27) | (1 << 28) | (1 << 29) | (1 << 30) \
- | (1 << 31))
+ | (1U << 31))
#define SMC_SDUBR 0x81810 /* Upper Base Register */
#define SMC_SBSR 0x81814 /* SDRAM Bank Size Register */
#define SMC_SBSR_BANK_NB (1 << 2) /* Number of DDR Banks
@@ -128,7 +128,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list