From 472f8c900b8b5dd32333c930ba1c6f4a75828102 Mon Sep 17 00:00:00 2001
From: tg74 <tg74@idefix.freepascal.org>
Date: Tue, 12 Jan 2021 16:19:53 +0000
Subject: [PATCH] cleanup + add internal error if all
 asmr_e_not_supported_combination_attsuffix_memrefsize_type are reported

git-svn-id: branches/tg74/avx512-0037785@48148 -
---
 compiler/x86/aasmcpu.pas | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas
index a4b461693d..da0b9dd40f 100644
--- a/compiler/x86/aasmcpu.pas
+++ b/compiler/x86/aasmcpu.pas
@@ -2309,7 +2309,7 @@ implementation
     function is_16_bit_ref(const ref:treference):boolean;
       var
         ir,br : Tregister;
-        isub,bsub : cgbase.tsubregister;
+        isub,bsub : tsubregister;
       begin
         if (ref.index<>NR_NO) and (getregtype(ref.index)=R_MMREGISTER) then
           exit(false);
@@ -2469,15 +2469,15 @@ implementation
         // ax cx dx bx si di bp sp   -- in x86reg.dat
         // ax cx dx bx sp bp si di   -- needed order
           (0, 1, 2, 3, 6, 7, 5, 4);
-        maxsupreg: array[cgbase.tregistertype] of cgbase.tsuperregister=
+        maxsupreg: array[tregistertype] of tsuperregister=
 {$ifdef x86_64}
           (0, 16, 9, 8, 32, 32, 8, 0, 0, 0);
 {$else x86_64}
           (0,  8, 9, 8,  8, 32, 8, 0, 0, 0);
 {$endif x86_64}
       var
-        rs: cgbase.tsuperregister;
-        rt: cgbase.tregistertype;
+        rs: tsuperregister;
+        rt: tregistertype;
       begin
         rs:=getsupreg(r);
         rt:=getregtype(r);
@@ -2534,7 +2534,7 @@ implementation
         base,index,scalefactor,
         o     : longint;
         ir,br : Tregister;
-        isub,bsub : cgbase.tsubregister;
+        isub,bsub : tsubregister;
       begin
         result:=false;
         ir:=input.ref^.index;
@@ -4640,7 +4640,7 @@ implementation
       end;
 
 
-    function taicpu.is_same_reg_move(regtype: cgbase.Tregistertype):boolean;
+    function taicpu.is_same_reg_move(regtype: Tregistertype):boolean;
       begin
         result:=(((opcode=A_MOV) or (opcode=A_XCHG)) and
                  (regtype = R_INTREGISTER) and