瀏覽代碼

* the resident table entry/table classes renamed "export table", because the
same classes can be used both for the resident and nonresident tables (they
share the same structure)

git-svn-id: trunk@42629 -

nickysn 6 年之前
父節點
當前提交
d1d2f6b701
共有 1 個文件被更改,包括 16 次插入16 次删除
  1. 16 16
      compiler/ogomf.pas

+ 16 - 16
compiler/ogomf.pas

@@ -510,9 +510,9 @@ interface
         property Size: QWord read GetSize;
         property Size: QWord read GetSize;
       end;
       end;
 
 
-      { TNewExeResidentNameTableEntry }
+      { TNewExeExportNameTableEntry }
 
 
-      TNewExeResidentNameTableEntry = class(TFPHashObject)
+      TNewExeExportNameTableEntry = class(TFPHashObject)
       private
       private
         FOrdinalNr: Word;
         FOrdinalNr: Word;
       public
       public
@@ -521,9 +521,9 @@ interface
         property OrdinalNr: Word read FOrdinalNr write FOrdinalNr;
         property OrdinalNr: Word read FOrdinalNr write FOrdinalNr;
       end;
       end;
 
 
-      { TNewExeResidentNameTable }
+      { TNewExeExportNameTable }
 
 
-      TNewExeResidentNameTable = class(TFPHashObjectList)
+      TNewExeExportNameTable = class(TFPHashObjectList)
       private
       private
         function GetSize: QWord;
         function GetSize: QWord;
       public
       public
@@ -669,7 +669,7 @@ interface
         FImports: TFPHashObjectList;
         FImports: TFPHashObjectList;
         FCurrExeMetaSec: TNewExeMetaSection;
         FCurrExeMetaSec: TNewExeMetaSection;
         FResourceTable: TNewExeResourceTable;
         FResourceTable: TNewExeResourceTable;
-        FResidentNameTable: TNewExeResidentNameTable;
+        FResidentNameTable: TNewExeExportNameTable;
         FModuleReferenceTable: TNewExeModuleReferenceTable;
         FModuleReferenceTable: TNewExeModuleReferenceTable;
         FImportedNameTable: TNewExeImportedNameTable;
         FImportedNameTable: TNewExeImportedNameTable;
         FEntryTable: TNewExeEntryTable;
         FEntryTable: TNewExeEntryTable;
@@ -684,7 +684,7 @@ interface
         property Header: TNewExeHeader read FHeader;
         property Header: TNewExeHeader read FHeader;
         property CurrExeMetaSec: TNewExeMetaSection read FCurrExeMetaSec write FCurrExeMetaSec;
         property CurrExeMetaSec: TNewExeMetaSection read FCurrExeMetaSec write FCurrExeMetaSec;
         property ResourceTable: TNewExeResourceTable read FResourceTable;
         property ResourceTable: TNewExeResourceTable read FResourceTable;
-        property ResidentNameTable: TNewExeResidentNameTable read FResidentNameTable;
+        property ResidentNameTable: TNewExeExportNameTable read FResidentNameTable;
         property ModuleReferenceTable: TNewExeModuleReferenceTable read FModuleReferenceTable;
         property ModuleReferenceTable: TNewExeModuleReferenceTable read FModuleReferenceTable;
         property ImportedNameTable: TNewExeImportedNameTable read FImportedNameTable;
         property ImportedNameTable: TNewExeImportedNameTable read FImportedNameTable;
         property EntryTable: TNewExeEntryTable read FEntryTable;
         property EntryTable: TNewExeEntryTable read FEntryTable;
@@ -3845,20 +3845,20 @@ cleanup:
       end;
       end;
 
 
 {****************************************************************************
 {****************************************************************************
-                       TNewExeResidentNameTableEntry
+                       TNewExeExportNameTableEntry
 ****************************************************************************}
 ****************************************************************************}
 
 
