WebSVN – Kolibri OS – Diff – /programs/develop/oberon07/Source/MSCOFF.ob07

     FH = PE32.IMAGE_FILE_HEADER;
     SH = PE32.IMAGE_SECTION_HEADER;
-PROCEDURE WriteReloc (File: WR.FILE; VirtualAddress, SymbolTableIndex, Type: INTEGER);
+PROCEDURE WriteReloc (VirtualAddress, SymbolTableIndex, Type: INTEGER);
 BEGIN
-    WR.Write32LE(File, VirtualAddress);
+    WR.Write32LE(VirtualAddress);
-    WR.Write32LE(File, SymbolTableIndex);
+    WR.Write32LE(SymbolTableIndex);
-    WR.Write16LE(File, Type)
+    WR.Write16LE(Type)
 END WriteReloc;
 PROCEDURE Reloc (program: BIN.PROGRAM);
-PROCEDURE Reloc (program: BIN.PROGRAM; File: WR.FILE);
+VAR
+    reloc:  BIN.RELOC;
-VAR
+    offset: INTEGER;
     reloc: BIN.RELOC;
+BEGIN
-BEGIN
+    reloc := program.rel_list.first(BIN.RELOC);
-    reloc := program.rel_list.first(BIN.RELOC);
+    WHILE reloc # NIL DO
-    WHILE reloc # NIL DO
         offset := reloc.offset;
         CASE reloc.opcode OF
         |BIN.RIMP,
-         BIN.IMPTAB: WriteReloc(File, reloc.offset, 4, 6)
+         BIN.IMPTAB: WriteReloc(offset, 4, 6)
 PROCEDURE RelocCount (program: BIN.PROGRAM): INTEGER;
 VAR
     reloc:   BIN.RELOC;
     iproc:   BIN.IMPRT;
     res, L:  INTEGER;
+    offset:  INTEGER;
     code:    CHL.BYTELIST;
 BEGIN
     res := 0;
     code := program.code;
     reloc := program.rel_list.first(BIN.RELOC);
     WHILE reloc # NIL DO
         INC(res);
-        INC(res);
+        offset := reloc.offset;
         IF reloc.opcode = BIN.RIMP THEN
-            L := BIN.get32le(code, reloc.offset);
+            L := BIN.get32le(code, offset);
             iproc := BIN.GetIProc(program, L);
-            BIN.put32le(code, reloc.offset, iproc.label)
+            BIN.put32le(code, offset, iproc.label)
         END;
         IF reloc.opcode = BIN.RCODE THEN
-            L := BIN.get32le(code, reloc.offset);
+            L := BIN.get32le(code, offset);
 END RelocCount;
-PROCEDURE write* (program: BIN.PROGRAM; FileName: ARRAY OF CHAR; ver: INTEGER);
-VAR
+PROCEDURE write* (program: BIN.PROGRAM; FileName: ARRAY OF CHAR; ver: INTEGER);
-    File:  WR.FILE;
+VAR
     exp:   BIN.EXPRT;
     ASSERT(LENGTH(szversion) = 7);
     KOS.Import(program, 0, ImportTable, ILen, LibCount, isize);
     ExpCount := LISTS.count(program.exp_list);
-    icount := CHL.Length(program.import);
+    icount := CHL.Length(program._import);
     dcount := CHL.Length(program.data);
     ccount := CHL.Length(program.code);
     edata.PointerToRelocations := flat.PointerToRelocations + ORD(flat.NumberOfRelocations) * 10;
     idata.PointerToRelocations := edata.PointerToRelocations + ORD(edata.NumberOfRelocations) * 10;
     FileHeader.PointerToSymbolTable := idata.PointerToRelocations + ORD(idata.NumberOfRelocations) * 10;
-    File := WR.Create(FileName);
+    WR.Create(FileName);
-    PE32.WriteFileHeader(File, FileHeader);
+    PE32.WriteFileHeader(FileHeader);
-    PE32.WriteSectionHeader(File, flat);
+    PE32.WriteSectionHeader(flat);
-    PE32.WriteSectionHeader(File, data);
+    PE32.WriteSectionHeader(data);
-    PE32.WriteSectionHeader(File, edata);
+    PE32.WriteSectionHeader(edata);
-    PE32.WriteSectionHeader(File, idata);
+    PE32.WriteSectionHeader(idata);
-    PE32.WriteSectionHeader(File, bss);
+    PE32.WriteSectionHeader(bss);
-    CHL.WriteToFile(File, program.code);
+    CHL.WriteToFile(program.code);
-    CHL.WriteToFile(File, program.data);
+    CHL.WriteToFile(program.data);
     exp := program.exp_list.first(BIN.EXPRT);
     WHILE exp # NIL DO
-        WR.Write32LE(File, exp.nameoffs + edata.SizeOfRawData - ecount);
+        WR.Write32LE(exp.nameoffs + edata.SizeOfRawData - ecount);
-        WR.Write32LE(File, exp.label);
+        WR.Write32LE(exp.label);
         exp := exp.next(BIN.EXPRT)
     END;
-    WR.Write32LE(File, ((ExpCount + 1) * 2 + 1) * SIZE_OF_DWORD);
+    WR.Write32LE(((ExpCount + 1) * 2 + 1) * SIZE_OF_DWORD);
-    WR.Write32LE(File, ver);
+    WR.Write32LE(ver);
-    WR.Write32LE(File, 0);
+    WR.Write32LE(0);
-    PE32.WriteName(File, szversion);
+    PE32.WriteName(szversion);
-    CHL.WriteToFile(File, program.export);
+    CHL.WriteToFile(program.export);
     FOR i := 0 TO ILen - 1 DO
-        WR.Write32LE(File, CHL.GetInt(ImportTable, i))
+        WR.Write32LE(CHL.GetInt(ImportTable, i))
     END;
-    CHL.WriteToFile(File, program.import);
+    CHL.WriteToFile(program._import);
-    Reloc(program, File);
-    n := 0;
-    exp := program.exp_list.first(BIN.EXPRT);
+    Reloc(program);
-    WHILE exp # NIL DO
         WriteReloc(File, n, 3, 6);
-        INC(n, 4);
+    n := 0;
     exp := program.exp_list.first(BIN.EXPRT);
-        WriteReloc(File, n, 1, 6);
+    WHILE exp # NIL DO
-        INC(n, 4);
+        WriteReloc(n, 3, 6);
         INC(n, 4);
-        exp := exp.next(BIN.EXPRT)
-    END;
+        WriteReloc(n, 1, 6);
+        INC(n, 4);
-    WriteReloc(File, n, 3, 6);
+        exp := exp.next(BIN.EXPRT)
-    i := 0;
+    END;
-    WHILE i < LibCount * 2 DO
-        WriteReloc(File, i * SIZE_OF_DWORD, 4, 6);
+    WriteReloc(n, 3, 6);
-        INC(i);
-        WriteReloc(File, i * SIZE_OF_DWORD, 4, 6);
+    FOR i := 0 TO LibCount * 2 - 1 DO
-        INC(i)
+        WriteReloc(i * SIZE_OF_DWORD, 4, 6)
     END;
     FOR i := LibCount * 2 TO ILen - 1 DO
         IF CHL.GetInt(ImportTable, i) # 0 THEN
-            WriteReloc(File, i * SIZE_OF_DWORD, 4, 6)
+            WriteReloc(i * SIZE_OF_DWORD, 4, 6)
         END

Subversion Repositories Kolibri OS

(root)/programs/develop/oberon07/Source/MSCOFF.ob07 – Rev 7983 → 8097