From 2e5b065ac24912be82e7082eeb136afd18d9734b Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 29 Jan 2015 20:19:07 -0500 Subject: liblink: define fixed A-numbers for common instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes names like ANOP, ATEXT, AGLOBL, ACALL, AJMP, ARET available for use by architecture-independent processing passes. On arm and ppc64, the alternate names are now aliases for the official ones (ABL for ACALL, AB or ABR for AJMP, ARETURN for ARET). Change-Id: Id027771243795af2b3745199c645b6e1bedd7d18 Reviewed-on: https://go-review.googlesource.com/3577 Reviewed-by: Aram Hăvărneanu Reviewed-by: Austin Clements --- src/liblink/obj9.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'src/liblink/obj9.c') diff --git a/src/liblink/obj9.c b/src/liblink/obj9.c index 58b6cf72c8..450ed00306 100644 --- a/src/liblink/obj9.c +++ b/src/liblink/obj9.c @@ -35,18 +35,6 @@ #include "../runtime/stack.h" #include "../runtime/funcdata.h" -static int -isdata(Prog *p) -{ - return p->as == ADATA || p->as == AGLOBL; -} - -static int -iscall(Prog *p) -{ - return p->as == ABL; -} - static void progedit(Link *ctxt, Prog *p) { @@ -933,26 +921,11 @@ LinkArch linkppc64 = { .preprocess = preprocess, .assemble = span9, .follow = follow, - .iscall = iscall, - .isdata = isdata, .progedit = progedit, .minlc = 4, .ptrsize = 8, .regsize = 8, - - .ACALL = ABL, - .ADATA = ADATA, - .AEND = AEND, - .AFUNCDATA = AFUNCDATA, - .AGLOBL = AGLOBL, - .AJMP = ABR, - .ANOP = ANOP, - .APCDATA = APCDATA, - .ARET = ARETURN, - .ATEXT = ATEXT, - .ATYPE = ATYPE, - .AUSEFIELD = AUSEFIELD, }; LinkArch linkppc64le = { @@ -963,24 +936,9 @@ LinkArch linkppc64le = { .preprocess = preprocess, .assemble = span9, .follow = follow, - .iscall = iscall, - .isdata = isdata, .progedit = progedit, .minlc = 4, .ptrsize = 8, .regsize = 8, - - .ACALL = ABL, - .ADATA = ADATA, - .AEND = AEND, - .AFUNCDATA = AFUNCDATA, - .AGLOBL = AGLOBL, - .AJMP = ABR, - .ANOP = ANOP, - .APCDATA = APCDATA, - .ARET = ARETURN, - .ATEXT = ATEXT, - .ATYPE = ATYPE, - .AUSEFIELD = AUSEFIELD, }; -- cgit v1.3-5-g9baa