clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-21 18:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

gc: delete float, complex

Browse Source 
rename cmplx -> complex

R=ken2
CC=golang-dev
https://golang.org/cl/4071041
This commit is contained in:
Russ Cox 2011-01-19 23:08:11 -05:00
parent 5cfadeb047
commit 0849944694
20 changed files with 19 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/5g/cgen.c
View File

@ -169,7 +169,7 @@ cgen(Node *n, Node *res)
case OREAL:
case OIMAG:
case OCMPLX:
case OCOMPLEX:
fatal("unexpected complex");
break;
@ -879,7 +879,6 @@ bgen(Node *n, int true, Prog *to)
switch(n->op) {
default:
def:
a = ONE;
if(!true)
a = OEQ;

2
src/cmd/5g/galign.c
View File

@ -17,8 +17,6 @@ Typedef typedefs[] =
"int", TINT, TINT32,
"uint", TUINT, TUINT32,
"uintptr", TUINTPTR, TUINT32,
"float", TFLOAT, TFLOAT32,
"complex", TCOMPLEX, TCOMPLEX64,
0
};

1
src/cmd/5g/reg.c
View File

@ -1066,7 +1066,6 @@ allreg(uint32 b, Rgn *r)
case TFLOAT32:
case TFLOAT64:
case TFLOAT:
i = BtoF(~b);
if(i && r->cost >= 0) {
r->regno = i+NREG;

2
src/cmd/6g/galign.c
View File

@ -17,8 +17,6 @@ Typedef typedefs[] =
"int", TINT, TINT32,
"uint", TUINT, TUINT32,
"uintptr", TUINTPTR, TUINT64,
"float", TFLOAT, TFLOAT32,
"complex", TCOMPLEX, TCOMPLEX64,
0
};

2
src/cmd/6g/reg.c
View File

@ -748,7 +748,6 @@ addmove(Reg *r, int bn, int rn, int f)
case TPTR64:
p1->as = AMOVQ;
break;
case TFLOAT:
case TFLOAT32:
p1->as = AMOVSS;
break;
@ -1180,7 +1179,6 @@ allreg(uint32 b, Rgn *r)
case TFLOAT32:
case TFLOAT64:
case TFLOAT:
i = BtoF(~b);
if(i && r->cost > 0) {
r->regno = i;

2
src/cmd/8g/cgen.c
View File

@ -174,7 +174,7 @@ cgen(Node *n, Node *res)
case OREAL:
case OIMAG:
case OCMPLX:
case OCOMPLEX:
fatal("unexpected complex");
return;

2
src/cmd/8g/galign.c
View File

@ -17,8 +17,6 @@ Typedef typedefs[] =
"int", TINT, TINT32,
"uint", TUINT, TUINT32,
"uintptr", TUINTPTR, TUINT32,
"float", TFLOAT, TFLOAT32,
"complex", TCOMPLEX, TCOMPLEX64,
0
};

1
src/cmd/8g/reg.c
View File

@ -1095,7 +1095,6 @@ allreg(uint32 b, Rgn *r)
case TFLOAT32:
case TFLOAT64:
case TFLOAT:
break;
}
return 0;

2
src/cmd/gc/align.c
View File

@ -412,11 +412,9 @@ typeinit(void)
isfloat[TFLOAT32] = 1;
isfloat[TFLOAT64] = 1;
isfloat[TFLOAT] = 1;
iscomplex[TCOMPLEX64] = 1;
iscomplex[TCOMPLEX128] = 1;
iscomplex[TCOMPLEX] = 1;
isptr[TPTR32] = 1;
isptr[TPTR64] = 1;

12
src/cmd/gc/const.c
View File

