Browse Source

* compilation on i386 fixed

git-svn-id: trunk@42655 -
florian 6 năm trước cách đây
mục cha
commit
4c9a0403f4
2 tập tin đã thay đổi với 6 bổ sung6 xóa
  1. 5 5
      compiler/x86/aasmcpu.pas
  2. 1 1
      compiler/x86/rax86.pas

+ 5 - 5
compiler/x86/aasmcpu.pas

@@ -1601,11 +1601,11 @@ implementation
                      (not(InsTabMemRefSizeInfoCache^[opcode].ConstSize in [csiMultiple, csiUnkown])) then
                   begin
                     case InsTabMemRefSizeInfoCache^[opcode].ConstSize of
-                      csiNoSize: ot := ot and (not(OT_SIZE_MASK)) or OT_IMMEDIATE;
-                        csiMem8: ot := ot and (not(OT_SIZE_MASK)) or OT_IMMEDIATE or OT_BITS8;
-                       csiMem16: ot := ot and (not(OT_SIZE_MASK)) or OT_IMMEDIATE or OT_BITS16;
-                       csiMem32: ot := ot and (not(OT_SIZE_MASK)) or OT_IMMEDIATE or OT_BITS32;
-                       csiMem64: ot := ot and (not(OT_SIZE_MASK)) or OT_IMMEDIATE or OT_BITS64;
+                      csiNoSize: ot := ot and OT_NON_SIZE or OT_IMMEDIATE;
+                        csiMem8: ot := ot and OT_NON_SIZE or OT_IMMEDIATE or OT_BITS8;
+                       csiMem16: ot := ot and OT_NON_SIZE or OT_IMMEDIATE or OT_BITS16;
+                       csiMem32: ot := ot and OT_NON_SIZE or OT_IMMEDIATE or OT_BITS32;
+                       csiMem64: ot := ot and OT_NON_SIZE or OT_IMMEDIATE or OT_BITS64;
                        else
                          ;
                     end;

+ 1 - 1
compiler/x86/rax86.pas

@@ -1890,7 +1890,7 @@ begin
                      ;
                  end;
                if asize<>0 then
-                 ai.oper[i-1]^.ot:=(ai.oper[i-1]^.ot and not OT_SIZE_MASK) or asize;
+                 ai.oper[i-1]^.ot:=(ai.oper[i-1]^.ot and OT_NON_SIZE) or asize;
              end;
          end;
        else