qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 05:07:56 -07:00
Code Releases Activity

rename libmach_amd64 libmach

Browse Source 
R=rsc
OCL=33273
CL=33276
This commit is contained in:
Rob Pike 2009-08-14 10:46:04 -07:00
parent ce1dd6cce3
commit 00274a13cb
32 changed files with 48 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/mach_amd64.h → include/mach.h
View File

@ -29,15 +29,7 @@
/* /*
* Architecture-dependent application data * Architecture-dependent application data
* This is just Plan 9's mach.h, tweaked to support only amd64 for now.
*/ */
/*
* Start of Plan 9 a.out.h
* Don't use system a.out; instead just lay in the Plan 9 one for now.
*/
/*
#include "a.out.h"
*/
typedef struct Exec Exec; typedef struct Exec Exec;
struct Exec struct Exec
@ -87,10 +79,6 @@ struct Sym
vlong gotype; vlong gotype;
int sequence; // order in file int sequence; // order in file
}; };
/*
* End of Plan 9 a.out.h
* Don't use system a.out; instead just lay in the Plan 9 one for now.
*/
/* /*

2
src/clean.bash
View File

@ -5,7 +5,7 @@
rm -rf $GOROOT/pkg/[0-9a-zA-Z_]* rm -rf $GOROOT/pkg/[0-9a-zA-Z_]*
rm -f $GOROOT/lib/*.[6a] rm -f $GOROOT/lib/*.[6a]
for i in lib9 libbio libmach_amd64 libregexp cmd pkg for i in lib9 libbio libmach libregexp cmd pkg
do do
cd $i cd $i
case $i in case $i in

2
src/cmd/ar/Makefile
View File

@ -13,7 +13,7 @@ OFILES=\
ar.$O\ ar.$O\
$(TARG): $(OFILES) $(TARG): $(OFILES)
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lbio -l9 $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
clean: clean:
rm -f $(OFILES) $(TARG) rm -f $(OFILES) $(TARG)

2
src/cmd/ar/ar.c
View File

@ -39,7 +39,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#include <ar.h> #include <ar.h>
#undef select #undef select

2
src/cmd/cov/Makefile
View File

@ -17,7 +17,7 @@ HFILES=\
tree.h\ tree.h\
$(TARG): $(OFILES) $(TARG): $(OFILES)
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lregexp9 -lbio -l9 $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lregexp9 -lbio -l9
clean: clean:
rm -f $(OFILES) $(TARG) rm -f $(OFILES) $(TARG)

2
src/cmd/cov/main.c
View File

@ -15,7 +15,7 @@
#include "tree.h" #include "tree.h"
#include <ureg_amd64.h> #include <ureg_amd64.h>
#include <mach_amd64.h> #include <mach.h>
typedef struct Ureg Ureg; typedef struct Ureg Ureg;
void void

2
src/cmd/nm/Makefile
View File

@ -13,7 +13,7 @@ OFILES=\
nm.$O\ nm.$O\
$(TARG): $(OFILES) $(TARG): $(OFILES)
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lbio -l9 $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
clean: clean:
rm -f $(OFILES) $(TARG) rm -f $(OFILES) $(TARG)

18
src/cmd/nm/nm.c
View File

@ -1,14 +1,14 @@
// Inferno utils/nm/nm.c // Inferno utils/nm/nm.c
// http://code.google.com/p/inferno-os/source/browse/utils/nm/nm.c // http://code.google.com/p/inferno-os/source/browse/utils/nm/nm.c
// //
// Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. // Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved.
// Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net) // Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
// Portions Copyright © 1997-1999 Vita Nuova Limited // Portions Copyright © 1997-1999 Vita Nuova Limited
// Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com) // Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
// Portions Copyright © 2004,2006 Bruce Ellis // Portions Copyright © 2004,2006 Bruce Ellis
// Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net) // Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
// Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others // Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
// Portions Copyright © 2009 The Go Authors. All rights reserved. // Portions Copyright © 2009 The Go Authors. All rights reserved.
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal // of this software and associated documentation files (the "Software"), to deal
@ -35,7 +35,7 @@
#include <libc.h> #include <libc.h>
#include <ar.h> #include <ar.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
enum{ enum{
CHUNK = 256 /* must be power of 2 */ CHUNK = 256 /* must be power of 2 */

2
src/cmd/prof/Makefile
View File