@ -980,10 +980,10 @@ defaultlit(Node **np, Type *t)
n->type = types[TINT];
goto num;
case CTFLT:
n->type = types[TFLOAT];
n->type = types[TFLOAT64];
goto num;
case CTCPLX:
n->type = types[TCOMPLEX];
n->type = types[TCOMPLEX128];
goto num;
num:
if(t != T) {
@ -1034,13 +1034,13 @@ defaultlit2(Node **lp, Node **rp, int force)
if(!force)
return;
if(isconst(l, CTCPLX) || isconst(r, CTCPLX)) {
convlit(lp, types[TCOMPLEX]);
convlit(rp, types[TCOMPLEX]);
convlit(lp, types[TCOMPLEX128]);
convlit(rp, types[TCOMPLEX128]);
return;
}
if(isconst(l, CTFLT) || isconst(r, CTFLT)) {
convlit(lp, types[TFLOAT]);
convlit(rp, types[TFLOAT]);
convlit(lp, types[TFLOAT64]);
convlit(rp, types[TFLOAT64]);
return;
}
convlit(lp, types[TINT]);

6
src/cmd/gc/cplx.c
View File

@ -84,7 +84,7 @@ maybe:
case OSUB:
case OMUL:
case OMINUS:
case OCMPLX:
case OCOMPLEX:
case OREAL:
case OIMAG:
goto yes;
@ -120,7 +120,7 @@ complexgen(Node *n, Node *res)
// pick off float/complex opcodes
switch(n->op) {
case OCMPLX:
case OCOMPLEX:
if(res->addable) {
subnode(&n1, &n2, res);
tempname(&tmp, n1.type);
@ -195,7 +195,7 @@ complexgen(Node *n, Node *res)
case OSUB:
case OMUL:
case OMINUS:
case OCMPLX:
case OCOMPLEX:
case OREAL:
case OIMAG:
break;

4
src/cmd/gc/go.h
View File

@ -390,7 +390,7 @@ enum
ORUNESTR,
OSELRECV,
OIOTA,
OREAL, OIMAG, OCMPLX,
OREAL, OIMAG, OCOMPLEX,
// stmts
OBLOCK,
@ -440,11 +440,9 @@ enum
TCOMPLEX64, // 12
TCOMPLEX128,
TCOMPLEX,
TFLOAT32, // 15
TFLOAT64,
TFLOAT,
TBOOL, // 18

2
src/cmd/gc/lex.c
View File

@ -1531,7 +1531,7 @@ static struct
"cap", LNAME, Txxx, OCAP,
"close", LNAME, Txxx, OCLOSE,
"closed", LNAME, Txxx, OCLOSED,
"cmplx", LNAME, Txxx, OCMPLX,
"complex", LNAME, Txxx, OCOMPLEX,
"copy", LNAME, Txxx, OCOPY,
"imag", LNAME, Txxx, OIMAG,
"len", LNAME, Txxx, OLEN,

4
src/cmd/gc/print.c
View File

@ -365,8 +365,8 @@ exprfmt(Fmt *f, Node *n, int prec)
fmtprint(f, ")");
break;
case OCMPLX:
fmtprint(f, "cmplx(");
case OCOMPLEX:
fmtprint(f, "complex(");
exprfmt(f, n->left, 0);
fmtprint(f, ", ");
exprfmt(f, n->right, 0);

7
src/cmd/gc/reflect.c
View File

@ -419,10 +419,8 @@ enum {
KindUint32,
KindUint64,
KindUintptr,
KindFloat,
KindFloat32,
KindFloat64,
KindComplex,
KindComplex64,
KindComplex128,
KindArray,
@ -453,7 +451,6 @@ kinds[] =
[TINT64] = KindInt64,
[TUINT64] = KindUint64,
[TUINTPTR] = KindUintptr,
[TFLOAT] = KindFloat,
[TFLOAT32] = KindFloat32,
[TFLOAT64] = KindFloat64,
[TBOOL] = KindBool,
@ -466,7 +463,6 @@ kinds[] =
[TMAP] = KindMap,
[TARRAY] = KindArray,
[TFUNC] = KindFunc,
[TCOMPLEX] = KindComplex,
[TCOMPLEX64] = KindComplex64,
[TCOMPLEX128] = KindComplex128,
};
@ -485,10 +481,8 @@ structnames[] =
[TINT64] = "*runtime.IntType",
[TUINT64] = "*runtime.UintType",
[TUINTPTR] = "*runtime.UintType",
[TCOMPLEX] = "*runtime.ComplexType",
[TCOMPLEX64] = "*runtime.ComplexType",
[TCOMPLEX128] = "*runtime.ComplexType",
[TFLOAT] = "*runtime.FloatType",
[TFLOAT32] = "*runtime.FloatType",
[TFLOAT64] = "*runtime.FloatType",
[TBOOL] = "*runtime.BoolType",
@ -542,7 +536,6 @@ haspointers(Type *t)
case TINT64:
case TUINT64:
case TUINTPTR:
case TFLOAT:
case TFLOAT32:
case TFLOAT64:
case TBOOL:

2
src/cmd/gc/sinit.c
View File

@ -917,14 +917,12 @@ gen_as_init(Node *n)
case TPTR64:
case TFLOAT32:
case TFLOAT64:
case TFLOAT:
gused(N); // in case the data is the dest of a goto
gdata(&nam, nr, nr->type->width);
break;
case TCOMPLEX64:
case TCOMPLEX128:
case TCOMPLEX:
gused(N); // in case the data is the dest of a goto
gdatacomplex(&nam, nr->val.u.cval);
break;

8
src/cmd/gc/subr.c
View File

@ -836,7 +836,7 @@ goopnames[] =
[OCASE] = "case",
[OCLOSED] = "closed",
[OCLOSE] = "close",
[OCMPLX] = "cmplx",
[OCOMPLEX] = "complex",
[OCOM] = "^",
[OCONTINUE] = "continue",
[OCOPY] = "copy",
@ -993,10 +993,8 @@ etnames[] =
[TINT64] = "INT64",
[TUINT64] = "UINT64",
[TUINTPTR] = "UINTPTR",
[TFLOAT] = "FLOAT",
[TFLOAT32] = "FLOAT32",
[TFLOAT64] = "FLOAT64",
[TCOMPLEX] = "COMPLEX",
[TCOMPLEX64] = "COMPLEX64",
[TCOMPLEX128] = "COMPLEX128",
[TBOOL] = "BOOL",
@ -1117,10 +1115,8 @@ basicnames[] =
[TINT64] = "int64",
[TUINT64] = "uint64",
[TUINTPTR] = "uintptr",
[TFLOAT] = "float",
[TFLOAT32] = "float32",
[TFLOAT64] = "float64",
[TCOMPLEX] = "complex",
[TCOMPLEX64] = "complex64",
[TCOMPLEX128] = "complex128",
[TBOOL] = "bool",
@ -1752,8 +1748,6 @@ int
cplxsubtype(int et)
{
switch(et) {
case TCOMPLEX:
return TFLOAT;
case TCOMPLEX64:
return TFLOAT32;
case TCOMPLEX128:

7
src/cmd/gc/typecheck.c
View File

@ -852,7 +852,7 @@ reswitch:
n->type = types[TINT];
goto ret;
case OCMPLX:
case OCOMPLEX:
ok |= Erv;
if(twoarg(n) < 0)
goto error;
@ -865,7 +865,7 @@ reswitch:
n->right = r;
if(l->type->etype != r->type->etype) {
badcmplx:
yyerror("invalid operation: %#N (cmplx of types %T, %T)", n, l->type, r->type);
yyerror("invalid operation: %#N (complex of types %T, %T)", n, l->type, r->type);
goto error;
}
switch(l->type->etype) {
@ -874,9 +874,6 @@ reswitch:
case TIDEAL:
t = types[TIDEAL];
break;
case TFLOAT:
t = types[TCOMPLEX];
break;
case TFLOAT32:
t = types[TCOMPLEX64];
break;

2
src/cmd/gc/walk.c
View File

@ -671,7 +671,7 @@ walkexpr(Node **np, NodeList **init)
case OGE:
case OGT:
case OADD:
case OCMPLX:
case OCOMPLEX:
walkexpr(&n->left, init);
walkexpr(&n->right, init);
goto ret;

4
src/cmd/ld/dwarf.c
View File

@ -768,10 +768,8 @@ enum {
KindUint32,
KindUint64,
KindUintptr,
KindFloat,
KindFloat32,
KindFloat64,
KindComplex,
KindComplex64,
KindComplex128,
KindArray,
@ -1049,7 +1047,6 @@ defgotype(Sym *gotype)
newattr(die, DW_AT_byte_size, DW_CLS_CONSTANT, bytesize, 0);
break;
case KindFloat:
case KindFloat32:
case KindFloat64:
die = newdie(&dwtypes, DW_ABRV_BASETYPE, name);
@ -1057,7 +1054,6 @@ defgotype(Sym *gotype)
newattr(die, DW_AT_byte_size, DW_CLS_CONSTANT, bytesize, 0);
break;
case KindComplex:
case KindComplex64:
case KindComplex128:
die = newdie(&dwtypes, DW_ABRV_BASETYPE, name);