2
0
Эх сурвалжийг харах

* replaced R_SUBADDR with the appropriate size (R_SUBW, R_SUBD or R_SUBQ) in
the cpu specific process_ea_ref function

git-svn-id: trunk@37400 -

nickysn 7 жил өмнө
parent
commit
31c9214884

+ 8 - 8
compiler/x86/aasmcpu.pas

@@ -1889,13 +1889,13 @@ implementation
            { 16 bit? }
            { 16 bit? }
 
 
            if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY]) and
            if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY]) and
-               (br<>NR_NO) and (bsub=R_SUBADDR)
+               (br<>NR_NO) and (bsub=R_SUBQ)
               ) then
               ) then
            begin
            begin
              // vector memory (AVX2) =>> ignore
              // vector memory (AVX2) =>> ignore
            end
            end
-           else if ((ir<>NR_NO) and (isub<>R_SUBADDR) and (isub<>R_SUBD)) or
-                   ((br<>NR_NO) and (bsub<>R_SUBADDR) and (bsub<>R_SUBD)) then
+           else if ((ir<>NR_NO) and (isub<>R_SUBQ) and (isub<>R_SUBD)) or
+                   ((br<>NR_NO) and (bsub<>R_SUBQ) and (bsub<>R_SUBD)) then
            begin
            begin
              message(asmw_e_16bit_32bit_not_supported);
              message(asmw_e_16bit_32bit_not_supported);
            end;
            end;
@@ -2094,13 +2094,13 @@ implementation
            { 16 bit address? }
            { 16 bit address? }
 
 
            if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY]) and
            if ((ir<>NR_NO) and (isub in [R_SUBMMX,R_SUBMMY]) and
-               (br<>NR_NO) and (bsub=R_SUBADDR)
+               (br<>NR_NO) and (bsub=R_SUBD)
               ) then
               ) then
            begin
            begin
              // vector memory (AVX2) =>> ignore
              // vector memory (AVX2) =>> ignore
            end
            end
-           else if ((ir<>NR_NO) and (isub<>R_SUBADDR)) or
-                   ((br<>NR_NO) and (bsub<>R_SUBADDR)) then
+           else if ((ir<>NR_NO) and (isub<>R_SUBD)) or
+                   ((br<>NR_NO) and (bsub<>R_SUBD)) then
              message(asmw_e_16bit_not_supported);
              message(asmw_e_16bit_not_supported);
 {$ifdef OPTEA}
 {$ifdef OPTEA}
            { make single reg base }
            { make single reg base }
@@ -2259,8 +2259,8 @@ implementation
           begin
           begin
             { 32 bit address? }
             { 32 bit address? }
 
 
-            if ((ir<>NR_NO) and (isub<>R_SUBADDR)) or
-               ((br<>NR_NO) and (bsub<>R_SUBADDR)) then
+            if ((ir<>NR_NO) and (isub<>R_SUBW)) or
+               ((br<>NR_NO) and (bsub<>R_SUBW)) then
               message(asmw_e_32bit_not_supported);
               message(asmw_e_32bit_not_supported);
             { scalefactor can only be 1 in 16-bit addresses }
             { scalefactor can only be 1 in 16-bit addresses }
             if (s<>1) and (ir<>NR_NO) then
             if (s<>1) and (ir<>NR_NO) then