mirror of
https://github.com/golang/go
synced 2024-10-14 03:43:28 +00:00
fix build after Mercurial move.
various missing or incorrect files. R=r CC=go-dev http://go/go-review/1014004
This commit is contained in:
parent
90cc4a5949
commit
219fb02042
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
rm -rf $GOROOT/pkg/${GOOS}_$GOARCH
|
rm -rf $GOROOT/pkg/${GOOS}_$GOARCH
|
||||||
rm -f $GOROOT/lib/*.a
|
rm -f $GOROOT/lib/*.a
|
||||||
for i in lib9 libbio libcgo libmach libregexp cmd pkg \
|
for i in lib9 libbio libcgo libmach cmd pkg \
|
||||||
../misc/cgo/gmp ../misc/cgo/stdio \
|
../misc/cgo/gmp ../misc/cgo/stdio \
|
||||||
../usr/r/rpc \
|
../usr/r/rpc \
|
||||||
../test/bench
|
../test/bench
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Use of this source code is governed by a BSD-style
|
# Use of this source code is governed by a BSD-style
|
||||||
# license that can be found in the LICENSE file.
|
# license that can be found in the LICENSE file.
|
||||||
|
|
||||||
for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g gopack db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
|
for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g gopack nm cgo cov ebnflint godefs godoc gofmt prof gotest
|
||||||
do
|
do
|
||||||
cd $i
|
cd $i
|
||||||
make clean
|
make clean
|
||||||
|
|
|
@ -17,7 +17,7 @@ HFILES=\
|
||||||
tree.h\
|
tree.h\
|
||||||
|
|
||||||
$(TARG): $(OFILES)
|
$(TARG): $(OFILES)
|
||||||
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lregexp9 -lbio -l9
|
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.$O $(TARG)
|
rm -f *.$O $(TARG)
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include <libc.h>
|
#include <libc.h>
|
||||||
#include <bio.h>
|
#include <bio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <regexp9.h>
|
|
||||||
#include "tree.h"
|
#include "tree.h"
|
||||||
|
|
||||||
#include <ureg_amd64.h>
|
#include <ureg_amd64.h>
|
||||||
|
@ -21,7 +20,7 @@ typedef struct Ureg Ureg;
|
||||||
void
|
void
|
||||||
usage(void)
|
usage(void)
|
||||||
{
|
{
|
||||||
fprint(2, "usage: cov [-lsv] [-g regexp] [-m minlines] [6.out args...]\n");
|
fprint(2, "usage: cov [-lsv] [-g substring] [-m minlines] [6.out args...]\n");
|
||||||
fprint(2, "-g specifies pattern of interesting functions or files\n");
|
fprint(2, "-g specifies pattern of interesting functions or files\n");
|
||||||
exits("usage");
|
exits("usage");
|
||||||
}
|
}
|
||||||
|
@ -41,7 +40,7 @@ int doshowsrc;
|
||||||
Map *mem;
|
Map *mem;
|
||||||
Map *text;
|
Map *text;
|
||||||
Fhdr fhdr;
|
Fhdr fhdr;
|
||||||
Reprog *grep;
|
char *substring;
|
||||||
char cwd[1000];
|
char cwd[1000];
|
||||||
int ncwd;
|
int ncwd;
|
||||||
int minlines = -1000;
|
int minlines = -1000;
|
||||||
|
@ -329,7 +328,7 @@ cover(void)
|
||||||
lastfn = s.name;
|
lastfn = s.name;
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
fileline(buf, sizeof buf, s.value);
|
fileline(buf, sizeof buf, s.value);
|
||||||
if(grep == nil || regexec9(grep, buf, nil, 0) > 0 || regexec9(grep, s.name, nil, 0) > 0)
|
if(substring == nil || strstr(buf, substring) || strstr(s.name, substring))
|
||||||
lastpc = s.value;
|
lastpc = s.value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -426,13 +425,10 @@ void
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
char *regexp;
|
|
||||||
|
|
||||||
ARGBEGIN{
|
ARGBEGIN{
|
||||||
case 'g':
|
case 'g':
|
||||||
regexp = EARGF(usage());
|
substring = EARGF(usage());
|
||||||
if((grep = regcomp9(regexp)) == nil)
|
|
||||||
sysfatal("bad regexp %s", regexp);
|
|
||||||
break;
|
break;
|
||||||
case 'l':
|
case 'l':
|
||||||
longnames++;
|
longnames++;
|
||||||
|
|
|
@ -18,7 +18,7 @@ bash mkenam
|
||||||
make enam.o
|
make enam.o
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
for i in cc ${O}l ${O}a ${O}c gc ${O}g gopack db nm acid cov godefs prof gotest
|
for i in cc ${O}l ${O}a ${O}c gc ${O}g gopack nm cov godefs prof gotest
|
||||||
do
|
do
|
||||||
echo; echo; echo %%%% making $i %%%%; echo
|
echo; echo; echo %%%% making $i %%%%; echo
|
||||||
cd $i
|
cd $i
|
||||||
|
|
|
@ -17,19 +17,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Copyright (c) 2002-2006 Lucent Technologies; see LICENSE */
|
/* Copyright (c) 2002-2006 Lucent Technologies; see LICENSE */
|
||||||
#include <stdio.h>
|
#include <u.h>
|
||||||
#include <math.h>
|
|
||||||
#include <float.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdarg.h>
|
#include <libc.h>
|
||||||
#include <fmt.h>
|
|
||||||
#include <assert.h>
|
|
||||||
#include "plan9.h"
|
|
||||||
#include "fmt.h"
|
|
||||||
#include "fmtdef.h"
|
#include "fmtdef.h"
|
||||||
#include "nan.h"
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -61,6 +52,8 @@ static double pows10[] =
|
||||||
1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149,
|
1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149,
|
||||||
1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159,
|
1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#undef pow10
|
||||||
#define npows10 ((int)(sizeof(pows10)/sizeof(pows10[0])))
|
#define npows10 ((int)(sizeof(pows10)/sizeof(pows10[0])))
|
||||||
#define pow10(x) fmtpow10(x)
|
#define pow10(x) fmtpow10(x)
|
||||||
|
|
||||||
|
|
|
@ -16,11 +16,8 @@
|
||||||
* THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
* THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Copyright (c) 2004 Google Inc.; see LICENSE */
|
#include <u.h>
|
||||||
#include <stdarg.h>
|
#include <libc.h>
|
||||||
#include <string.h>
|
|
||||||
#include "plan9.h"
|
|
||||||
#include "fmt.h"
|
|
||||||
#include "fmtdef.h"
|
#include "fmtdef.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
532
src/lib9/fmt/strtod.c
Normal file
532
src/lib9/fmt/strtod.c
Normal file
|
@ -0,0 +1,532 @@
|
||||||
|
/*
|
||||||
|
* The authors of this software are Rob Pike and Ken Thompson,
|
||||||
|
* with contributions from Mike Burrows and Sean Dorward.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2002-2006 by Lucent Technologies.
|
||||||
|
* Portions Copyright (c) 2004 Google Inc.
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and distribute this software for any
|
||||||
|
* purpose without fee is hereby granted, provided that this entire notice
|
||||||
|
* is included in all copies of any software which is or includes a copy
|
||||||
|
* or modification of this software and in all copies of the supporting
|
||||||
|
* documentation for such software.
|
||||||
|
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
|
||||||
|
* WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES
|
||||||
|
* NOR GOOGLE INC MAKE ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING
|
||||||
|
* THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <u.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <libc.h>
|
||||||
|
#include "fmtdef.h"
|
||||||
|
|
||||||
|
static ulong
|
||||||
|
umuldiv(ulong a, ulong b, ulong c)
|
||||||
|
{
|
||||||
|
double d;
|
||||||
|
|
||||||
|
d = ((double)a * (double)b) / (double)c;
|
||||||
|
if(d >= 4294967295.)
|
||||||
|
d = 4294967295.;
|
||||||
|
return (ulong)d;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This routine will convert to arbitrary precision
|
||||||
|
* floating point entirely in multi-precision fixed.
|
||||||
|
* The answer is the closest floating point number to
|
||||||
|
* the given decimal number. Exactly half way are
|
||||||
|
* rounded ala ieee rules.
|
||||||
|
* Method is to scale input decimal between .500 and .999...
|
||||||
|
* with external power of 2, then binary search for the
|
||||||
|
* closest mantissa to this decimal number.
|
||||||
|
* Nmant is is the required precision. (53 for ieee dp)
|
||||||
|
* Nbits is the max number of bits/word. (must be <= 28)
|
||||||
|
* Prec is calculated - the number of words of fixed mantissa.
|
||||||
|
*/
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
Nbits = 28, /* bits safely represented in a ulong */
|
||||||
|
Nmant = 53, /* bits of precision required */
|
||||||
|
Prec = (Nmant+Nbits+1)/Nbits, /* words of Nbits each to represent mantissa */
|
||||||
|
Sigbit = 1<<(Prec*Nbits-Nmant), /* first significant bit of Prec-th word */
|
||||||
|
Ndig = 1500,
|
||||||
|
One = (ulong)(1<<Nbits),
|
||||||
|
Half = (ulong)(One>>1),
|
||||||
|
Maxe = 310,
|
||||||
|
|
||||||
|
Fsign = 1<<0, /* found - */
|
||||||
|
Fesign = 1<<1, /* found e- */
|
||||||
|
Fdpoint = 1<<2, /* found . */
|
||||||
|
|
||||||
|
S0 = 0, /* _ _S0 +S1 #S2 .S3 */
|
||||||
|
S1, /* _+ #S2 .S3 */
|
||||||
|
S2, /* _+# #S2 .S4 eS5 */
|
||||||
|
S3, /* _+. #S4 */
|
||||||
|
S4, /* _+#.# #S4 eS5 */
|
||||||
|
S5, /* _+#.#e +S6 #S7 */
|
||||||
|
S6, /* _+#.#e+ #S7 */
|
||||||
|
S7 /* _+#.#e+# #S7 */
|
||||||
|
};
|
||||||
|
|
||||||
|
static int xcmp(char*, char*);
|
||||||
|
static int fpcmp(char*, ulong*);
|
||||||
|
static void frnorm(ulong*);
|
||||||
|
static void divascii(char*, int*, int*, int*);
|
||||||
|
static void mulascii(char*, int*, int*, int*);
|
||||||
|
|
||||||
|
typedef struct Tab Tab;
|
||||||
|
struct Tab
|
||||||
|
{
|
||||||
|
int bp;
|
||||||
|
int siz;
|
||||||
|
char* cmp;
|
||||||
|
};
|
||||||
|
|
||||||
|
double
|
||||||
|
fmtstrtod(const char *as, char **aas)
|
||||||
|
{
|
||||||
|
int na, ex, dp, bp, c, i, flag, state;
|
||||||
|
ulong low[Prec], hig[Prec], mid[Prec];
|
||||||
|
double d;
|
||||||
|
char *s, a[Ndig];
|
||||||
|
|
||||||
|
flag = 0; /* Fsign, Fesign, Fdpoint */
|
||||||
|
na = 0; /* number of digits of a[] */
|
||||||
|
dp = 0; /* na of decimal point */
|
||||||
|
ex = 0; /* exonent */
|
||||||
|
|
||||||
|
state = S0;
|
||||||
|
for(s=(char*)as;; s++) {
|
||||||
|
c = *s;
|
||||||
|
if(c >= '0' && c <= '9') {
|
||||||
|
switch(state) {
|
||||||
|
case S0:
|
||||||
|
case S1:
|
||||||
|
case S2:
|
||||||
|
state = S2;
|
||||||
|
break;
|
||||||
|
case S3:
|
||||||
|
case S4:
|
||||||
|
state = S4;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case S5:
|
||||||
|
case S6:
|
||||||
|
case S7:
|
||||||
|
state = S7;
|
||||||
|
ex = ex*10 + (c-'0');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(na == 0 && c == '0') {
|
||||||
|
dp--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(na < Ndig-50)
|
||||||
|
a[na++] = c;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
switch(c) {
|
||||||
|
case '\t':
|
||||||
|
case '\n':
|
||||||
|
case '\v':
|
||||||
|
case '\f':
|
||||||
|
case '\r':
|
||||||
|
case ' ':
|
||||||
|
if(state == S0)
|
||||||
|
continue;
|
||||||
|
break;
|
||||||
|
case '-':
|
||||||
|
if(state == S0)
|
||||||
|
flag |= Fsign;
|
||||||
|
else
|
||||||
|
flag |= Fesign;
|
||||||
|
case '+':
|
||||||
|
if(state == S0)
|
||||||
|
state = S1;
|
||||||
|
else
|
||||||
|
if(state == S5)
|
||||||
|
state = S6;
|
||||||
|
else
|
||||||
|
break; /* syntax */
|
||||||
|
continue;
|
||||||
|
case '.':
|
||||||
|
flag |= Fdpoint;
|
||||||
|
dp = na;
|
||||||
|
if(state == S0 || state == S1) {
|
||||||
|
state = S3;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(state == S2) {
|
||||||
|
state = S4;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'e':
|
||||||
|
case 'E':
|
||||||
|
if(state == S2 || state == S4) {
|
||||||
|
state = S5;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* clean up return char-pointer
|
||||||
|
*/
|
||||||
|
switch(state) {
|
||||||
|
case S0:
|
||||||
|
if(xcmp(s, "nan") == 0) {
|
||||||
|
if(aas != nil)
|
||||||
|
*aas = s+3;
|
||||||
|
goto retnan;
|
||||||
|
}
|
||||||
|
case S1:
|
||||||
|
if(xcmp(s, "infinity") == 0) {
|
||||||
|
if(aas != nil)
|
||||||
|
*aas = s+8;
|
||||||
|
goto retinf;
|
||||||
|
}
|
||||||
|
if(xcmp(s, "inf") == 0) {
|
||||||
|
if(aas != nil)
|
||||||
|
*aas = s+3;
|
||||||
|
goto retinf;
|
||||||
|
}
|
||||||
|
case S3:
|
||||||
|
if(aas != nil)
|
||||||
|
*aas = (char*)as;
|
||||||
|
goto ret0; /* no digits found */
|
||||||
|
case S6:
|
||||||
|
s--; /* back over +- */
|
||||||
|
case S5:
|
||||||
|
s--; /* back over e */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if(aas != nil)
|
||||||
|
*aas = s;
|
||||||
|
|
||||||
|
if(flag & Fdpoint)
|
||||||
|
while(na > 0 && a[na-1] == '0')
|
||||||
|
na--;
|
||||||
|
if(na == 0)
|
||||||
|
goto ret0; /* zero */
|
||||||
|
a[na] = 0;
|
||||||
|
if(!(flag & Fdpoint))
|
||||||
|
dp = na;
|
||||||
|
if(flag & Fesign)
|
||||||
|
ex = -ex;
|
||||||
|
dp += ex;
|
||||||
|
if(dp < -Maxe){
|
||||||
|
errno = ERANGE;
|
||||||
|
goto ret0; /* underflow by exp */
|
||||||
|
} else
|
||||||
|
if(dp > +Maxe)
|
||||||
|
goto retinf; /* overflow by exp */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* normalize the decimal ascii number
|
||||||
|
* to range .[5-9][0-9]* e0
|
||||||
|
*/
|
||||||
|
bp = 0; /* binary exponent */
|
||||||
|
while(dp > 0)
|
||||||
|
divascii(a, &na, &dp, &bp);
|
||||||
|
while(dp < 0 || a[0] < '5')
|
||||||
|
mulascii(a, &na, &dp, &bp);
|
||||||
|
|
||||||
|
/* close approx by naive conversion */
|
||||||
|
mid[0] = 0;
|
||||||
|
mid[1] = 1;
|
||||||
|
for(i=0; (c=a[i]) != '\0'; i++) {
|
||||||
|
mid[0] = mid[0]*10 + (c-'0');
|
||||||
|
mid[1] = mid[1]*10;
|
||||||
|
if(i >= 8)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
low[0] = umuldiv(mid[0], One, mid[1]);
|
||||||
|
hig[0] = umuldiv(mid[0]+1, One, mid[1]);
|
||||||
|
for(i=1; i<Prec; i++) {
|
||||||
|
low[i] = 0;
|
||||||
|
hig[i] = One-1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* binary search for closest mantissa */
|
||||||
|
for(;;) {
|
||||||
|
/* mid = (hig + low) / 2 */
|
||||||
|
c = 0;
|
||||||
|
for(i=0; i<Prec; i++) {
|
||||||
|
mid[i] = hig[i] + low[i];
|
||||||
|
if(c)
|
||||||
|
mid[i] += One;
|
||||||
|
c = mid[i] & 1;
|
||||||
|
mid[i] >>= 1;
|
||||||
|
}
|
||||||
|
frnorm(mid);
|
||||||
|
|
||||||
|
/* compare */
|
||||||
|
c = fpcmp(a, mid);
|
||||||
|
if(c > 0) {
|
||||||
|
c = 1;
|
||||||
|
for(i=0; i<Prec; i++)
|
||||||
|
if(low[i] != mid[i]) {
|
||||||
|
c = 0;
|
||||||
|
low[i] = mid[i];
|
||||||
|
}
|
||||||
|
if(c)
|
||||||
|
break; /* between mid and hig */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(c < 0) {
|
||||||
|
for(i=0; i<Prec; i++)
|
||||||
|
hig[i] = mid[i];
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* only hard part is if even/odd roundings wants to go up */
|
||||||
|
c = mid[Prec-1] & (Sigbit-1);
|
||||||
|
if(c == Sigbit/2 && (mid[Prec-1]&Sigbit) == 0)
|
||||||
|
mid[Prec-1] -= c;
|
||||||
|
break; /* exactly mid */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* normal rounding applies */
|
||||||
|
c = mid[Prec-1] & (Sigbit-1);
|
||||||
|
mid[Prec-1] -= c;
|
||||||
|
if(c >= Sigbit/2) {
|
||||||
|
mid[Prec-1] += Sigbit;
|
||||||
|
frnorm(mid);
|
||||||
|
}
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
ret0:
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
retnan:
|
||||||
|
return __NaN();
|
||||||
|
|
||||||
|
retinf:
|
||||||
|
/*
|
||||||
|
* Unix strtod requires these. Plan 9 would return Inf(0) or Inf(-1). */
|
||||||
|
errno = ERANGE;
|
||||||
|
if(flag & Fsign)
|
||||||
|
return -HUGE_VAL;
|
||||||
|
return HUGE_VAL;
|
||||||
|
|
||||||
|
out:
|
||||||
|
d = 0;
|
||||||
|
for(i=0; i<Prec; i++)
|
||||||
|
d = d*One + mid[i];
|
||||||
|
if(flag & Fsign)
|
||||||
|
d = -d;
|
||||||
|
d = ldexp(d, bp - Prec*Nbits);
|
||||||
|
if(d == 0){ /* underflow */
|
||||||
|
errno = ERANGE;
|
||||||
|
}
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
frnorm(ulong *f)
|
||||||
|
{
|
||||||
|
int i, c;
|
||||||
|
|
||||||
|
c = 0;
|
||||||
|
for(i=Prec-1; i>0; i--) {
|
||||||
|
f[i] += c;
|
||||||
|
c = f[i] >> Nbits;
|
||||||
|
f[i] &= One-1;
|
||||||
|
}
|
||||||
|
f[0] += c;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
fpcmp(char *a, ulong* f)
|
||||||
|
{
|
||||||
|
ulong tf[Prec];
|
||||||
|
int i, d, c;
|
||||||
|
|
||||||
|
for(i=0; i<Prec; i++)
|
||||||
|
tf[i] = f[i];
|
||||||
|
|
||||||
|
for(;;) {
|
||||||
|
/* tf *= 10 */
|
||||||
|
for(i=0; i<Prec; i++)
|
||||||
|
tf[i] = tf[i]*10;
|
||||||
|
frnorm(tf);
|
||||||
|
d = (tf[0] >> Nbits) + '0';
|
||||||
|
tf[0] &= One-1;
|
||||||
|
|
||||||
|
/* compare next digit */
|
||||||
|
c = *a;
|
||||||
|
if(c == 0) {
|
||||||
|
if('0' < d)
|
||||||
|
return -1;
|
||||||
|
if(tf[0] != 0)
|
||||||
|
goto cont;
|
||||||
|
for(i=1; i<Prec; i++)
|
||||||
|
if(tf[i] != 0)
|
||||||
|
goto cont;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if(c > d)
|
||||||
|
return +1;
|
||||||
|
if(c < d)
|
||||||
|
return -1;
|
||||||
|
a++;
|
||||||
|
cont:;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
divby(char *a, int *na, int b)
|
||||||
|
{
|
||||||
|
int n, c;
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
p = a;
|
||||||
|
n = 0;
|
||||||
|
while(n>>b == 0) {
|
||||||
|
c = *a++;
|
||||||
|
if(c == 0) {
|
||||||
|
while(n) {
|
||||||
|
c = n*10;
|
||||||
|
if(c>>b)
|
||||||
|
break;
|
||||||
|
n = c;
|
||||||
|
}
|
||||||
|
goto xx;
|
||||||
|
}
|
||||||
|
n = n*10 + c-'0';
|
||||||
|
(*na)--;
|
||||||
|
}
|
||||||
|
for(;;) {
|
||||||
|
c = n>>b;
|
||||||
|
n -= c<<b;
|
||||||
|
*p++ = c + '0';
|
||||||
|
c = *a++;
|
||||||
|
if(c == 0)
|
||||||
|
break;
|
||||||
|
n = n*10 + c-'0';
|
||||||
|
}
|
||||||
|
(*na)++;
|
||||||
|
xx:
|
||||||
|
while(n) {
|
||||||
|
n = n*10;
|
||||||
|
c = n>>b;
|
||||||
|
n -= c<<b;
|
||||||
|
*p++ = c + '0';
|
||||||
|
(*na)++;
|
||||||
|
}
|
||||||
|
*p = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Tab tab1[] =
|
||||||
|
{
|
||||||
|
1, 0, "",
|
||||||
|
3, 1, "7",
|
||||||
|
6, 2, "63",
|
||||||
|
9, 3, "511",
|
||||||
|
13, 4, "8191",
|
||||||
|
16, 5, "65535",
|
||||||
|
19, 6, "524287",
|
||||||
|
23, 7, "8388607",
|
||||||
|
26, 8, "67108863",
|
||||||
|
27, 9, "134217727",
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
divascii(char *a, int *na, int *dp, int *bp)
|
||||||
|
{
|
||||||
|
int b, d;
|
||||||
|
Tab *t;
|
||||||
|
|
||||||
|
d = *dp;
|
||||||
|
if(d >= (int)(nelem(tab1)))
|
||||||
|
d = (int)(nelem(tab1))-1;
|
||||||
|
t = tab1 + d;
|
||||||
|
b = t->bp;
|
||||||
|
if(memcmp(a, t->cmp, t->siz) > 0)
|
||||||
|
d--;
|
||||||
|
*dp -= d;
|
||||||
|
*bp += b;
|
||||||
|
divby(a, na, b);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
mulby(char *a, char *p, char *q, int b)
|
||||||
|
{
|
||||||
|
int n, c;
|
||||||
|
|
||||||
|
n = 0;
|
||||||
|
*p = 0;
|
||||||
|
for(;;) {
|
||||||
|
q--;
|
||||||
|
if(q < a)
|
||||||
|
break;
|
||||||
|
c = *q - '0';
|
||||||
|
c = (c<<b) + n;
|
||||||
|
n = c/10;
|
||||||
|
c -= n*10;
|
||||||
|
p--;
|
||||||
|
*p = c + '0';
|
||||||
|
}
|
||||||
|
while(n) {
|
||||||
|
c = n;
|
||||||
|
n = c/10;
|
||||||
|
c -= n*10;
|
||||||
|
p--;
|
||||||
|
*p = c + '0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Tab tab2[] =
|
||||||
|
{
|
||||||
|
1, 1, "", /* dp = 0-0 */
|
||||||
|
3, 3, "125",
|
||||||
|
6, 5, "15625",
|
||||||
|
9, 7, "1953125",
|
||||||
|
13, 10, "1220703125",
|
||||||
|
16, 12, "152587890625",
|
||||||
|
19, 14, "19073486328125",
|
||||||
|
23, 17, "11920928955078125",
|
||||||
|
26, 19, "1490116119384765625",
|
||||||
|
27, 19, "7450580596923828125", /* dp 8-9 */
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
mulascii(char *a, int *na, int *dp, int *bp)
|
||||||
|
{
|
||||||
|
char *p;
|
||||||
|
int d, b;
|
||||||
|
Tab *t;
|
||||||
|
|
||||||
|
d = -*dp;
|
||||||
|
if(d >= (int)(nelem(tab2)))
|
||||||
|
d = (int)(nelem(tab2))-1;
|
||||||
|
t = tab2 + d;
|
||||||
|
b = t->bp;
|
||||||
|
if(memcmp(a, t->cmp, t->siz) < 0)
|
||||||
|
d--;
|
||||||
|
p = a + *na;
|
||||||
|
*bp -= b;
|
||||||
|
*dp += d;
|
||||||
|
*na += d;
|
||||||
|
mulby(a, p+d, p, b);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
xcmp(char *a, char *b)
|
||||||
|
{
|
||||||
|
int c1, c2;
|
||||||
|
|
||||||
|
while((c1 = *b++) != '\0') {
|
||||||
|
c2 = *a++;
|
||||||
|
if(isupper(c2))
|
||||||
|
c2 = tolower(c2);
|
||||||
|
if(c1 != c2)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
||||||
|
|
||||||
#include <u.h>
|
#include <u.h>
|
||||||
#include <libc.h>
|
#include <libc.h>
|
||||||
#include "fmt/nan.h"
|
#include "fmt/fmtdef.h"
|
||||||
|
|
||||||
double
|
double
|
||||||
NaN(void)
|
NaN(void)
|
||||||
|
|
60
src/lib9/time.c
Normal file
60
src/lib9/time.c
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
Plan 9 from User Space src/lib9/time.c
|
||||||
|
http://code.swtch.com/plan9port/src/tip/src/lib9/time.c
|
||||||
|
|
||||||
|
Copyright 2001-2007 Russ Cox. All Rights Reserved.
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
#include <u.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/resource.h>
|
||||||
|
#define NOPLAN9DEFINES
|
||||||
|
#include <libc.h>
|
||||||
|
|
||||||
|
long
|
||||||
|
p9times(long *t)
|
||||||
|
{
|
||||||
|
struct rusage ru, cru;
|
||||||
|
|
||||||
|
if(getrusage(0, &ru) < 0 || getrusage(-1, &cru) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
t[0] = ru.ru_utime.tv_sec*1000 + ru.ru_utime.tv_usec/1000;
|
||||||
|
t[1] = ru.ru_stime.tv_sec*1000 + ru.ru_stime.tv_usec/1000;
|
||||||
|
t[2] = cru.ru_utime.tv_sec*1000 + cru.ru_utime.tv_usec/1000;
|
||||||
|
t[3] = cru.ru_stime.tv_sec*1000 + cru.ru_stime.tv_usec/1000;
|
||||||
|
|
||||||
|
/* BUG */
|
||||||
|
return t[0]+t[1]+t[2]+t[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
double
|
||||||
|
p9cputime(void)
|
||||||
|
{
|
||||||
|
long t[4];
|
||||||
|
double d;
|
||||||
|
|
||||||
|
if(p9times(t) < 0)
|
||||||
|
return -1.0;
|
||||||
|
|
||||||
|
d = (double)t[0]+(double)t[1]+(double)t[2]+(double)t[3];
|
||||||
|
return d/1000.0;
|
||||||
|
}
|
1361
src/lib9/utf/runetypebody-5.0.0.c
Normal file
1361
src/lib9/utf/runetypebody-5.0.0.c
Normal file
File diff suppressed because it is too large
Load diff
|
@ -120,6 +120,7 @@ addr(Biobuf *bp)
|
||||||
long off;
|
long off;
|
||||||
|
|
||||||
off = 0;
|
off = 0;
|
||||||
|
a.gotype = 0;
|
||||||
a.sym = -1;
|
a.sym = -1;
|
||||||
a.flags = Bgetc(bp); /* flags */
|
a.flags = Bgetc(bp); /* flags */
|
||||||
if(a.flags & T_INDEX)
|
if(a.flags & T_INDEX)
|
||||||
|
|
|
@ -514,7 +514,12 @@ commonllp64(int unused, Fhdr *fp, ExecHdr *hp)
|
||||||
*/
|
*/
|
||||||
if((hp->e.exechdr.magic & ~DYN_MAGIC)>>16)
|
if((hp->e.exechdr.magic & ~DYN_MAGIC)>>16)
|
||||||
return 0;
|
return 0;
|
||||||
entry = beswav(*(uvlong*)&hp->e.exechdr);
|
union {
|
||||||
|
char *p;
|
||||||
|
uvlong *v;
|
||||||
|
} u;
|
||||||
|
u.p = (char*)&hp->e.exechdr;
|
||||||
|
entry = beswav(*u.v);
|
||||||
|
|
||||||
pgsize = mach->pgsize;
|
pgsize = mach->pgsize;
|
||||||
settext(fp, entry, pgsize+fp->hdrsz, hp->e.exechdr.text, fp->hdrsz);
|
settext(fp, entry, pgsize+fp->hdrsz, hp->e.exechdr.text, fp->hdrsz);
|
||||||
|
|
|
@ -19,7 +19,7 @@ rm -f $GOBIN/quietgcc
|
||||||
cp quietgcc.bash $GOBIN/quietgcc
|
cp quietgcc.bash $GOBIN/quietgcc
|
||||||
chmod +x $GOBIN/quietgcc
|
chmod +x $GOBIN/quietgcc
|
||||||
|
|
||||||
for i in lib9 libbio libmach libregexp cmd pkg libcgo cmd/cgo cmd/ebnflint cmd/godoc cmd/gofmt
|
for i in lib9 libbio libmach cmd pkg libcgo cmd/cgo cmd/ebnflint cmd/godoc cmd/gofmt
|
||||||
do
|
do
|
||||||
case "$i-$GOOS" in
|
case "$i-$GOOS" in
|
||||||
libcgo-nacl)
|
libcgo-nacl)
|
||||||
|
|
|
@ -82,9 +82,9 @@ include $(GOROOT)/src/Make.pkg
|
||||||
clean: clean-local
|
clean: clean-local
|
||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
rm -f runtime.acid cgo2c */asm.h
|
rm -f cgo2c */asm.h
|
||||||
|
|
||||||
$(GOARCH)/asm.h: runtime.acid mkasmh.sh
|
$(GOARCH)/asm.h: mkasmh.sh
|
||||||
./mkasmh.sh >$@.x
|
./mkasmh.sh >$@.x
|
||||||
mv -f $@.x $@
|
mv -f $@.x $@
|
||||||
|
|
||||||
|
@ -111,18 +111,3 @@ cgo2c: cgo2c.c
|
||||||
$(AS) $<
|
$(AS) $<
|
||||||
|
|
||||||
|
|
||||||
# acid support files
|
|
||||||
|
|
||||||
all: runtime.acid
|
|
||||||
|
|
||||||
install: $(GOROOT)/acid/runtime.acid
|
|
||||||
|
|
||||||
$(GOROOT)/acid/runtime.acid: runtime.acid
|
|
||||||
cp runtime.acid $@
|
|
||||||
|
|
||||||
runtime.acid: runtime.h proc.c
|
|
||||||
$(CC) -a proc.c >runtime.acid
|
|
||||||
|
|
||||||
chan.acid: runtime.h chan.c
|
|
||||||
$(CC) -a chan.c >chan.acid
|
|
||||||
|
|
||||||
|
|
|
@ -53,12 +53,6 @@ make clean
|
||||||
./test.bash
|
./test.bash
|
||||||
) || exit $?
|
) || exit $?
|
||||||
|
|
||||||
(xcd ../usr/r/rpc
|
|
||||||
make clean
|
|
||||||
time make
|
|
||||||
./chanrun
|
|
||||||
) || exit $?
|
|
||||||
|
|
||||||
(xcd pkg/exp/ogle
|
(xcd pkg/exp/ogle
|
||||||
make clean
|
make clean
|
||||||
time make ogle
|
time make ogle
|
||||||
|
|
|
@ -78,34 +78,37 @@ func fannkuch(n int) int {
|
||||||
for i := 1; i < n; i++ { // perm = perm1
|
for i := 1; i < n; i++ { // perm = perm1
|
||||||
perm[i] = perm1[i];
|
perm[i] = perm1[i];
|
||||||
}
|
}
|
||||||
for perm[0] != 0 {
|
k := perm1[0]; // cache perm[0] in k
|
||||||
for i, j := 0, perm[0]; i < j; i, j = i+1, j-1 {
|
for { // k!=0 ==> k>0
|
||||||
perm[i], perm[j] = perm[j], perm[i];
|
for i, j := 1, k-1; i < j; i, j = i+1, j-1 {
|
||||||
}
|
perm[i], perm[j] = perm[j], perm[i];
|
||||||
flips++;
|
}
|
||||||
} if flipsMax < flips {
|
flips++;
|
||||||
|
// Now exchange k (caching perm[0]) and perm[k]... with care!
|
||||||
|
j := perm[k]; perm[k] = k; k = j;
|
||||||
|
if k == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if flipsMax < flips {
|
||||||
flipsMax = flips;
|
flipsMax = flips;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for {
|
for ; r < n; r++ {
|
||||||
if r == n {
|
|
||||||
return flipsMax;
|
|
||||||
}
|
|
||||||
// rotate down perm[0..r] by one
|
// rotate down perm[0..r] by one
|
||||||
perm0 := perm1[0];
|
perm0 := perm1[0];
|
||||||
i := 0;
|
for i := 0; i < r; i++ {
|
||||||
for i < r {
|
perm1[i] = perm1[i+1];
|
||||||
k := i+1;
|
|
||||||
perm1[i] = perm1[k];
|
|
||||||
i = k;
|
|
||||||
}
|
}
|
||||||
perm1[r] = perm0;
|
perm1[r] = perm0;
|
||||||
count[r]--;
|
count[r]--;
|
||||||
if count[r] > 0 {
|
if count[r] > 0 {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
r++;
|
}
|
||||||
|
if r == n {
|
||||||
|
return flipsMax;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in a new issue