-    constructor TNewExeResidentNameTableEntry.Create(HashObjectList:TFPHashObjectList;const s:TSymStr;OrdNr:Word);
+    constructor TNewExeExportNameTableEntry.Create(HashObjectList:TFPHashObjectList;const s:TSymStr;OrdNr:Word);
       begin
       begin
         inherited Create(HashObjectList,s);
         inherited Create(HashObjectList,s);
         OrdinalNr:=OrdNr;
         OrdinalNr:=OrdNr;
       end;
       end;
 
 
 {****************************************************************************
 {****************************************************************************
-                         TNewExeResidentNameTable
+                         TNewExeExportNameTable
 ****************************************************************************}
 ****************************************************************************}
 
 
-    function TNewExeResidentNameTable.GetSize: QWord;
+    function TNewExeExportNameTable.GetSize: QWord;
       var
       var
         i: Integer;
         i: Integer;
       begin
       begin
@@ -3866,19 +3866,19 @@ cleanup:
         Result:=1;
         Result:=1;
         { each entry is 3 bytes, plus the length of the name }
         { each entry is 3 bytes, plus the length of the name }
         for i:=0 to Count-1 do
         for i:=0 to Count-1 do
-          Inc(Result,3+Length(TNewExeResidentNameTableEntry(Items[i]).Name));
+          Inc(Result,3+Length(TNewExeExportNameTableEntry(Items[i]).Name));
       end;
       end;
 
 
-    procedure TNewExeResidentNameTable.WriteTo(aWriter: TObjectWriter);
+    procedure TNewExeExportNameTable.WriteTo(aWriter: TObjectWriter);
       var
       var
         i: Integer;
         i: Integer;
-        rn: TNewExeResidentNameTableEntry;
+        rn: TNewExeExportNameTableEntry;
         slen: Byte;
         slen: Byte;
         OrdNrBuf: array [0..1] of Byte;
         OrdNrBuf: array [0..1] of Byte;
       begin
       begin
         for i:=0 to Count-1 do
         for i:=0 to Count-1 do
           begin
           begin
-            rn:=TNewExeResidentNameTableEntry(Items[i]);
+            rn:=TNewExeExportNameTableEntry(Items[i]);
             slen:=Length(rn.Name);
             slen:=Length(rn.Name);
             if slen=0 then
             if slen=0 then
               internalerror(2019080801);
               internalerror(2019080801);
@@ -4300,7 +4300,7 @@ cleanup:
         AddEntryPointsForAllExportSymbols;
         AddEntryPointsForAllExportSymbols;
 
 
         { the first entry in the resident-name table is the module name }
         { the first entry in the resident-name table is the module name }
-        TNewExeResidentNameTableEntry.Create(ResidentNameTable,ExtractModuleName(current_module.exefilename),0);
+        TNewExeExportNameTableEntry.Create(ResidentNameTable,ExtractModuleName(current_module.exefilename),0);
 
 
         FillImportedNameAndModuleReferenceTable;
         FillImportedNameAndModuleReferenceTable;
         ImportedNameTable.CalcTableOffsets;
         ImportedNameTable.CalcTableOffsets;
@@ -4493,7 +4493,7 @@ cleanup:
         MaxMemPos:=$FFFFFFFF;
         MaxMemPos:=$FFFFFFFF;
         CurrExeMetaSec:=nemsNone;
         CurrExeMetaSec:=nemsNone;
         FResourceTable:=TNewExeResourceTable.Create;
         FResourceTable:=TNewExeResourceTable.Create;
-        FResidentNameTable:=TNewExeResidentNameTable.Create;
+        FResidentNameTable:=TNewExeExportNameTable.Create;
         FModuleReferenceTable:=TNewExeModuleReferenceTable.Create;
         FModuleReferenceTable:=TNewExeModuleReferenceTable.Create;
         FImportedNameTable:=TNewExeImportedNameTable.Create;
         FImportedNameTable:=TNewExeImportedNameTable.Create;
         FEntryTable:=TNewExeEntryTable.Create;
         FEntryTable:=TNewExeEntryTable.Create;