Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alexey Frunze
2014-05-04 01:23:36 -07:00
7 changed files with 34 additions and 34 deletions

View File

@@ -1594,17 +1594,13 @@ foff16: expr_flags = 0;
/* Test whether the immediate is in valid range
* for the opcode. */
switch (opcode & 0xfc000000) {
case 0x20000000: // addi
case 0x24000000: // addiu
case 0x28000000: // slti
case 0x2c000000: // sltiu
default: /* addi, addiu, slti, sltiu, lw, sw */
/* 16-bit signed value. */
valid_range = (offset >= -0x8000) || (offset <= 0x7fff);
break;
case 0x30000000: // andi
case 0x34000000: // ori
case 0x38000000: // xori
default:
case 0x30000000: /* andi */
case 0x34000000: /* ori */
case 0x38000000: /* xori */
/* 16-bit unsigned value. */
valid_range = (offset <= 0xffff);
break;

View File

@@ -14,7 +14,7 @@
*/
char *
getenv(name)
char *name;
const char *name;
{
int offset;
char *_findenv();

View File

@@ -43,7 +43,8 @@ char *suboptarg;
int
getsubopt(optionp, tokens, valuep)
register char **optionp, **valuep;
register char **optionp;
register char **valuep;
register char **tokens;
{
register int cnt;

View File

@@ -43,11 +43,11 @@
*/
long
strtol(nptr, endptr, base)
char *nptr;
const char *nptr;
char **endptr;
register int base;
{
register char *s = nptr;
register const char *s = nptr;
register unsigned long acc;
register int c;
register unsigned long cutoff;

View File

@@ -43,11 +43,11 @@
*/
unsigned long
strtoul(nptr, endptr, base)
char *nptr;
const char *nptr;
char **endptr;
register int base;
{
register char *s = nptr;
register const char *s = nptr;
register unsigned long acc;
register int c;
register unsigned long cutoff;