@ -17,7 +17,7 @@ OFILES=\
# fns.h\ # fns.h\
$(TARG): $(OFILES) $(TARG): $(OFILES)
$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lbio -l9 $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
clean: clean:
rm -f $(OFILES) $(TARG) rm -f $(OFILES) $(TARG)

2
src/cmd/prof/main.c
View File

@ -9,7 +9,7 @@
#include <ctype.h> #include <ctype.h>
#include <ureg_amd64.h> #include <ureg_amd64.h>
#include <mach_amd64.h> #include <mach.h>
char* file = "6.out"; char* file = "6.out";
static Fhdr fhdr; static Fhdr fhdr;

2
src/libmach_amd64/5obj.c → src/libmach/5obj.c
View File

@ -32,7 +32,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#include "../cmd/5l/5.out.h" #include "../cmd/5l/5.out.h"
#include "obj.h" #include "obj.h"

2
src/libmach_amd64/6.c → src/libmach/6.c
View File

@ -33,7 +33,7 @@
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include "ureg_amd64.h" #include "ureg_amd64.h"
#include <mach_amd64.h> #include <mach.h>
#define REGOFF(x) offsetof(struct Ureg, x) #define REGOFF(x) offsetof(struct Ureg, x)

2
src/libmach_amd64/6obj.c → src/libmach/6obj.c
View File

@ -32,7 +32,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#include "../cmd/6l/6.out.h" #include "../cmd/6l/6.out.h"
#include "obj.h" #include "obj.h"

2
src/libmach_amd64/8.c → src/libmach/8.c
View File

@ -32,7 +32,7 @@
#include <u.h> #include <u.h>
#include <bio.h> #include <bio.h>
#include <ureg_x86.h> #include <ureg_x86.h>
#include <mach_amd64.h> #include <mach.h>
#define REGOFF(x) (uintptr)(&((struct Ureg *) 0)->x) #define REGOFF(x) (uintptr)(&((struct Ureg *) 0)->x)

2
src/libmach_amd64/8db.c → src/libmach/8db.c
View File

@ -29,7 +29,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#define Ureg UregAmd64 #define Ureg UregAmd64
#include <ureg_amd64.h> #include <ureg_amd64.h>
#undef Ureg #undef Ureg

2
src/libmach_amd64/8obj.c → src/libmach/8obj.c
View File

@ -32,7 +32,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#include "../cmd/8l/8.out.h" #include "../cmd/8l/8.out.h"
#include "obj.h" #include "obj.h"

28
src/libmach_amd64/Makefile → src/libmach/Makefile
View File

@ -28,7 +28,7 @@
include ../Make.conf include ../Make.conf
LIB=libmach_amd64.a LIB=libmach.a
OFILES=\ OFILES=\
executable.$O\ executable.$O\
fakeobj.$O\ fakeobj.$O\
@ -46,32 +46,8 @@ OFILES=\
6obj.$O\ 6obj.$O\
8obj.$O\ 8obj.$O\
$(GOOS).$O\ $(GOOS).$O\
# v.$O\
# k.$O\
# u.$O\
# q.$O\
# 0.$O\
# 2.$O\
# 5.$O\
# 7.$O\
# 9.$O\
# vdb.$O\
# kdb.$O\
# udb.$O\
# qdb.$O\
# 2db.$O\
# 5db.$O\
# 7db.$O\
# vobj.$O\
# kobj.$O\
# uobj.$O\
# 2obj.$O\
# 7obj.$O\
# 9obj.$O\
# qobj.$O\
# vcodas.$O\
HFILES=$(GOROOT)/include/mach_amd64.h elf.h macho.h obj.h HFILES=$(GOROOT)/include/mach.h elf.h macho.h obj.h
install: $(LIB) install: $(LIB)
cp $(LIB) $(GOROOT)/lib cp $(LIB) $(GOROOT)/lib

2
src/libmach_amd64/access.c → src/libmach/access.c
View File

@ -33,7 +33,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
static int mget(Map*, uvlong, void*, int); static int mget(Map*, uvlong, void*, int);
static int mput(Map*, uvlong, void*, int); static int mput(Map*, uvlong, void*, int);

2
src/libmach_amd64/darwin.c → src/libmach/darwin.c
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#define Ureg Ureg32 #define Ureg Ureg32
#include <ureg_x86.h> #include <ureg_x86.h>
#undef Ureg #undef Ureg

0
src/libmach_amd64/elf.h → src/libmach/elf.h
View File

14
src/libmach_amd64/executable.c → src/libmach/executable.c
View File

