Changeset 16

Timestamp:

03/12/08 21:07:23 (6 months ago)

Author:

mwhitworth

Message:

Fix linker problem.

Location:

Whitix/trunk

Files:

• Makefile (modified) (3 diffs)
• include/sys.h (modified) (1 diff)
• kernel/main.c (modified) (1 diff)
• memory/mmap.c (modified) (2 diffs)
• user/libc/Makefile (modified) (1 diff)
• user/linker/Linker (modified) (previous)
• user/linker/load_lib.c (modified) (3 diffs)

Whitix/trunk/Makefile

@@ -14 +14 @@
 export ARCH
 
+# All directories that are to be built or cleaned.
+SUBDIRS = arch/$(ARCH) devices fs kernel lib memory video user
+
 all: cd 
         mkdir -p CdRoot CdRoot/Applications CdRoot/Devices CdRoot/Mount CdRoot/System CdRoot/System/Include CdRoot/System/Runtime
-        make -C user
         make -C user install
         mkisofs -o cd.iso -b Boot/isoboot -no-emul-boot -c Boot/boot.cat -boot-load-size 4 -boot-info-table -iso-level 3 -l CdRoot
@@ -39 +41 @@
         mkisofs -o cd.iso -b Boot/isoboot -no-emul-boot -c Boot/boot.cat -boot-load-size 4 -boot-info-table -iso-level 3 -l CdRoot
 
-kern:
-        make -C arch/$(ARCH)
-        make -C devices
-        make -C fs
-        make -C kernel
-        make -C lib
-        make -C video
-        make -C memory
+kern: subdirs
         ld -M -T link.ld arch/$(ARCH)/boot/*.o arch/$(ARCH)/lib/*.o arch/$(ARCH)/kernel/*.o arch/$(ARCH)/mm/*.o devices/*.o devices/storage/*.o devices/storage/ata/*.o kernel/*.o video/*.o fs/*.o fs/isofs/*.o fs/vfs/*.o fs/fat/*.o fs/ext3/*.o lib/*.o memory/*.o -o kern > kernel.txt
 
-.PHONY: clean
+subdirs:
+        for dir in $(SUBDIRS); do \
+                $(MAKE) -C $$dir; \
+        done;
+
+$(SUBDIRS):
+        $(MAKE) -C $@
+
+.PHONY: subdirs $(SUBDIRS)
+
 clean:
         make -C arch/$(ARCH) clean
@@ -70 +74 @@
         @echo "clean - remove all intermediate files"
         @echo "See the readme file for more help"
+
+# Phony targets.
+.PHONY: clean help cd

Whitix/trunk/include/sys.h

@@ -57 +57 @@
 /* Memory calls */
 void* SysMoreCore(int len);
-int SysMemoryMap(DWORD address,DWORD length,int protection,int fd,DWORD offset,int flags);
+int SysMemoryMap(DWORD address, DWORD length, int protection, int fd, DWORD offset, int flags);
 int SysMemoryUnmap(DWORD address,DWORD length);
 

Whitix/trunk/kernel/main.c

@@ -16 +16 @@
  *
  */
+
+/* TODO: Fix cli(); hlt(); */
 
 #include <console.h>

Whitix/trunk/memory/mmap.c

@@ -599 +599 @@
         }else if (!vNode)
         {
-                int err=NameToVNode(&vNode,DEVICES_PATH "Zero",0);
-                if (err)
+                /* Map to the zero file, so we can use the existing infrastructure. */
+                if (NameToVNode(&vNode,DEVICES_PATH "Zero",0))
                         return 0;
         }
@@ -762 +762 @@
                 if (!(vNode=MMapGetVNode(fd)))
                         return 0;
-
+                        
         return MMapDo(current,vNode,PAGE_ALIGN(address),PAGE_ALIGN_UP(length),protection,offset,flags);
 }

Whitix/trunk/user/libc/Makefile

@@ -26 +26 @@
         make -C init clean
         make -C setjmp clean
-        rm *.so
+        rm *.so -f

Whitix/trunk/user/linker/load_lib.c

@@ -115 +115 @@
                                 elfProt|=2;
 
-                        if (loadAddr || !picLib)
+                        if (*loadAddr || !picLib)
                                 mmapFlags|=_SYS_MMAP_FIXED;
 
@@ -153 +153 @@
                                 /* Zero out the bss. */
                                 if (PAGE_OFFSET(elfBss) > 0)
-                                {
-                                        DWORD partSize=PAGE_OFFSET(pHeaders[i].memSize-pHeaders[i].fileSize);
-                                        link_memset((void*)(pHeaders[i].vAddr+pHeaders[i].fileSize), 0, partSize);
-                                }
+                                        link_memset((void*)(pHeaders[i].vAddr+pHeaders[i].fileSize), 0, PAGE_OFFSET(pHeaders[i].memSize-pHeaders[i].fileSize));
                         }
                 }
@@ -251 +248 @@
         }
 
-        DlCreateResolveEntry(name, pHeaders, fileHeader.phEntries, loadAddr, dynamicAddr, dynEntries);
+        entry=DlCreateResolveEntry(name, pHeaders, fileHeader.phEntries, loadAddr, dynamicAddr, dynEntries);
 
         /* Initialize the global offset table (GOT) */