浏览代码

* removed {$ifndef i8086} in tx86vecnode, instead reset cvecnode to
tcgvecnode in the n8086mem initcode

git-svn-id: trunk@27360 -

Jonas Maebe 11 年之前
父节点
当前提交
b5fd71c3b9
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 2 0
      compiler/i8086/n8086mem.pas
  2. 0 4
      compiler/x86/nx86mem.pas

+ 2 - 0
compiler/i8086/n8086mem.pas

@@ -129,4 +129,6 @@ implementation
 
 
 begin
 begin
   cderefnode:=ti8086derefnode;
   cderefnode:=ti8086derefnode;
+  { override tx86vecnode, which doesn't work for i8086 }
+  cvecnode:=tcgvecnode;
 end.
 end.

+ 0 - 4
compiler/x86/nx86mem.pas

@@ -35,9 +35,7 @@ interface
       end;
       end;
 
 
       tx86vecnode = class(tcgvecnode)
       tx86vecnode = class(tcgvecnode)
-{$ifndef i8086}
         procedure update_reference_reg_mul(maybe_const_reg:tregister;l:aint);override;
         procedure update_reference_reg_mul(maybe_const_reg:tregister;l:aint);override;
-{$endif not i8086}
       end;
       end;
 
 
 implementation
 implementation
@@ -80,7 +78,6 @@ implementation
                              TX86VECNODE
                              TX86VECNODE
 *****************************************************************************}
 *****************************************************************************}
 
 
-{$ifndef i8086}
      { this routine must, like any other routine, not change the contents }
      { this routine must, like any other routine, not change the contents }
      { of base/index registers of references, as these may be regvars.    }
      { of base/index registers of references, as these may be regvars.    }
      { The register allocator can coalesce one LOC_REGISTER being moved   }
      { The register allocator can coalesce one LOC_REGISTER being moved   }
@@ -140,7 +137,6 @@ implementation
          end;
          end;
          location.reference.index:=hreg;
          location.reference.index:=hreg;
        end;
        end;
-{$endif not i8086}
 
 
 begin
 begin
    cderefnode:=tx86derefnode;
    cderefnode:=tx86derefnode;