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

 (*
     BSD 2-Clause License
-    Copyright (c) 2018-2019, Anton Krotov
+    Copyright (c) 2018-2020, Anton Krotov
     All rights reserved.
 *)
     SIZE_OF_DWORD = 4;
-TYPE
-    FILE = WR.FILE;
+TYPE
     HEADER = RECORD
-        menuet01: ARRAY 9 OF CHAR;
-        ver, start, size, mem, sp, param, path: INTEGER
-    END;
-PROCEDURE align (n, _align: INTEGER): INTEGER;
-BEGIN
-    IF n MOD _align # 0 THEN
         n := n + _align - (n MOD _align)
-    END
+        menuet01: ARRAY 9 OF CHAR;
         ver, start, size, mem, sp, param, path: INTEGER
-    RETURN n
-END align;
+    END;
 PROCEDURE Import* (program: BIN.PROGRAM; idata: INTEGER; VAR ImportTable: CHL.INTLIST; VAR len, libcount, size: INTEGER);
 VAR
-    i:      INTEGER;
+    i:   INTEGER;
-    import: BIN.IMPRT;
+    imp: BIN.IMPRT;
 BEGIN
     libcount  := 0;
-    import := program.imp_list.first(BIN.IMPRT);
+    imp := program.imp_list.first(BIN.IMPRT);
     FOR i := 0 TO size DIV SIZE_OF_DWORD - 1 DO
         CHL.PushInt(ImportTable, 0)
     END;
     i := 0;
-    import := program.imp_list.first(BIN.IMPRT);
+    imp := program.imp_list.first(BIN.IMPRT);
-    WHILE import # NIL DO
+    WHILE imp # NIL DO
-        IF import.label = 0 THEN
+        IF imp.label = 0 THEN
             CHL.SetInt(ImportTable, len, 0);
             INC(len);
             CHL.SetInt(ImportTable, i, idata + len * SIZE_OF_DWORD);
             INC(i);
-            CHL.SetInt(ImportTable, i, import.nameoffs + size + idata);
+            CHL.SetInt(ImportTable, i, imp.nameoffs + size + idata);
             INC(i)
         ELSE
-            CHL.SetInt(ImportTable, len, import.nameoffs + size + idata);
+            CHL.SetInt(ImportTable, len, imp.nameoffs + size + idata);
-            import.label := len * SIZE_OF_DWORD;
+            imp.label := len * SIZE_OF_DWORD;
             INC(len)
         END;
-        import := import.next(BIN.IMPRT)
+        imp := imp.next(BIN.IMPRT)
     END;
     CHL.SetInt(ImportTable, len, 0);
     CHL.SetInt(ImportTable, i, 0);
     CHL.SetInt(ImportTable, i + 1, 0);
     INC(len);
 VAR
     header: HEADER;
-    base, text, data, idata, bss: INTEGER;
+    base, text, data, idata, bss, offset: INTEGER;
     reloc:   BIN.RELOC;
-    iproc:   BIN.IMPRT;
-    L:       INTEGER;
-    delta:   INTEGER;
+    iproc:   BIN.IMPRT;
     L:       INTEGER;
-    i: INTEGER;
+    delta:   INTEGER;
-    File: FILE;
+    i: INTEGER;
     ImportTable: CHL.INTLIST;
     ILen, libcount, isize: INTEGER;
     icount, dcount, ccount: INTEGER;
     code: CHL.BYTELIST;
 BEGIN
     base := 0;
-    icount := CHL.Length(program.import);
+    icount := CHL.Length(program._import);
     dcount := CHL.Length(program.data);
     ccount := CHL.Length(program.code);
     text  := base + HEADER_SIZE;
-    data  := align(text + ccount, FileAlignment);
+    data  := WR.align(text + ccount, FileAlignment);
-    idata := align(data + dcount, FileAlignment);
+    idata := WR.align(data + dcount, FileAlignment);
     Import(program, idata, ImportTable, ILen, libcount, isize);
+    bss := WR.align(idata + isize, FileAlignment);
-    bss := align(idata + isize, FileAlignment);
     header.menuet01 := "MENUET01";
-    header.menuet01 := "MENUET01";
+    header.ver      :=  1;
-    header.ver      :=  1;
+    header.start    :=  text;
-    header.start    :=  text;
+    header.size     :=  idata + isize - base;
-    header.size     :=  idata + isize - base;
+    header.mem      :=  WR.align(header.size + program.stack + program.bss + PARAM_SIZE * 2 + 4096, FileAlignment);
-    header.mem      :=  align(header.size + program.stack + program.bss + PARAM_SIZE * 2 + 4096, FileAlignment);
+    header.sp       :=  base + header.mem - PARAM_SIZE * 2;
-    header.sp       :=  base + header.mem - PARAM_SIZE * 2;
+    header.param    :=  header.sp;
-    header.param    :=  header.sp;
+    header.path     :=  header.param + PARAM_SIZE;
     header.path     :=  header.param + PARAM_SIZE;
+    code := program.code;
-    code := program.code;
+    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;
-        L := BIN.get32le(code, reloc.offset);
+        L := BIN.get32le(code, offset);
-        delta := 3 - reloc.offset - text;
+        delta := 3 - offset - text;
         CASE reloc.opcode OF
         |BIN.RIMP:
               iproc := BIN.GetIProc(program, L);
-              BIN.put32le(code, reloc.offset, idata + iproc.label)
+              delta := idata + iproc.label
         |BIN.RBSS:
-        |BIN.RBSS:
+              delta := L + bss
-              BIN.put32le(code, reloc.offset, L + bss)
         |BIN.RDATA:
-        |BIN.RDATA:
+              delta := L + data
               BIN.put32le(code, reloc.offset, L + data)
+        |BIN.RCODE:
-        |BIN.RCODE:
+              delta := BIN.GetLabel(program, L) + text
-              BIN.put32le(code, reloc.offset, BIN.GetLabel(program, L) + text)
+        |BIN.PICDATA:
-        |BIN.PICDATA:
+              INC(delta, L + data)
-              BIN.put32le(code, reloc.offset, L + data + delta)
+        |BIN.PICCODE:
-        |BIN.PICCODE:
+              INC(delta, BIN.GetLabel(program, L) + text)
-              BIN.put32le(code, reloc.offset, BIN.GetLabel(program, L) + text + delta)
+        |BIN.PICBSS:
-        |BIN.PICBSS:
+              INC(delta, L + bss)
               BIN.put32le(code, reloc.offset, L + bss + delta)
+        |BIN.PICIMP:
-        |BIN.PICIMP:
+              iproc := BIN.GetIProc(program, L);
-              iproc := BIN.GetIProc(program, L);
+              INC(delta, idata + iproc.label)
-              BIN.put32le(code, reloc.offset, idata + iproc.label + delta)
         |BIN.IMPTAB:
-              BIN.put32le(code, reloc.offset, idata + delta)
+              INC(delta, idata)

Subversion Repositories Kolibri OS

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