@ -1,11 +1,11 @@
// Inferno libmach/executable.c // Inferno libmach/executable.c
// http://code.google.com/p/inferno-os/source/browse/utils/libmach/executable.c // http://code.google.com/p/inferno-os/source/browse/utils/libmach/executable.c
// //
// Copyright © 1994-1999 Lucent Technologies Inc. // Copyright © 1994-1999 Lucent Technologies Inc.
// Power PC support Copyright © 1995-2004 C H Forsyth (forsyth@terzarima.net). // Power PC support Copyright © 1995-2004 C H Forsyth (forsyth@terzarima.net).
// Portions Copyright © 1997-1999 Vita Nuova Limited. // Portions Copyright © 1997-1999 Vita Nuova Limited.
// Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com). // Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).
// Revisions Copyright © 2000-2004 Lucent Technologies Inc. and others. // Revisions Copyright © 2000-2004 Lucent Technologies Inc. and others.
// Portions Copyright © 2009 The Go Authors. All rights reserved. // Portions Copyright © 2009 The Go Authors. All rights reserved.
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
@ -30,7 +30,7 @@
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <bootexec.h> #include <bootexec.h>
#include <mach_amd64.h> #include <mach.h>
#include "elf.h" #include "elf.h"
#include "macho.h" #include "macho.h"
@ -268,7 +268,7 @@ ExecTable exectab[] =
sizeof(Machhdr), sizeof(Machhdr),
nil, nil,
machdotout }, machdotout },
{ MACH32_MAG, /* 64-bit MACH (apple mac) */ { MACH32_MAG, /* 32-bit MACH (apple mac) */
"mach executable", "mach executable",
nil, nil,
FI386, FI386,

2
src/libmach_amd64/fakeobj.c → src/libmach/fakeobj.c
View File

@ -10,7 +10,7 @@
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <ar.h> #include <ar.h>
#include <mach_amd64.h> #include <mach.h>
#include "obj.h" #include "obj.h"
int _is2(char* x) { return 0; } int _is2(char* x) { return 0; }

2
src/libmach_amd64/linux.c → src/libmach/linux.c
View File

@ -37,7 +37,7 @@
#include <errno.h> #include <errno.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#define Ureg Ureg32 #define Ureg Ureg32
#include <ureg_x86.h> #include <ureg_x86.h>
#undef Ureg #undef Ureg

2
src/libmach_amd64/machdata.c → src/libmach/machdata.c
View File

@ -33,7 +33,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#define STARTSYM "_main" #define STARTSYM "_main"
#define PROFSYM "_mainp" #define PROFSYM "_mainp"

0
src/libmach_amd64/macho.h → src/libmach/macho.h
View File

2
src/libmach_amd64/map.c → src/libmach/map.c
View File

@ -37,7 +37,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
Map * Map *
newmap(Map *map, int n) newmap(Map *map, int n)

2
src/libmach_amd64/obj.c → src/libmach/obj.c
View File

@ -34,7 +34,7 @@
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <ar.h> #include <ar.h>
#include <mach_amd64.h> #include <mach.h>
#include "obj.h" #include "obj.h"
#define islocal(t) ((t)=='a' || (t)=='p') #define islocal(t) ((t)=='a' || (t)=='p')

0
src/libmach_amd64/obj.h → src/libmach/obj.h
View File

2
src/libmach_amd64/setmach.c → src/libmach/setmach.c
View File

@ -29,7 +29,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
/* table for selecting machine-dependent parameters */ /* table for selecting machine-dependent parameters */
typedef struct machtab Machtab; typedef struct machtab Machtab;

0
src/libmach_amd64/swap.c → src/libmach/swap.c
View File

2
src/libmach_amd64/sym.c → src/libmach/sym.c
View File

@ -29,7 +29,7 @@
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <bio.h> #include <bio.h>
#include <mach_amd64.h> #include <mach.h>
#define HUGEINT 0x7fffffff #define HUGEINT 0x7fffffff
#define NNAME 20 /* a relic of the past */ #define NNAME 20 /* a relic of the past */

2
src/make.bash
View File

@ -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_amd64 libregexp cmd pkg cmd/ebnflint cmd/godoc cmd/gofmt for i in lib9 libbio libmach libregexp cmd pkg cmd/ebnflint cmd/godoc cmd/gofmt
do do
# The ( ) here are to preserve the current directory # The ( ) here are to preserve the current directory
# for the next round despite the cd $i below. # for the next round despite the cd $i below.