diff options
| author | forsyth <forsyth@lavoro.terzarima.net> | 2013-06-03 21:01:14 +0000 |
|---|---|---|
| committer | forsyth <forsyth@lavoro.terzarima.net> | 2013-06-03 21:01:14 +0000 |
| commit | 45a20ab721a513710138340faff3d59a31c3e01e (patch) | |
| tree | eea29d2684c51cc73725b8992a2125bede48e118 /utils/include/mach.h | |
| parent | cd8e99851af33e52bcdf8faf34f9d4e62fa0cbaf (diff) | |
sync compilers with Plan 9
remove 1[acl] 2[acl]
Diffstat (limited to 'utils/include/mach.h')
| -rw-r--r-- | utils/include/mach.h | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/utils/include/mach.h b/utils/include/mach.h index ea22b7e1..1c8d7a83 100644 --- a/utils/include/mach.h +++ b/utils/include/mach.h @@ -2,7 +2,7 @@ * Architecture-dependent application data */ #include "a.out.h" -#pragma src "/usr/inferno/utils/libmach" +#pragma src "/sys/src/libmach" #pragma lib "libmach.a" /* * Supported architectures: @@ -11,12 +11,11 @@ * i386, * amd64, * sparc, - * sparc64, * mips2 (R4000) * arm * powerpc, * powerpc64 - * alpha + * arm64 */ enum { @@ -31,11 +30,12 @@ enum M29000, /* retired */ MARM, MPOWER, - MALPHA, + MALPHA, /* retired */ NMIPS, - MSPARC64, + MSPARC64, /* retired */ MAMD64, MPOWER64, + MARM64, /* types of executables */ FNONE = 0, /* unidentified */ FMIPS, /* v.out */ @@ -57,14 +57,16 @@ enum FPOWER, /* q.out */ FPOWERB, /* power pc bootable */ FMIPS2LE, /* 0.out */ - FALPHA, /* 7.out */ - FALPHAB, /* DEC Alpha bootable */ + FALPHA, /* retired */ + FALPHAB, /* retired DEC Alpha bootable */ FMIPSLE, /* 3k little endian */ - FSPARC64, /* u.out */ + FSPARC64, /* retired */ FAMD64, /* 6.out */ FAMD64B, /* 6.out bootable */ FPOWER64, /* 9.out */ FPOWER64B, /* 9.out bootable */ + FARM64, /* arm64 */ + FARM64B, /* arm64 bootable */ ANONE = 0, /* dissembler types */ AMIPS, @@ -78,10 +80,11 @@ enum A29000, /* retired */ AARM, APOWER, - AALPHA, - ASPARC64, + AALPHA, /* retired */ + ASPARC64, /* retired */ AAMD64, APOWER64, + AARM64, /* object file types */ Obj68020 = 0, /* .2 */ ObjSparc, /* .k */ @@ -94,11 +97,12 @@ enum ObjArm, /* .5 */ ObjPower, /* .q */ ObjMips2le, /* .0 */ - ObjAlpha, /* .7 */ - ObjSparc64, /* .u */ + ObjAlpha, /* retired */ + ObjSparc64, /* retired */ ObjAmd64, /* .6 */ ObjSpim, /* .0 */ - ObjPower64, /* .9 */ + ObjPower64, /* .9 */ + ObjArm64, /* .4? */ Maxobjtype, CNONE = 0, /* symbol table classes */ @@ -113,11 +117,10 @@ enum typedef struct Map Map; typedef struct Symbol Symbol; typedef struct Reglist Reglist; -typedef struct Mach Mach; -typedef struct Machdata Machdata; - typedef struct segment segment; +typedef struct Mach Mach; +typedef struct Machdata Machdata; typedef int (*Rsegio)(segment*, ulong, long, char*, int); /* @@ -321,6 +324,4 @@ int syminit(int, Fhdr*); int symoff(char*, int, uvlong, int); void textseg(uvlong, Fhdr*); int textsym(Symbol*, int); -void thumbpctab(Biobuf*, Fhdr*); -int thumbpclookup(uvlong); void unusemap(Map*, int); |