diff options
| -rw-r--r-- | lib9/mkfile | 1 | ||||
| -rw-r--r-- | lib9/mkfile-Nt | 1 | ||||
| -rw-r--r-- | lib9/pread-Nt.c | 9 | ||||
| -rw-r--r-- | lib9/strtoull.c | 96 | ||||
| -rw-r--r-- | utils/libmach/6.c | 6 | ||||
| -rw-r--r-- | utils/libmach/9.c | 4 | ||||
| -rw-r--r-- | utils/libmach/q.c | 6 |
7 files changed, 115 insertions, 8 deletions
diff --git a/lib9/mkfile b/lib9/mkfile index 2fd660b2..4166196e 100644 --- a/lib9/mkfile +++ b/lib9/mkfile @@ -14,6 +14,7 @@ COMMONFILES=\ qsort.$O\ runestrlen.$O\ strtoll.$O\ + strtoull.$O\ rune.$O\ # # files used by most models. these are added to TARGFILES in some diff --git a/lib9/mkfile-Nt b/lib9/mkfile-Nt index 28e714ba..f264c479 100644 --- a/lib9/mkfile-Nt +++ b/lib9/mkfile-Nt @@ -6,3 +6,4 @@ TARGFILES=\ getwd-Nt.$O\ setbinmode-Nt.$O\ lock-Nt-386.$O\ + pread-Nt.$O\ diff --git a/lib9/pread-Nt.c b/lib9/pread-Nt.c new file mode 100644 index 00000000..94fc81d5 --- /dev/null +++ b/lib9/pread-Nt.c @@ -0,0 +1,9 @@ +#include "lib9.h" + +long +pread(int fd, void *buf, long n, vlong offset) +{ + if(seek(fd, offset, 0) < 0) + return -1; + return read(fd, buf, n); +} diff --git a/lib9/strtoull.c b/lib9/strtoull.c new file mode 100644 index 00000000..3f08ba61 --- /dev/null +++ b/lib9/strtoull.c @@ -0,0 +1,96 @@ +#include "lib9.h" + +#define UVLONG_MAX (1LL<<63) + +uvlong +strtoull(char *nptr, char **endptr, int base) +{ + char *p; + uvlong n, nn, m; + int c, ovfl, v, neg, ndig; + + p = nptr; + neg = 0; + n = 0; + ndig = 0; + ovfl = 0; + + /* + * White space + */ + for(;; p++) { + switch(*p) { + case ' ': + case '\t': + case '\n': + case '\f': + case '\r': + case '\v': + continue; + } + break; + } + + /* + * Sign + */ + if(*p == '-' || *p == '+') + if(*p++ == '-') + neg = 1; + + /* + * Base + */ + if(base == 0) { + base = 10; + if(*p == '0') { + base = 8; + if(p[1] == 'x' || p[1] == 'X'){ + p += 2; + base = 16; + } + } + } else + if(base == 16 && *p == '0') { + if(p[1] == 'x' || p[1] == 'X') + p += 2; + } else + if(base < 0 || 36 < base) + goto Return; + + /* + * Non-empty sequence of digits + */ + m = UVLONG_MAX/base; + for(;; p++,ndig++) { + c = *p; + v = base; + if('0' <= c && c <= '9') + v = c - '0'; + else + if('a' <= c && c <= 'z') + v = c - 'a' + 10; + else + if('A' <= c && c <= 'Z') + v = c - 'A' + 10; + if(v >= base) + break; + if(n > m) + ovfl = 1; + nn = n*base + v; + if(nn < n) + ovfl = 1; + n = nn; + } + +Return: + if(ndig == 0) + p = nptr; + if(endptr) + *endptr = p; + if(ovfl) + return UVLONG_MAX; + if(neg) + return -n; + return n; +} diff --git a/utils/libmach/6.c b/utils/libmach/6.c index 459d1191..816566e4 100644 --- a/utils/libmach/6.c +++ b/utils/libmach/6.c @@ -105,9 +105,9 @@ Mach mamd64= "setSB", /* static base register name (bogus anyways) */ 0, /* static base register value */ 0x1000, /* page size */ - 0xFFFFFFFF80110000ULL, /* kernel base */ - 0xFFFF800000000000ULL, /* kernel text mask */ - 0x00007FFFFFFFF000ULL, /* user stack top */ + 0xFFFFFFFF80110000U, /* kernel base */ + 0xFFFF800000000000U, /* kernel text mask */ + 0x00007FFFFFFFF000U, /* user stack top */ 1, /* quantization of pc */ 8, /* szaddr */ 4, /* szreg */ diff --git a/utils/libmach/9.c b/utils/libmach/9.c index aeeebae3..cafa3a93 100644 --- a/utils/libmach/9.c +++ b/utils/libmach/9.c @@ -109,9 +109,9 @@ Mach mpower64 = "setSB", /* static base register name */ 0, /* value */ 0x1000, /* page size */ - 0x80000000ULL, /* kernel base */ + 0x80000000U, /* kernel base */ 0, /* kernel text mask */ - 0x7FFFFFFFULL, /* user stack top */ + 0x7FFFFFFFU, /* user stack top */ 4, /* quantization of pc */ 8, /* szaddr */ 8, /* szreg */ diff --git a/utils/libmach/q.c b/utils/libmach/q.c index 4eeba92a..2e8f66fb 100644 --- a/utils/libmach/q.c +++ b/utils/libmach/q.c @@ -112,9 +112,9 @@ Mach mpower = "setSB", /* static base register name */ 0, /* value */ 0x1000, /* page size */ - 0x80000000ULL, /* kernel base */ - 0xF0000000ULL, /* kernel text mask */ - 0x7FFFFFFFULL, /* user stack top */ + 0x80000000U, /* kernel base */ + 0xF0000000U, /* kernel text mask */ + 0x7FFFFFFFU, /* user stack top */ 4, /* quantization of pc */ 4, /* szaddr */ 4, /* szreg */ |