linksos-commit Mailing List for Links OS: Swift, Secure, Straightforward (Page 8)
Status: Inactive
Brought to you by:
terencevs
Menu
▾
▴
linksos-commit — Automatic CVS Commit Notifications
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(135) |
Feb
(3) |
Mar
(86) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ke...@to...> - 2003-01-03 23:35:12
|
Update of /cvsroot/linksos/linksos/hal/x86 In directory router-internal.tossell.net:/tmp/cvs-serv23684/hal/x86 Modified Files: Makefile Log Message: Title: Various Makefile patches Changes: Changed the makefile. duh Effects: Compiling for other... a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/hal/x86/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 3 Jan 2003 23:00:24 -0000 1.3 --- Makefile 3 Jan 2003 23:35:03 -0000 1.4 *************** *** 6,11 **** CFLAGS = $(INCDIRS) -Wall -O -fomit-frame-pointer -c -o ! hal: kstdio.o ! ld -r -o hal.o kstdio.o .c.o: --- 6,13 ---- CFLAGS = $(INCDIRS) -Wall -O -fomit-frame-pointer -c -o ! OBJS = kstdio.o ! ! hal.o: $(OBJS) ! ld -r -o hal.o $(OBJS) .c.o: |
|
From: <ke...@to...> - 2003-01-03 23:35:12
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv23684/main Modified Files: Makefile Log Message: Title: Various Makefile patches Changes: Changed the makefile. duh Effects: Compiling for other... a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 3 Jan 2003 23:10:07 -0000 1.10 --- Makefile 3 Jan 2003 23:35:04 -0000 1.11 *************** *** 8,12 **** .SUFFIXES: .asm ! main: start.o ld -r -o main.o $< --- 8,14 ---- .SUFFIXES: .asm ! OBJS = start.o start.o ! ! main.o: $(OBJS) ld -r -o main.o $< |
|
From: <ke...@to...> - 2003-01-03 23:10:12
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv23059/main Modified Files: Makefile Log Message: Title: .o missing Changes: added .o Effects: obj file will be written to a .o file a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 3 Jan 2003 23:06:18 -0000 1.9 --- Makefile 3 Jan 2003 23:10:07 -0000 1.10 *************** *** 9,13 **** main: start.o ! ld -r -o main $< .c.o: --- 9,13 ---- main: start.o ! ld -r -o main.o $< .c.o: |
|
From: <ke...@to...> - 2003-01-03 23:06:22
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv22867 Modified Files: Makefile Added Files: start.c Removed Files: main.c Log Message: Title: Naming conflict Changes: Conflicting main.o files. - main.o changed to start.o Effects: Should compile a=kennyt --- NEW FILE: start.c --- /****************************************************************************\ ** filename: main.c ** ** creation date: 11/29/2002, 0134 MST ** ** author: Charles Banas ** ** version: 0.01 ** ****************************************************************************** ** revision history: ** ** 11/29/2002 - 0134 MST - Charles Banas ** ** put something in main() just to make sure we get there. ** ** 12/22/2002 - 1132 MST - Charles Banas ** ** changed boot message. ** \****************************************************************************/ #include "kstdio.h" #include "multiboot.h" void cmain(unsigned long magic, multiboot_info_t addr) { if ( magic != MULTIBOOT_BOOTLOADER_MAGIC ) { kprintf("Invalid bootloader magic number\n"); return; } kprintf("\n\n\nLinksOS v0.0.1a kernel booted.\nI'll loop forever now.\n"); while(1); } Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 3 Jan 2003 23:00:24 -0000 1.8 --- Makefile 3 Jan 2003 23:06:18 -0000 1.9 *************** *** 8,13 **** .SUFFIXES: .asm ! main: main.o ! ld -r -o boot.o $< .c.o: --- 8,13 ---- .SUFFIXES: .asm ! main: start.o ! ld -r -o main $< .c.o: --- main.c DELETED --- |
|
From: <ke...@to...> - 2003-01-03 23:00:28
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv22600/main Modified Files: Makefile include.mk Log Message: Title: Include path fix Changes: -I is now added in the include.mk files, not in the Makefile Effects: We won't have to worry about stupid shells misbehaving. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 3 Jan 2003 22:53:49 -0000 1.7 --- Makefile 3 Jan 2003 23:00:24 -0000 1.8 *************** *** 4,8 **** include include.mk ! CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm --- 4,8 ---- include include.mk ! CFLAGS = $(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm Index: include.mk =================================================================== RCS file: /cvsroot/linksos/linksos/main/include.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** include.mk 3 Jan 2003 22:32:11 -0000 1.2 --- include.mk 3 Jan 2003 23:00:24 -0000 1.3 *************** *** 1 **** ! INCDIRS += {$(TOPDIR)hal/prototypes,$(TOPDIR)boot/$(ARCH)} \ No newline at end of file --- 1 ---- ! INCDIRS += -I$(TOPDIR)hal/prototypes -I$(TOPDIR)boot/$(ARCH) \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 23:00:28
|
Update of /cvsroot/linksos/linksos/hal/x86 In directory router-internal.tossell.net:/tmp/cvs-serv22600/hal/x86 Modified Files: Makefile Log Message: Title: Include path fix Changes: -I is now added in the include.mk files, not in the Makefile Effects: We won't have to worry about stupid shells misbehaving. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/hal/x86/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 3 Jan 2003 22:53:49 -0000 1.2 --- Makefile 3 Jan 2003 23:00:24 -0000 1.3 *************** *** 4,8 **** include ../include.mk ! CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o hal: kstdio.o --- 4,8 ---- include ../include.mk ! CFLAGS = $(INCDIRS) -Wall -O -fomit-frame-pointer -c -o hal: kstdio.o |
|
From: <ke...@to...> - 2003-01-03 23:00:28
|
Update of /cvsroot/linksos/linksos/hal In directory router-internal.tossell.net:/tmp/cvs-serv22600/hal Modified Files: include.mk Log Message: Title: Include path fix Changes: -I is now added in the include.mk files, not in the Makefile Effects: We won't have to worry about stupid shells misbehaving. a=kennyt Index: include.mk =================================================================== RCS file: /cvsroot/linksos/linksos/hal/include.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** include.mk 3 Jan 2003 21:24:34 -0000 1.1 --- include.mk 3 Jan 2003 23:00:23 -0000 1.2 *************** *** 1 **** ! INCDIRS += ../prototypes \ No newline at end of file --- 1 ---- ! INCDIRS += -I../prototypes \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 23:00:27
|
Update of /cvsroot/linksos/linksos/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv22600/boot/x86 Modified Files: Makefile Log Message: Title: Include path fix Changes: -I is now added in the include.mk files, not in the Makefile Effects: We won't have to worry about stupid shells misbehaving. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/boot/x86/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 3 Jan 2003 22:53:47 -0000 1.3 --- Makefile 3 Jan 2003 23:00:23 -0000 1.4 *************** *** 4,8 **** #include ../include.mk ! CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm --- 4,8 ---- #include ../include.mk ! CFLAGS = $(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm |
|
From: <ke...@to...> - 2003-01-03 22:55:45
|
Update of /cvsroot/linksos/linksos In directory router-internal.tossell.net:/tmp/cvs-serv22458 Modified Files: Makefile Log Message: Title: Main cleanup Changes: Added .bin to list of product files Effects: Will now remove kernel.bin a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 3 Jan 2003 22:53:45 -0000 1.5 --- Makefile 3 Jan 2003 22:55:41 -0000 1.6 *************** *** 10,14 **** clean: ! rm -f *.o *~ cd hal && make clean cd boot && make clean --- 10,14 ---- clean: ! rm -f *.o *~ *.bin cd hal && make clean cd boot && make clean |
|
From: <ke...@to...> - 2003-01-03 22:54:21
|
Update of /cvsroot/linksos/linksos/boot In directory router-internal.tossell.net:/tmp/cvs-serv22328/boot Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt |
|
From: <ke...@to...> - 2003-01-03 22:54:20
|
Update of /cvsroot/linksos/linksos In directory router-internal.tossell.net:/tmp/cvs-serv22328 Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 3 Jan 2003 22:32:10 -0000 1.4 --- Makefile 3 Jan 2003 22:53:45 -0000 1.5 *************** *** 8,9 **** --- 8,15 ---- cd main && make main $(LD) -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -Ttext 0x100000 + + clean: + rm -f *.o *~ + cd hal && make clean + cd boot && make clean + cd main && make clean \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 22:53:55
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv22328/main Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 3 Jan 2003 22:32:11 -0000 1.6 --- Makefile 3 Jan 2003 22:53:49 -0000 1.7 *************** *** 15,17 **** .asm.o: ! $(ASM) -f elf $< \ No newline at end of file --- 15,20 ---- .asm.o: ! $(ASM) -f elf $< ! ! clean: ! rm -f *.o *~ \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 22:53:55
|
Update of /cvsroot/linksos/linksos/hal/x86 In directory router-internal.tossell.net:/tmp/cvs-serv22328/hal/x86 Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/hal/x86/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 3 Jan 2003 21:24:34 -0000 1.1 --- Makefile 3 Jan 2003 22:53:49 -0000 1.2 *************** *** 10,12 **** .c.o: ! $(GCC) $(CFLAGS) $@ $< \ No newline at end of file --- 10,15 ---- .c.o: ! $(GCC) $(CFLAGS) $@ $< ! ! clean: ! rm -f *.o *~ \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 22:53:54
|
Update of /cvsroot/linksos/linksos/hal In directory router-internal.tossell.net:/tmp/cvs-serv22328/hal Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/hal/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 3 Jan 2003 21:24:34 -0000 1.2 --- Makefile 3 Jan 2003 22:53:48 -0000 1.3 *************** *** 15,16 **** --- 15,20 ---- hal-$(ARCH).o: cd $(ARCH) && make hal + + clean: + rm -f *.o *~ + cd $(ARCH) && make clean \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 22:53:53
|
Update of /cvsroot/linksos/linksos/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv22328/boot/x86 Modified Files: Makefile Log Message: Title: Cleanup Target Changes: Added the clean target. Effects: Clean up that code. a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/boot/x86/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 3 Jan 2003 22:32:10 -0000 1.2 --- Makefile 3 Jan 2003 22:53:47 -0000 1.3 *************** *** 13,16 **** --- 13,19 ---- ld -r -o boot.o $(OBJS) + clean: + rm -f *.o *~ + .c.o: $(GCC) $(CFLAGS) $@ $< |
|
From: <ke...@to...> - 2003-01-03 22:33:35
|
Update of /cvsroot/linksos/linksos/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv21516/boot/x86 Added Files: io.c io.h multiboot.S multiboot.h Log Message: Title: Multiboot and IO files Changes: Added the source code for multiboot and some i/o, which really should be in hal/ Effects: Multiboot works. a=kennyt --- NEW FILE: io.c --- #include "io.h" inline unsigned char inportb(unsigned int port) /* Input a byte from a port */ { unsigned char ret; asm volatile ("inb %%dx,%%al":"=a" (ret):"d" (port)); return ret; } inline void outportb(unsigned int port,unsigned char value) /* Output a byte to a port */ { asm volatile ("outb %%al,%%dx"::"d" (port), "a" (value)); } --- NEW FILE: io.h --- #ifndef _IO_H #define _IO_H inline unsigned char inportb(unsigned int port); inline void outportb(unsigned int port, unsigned char value); #endif --- NEW FILE: multiboot.S --- #define ASM 1 #include "multiboot.h" .text .globl start, _start start: _start: jmp multiboot_entry /* Align 32 bits boundary. */ .align 4 /* Multiboot header. */ multiboot_header: /* magic */ .long MULTIBOOT_HEADER_MAGIC /* flags */ .long MULTIBOOT_HEADER_FLAGS /* checksum */ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) #ifndef __ELF__ /* header_addr */ .long multiboot_header /* load_addr */ .long _start /* load_end_addr */ .long _edata /* bss_end_addr */ .long _end /* entry_addr */ .long multiboot_entry #endif /* ! __ELF__ */ multiboot_entry: /* Initialize the stack pointer. */ movl $(stack + STACK_SIZE), %esp /* Reset EFLAGS. */ pushl $0 popf /* Push the pointer to the Multiboot information structure. */ pushl %ebx /* Push the magic value. */ pushl %eax /* Now enter the C main function... */ call EXT_C(cmain) /* Halt. */ pushl $halt_message call EXT_C(kprintf) loop: hlt jmp loop halt_message: .asciz "Halted." /* Our stack area. */ .comm stack, STACK_SIZE --- NEW FILE: multiboot.h --- /* The magic number for the Multiboot header. */ #define MULTIBOOT_HEADER_MAGIC 0x1BADB002 /* The flags for the Multiboot header. */ #ifdef __ELF__ # define MULTIBOOT_HEADER_FLAGS 0x00000003 #else # define MULTIBOOT_HEADER_FLAGS 0x00010003 #endif /* The magic number passed by a Multiboot-compliant boot loader. */ #define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 /* The size of our stack (16KB). */ #define STACK_SIZE 0x4000 /* C symbol format. HAVE_ASM_USCORE is defined by configure. */ #ifdef HAVE_ASM_USCORE # define EXT_C(sym) _ ## sym #else # define EXT_C(sym) sym #endif #ifndef ASM /* Do not include here in boot.S. */ /* Types. */ /* The Multiboot header. */ typedef struct multiboot_header { unsigned long magic; unsigned long flags; unsigned long checksum; unsigned long header_addr; unsigned long load_addr; unsigned long load_end_addr; unsigned long bss_end_addr; unsigned long entry_addr; } multiboot_header_t; /* The symbol table for a.out. */ typedef struct aout_symbol_table { unsigned long tabsize; unsigned long strsize; unsigned long addr; unsigned long reserved; } aout_symbol_table_t; /* The section header table for ELF. */ typedef struct elf_section_header_table { unsigned long num; unsigned long size; unsigned long addr; unsigned long shndx; } elf_section_header_table_t; /* The Multiboot information. */ typedef struct multiboot_info { unsigned long flags; unsigned long mem_lower; unsigned long mem_upper; unsigned long boot_device; unsigned long cmdline; unsigned long mods_count; unsigned long mods_addr; union { aout_symbol_table_t aout_sym; elf_section_header_table_t elf_sec; } u; unsigned long mmap_length; unsigned long mmap_addr; } multiboot_info_t; /* The module structure. */ typedef struct module { unsigned long mod_start; unsigned long mod_end; unsigned long string; unsigned long reserved; } module_t; /* The memory map. Be careful that the offset 0 is base_addr_low but no size. */ typedef struct memory_map { unsigned long size; unsigned long base_addr_low; unsigned long base_addr_high; unsigned long length_low; unsigned long length_high; unsigned long type; } memory_map_t; #endif /* ! ASM */ |
|
From: <ke...@to...> - 2003-01-03 22:32:21
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv21406/main Modified Files: Makefile include.mk main.c Log Message: Title: Multiboot Changes: Added multiboot code (bgm's). Fixed makefiles (they need more work) - changed to GNU as, added more to main.c (notices and multiboot checks) Effects: You can boot from GRUB! a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 3 Jan 2003 21:47:38 -0000 1.5 --- Makefile 3 Jan 2003 22:32:11 -0000 1.6 *************** *** 8,12 **** .SUFFIXES: .asm ! boot: main.o ld -r -o boot.o $< --- 8,12 ---- .SUFFIXES: .asm ! main: main.o ld -r -o boot.o $< Index: include.mk =================================================================== RCS file: /cvsroot/linksos/linksos/main/include.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** include.mk 3 Jan 2003 21:47:38 -0000 1.1 --- include.mk 3 Jan 2003 22:32:11 -0000 1.2 *************** *** 1 **** ! INCDIRS += $(TOPDIR)/hal/prototypes \ No newline at end of file --- 1 ---- ! INCDIRS += {$(TOPDIR)hal/prototypes,$(TOPDIR)boot/$(ARCH)} \ No newline at end of file Index: main.c =================================================================== RCS file: /cvsroot/linksos/linksos/main/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 3 Jan 2003 21:47:38 -0000 1.3 --- main.c 3 Jan 2003 22:32:11 -0000 1.4 *************** *** 13,20 **** #include "kstdio.h" ! void main(void) ! { while(1); - kprintf("LinksOS v0.0.1a kernel booted."); } --- 13,24 ---- #include "kstdio.h" + #include "multiboot.h" ! void cmain(unsigned long magic, multiboot_info_t addr) { ! if ( magic != MULTIBOOT_BOOTLOADER_MAGIC ) { ! kprintf("Invalid bootloader magic number\n"); ! return; ! } ! kprintf("\n\n\nLinksOS v0.0.1a kernel booted.\nI'll loop forever now.\n"); while(1); } |
|
From: <ke...@to...> - 2003-01-03 22:32:21
|
Update of /cvsroot/linksos/linksos/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv21406/boot/x86 Modified Files: Makefile Log Message: Title: Multiboot Changes: Added multiboot code (bgm's). Fixed makefiles (they need more work) - changed to GNU as, added more to main.c (notices and multiboot checks) Effects: You can boot from GRUB! a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/boot/x86/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 3 Jan 2003 21:47:38 -0000 1.1 --- Makefile 3 Jan 2003 22:32:10 -0000 1.2 *************** *** 8,13 **** .SUFFIXES: .asm ! boot: strap.o ! ld -r -o boot.o $< .c.o: --- 8,15 ---- .SUFFIXES: .asm ! OBJS = io.o multiboot.o ! ! boot: $(OBJS) ! ld -r -o boot.o $(OBJS) .c.o: *************** *** 15,17 **** .asm.o: ! $(ASM) -f elf $< \ No newline at end of file --- 17,22 ---- .asm.o: ! $(ASM) -f elf $< ! ! .S.o: ! $(GCC) $(CFLAGS) $@ $< \ No newline at end of file |
|
From: <ke...@to...> - 2003-01-03 22:32:21
|
Update of /cvsroot/linksos/linksos In directory router-internal.tossell.net:/tmp/cvs-serv21406 Modified Files: Makefile machine.mk Log Message: Title: Multiboot Changes: Added multiboot code (bgm's). Fixed makefiles (they need more work) - changed to GNU as, added more to main.c (notices and multiboot checks) Effects: You can boot from GRUB! a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 3 Jan 2003 21:47:38 -0000 1.3 --- Makefile 3 Jan 2003 22:32:10 -0000 1.4 *************** *** 6,8 **** cd hal && make hal cd boot && make boot ! $(LD) -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -T main/kernel.ls --- 6,9 ---- cd hal && make hal cd boot && make boot ! cd main && make main ! $(LD) -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -Ttext 0x100000 Index: machine.mk =================================================================== RCS file: /cvsroot/linksos/linksos/machine.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** machine.mk 3 Jan 2003 21:47:38 -0000 1.2 --- machine.mk 3 Jan 2003 22:32:10 -0000 1.3 *************** *** 1,4 **** LD=ld GCC=gcc ! ASM=nasm ARCH=x86 --- 1,4 ---- LD=ld GCC=gcc ! ASM=as ARCH=x86 |
|
From: <ke...@to...> - 2003-01-03 21:47:46
|
Update of /cvsroot/linksos/linksos/main In directory router-internal.tossell.net:/tmp/cvs-serv20371/main Modified Files: Makefile main.c Added Files: include.mk Log Message: Title: More build system Changes: added root makefile and machine definition file; main makefile. added boot/ makefiles and the main/ include def file. (this should be globalized.) Changed main.c to include using the predefined path. Effects: It builds (yes, it is the old code and it might not even be the right format, so what?) a=kennyt --- NEW FILE: include.mk --- INCDIRS += $(TOPDIR)/hal/prototypes Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 28 Dec 2002 21:23:25 -0000 1.4 --- Makefile 3 Jan 2003 21:47:38 -0000 1.5 *************** *** 1,42 **** ! #No comment ! ! # Programs to delete and copy files with ! RM = rm -f ! ! # The C compiler ! GCC = gcc ! ! #The assembler ! ASM = nasm ! ! # The linker ! LD = ld ! ! # The kernel filename ! KERNELFN = kernel.bin ! ! # The object files ! OBJS = kstdio.o main.o strap.o ! #Compiler parameters ! CFLAGS = -I$(INCLUDE) -Wall -O -fomit-frame-pointer -c -o ! ASMFLAGS = -f elf .SUFFIXES: .asm ! ALL: $(KERNELFN) ! ! $(KERNELFN): $(OBJS) ! $(LD) -Bstatic -o $(KERNELFN) $(OBJS) -Map kernel.map -T kernel.ls .c.o: ! $(CC) $(CFLAGS) $@ $< ! ! .asm.o: ! $(ASM) $(ASMFLAGS) $< ! ! clean: ! $(RM) $(KERNELFN) *~ kernel.map *.o ! --- 1,17 ---- ! TOPDIR = ../ ! include $(TOPDIR)/machine.mk ! include include.mk + CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm ! boot: main.o ! ld -r -o boot.o $< .c.o: ! $(GCC) $(CFLAGS) $@ $< + .asm.o: + $(ASM) -f elf $< \ No newline at end of file Index: main.c =================================================================== RCS file: /cvsroot/linksos/linksos/main/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.c 28 Dec 2002 16:53:16 -0000 1.2 --- main.c 3 Jan 2003 21:47:38 -0000 1.3 *************** *** 12,16 **** \****************************************************************************/ ! #include "include/kstdio.h" void main(void) --- 12,16 ---- \****************************************************************************/ ! #include "kstdio.h" void main(void) |
|
From: <ke...@to...> - 2003-01-03 21:47:46
|
Update of /cvsroot/linksos/linksos In directory router-internal.tossell.net:/tmp/cvs-serv20371 Modified Files: Makefile machine.mk Log Message: Title: More build system Changes: added root makefile and machine definition file; main makefile. added boot/ makefiles and the main/ include def file. (this should be globalized.) Changed main.c to include using the predefined path. Effects: It builds (yes, it is the old code and it might not even be the right format, so what?) a=kennyt Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 17 Nov 2002 07:45:48 -0000 1.2 --- Makefile 3 Jan 2003 21:47:38 -0000 1.3 *************** *** 1,2 **** ! #The main Makefile goes here ! # --- 1,8 ---- ! include machine.mk ! ! all: kernel ! ! kernel: ! cd hal && make hal ! cd boot && make boot ! $(LD) -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -T main/kernel.ls Index: machine.mk =================================================================== RCS file: /cvsroot/linksos/linksos/machine.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** machine.mk 3 Jan 2003 21:26:34 -0000 1.1 --- machine.mk 3 Jan 2003 21:47:38 -0000 1.2 *************** *** 1,2 **** --- 1,4 ---- + LD=ld GCC=gcc + ASM=nasm ARCH=x86 |
|
From: <ke...@to...> - 2003-01-03 21:47:46
|
Update of /cvsroot/linksos/linksos/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv20371/boot/x86 Added Files: Makefile Log Message: Title: More build system Changes: added root makefile and machine definition file; main makefile. added boot/ makefiles and the main/ include def file. (this should be globalized.) Changed main.c to include using the predefined path. Effects: It builds (yes, it is the old code and it might not even be the right format, so what?) a=kennyt --- NEW FILE: Makefile --- TOPDIR = ../../ include $(TOPDIR)/machine.mk #include ../include.mk CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o .SUFFIXES: .asm boot: strap.o ld -r -o boot.o $< .c.o: $(GCC) $(CFLAGS) $@ $< .asm.o: $(ASM) -f elf $< |
|
From: <ke...@to...> - 2003-01-03 21:47:46
|
Update of /cvsroot/linksos/linksos/boot In directory router-internal.tossell.net:/tmp/cvs-serv20371/boot Added Files: Makefile Log Message: Title: More build system Changes: added root makefile and machine definition file; main makefile. added boot/ makefiles and the main/ include def file. (this should be globalized.) Changed main.c to include using the predefined path. Effects: It builds (yes, it is the old code and it might not even be the right format, so what?) a=kennyt --- NEW FILE: Makefile --- TOPDIR = ../ include $(TOPDIR)/machine.mk boot: boot-$(ARCH).o rm -f boot.o cp $(ARCH)/boot.o ./ boot-$(ARCH).o: cd $(ARCH) && make boot |
|
From: <ke...@to...> - 2003-01-03 21:26:39
|
Update of /cvsroot/linksos/linksos In directory router-internal.tossell.net:/tmp/cvs-serv19836 Added Files: machine.mk Log Message: Title: machine.mk Changes: machine makefile for architecture and tools definitions Effects: centralizing data... a=kennyt --- NEW FILE: machine.mk --- GCC=gcc ARCH=x86 |
|
From: <ke...@to...> - 2003-01-03 21:24:39
|
Update of /cvsroot/linksos/linksos/hal/x86 In directory router-internal.tossell.net:/tmp/cvs-serv19726/x86 Modified Files: kstdio.c Added Files: Makefile Log Message: Title: Basic HAL layout Changes: Added the new makefile and kstdio.c. Added x86 makefile and include.mk makefile include. Effects: kprintf should be ready to link into the kernel... once the kernel is ready to be linked :P a=kennyt --- NEW FILE: Makefile --- TOPDIR = ../../ include $(TOPDIR)/machine.mk include ../include.mk CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o hal: kstdio.o ld -r -o hal.o kstdio.o .c.o: $(GCC) $(CFLAGS) $@ $< Index: kstdio.c =================================================================== RCS file: /cvsroot/linksos/linksos/hal/x86/kstdio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kstdio.c 3 Jan 2003 20:22:27 -0000 1.1 --- kstdio.c 3 Jan 2003 21:24:34 -0000 1.2 *************** *** 10,17 **** \****************************************************************************/ ! #include "include/kstdio.h" ! typedef unsigned char u_char; /* this needs to be moved to a "types" ! header file. */ void kprintf(char* text) --- 10,17 ---- \****************************************************************************/ ! #include "kstdio.h" ! typedef unsigned char u_char; ! /* this needs to be moved to a "types" header file. */ void kprintf(char* text) |
