diff options
| author | eadler <eadler@FreeBSD.org> | 2013-11-30 22:17:27 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2013-11-30 22:17:27 +0000 |
| commit | 44c01df17391f4429ee371e8039ae4fd802c2a8e (patch) | |
| tree | 050fb3b68519f6ef7d59051550fa29cdd79d6dac /sys/mips/nlm | |
| parent | 5bcb8c5f4293579e5f8aba6f33f85246b7b70e5d (diff) | |
| download | FreeBSD-src-44c01df17391f4429ee371e8039ae4fd802c2a8e.zip FreeBSD-src-44c01df17391f4429ee371e8039ae4fd802c2a8e.tar.gz | |
Fix undefined behavior: (1 << 31) is not defined as 1 is an int and this
shifts into the sign bit. Instead use (1U << 31) which gets the
expected result.
This fix is not ideal as it assumes a 32 bit int, but does fix the issue
for most cases.
A similar change was made in OpenBSD.
Discussed with: -arch, rdivacky
Reviewed by: cperciva
Diffstat (limited to 'sys/mips/nlm')
| -rw-r--r-- | sys/mips/nlm/dev/net/nae.c | 4 | ||||
| -rw-r--r-- | sys/mips/nlm/xlp_machdep.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/mips/nlm/dev/net/nae.c b/sys/mips/nlm/dev/net/nae.c index 9f06372..b3790a2 100644 --- a/sys/mips/nlm/dev/net/nae.c +++ b/sys/mips/nlm/dev/net/nae.c @@ -1401,7 +1401,7 @@ nlm_nae_open_if(uint64_t nae_base, int nblock, int port_type, mac_cfg1 = nlm_read_nae_reg(nae_base, conf1_reg); nlm_write_nae_reg(nae_base, conf1_reg, mac_cfg1 | - (1 << 31) | /* soft reset */ + (1U << 31) | /* soft reset */ (1 << 2) | /* rx enable */ (1)); /* tx enable */ @@ -1415,7 +1415,7 @@ nlm_nae_open_if(uint64_t nae_base, int nblock, int port_type, /* clear gmac reset */ mac_cfg1 = nlm_read_nae_reg(nae_base, conf1_reg); - nlm_write_nae_reg(nae_base, conf1_reg, mac_cfg1 & ~(1 << 31)); + nlm_write_nae_reg(nae_base, conf1_reg, mac_cfg1 & ~(1U << 31)); /* clear speed debug bit */ iface_ctrl3_reg = SGMII_NET_IFACE_CTRL3(nblock, iface); diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c index f95592e..6a5dcb8 100644 --- a/sys/mips/nlm/xlp_machdep.c +++ b/sys/mips/nlm/xlp_machdep.c @@ -150,7 +150,7 @@ xlp_setup_mmu(void) /* Enable no-read, no-exec, large-physical-address */ pagegrain = mips_rd_pagegrain(); - pagegrain |= (1 << 31) | /* RIE */ + pagegrain |= (1U << 31) | /* RIE */ (1 << 30) | /* XIE */ (1 << 29); /* ELPA */ mips_wr_pagegrain(pagegrain); |
