From bfd8093c969d2b7b7e1e60866031508ea6e462d6 Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Wed, 29 Mar 2017 14:35:27 +1100 Subject: [PATCH] cmd/asm/internal/arch: use generic obj.Rconv function everywhere Rather than using arm64.Rconv directly in the archArm64 constructor use the generic obj.Rconv helper. This removes the only use of arm64.Rconv outside the arm64 package itself. Change-Id: I99e9e7156b52cd26dc134f610f764ec794264e2c Reviewed-on: https://go-review.googlesource.com/38756 Run-TryBot: Dave Cheney TryBot-Result: Gobot Gobot Reviewed-by: Josh Bleecher Snyder --- src/cmd/asm/internal/arch/arch.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/asm/internal/arch/arch.go b/src/cmd/asm/internal/arch/arch.go index 6f13a3a4db..f325e9366d 100644 --- a/src/cmd/asm/internal/arch/arch.go +++ b/src/cmd/asm/internal/arch/arch.go @@ -238,15 +238,15 @@ func archArm64() *Arch { register := make(map[string]int16) // Create maps for easy lookup of instruction names etc. // Note that there is no list of names as there is for 386 and amd64. - register[arm64.Rconv(arm64.REGSP)] = int16(arm64.REGSP) + register[obj.Rconv(arm64.REGSP)] = int16(arm64.REGSP) for i := arm64.REG_R0; i <= arm64.REG_R31; i++ { - register[arm64.Rconv(i)] = int16(i) + register[obj.Rconv(i)] = int16(i) } for i := arm64.REG_F0; i <= arm64.REG_F31; i++ { - register[arm64.Rconv(i)] = int16(i) + register[obj.Rconv(i)] = int16(i) } for i := arm64.REG_V0; i <= arm64.REG_V31; i++ { - register[arm64.Rconv(i)] = int16(i) + register[obj.Rconv(i)] = int16(i) } register["LR"] = arm64.REGLINK register["DAIF"] = arm64.REG_DAIF -- 2.48.1