From 59548ee9f6e22b374d9e399d386c29bf7010d8c2 Mon Sep 17 00:00:00 2001 From: Michael McLoughlin Date: Sun, 2 Dec 2018 21:35:33 -0800 Subject: [PATCH] rename some register types --- operand/checks.go | 2 +- operand/types.go | 4 ++-- reg/types.go | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/operand/checks.go b/operand/checks.go index a95a9ea..2d4e98f 100644 --- a/operand/checks.go +++ b/operand/checks.go @@ -115,7 +115,7 @@ func IsYmm(op Op) bool { // IsRegisterKindSize returns true if op is a register of the given kind and size in bytes. func IsRegisterKindSize(op Op, k reg.Kind, n uint) bool { - r, ok := op.(reg.Type) + r, ok := op.(reg.Register) return ok && r.Kind() == k && r.Bytes() == n } diff --git a/operand/types.go b/operand/types.go index ba823ac..3445277 100644 --- a/operand/types.go +++ b/operand/types.go @@ -12,8 +12,8 @@ type Op interface { type Mem struct { Disp int - Base reg.Register - Index reg.Register + Base reg.Physical + Index reg.Physical Scale uint8 } diff --git a/reg/types.go b/reg/types.go index 472f2ad..792092e 100644 --- a/reg/types.go +++ b/reg/types.go @@ -20,10 +20,10 @@ type Kind uint8 type Family struct { Kind Kind - registers []Register + registers []Physical } -func (f *Family) define(s Spec, id uint16, name string) Register { +func (f *Family) define(s Spec, id uint16, name string) Physical { r := register{ id: id, kind: f.Kind, @@ -46,7 +46,7 @@ type private interface { private() } -type Type interface { +type Register interface { Kind() Kind Bytes() uint Asm() string @@ -55,7 +55,7 @@ type Type interface { type Virtual interface { VirtualID() uint16 - Type + Register } type virtual struct { @@ -74,10 +74,10 @@ func (v virtual) Asm() string { func (v virtual) private() {} -type Register interface { +type Physical interface { PhysicalID() uint16 Mask() uint16 - Type + Register } type register struct {