mirror of
https://github.com/golang/go
synced 2024-09-15 22:20:06 +00:00
cmd/5l, cmd/6l, cmd/8l, cmd/ld: remove unused code, consolidate enums
LGTM=rsc R=rsc, iant CC=golang-codereviews https://golang.org/cl/120220043
This commit is contained in:
parent
08ee2661f2
commit
45bd2f8c45
|
@ -648,14 +648,14 @@ asmb(void)
|
||||||
switch(HEADTYPE) {
|
switch(HEADTYPE) {
|
||||||
default:
|
default:
|
||||||
case Hplan9: /* plan 9 */
|
case Hplan9: /* plan 9 */
|
||||||
lput(0x647); /* magic */
|
LPUT(0x647); /* magic */
|
||||||
lput(segtext.filelen); /* sizes */
|
LPUT(segtext.filelen); /* sizes */
|
||||||
lput(segdata.filelen);
|
LPUT(segdata.filelen);
|
||||||
lput(segdata.len - segdata.filelen);
|
LPUT(segdata.len - segdata.filelen);
|
||||||
lput(symsize); /* nsyms */
|
LPUT(symsize); /* nsyms */
|
||||||
lput(entryvalue()); /* va of entry */
|
LPUT(entryvalue()); /* va of entry */
|
||||||
lput(0L);
|
LPUT(0L);
|
||||||
lput(lcsize);
|
LPUT(lcsize);
|
||||||
break;
|
break;
|
||||||
case Hlinux:
|
case Hlinux:
|
||||||
case Hfreebsd:
|
case Hfreebsd:
|
||||||
|
@ -676,64 +676,6 @@ asmb(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
void
|
|
||||||
cput(int32 c)
|
|
||||||
{
|
|
||||||
*cbp++ = c;
|
|
||||||
if(--cbc <= 0)
|
|
||||||
cflush();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
wput(int32 l)
|
|
||||||
{
|
|
||||||
|
|
||||||
cbp[0] = l>>8;
|
|
||||||
cbp[1] = l;
|
|
||||||
cbp += 2;
|
|
||||||
cbc -= 2;
|
|
||||||
if(cbc <= 0)
|
|
||||||
cflush();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
hput(int32 l)
|
|
||||||
{
|
|
||||||
|
|
||||||
cbp[0] = l>>8;
|
|
||||||
cbp[1] = l;
|
|
||||||
cbp += 2;
|
|
||||||
cbc -= 2;
|
|
||||||
if(cbc <= 0)
|
|
||||||
cflush();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
lput(int32 l)
|
|
||||||
{
|
|
||||||
|
|
||||||
cbp[0] = l>>24;
|
|
||||||
cbp[1] = l>>16;
|
|
||||||
cbp[2] = l>>8;
|
|
||||||
cbp[3] = l;
|
|
||||||
cbp += 4;
|
|
||||||
cbc -= 4;
|
|
||||||
if(cbc <= 0)
|
|
||||||
cflush();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
nopstat(char *f, Count *c)
|
|
||||||
{
|
|
||||||
if(c->outof)
|
|
||||||
Bprint(&bso, "%s delay %d/%d (%.2f)\n", f,
|
|
||||||
c->outof - c->count, c->outof,
|
|
||||||
(double)(c->outof - c->count)/c->outof);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32
|
int32
|
||||||
rnd(int32 v, int32 r)
|
rnd(int32 v, int32 r)
|
||||||
{
|
{
|
||||||
|
|
|
@ -48,23 +48,8 @@ enum
|
||||||
#define EXTERN extern
|
#define EXTERN extern
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* do not undefine this - code will be removed eventually */
|
|
||||||
#define CALLEEBX
|
|
||||||
|
|
||||||
#define dynptrsize 0
|
|
||||||
|
|
||||||
#define P ((Prog*)0)
|
#define P ((Prog*)0)
|
||||||
#define S ((LSym*)0)
|
#define S ((LSym*)0)
|
||||||
#define TNAME (ctxt->cursym?ctxt->cursym->name:noname)
|
|
||||||
|
|
||||||
#define SIGNINTERN (1729*325*1729)
|
|
||||||
|
|
||||||
typedef struct Count Count;
|
|
||||||
struct Count
|
|
||||||
{
|
|
||||||
int32 count;
|
|
||||||
int32 outof;
|
|
||||||
};
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -73,11 +58,6 @@ enum
|
||||||
LABEL = 1<<1,
|
LABEL = 1<<1,
|
||||||
LEAF = 1<<2,
|
LEAF = 1<<2,
|
||||||
|
|
||||||
STRINGSZ = 200,
|
|
||||||
MINSIZ = 64,
|
|
||||||
NENT = 100,
|
|
||||||
MAXIO = 8192,
|
|
||||||
MAXHIST = 40, /* limit of path elements for history symbols */
|
|
||||||
MINLC = 4,
|
MINLC = 4,
|
||||||
|
|
||||||
C_NONE = 0,
|
C_NONE = 0,
|
||||||
|
@ -127,8 +107,6 @@ enum
|
||||||
C_GOK,
|
C_GOK,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef COFFCVT
|
|
||||||
|
|
||||||
EXTERN int32 autosize;
|
EXTERN int32 autosize;
|
||||||
EXTERN LSym* datap;
|
EXTERN LSym* datap;
|
||||||
EXTERN int debug[128];
|
EXTERN int debug[128];
|
||||||
|
@ -152,25 +130,18 @@ void adddynrela(LSym *rel, LSym *s, Reloc *r);
|
||||||
void adddynsym(Link *ctxt, LSym *s);
|
void adddynsym(Link *ctxt, LSym *s);
|
||||||
int archreloc(Reloc *r, LSym *s, vlong *val);
|
int archreloc(Reloc *r, LSym *s, vlong *val);
|
||||||
void asmb(void);
|
void asmb(void);
|
||||||
void cput(int32 c);
|
|
||||||
int elfreloc1(Reloc *r, vlong sectoff);
|
int elfreloc1(Reloc *r, vlong sectoff);
|
||||||
void elfsetupplt(void);
|
void elfsetupplt(void);
|
||||||
void hput(int32 l);
|
|
||||||
void listinit(void);
|
void listinit(void);
|
||||||
void lput(int32 l);
|
|
||||||
int machoreloc1(Reloc *r, vlong sectoff);
|
int machoreloc1(Reloc *r, vlong sectoff);
|
||||||
void main(int argc, char *argv[]);
|
void main(int argc, char *argv[]);
|
||||||
void nopstat(char *f, Count *c);
|
|
||||||
int32 rnd(int32 v, int32 r);
|
int32 rnd(int32 v, int32 r);
|
||||||
void wput(int32 l);
|
|
||||||
|
|
||||||
/* Native is little-endian */
|
/* Native is little-endian */
|
||||||
#define LPUT(a) lputl(a)
|
#define LPUT(a) lputl(a)
|
||||||
#define WPUT(a) wputl(a)
|
#define WPUT(a) wputl(a)
|
||||||
#define VPUT(a) abort()
|
#define VPUT(a) abort()
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Used by ../ld/dwarf.c */
|
/* Used by ../ld/dwarf.c */
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -68,14 +68,9 @@ EXTERN int RegSize;
|
||||||
|
|
||||||
#define P ((Prog*)0)
|
#define P ((Prog*)0)
|
||||||
#define S ((LSym*)0)
|
#define S ((LSym*)0)
|
||||||
#define TNAME (ctxt->cursym?ctxt->cursym->name:noname)
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
MINSIZ = 8,
|
|
||||||
STRINGSZ = 200,
|
|
||||||
MINLC = 1,
|
MINLC = 1,
|
||||||
MAXIO = 8192,
|
|
||||||
MAXHIST = 40, /* limit of path elements for history symbols */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma varargck type "I" uchar*
|
#pragma varargck type "I" uchar*
|
||||||
|
@ -89,9 +84,6 @@ EXTERN int32 spsize;
|
||||||
EXTERN LSym* symlist;
|
EXTERN LSym* symlist;
|
||||||
EXTERN int32 symsize;
|
EXTERN int32 symsize;
|
||||||
|
|
||||||
EXTERN vlong textstksiz;
|
|
||||||
EXTERN vlong textarg;
|
|
||||||
|
|
||||||
int Iconv(Fmt *fp);
|
int Iconv(Fmt *fp);
|
||||||
void adddynlib(char *lib);
|
void adddynlib(char *lib);
|
||||||
void adddynrel(LSym *s, Reloc *r);
|
void adddynrel(LSym *s, Reloc *r);
|
||||||
|
@ -103,8 +95,6 @@ int elfreloc1(Reloc *r, vlong sectoff);
|
||||||
void elfsetupplt(void);
|
void elfsetupplt(void);
|
||||||
void listinit(void);
|
void listinit(void);
|
||||||
int machoreloc1(Reloc *r, vlong sectoff);
|
int machoreloc1(Reloc *r, vlong sectoff);
|
||||||
void main(int argc, char *argv[]);
|
|
||||||
void parsetextconst(vlong arg);
|
|
||||||
vlong rnd(vlong v, vlong r);
|
vlong rnd(vlong v, vlong r);
|
||||||
|
|
||||||
/* Native is little-endian */
|
/* Native is little-endian */
|
||||||
|
|
|
@ -50,15 +50,10 @@ enum
|
||||||
|
|
||||||
#define P ((Prog*)0)
|
#define P ((Prog*)0)
|
||||||
#define S ((LSym*)0)
|
#define S ((LSym*)0)
|
||||||
#define TNAME (ctxt->cursym?ctxt->cursym->name:noname)
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
MINSIZ = 4,
|
|
||||||
STRINGSZ = 200,
|
|
||||||
MINLC = 1,
|
MINLC = 1,
|
||||||
MAXIO = 8192,
|
|
||||||
MAXHIST = 40, /* limit of path elements for history symbols */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma varargck type "I" uchar*
|
#pragma varargck type "I" uchar*
|
||||||
|
@ -72,7 +67,6 @@ EXTERN char* rpath;
|
||||||
EXTERN int32 spsize;
|
EXTERN int32 spsize;
|
||||||
EXTERN LSym* symlist;
|
EXTERN LSym* symlist;
|
||||||
EXTERN int32 symsize;
|
EXTERN int32 symsize;
|
||||||
EXTERN int32 textsize;
|
|
||||||
|
|
||||||
int Iconv(Fmt *fp);
|
int Iconv(Fmt *fp);
|
||||||
void adddynlib(char *lib);
|
void adddynlib(char *lib);
|
||||||
|
@ -85,7 +79,6 @@ int elfreloc1(Reloc *r, vlong sectoff);
|
||||||
void elfsetupplt(void);
|
void elfsetupplt(void);
|
||||||
void listinit(void);
|
void listinit(void);
|
||||||
int machoreloc1(Reloc *r, vlong sectoff);
|
int machoreloc1(Reloc *r, vlong sectoff);
|
||||||
void main(int argc, char *argv[]);
|
|
||||||
int32 rnd(int32 v, int32 r);
|
int32 rnd(int32 v, int32 r);
|
||||||
void s8put(char *n);
|
void s8put(char *n);
|
||||||
char* xsymname(LSym *s);
|
char* xsymname(LSym *s);
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
// A section further describes the pieces of that block for
|
// A section further describes the pieces of that block for
|
||||||
// use in debuggers and such.
|
// use in debuggers and such.
|
||||||
|
|
||||||
|
enum {
|
||||||
|
MAXIO = 8192,
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct Segment Segment;
|
typedef struct Segment Segment;
|
||||||
typedef struct Section Section;
|
typedef struct Section Section;
|
||||||
|
|
||||||
|
|
|
@ -1,104 +0,0 @@
|
||||||
// Inferno utils/6l/pass.c
|
|
||||||
// http://code.google.com/p/inferno-os/source/browse/utils/6l/pass.c
|
|
||||||
//
|
|
||||||
// Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved.
|
|
||||||
// Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
|
|
||||||
// Portions Copyright © 1997-1999 Vita Nuova Limited
|
|
||||||
// Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
|
|
||||||
// Portions Copyright © 2004,2006 Bruce Ellis
|
|
||||||
// Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
|
|
||||||
// Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
|
|
||||||
// Portions Copyright © 2009 The Go Authors. 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.
|
|
||||||
|
|
||||||
// Code and data passes.
|
|
||||||
|
|
||||||
#include "l.h"
|
|
||||||
#include "../ld/lib.h"
|
|
||||||
#include "../../pkg/runtime/stack.h"
|
|
||||||
|
|
||||||
void
|
|
||||||
follow(void)
|
|
||||||
{
|
|
||||||
LSym *s;
|
|
||||||
|
|
||||||
if(debug['v'])
|
|
||||||
Bprint(&bso, "%5.2f follow\n", cputime());
|
|
||||||
Bflush(&bso);
|
|
||||||
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
ctxt->arch->follow(ctxt, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
patch(void)
|
|
||||||
{
|
|
||||||
LSym *s;
|
|
||||||
|
|
||||||
if(debug['v'])
|
|
||||||
Bprint(&bso, "%5.2f mkfwd\n", cputime());
|
|
||||||
Bflush(&bso);
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
mkfwd(s);
|
|
||||||
if(debug['v'])
|
|
||||||
Bprint(&bso, "%5.2f patch\n", cputime());
|
|
||||||
Bflush(&bso);
|
|
||||||
|
|
||||||
if(flag_shared) {
|
|
||||||
s = linklookup(ctxt, "init_array", 0);
|
|
||||||
s->type = SINITARR;
|
|
||||||
s->reachable = 1;
|
|
||||||
s->hide = 1;
|
|
||||||
addaddr(ctxt, s, linklookup(ctxt, INITENTRY, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
linkpatch(ctxt, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
dostkoff(void)
|
|
||||||
{
|
|
||||||
LSym *s;
|
|
||||||
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
ctxt->arch->addstacksplit(ctxt, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
span(void)
|
|
||||||
{
|
|
||||||
LSym *s;
|
|
||||||
|
|
||||||
if(debug['v'])
|
|
||||||
Bprint(&bso, "%5.2f span\n", cputime());
|
|
||||||
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
ctxt->arch->assemble(ctxt, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
pcln(void)
|
|
||||||
{
|
|
||||||
LSym *s;
|
|
||||||
|
|
||||||
for(s = ctxt->textp; s != nil; s = s->next)
|
|
||||||
linkpcln(ctxt, s);
|
|
||||||
}
|
|
Loading…
Reference in a new issue