qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 13:08:08 -07:00
Code Releases Activity

8l fixes, cut and paste from 6l.

Browse Source 
move PtrSize value into 6l/8l files.

R=r
DELTA=78  (47 added, 15 deleted, 16 changed)
OCL=29729
CL=29798
This commit is contained in:
Russ Cox 2009-06-02 22:33:21 -07:00
parent bf0a339bf3
commit 07393f8706
7 changed files with 68 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/6l/go.c
View File

@ -3,4 +3,8 @@
// license that can be found in the LICENSE file.
#include "l.h"
enum
{
PtrSize = 8
};
#include "../ld/go.c"

6
src/cmd/6l/obj.c
View File

@ -137,10 +137,8 @@ main(int argc, char *argv[])
break;
} ARGEND
USED(argc);
if(*argv == 0) {
diag("usage: 6l [-options] objects");
errorexit();
}
if(*argv == 0)
usage();
mywhatsys(); // get goroot, goarch, goos
if(strcmp(goarch, thestring) != 0)

14
src/cmd/8l/asm.c
View File

@ -766,6 +766,20 @@ datblk(int32 s, int32 n)
l++;
}
break;
case D_SBIG:
if(debug['a'] && i == 0) {
Bprint(&bso, pcstr, l+s+INITDAT);
for(j=0; j<c; j++)
Bprint(&bso, "%.2ux", p->to.scon[j] & 0xff);
Bprint(&bso, "\t%P\n", curp);
}
for(; i<c; i++) {
buf.dbuf[l] = p->to.sbig[i];
l++;
}
break;
default:
fl = p->to.offset;
if(p->to.type == D_ADDR) {

10
src/cmd/8l/go.c Normal file
View File

@ -0,0 +1,10 @@
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
#include "l.h"
enum
{
PtrSize = 4
};
#include "../ld/go.c"

1
src/cmd/8l/l.h
View File

@ -248,6 +248,7 @@ EXTERN int32 INITDAT;
EXTERN int32 INITRND;
EXTERN int32 INITTEXT;
EXTERN char* INITENTRY; /* entry point */
EXTERN char* LIBDIR;
EXTERN Biobuf bso;
EXTERN int32 bsssize;
EXTERN int32 casepc;

62
src/cmd/8l/obj.c
View File

@ -71,6 +71,13 @@ isobjfile(char *f)
return v;
}
void
usage(void)
{
fprint(2, "usage: 8l [-options] [-E entry] [-H head] [-L dir] [-T text] [-R rnd] [-o out] files...\n");
exits("usage");
}
void
main(int argc, char *argv[])
{
@ -95,32 +102,26 @@ main(int argc, char *argv[])
debug[c]++;
break;
case 'o': /* output to (next arg) */
outfile = ARGF();
outfile = EARGF(usage());
break;
case 'E':
a = ARGF();
if(a)
INITENTRY = a;
INITENTRY = EARGF(usage());
break;
case 'H':
a = ARGF();
if(a)
HEADTYPE = atolwhex(a);
HEADTYPE = atolwhex(EARGF(usage()));
break;
case 'L':
LIBDIR = EARGF(usage());
break;
case 'T':
a = ARGF();
if(a)
INITTEXT = atolwhex(a);
INITTEXT = atolwhex(EARGF(usage()));
break;
case 'D':
a = ARGF();
if(a)
INITDAT = atolwhex(a);
INITDAT = atolwhex(EARGF(usage()));
break;
case 'R':
a = ARGF();
if(a)
INITRND = atolwhex(a);
INITRND = atolwhex(EARGF(usage()));
break;
break;
case 'x': /* produce export table */
doexp = 1;
@ -135,10 +136,8 @@ main(int argc, char *argv[])
break;
} ARGEND
USED(argc);
if(*argv == 0) {
diag("usage: 8l [-options] objects");
errorexit();
}
if(*argv == 0)
usage();
whatsys(); // get goroot, goarch, goos
if(strcmp(goarch, thestring) != 0)
@ -602,12 +601,13 @@ zaddr(Biobuf *f, Adr *a, Sym *h[])
void
addlib(char *src, char *obj)
{
char name[1024], comp[256], *p, *q;
int i;
char name[1024], pname[1024], comp[256], *p, *q;
int i, search;
if(histfrogp <= 0)
return;
search = 0;
if(histfrog[0]->name[1] == '/') {
sprint(name, "");
i = 1;
@ -616,11 +616,9 @@ addlib(char *src, char *obj)
sprint(name, ".");
i = 0;
} else {
if(debug['9'])
sprint(name, "/%s/lib", thestring);
else
sprint(name, "/usr/%clib", thechar);
sprint(name, "");
i = 0;
search = 1;
}
for(; i<histfrogp; i++) {
@ -650,6 +648,16 @@ addlib(char *src, char *obj)
strcat(name, "/");
strcat(name, comp);
}
if(search) {
// try dot, -L "libdir", and then goroot.
snprint(pname, sizeof pname, "./%s", name);
if(access(pname, AEXIST) < 0 && LIBDIR != nil)
snprint(pname, sizeof pname, "%s/%s", LIBDIR, name);
if(access(pname, AEXIST) < 0)
snprint(pname, sizeof pname, "%s/pkg/%s", goroot, name);
strcpy(name, pname);
}
if(debug['v'])
Bprint(&bso, "%5.2f addlib: %s %s pulls in %s\n", cputime(), obj, src, name);
@ -976,6 +984,8 @@ loop:
}
if(p->to.offset > s->value)
s->value = p->to.offset;
if(p->from.scale & DUPOK)
s->dupok = 1;
goto loop;
case ADYNT:

1
src/cmd/ld/go.c
View File

@ -465,7 +465,6 @@ definetypesigs(void)
qsort(all, n, sizeof all[0], symcmp);
// emit array as sequence of references.
enum { PtrSize = 8 };
for(i=0; i<n; i++) {
prog = newdata(s, PtrSize*i, PtrSize, D_EXTERN);
prog->to.type = D_ADDR;