Skip to content

Instantly share code, notes, and snippets.

@puckipedia

puckipedia/wtf.diff Secret

Created July 16, 2014 13:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save puckipedia/29d6ba2ed370cc851b8d to your computer and use it in GitHub Desktop.
Save puckipedia/29d6ba2ed370cc851b8d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
wtf.diff
diff -ENwbur xnix/etc/blog.txt Hilix/etc/blog.txt
--- xnix/etc/blog.txt 2014-07-16 14:56:10.828271717 +0200
+++ Hilix/etc/blog.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,227 +0,0 @@
-00000000000i[ ] Bochs x86 Emulator 2.4.5
-00000000000i[ ] Build from CVS snapshot, on April 25, 2010
-00000000000i[ ] System configuration
-00000000000i[ ] processors: 1 (cores=1, HT threads=1)
-00000000000i[ ] A20 line support: yes
-00000000000i[ ] CPU configuration
-00000000000i[ ] level: 6
-00000000000i[ ] SMP support: no
-00000000000i[ ] APIC support: yes
-00000000000i[ ] FPU support: yes
-00000000000i[ ] MMX support: yes
-00000000000i[ ] 3dnow! support: no
-00000000000i[ ] SEP support: yes
-00000000000i[ ] SSE support: sse2
-00000000000i[ ] XSAVE support: no
-00000000000i[ ] AES support: no
-00000000000i[ ] MOVBE support: no
-00000000000i[ ] x86-64 support: yes
-00000000000i[ ] 1G paging support: no
-00000000000i[ ] MWAIT support: no
-00000000000i[ ] VMX support: no
-00000000000i[ ] Optimization configuration
-00000000000i[ ] RepeatSpeedups support: yes
-00000000000i[ ] Trace cache support: yes
-00000000000i[ ] Fast function calls: yes
-00000000000i[ ] Devices configuration
-00000000000i[ ] ACPI support: yes
-00000000000i[ ] NE2000 support: yes
-00000000000i[ ] PCI support: yes, enabled=yes
-00000000000i[ ] SB16 support: yes
-00000000000i[ ] USB support: yes
-00000000000i[ ] VGA extension support: vbe
-00000000000i[MEM0 ] allocated memory at 0x4155f008. after alignment, vector=0x41560000
-00000000000i[MEM0 ] 32.00MB
-00000000000i[MEM0 ] mem block size = 0x00100000, blocks=32
-00000000000i[MEM0 ] rom at 0xfffe0000/131072 ('/usr/share/bochs/BIOS-bochs-latest')
-00000000000i[MEM0 ] rom at 0xc0000/40448 ('/usr/share/bochs/VGABIOS-lgpl-latest')
-00000000000i[VTIME] using 'realtime pit' synchronization method
-00000000000i[ ] lt_dlhandle is 0xa42c240
-00000000000i[PLGIN] loaded plugin libbx_cmos.so
-00000000000i[ ] lt_dlhandle is 0xa42c760
-00000000000i[PLGIN] loaded plugin libbx_dma.so
-00000000000i[ ] lt_dlhandle is 0xa42ccc8
-00000000000i[PLGIN] loaded plugin libbx_pic.so
-00000000000i[ ] lt_dlhandle is 0xa42d278
-00000000000i[PLGIN] loaded plugin libbx_pit.so
-00000000000i[ ] lt_dlhandle is 0xa42d788
-00000000000i[PLGIN] loaded plugin libbx_vga.so
-00000000000i[ ] lt_dlhandle is 0xa42dd50
-00000000000i[PLGIN] loaded plugin libbx_floppy.so
-00000000000i[ ] lt_dlhandle is 0xa42e538
-00000000000i[PLGIN] loaded plugin libbx_pci.so
-00000000000i[ ] lt_dlhandle is 0xa42ec48
-00000000000i[PLGIN] loaded plugin libbx_pci2isa.so
-00000000000i[ ] lt_dlhandle is 0xa42f150
-00000000000i[PLGIN] loaded plugin libbx_unmapped.so
-00000000000i[ ] lt_dlhandle is 0xa42f768
-00000000000i[PLGIN] loaded plugin libbx_biosdev.so
-00000000000i[ ] lt_dlhandle is 0xa42fc38
-00000000000i[PLGIN] loaded plugin libbx_speaker.so
-00000000000i[ ] lt_dlhandle is 0xa430248
-00000000000i[PLGIN] loaded plugin libbx_extfpuirq.so
-00000000000i[ ] lt_dlhandle is 0xa430720
-00000000000i[PLGIN] loaded plugin libbx_gameport.so
-00000000000i[ ] lt_dlhandle is 0xa430c00
-00000000000i[PLGIN] loaded plugin libbx_pci_ide.so
-00000000000i[ ] lt_dlhandle is 0xa431100
-00000000000i[PLGIN] loaded plugin libbx_acpi.so
-00000000000i[ ] lt_dlhandle is 0xa431728
-00000000000i[PLGIN] loaded plugin libbx_ioapic.so
-00000000000i[ ] lt_dlhandle is 0xa431d30
-00000000000i[PLGIN] loaded plugin libbx_keyboard.so
-00000000000i[ ] lt_dlhandle is 0xa432308
-00000000000i[PLGIN] loaded plugin libbx_harddrv.so
-00000000000i[ ] lt_dlhandle is 0xa444098
-00000000000i[PLGIN] loaded plugin libbx_serial.so
-00000000000i[ ] lt_dlhandle is 0xa444ba8
-00000000000i[PLGIN] loaded plugin libbx_parallel.so
-00000000000i[CMOS ] Using local time for initial clock
-00000000000i[CMOS ] Setting initial clock to: Wed Jul 10 15:05:45 2013 (time0=1373483145)
-00000000000i[DMA ] channel 4 used by cascade
-00000000000i[DMA ] channel 2 used by Floppy Drive
-00000000000i[FDD ] fd0: '../build/floppy.img' ro=0, h=2,t=80,spt=18
-00000000000i[PCI ] 440FX Host bridge present at device 0, function 0
-00000000000i[PCI ] PIIX3 PCI-to-ISA bridge present at device 1, function 0
-00000000000i[VGA ] interval=50000
-00000000000i[MEM0 ] Register memory access handlers: 0x000a0000 - 0x000bffff
-00000000000i[MEM0 ] Register memory access handlers: 0xe0000000 - 0xe0ffffff
-00000000000i[VGA ] VBE Bochs Display Extension Enabled
-00000000000i[PLGIN] init_dev of 'unmapped' plugin device by virtual method
-00000000000i[PLGIN] init_dev of 'biosdev' plugin device by virtual method
-00000000000i[PLGIN] init_dev of 'speaker' plugin device by virtual method
-00000000000i[SPEAK] Failed to open /dev/console: Resource temporarily unavailable
-00000000000i[SPEAK] Deactivating beep on console
-00000000000i[PLGIN] init_dev of 'extfpuirq' plugin device by virtual method
-00000000000i[PLGIN] init_dev of 'gameport' plugin device by virtual method
-00000000000i[PLGIN] init_dev of 'pci_ide' plugin device by virtual method
-00000000000i[PCI ] PIIX3 PCI IDE controller present at device 1, function 1
-00000000000i[PLGIN] init_dev of 'acpi' plugin device by virtual method
-00000000000i[PCI ] ACPI Controller present at device 1, function 3
-00000000000i[PLGIN] init_dev of 'ioapic' plugin device by virtual method
-00000000000i[IOAP ] initializing I/O APIC
-00000000000i[MEM0 ] Register memory access handlers: 0xfec00000 - 0xfec00fff
-00000000000i[PLGIN] init_dev of 'keyboard' plugin device by virtual method
-00000000000i[KBD ] will paste characters every 1000 keyboard ticks
-00000000000i[PLGIN] init_dev of 'harddrv' plugin device by virtual method
-00000000000i[HD ] Using boot sequence floppy, none, none
-00000000000i[HD ] Floppy boot signature check is enabled
-00000000000i[PLGIN] init_dev of 'serial' plugin device by virtual method
-00000000000i[SER ] com1 at 0x03f8 irq 4
-00000000000i[PLGIN] init_dev of 'parallel' plugin device by virtual method
-00000000000i[PAR ] parallel port 1 at 0x0378 irq 7
-00000000000i[PLGIN] register state of 'unmapped' plugin device by virtual method
-00000000000i[PLGIN] register state of 'biosdev' plugin device by virtual method
-00000000000i[PLGIN] register state of 'speaker' plugin device by virtual method
-00000000000i[PLGIN] register state of 'extfpuirq' plugin device by virtual method
-00000000000i[PLGIN] register state of 'gameport' plugin device by virtual method
-00000000000i[PLGIN] register state of 'pci_ide' plugin device by virtual method
-00000000000i[PLGIN] register state of 'acpi' plugin device by virtual method
-00000000000i[PLGIN] register state of 'ioapic' plugin device by virtual method
-00000000000i[PLGIN] register state of 'keyboard' plugin device by virtual method
-00000000000i[PLGIN] register state of 'harddrv' plugin device by virtual method
-00000000000i[PLGIN] register state of 'serial' plugin device by virtual method
-00000000000i[PLGIN] register state of 'parallel' plugin device by virtual method
-00000000000i[SYS ] bx_pc_system_c::Reset(HARDWARE) called
-00000000000i[CPU0 ] cpu hardware reset
-00000000000i[APIC0] allocate APIC id=0 (MMIO enabled) to 0xfee00000
-00000000000i[CPU0 ] CPUID[0x00000000]: 00000003 756e6547 6c65746e 49656e69
-00000000000i[CPU0 ] CPUID[0x00000001]: 00000f20 00000800 00002000 078bfbff
-00000000000i[CPU0 ] CPUID[0x00000002]: 00410601 00000000 00000000 00000000
-00000000000i[CPU0 ] CPUID[0x00000003]: 00000000 00000000 00000000 00000000
-00000000000i[CPU0 ] CPUID[0x00000004]: 00000000 00000000 00000000 00000000
-00000000000i[CPU0 ] CPUID[0x80000000]: 80000008 00000000 00000000 00000000
-00000000000i[CPU0 ] CPUID[0x80000001]: 00000000 00000000 00000101 2a100800
-00000000000i[CPU0 ] CPUID[0x80000002]: 20202020 20202020 20202020 6e492020
-00000000000i[CPU0 ] CPUID[0x80000003]: 286c6574 50202952 69746e65 52286d75
-00000000000i[CPU0 ] CPUID[0x80000004]: 20342029 20555043 20202020 00202020
-00000000000i[CPU0 ] CPUID[0x80000006]: 00000000 42004200 02008140 00000000
-00000000000i[CPU0 ] CPUID[0x80000007]: 00000000 00000000 00000000 00000000
-00000000000i[CPU0 ] CPUID[0x80000008]: 00003020 00000000 00000000 00000000
-00000000000i[PLGIN] reset of 'unmapped' plugin device by virtual method
-00000000000i[PLGIN] reset of 'biosdev' plugin device by virtual method
-00000000000i[PLGIN] reset of 'speaker' plugin device by virtual method
-00000000000i[PLGIN] reset of 'extfpuirq' plugin device by virtual method
-00000000000i[PLGIN] reset of 'gameport' plugin device by virtual method
-00000000000i[PLGIN] reset of 'pci_ide' plugin device by virtual method
-00000000000i[PLGIN] reset of 'acpi' plugin device by virtual method
-00000000000i[PLGIN] reset of 'ioapic' plugin device by virtual method
-00000000000i[PLGIN] reset of 'keyboard' plugin device by virtual method
-00000000000i[PLGIN] reset of 'harddrv' plugin device by virtual method
-00000000000i[PLGIN] reset of 'serial' plugin device by virtual method
-00000000000i[PLGIN] reset of 'parallel' plugin device by virtual method
-00000003305i[BIOS ] $Revision: 1.247 $ $Date: 2010/04/04 19:33:50 $
-00000316446i[KBD ] reset-disable command received
-00000441532i[VBIOS] VGABios $Id: vgabios.c,v 1.69 2009/04/07 18:18:20 vruppert Exp $
-00000441603i[VGA ] VBE known Display Interface b0c0
-00000441635i[VGA ] VBE known Display Interface b0c5
-00000444560i[VBIOS] VBE Bios $Id: vbe.c,v 1.62 2009/01/25 15:46:25 vruppert Exp $
-00000762076i[BIOS ] Starting rombios32
-00000762556i[BIOS ] Shutdown flag 0
-00000763195i[BIOS ] ram_size=0x02000000
-00000763658i[BIOS ] ram_end=32MB
-00000778899i[BIOS ] Found 1 cpu(s)
-00000795075i[BIOS ] bios_table_addr: 0x000fbc18 end=0x000fcc00
-00000795178i[PCI ] 440FX PMC write to PAM register 59 (TLB Flush)
-00001122872i[PCI ] 440FX PMC write to PAM register 59 (TLB Flush)
-00001450802i[P2I ] PCI IRQ routing: PIRQA# set to 0x0b
-00001450823i[P2I ] PCI IRQ routing: PIRQB# set to 0x09
-00001450844i[P2I ] PCI IRQ routing: PIRQC# set to 0x0b
-00001450865i[P2I ] PCI IRQ routing: PIRQD# set to 0x09
-00001450875i[P2I ] write: ELCR2 = 0x0a
-00001451722i[BIOS ] PIIX3/PIIX4 init: elcr=00 0a
-00001459569i[BIOS ] PCI: bus=0 devfn=0x00: vendor_id=0x8086 device_id=0x1237 class=0x0600
-00001462025i[BIOS ] PCI: bus=0 devfn=0x08: vendor_id=0x8086 device_id=0x7000 class=0x0601
-00001464320i[BIOS ] PCI: bus=0 devfn=0x09: vendor_id=0x8086 device_id=0x7010 class=0x0101
-00001464555i[PIDE ] new BM-DMA address: 0xc000
-00001465222i[BIOS ] region 4: 0x0000c000
-00001467426i[BIOS ] PCI: bus=0 devfn=0x0b: vendor_id=0x8086 device_id=0x7113 class=0x0680
-00001467669i[ACPI ] new irq line = 11
-00001467681i[ACPI ] new irq line = 9
-00001467712i[ACPI ] new PM base address: 0xb000
-00001467726i[ACPI ] new SM base address: 0xb100
-00001467754i[PCI ] setting SMRAM control register to 0x4a
-00001631845i[CPU0 ] Enter to System Management Mode
-00001631855i[CPU0 ] RSM: Resuming from System Management Mode
-00001795873i[PCI ] setting SMRAM control register to 0x0a
-00001804743i[BIOS ] MP table addr=0x000fbcf0 MPC table addr=0x000fbc20 size=0xd0
-00001806610i[BIOS ] SMBIOS table addr=0x000fbd00
-00001809688i[BIOS ] Firmware waking vector 0x1ff00cc
-00001850671i[BIOS ] ACPI tables: RSDP addr=0x000fbe20 ACPI DATA addr=0x01ff0000 size=0x1f18
-00001850708i[PCI ] 440FX PMC write to PAM register 59 (TLB Flush)
-00001851500i[BIOS ] bios_table_cur_addr: 0x000fbe44
-00018556131i[BIOS ] Booting from 0000:7c00
-00020173894i[BIOS ] int13_harddisk: function 41, unmapped device for ELDL=80
-00020178671i[BIOS ] int13_harddisk: function 08, unmapped device for ELDL=80
-00020183324i[BIOS ] *** int 15h function AX=00c0, BX=0000 not yet supported!
-00042330500p[SDL ] >>PANIC<< User requested shutdown.
-00042330500i[CPU0 ] CPU is in protected mode (active)
-00042330500i[CPU0 ] CS.d_b = 32 bit
-00042330500i[CPU0 ] SS.d_b = 32 bit
-00042330500i[CPU0 ] EFER = 0x00000000
-00042330500i[CPU0 ] | RAX=00000000dfffffc8 RBX=000000000002d000
-00042330500i[CPU0 ] | RCX=000000000000000a RDX=00000000000b03d5
-00042330500i[CPU0 ] | RSP=00000000dfffffd8 RBP=00000000e0000014
-00042330500i[CPU0 ] | RSI=0000000000053ca2 RDI=0000000000053ca3
-00042330500i[CPU0 ] | R8=0000000000000000 R9=0000000000000000
-00042330500i[CPU0 ] | R10=0000000000000000 R11=0000000000000000
-00042330500i[CPU0 ] | R12=0000000000000000 R13=0000000000000000
-00042330500i[CPU0 ] | R14=0000000000000000 R15=0000000000000000
-00042330500i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df IF tf SF zf AF PF cf
-00042330500i[CPU0 ] | SEG selector base limit G D
-00042330500i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D
-00042330500i[CPU0 ] | CS:001b( 0003| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | DS:0023( 0004| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | SS:0023( 0004| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | ES:0023( 0004| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | FS:0023( 0004| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | GS:0023( 0004| 0| 3) 00000000 ffffffff 1 1
-00042330500i[CPU0 ] | MSR_FS_BASE:0000000000000000
-00042330500i[CPU0 ] | MSR_GS_BASE:0000000000000000
-00042330500i[CPU0 ] | RIP=00000000001044e1 (00000000001044e1)
-00042330500i[CPU0 ] | CR0=0xe0000011 CR2=0x0000000000000000
-00042330500i[CPU0 ] | CR3=0x001a2000 CR4=0x00000000
-00042330500i[CPU0 ] 0x00000000001044e1>> jmp .-2 (0x001044e1) : EBFE
-00042330500i[CMOS ] Last time is 1373483229 (Wed Jul 10 15:07:09 2013)
-00042330500i[ ] restoring default signal behavior
-00042330500i[CTRL ] quit_sim called with exit code 1
Binary files xnix/etc/floppy.img and Hilix/etc/floppy.img differ
diff -ENwbur xnix/etc/snapshot.txt Hilix/etc/snapshot.txt
--- xnix/etc/snapshot.txt 2014-07-16 14:56:10.844938865 +0200
+++ Hilix/etc/snapshot.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-xnix 0.0.1 (by Aaron Blakely)
-Installing handler: page fault handler
-Creating kernel heap...
-Multitasking enabled.
-Installing handler: syscall handler
-Attempting to switch to user mode.
-PANIC: Encountered unmaskable interrupt!
-
-
-Register states at interrupt:
- eax: ................. 0x103b37
- ebx: ................. 0x0
- ecx: ................. 0x0
- edx: ................. 0x80
- esp: ................. 0xa
- ebp: ................. 0xb03d5
- eip: ................. 0xdfffffb0
- cr0: ................. 0xe0000011
- cr3: ................. 0x1a3000
- Interrupt Number: .... 0x1b
- Error Code: .......... 0x282
- EFLAGS: .............. 0x123890ab
- User ESP: ............ 0xc0080ff4
-
-
diff -ENwbur xnix/Extras/tools/mkcrosscompiler.sh Hilix/Extras/tools/mkcrosscompiler.sh
--- xnix/Extras/tools/mkcrosscompiler.sh 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/Extras/tools/mkcrosscompiler.sh 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,62 @@
+#!/bin/bash
+# I can't do the manual thing
+#
+
+if [ `whoami` != "root" ]; then
+ echo "Error: Need to run as root."
+ exit
+fi
+
+GCCURLPH="http://ftp.tsukuba.wide.ad.jp/software/gcc/releases/gcc-4.9.0/gcc-4.9.0.tar.bz2"
+GCCURL="http://ftp.gnu.org/gnu/gcc/gcc-4.9.0/gcc-4.9.0.tar.bz2"
+BINUTILSURL="http://ftp.gnu.org/gnu/binutils/binutils-2.22.tar.gz"
+
+# By default this will install the cross compiler
+# and binutils to /usr/local/cross
+#
+PREFIX="/usr/local/cross"
+TARGET="i586-elf"
+
+# Downloading some stuff for the cross compiler
+cd /usr/src
+mkdir build-binutils build-gcc
+
+echo "Downloading gcc 4.9.0... :)"
+wget $GCCURLPH
+echo "Done! Downloading GCC 4.9.0"
+sleep 3s
+echo "Downloading Binutils 2.22"
+wget $BINUTILSURL
+
+echo "Extracting the DNA from the seeds."
+tar xvf `basename $BINUTILSURL`
+tar xvjf `basename $GCCURL`
+
+########################################################
+# Start the binutils install
+########################################################
+
+cd /usr/src/build-binutils
+/usr/src/`basename $BINUTILSURL .tar.gz`/configure --target=${TARGET} --prefix=${PREFIX} --disable-nls
+make all
+make install
+echo "Done installing binutils."
+
+#######################################################
+# Start the gcc install
+#######################################################
+
+cd /usr/src/build-gcc/
+export PATH=$PATH:$PREFIX/bin
+/usr/src/`basename $GCCURL .tar.bz2`/configure --target=${TARGET} --prefix=${PREFIX} --disable-nls --enable-languages=c,c++ --without-headers
+make all-gcc
+make install-gcc
+echo "Done installing gcc."
+
+
+echo "Your environment should now have a working i586-elf cross compiler tool chain!"
+echo 'But first, you need to do this:'
+echo ' export PATH=$PATH:/usr/local/cross/bin'
+echo " "
+echo "Also make sure you have a working nasm assembler."
+
diff -ENwbur xnix/Extras/tools/mkusb/mkusb.c Hilix/Extras/tools/mkusb/mkusb.c
--- xnix/Extras/tools/mkusb/mkusb.c 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/Extras/tools/mkusb/mkusb.c 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char *argv[])
+{
+ if (!argv[1]) {
+ printf("usage: %s <device>\n\n", argv[0]);
+ printf("NOTE: Don't run this on a partition. Use it on the device itself.\n");
+ printf("The AIX System is not responable for any damage done to your computer or storage devices\n");
+ printf("by incorrect usage of this tool.\n");
+ exit(-1);
+ }
+
+ printf("%s: Creating bootable USB of HiliX (device=%s)\n", argv[0], argv[1]);
+ printf("%s: Building the floppy image to the USB Stick.", argv[0]);
+ system("cd ..;make floppy");
+ char *syscmd;
+ sprintf(syscmd, "cd ..;dd if=build/kernel.bin of=%s", argv[1]);
+ printf("%s: Copying image to device with dd.", argv[0]);
+ system(syscmd);
+ printf("%s: Done.\n", argv[0]);
+ return 0;
+}
diff -ENwbur xnix/Extras/tools/mkusb/mkusb.txt Hilix/Extras/tools/mkusb/mkusb.txt
--- xnix/Extras/tools/mkusb/mkusb.txt 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/Extras/tools/mkusb/mkusb.txt 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,15 @@
+The tool (mkusb) is used for copying the floppy image
+to a usb drive.
+
+To build it use:
+ gcc -o mkusb mkusb.c
+
+Usage:
+ ./mkusb <device>
+
+Note:
+ Don't use it on a partition.
+ MAKE SURE YOUR DATA IS BACKED UP!
+ Don't use it on your system drive, unless you're in a live distro and
+ are wanting to install xnix (not sure why but...)
+
diff -ENwbur xnix/.git/config Hilix/.git/config
--- xnix/.git/config 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/config 2014-07-16 14:56:32.262223853 +0200
@@ -4,7 +4,7 @@
bare = false
logallrefupdates = true
[remote "origin"]
- url = https://github.com/ablakely/xnix.git
+ url = https://github.com/theclockknowsall/Hilix.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
Binary files xnix/.git/index and Hilix/.git/index differ
diff -ENwbur xnix/.git/logs/HEAD Hilix/.git/logs/HEAD
--- xnix/.git/logs/HEAD 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/logs/HEAD 2014-07-16 14:56:32.262223853 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 60b7885da8128204cfd1495a967881b04bda5452 Puck Meerburg <puck@puckipedia.nl> 1405515370 +0200 clone: from https://github.com/ablakely/xnix.git
+0000000000000000000000000000000000000000 dad4f5b55920846138e11957cf05cea907e355b2 Puck Meerburg <puck@puckipedia.nl> 1405515392 +0200 clone: from https://github.com/theclockknowsall/Hilix.git
diff -ENwbur xnix/.git/logs/refs/heads/master Hilix/.git/logs/refs/heads/master
--- xnix/.git/logs/refs/heads/master 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/logs/refs/heads/master 2014-07-16 14:56:32.262223853 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 60b7885da8128204cfd1495a967881b04bda5452 Puck Meerburg <puck@puckipedia.nl> 1405515370 +0200 clone: from https://github.com/ablakely/xnix.git
+0000000000000000000000000000000000000000 dad4f5b55920846138e11957cf05cea907e355b2 Puck Meerburg <puck@puckipedia.nl> 1405515392 +0200 clone: from https://github.com/theclockknowsall/Hilix.git
diff -ENwbur xnix/.git/logs/refs/remotes/origin/HEAD Hilix/.git/logs/refs/remotes/origin/HEAD
--- xnix/.git/logs/refs/remotes/origin/HEAD 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/logs/refs/remotes/origin/HEAD 2014-07-16 14:56:32.262223853 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 60b7885da8128204cfd1495a967881b04bda5452 Puck Meerburg <puck@puckipedia.nl> 1405515370 +0200 clone: from https://github.com/ablakely/xnix.git
+0000000000000000000000000000000000000000 dad4f5b55920846138e11957cf05cea907e355b2 Puck Meerburg <puck@puckipedia.nl> 1405515392 +0200 clone: from https://github.com/theclockknowsall/Hilix.git
Binary files xnix/.git/objects/pack/pack-4401053b270f79d9048b3936e450fdfa79433736.idx and Hilix/.git/objects/pack/pack-4401053b270f79d9048b3936e450fdfa79433736.idx differ
Binary files xnix/.git/objects/pack/pack-4401053b270f79d9048b3936e450fdfa79433736.pack and Hilix/.git/objects/pack/pack-4401053b270f79d9048b3936e450fdfa79433736.pack differ
Binary files xnix/.git/objects/pack/pack-979c9d0adbbc90e66f5d5f53f8b6cf13241acd40.idx and Hilix/.git/objects/pack/pack-979c9d0adbbc90e66f5d5f53f8b6cf13241acd40.idx differ
Binary files xnix/.git/objects/pack/pack-979c9d0adbbc90e66f5d5f53f8b6cf13241acd40.pack and Hilix/.git/objects/pack/pack-979c9d0adbbc90e66f5d5f53f8b6cf13241acd40.pack differ
diff -ENwbur xnix/.git/packed-refs Hilix/.git/packed-refs
--- xnix/.git/packed-refs 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/packed-refs 2014-07-16 14:56:32.262223853 +0200
@@ -1,2 +1,2 @@
# pack-refs with: peeled fully-peeled
-60b7885da8128204cfd1495a967881b04bda5452 refs/remotes/origin/master
+dad4f5b55920846138e11957cf05cea907e355b2 refs/remotes/origin/master
diff -ENwbur xnix/.git/refs/heads/master Hilix/.git/refs/heads/master
--- xnix/.git/refs/heads/master 2014-07-16 14:56:10.821604859 +0200
+++ Hilix/.git/refs/heads/master 2014-07-16 14:56:32.262223853 +0200
@@ -1 +1 @@
-60b7885da8128204cfd1495a967881b04bda5452
+dad4f5b55920846138e11957cf05cea907e355b2
diff -ENwbur xnix/.gitignore Hilix/.gitignore
--- xnix/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/.gitignore 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,23 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
diff -ENwbur xnix/initrd/mkinitrd.c Hilix/initrd/mkinitrd.c
--- xnix/initrd/mkinitrd.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/initrd/mkinitrd.c 2014-07-16 14:56:32.285557860 +0200
@@ -15,7 +15,7 @@
if (argc < 2)
{
fprintf(stderr, "usage: %s <local file> <remote file>\n", argv[0]);
- fprintf(stderr, "\nmkinitrd: Tool used for creating an init ramdisk image used for xnix.\n");
+ fprintf(stderr, "\nmkinitrd: Tool used for creating an init ramdisk image used for hilix.\n");
return -1;
}
diff -ENwbur xnix/initrd/README.md Hilix/initrd/README.md
--- xnix/initrd/README.md 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/initrd/README.md 2014-07-16 14:56:32.285557860 +0200
@@ -1,6 +1,6 @@
# mkinitrd
-Tool used for creating init ramdisk images that are used with the xnix kernel.
+Tool used for creating init ramdisk images that are used with the Hilix kernel.
### Building an Initrd Image
@@ -18,4 +18,4 @@
```make initrd``` to compile the image and copy it over to the build directory.
One all the previously mentioned steps have been taken you can build a new kernel image and be
-able to access your new initrd from Xnix itself.
+able to access your new initrd from Hilix itself.
diff -ENwbur xnix/kernel/boot/param_parser.c Hilix/kernel/boot/param_parser.c
--- xnix/kernel/boot/param_parser.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/boot/param_parser.c 2014-07-16 14:56:32.285557860 +0200
@@ -1,7 +1,6 @@
/*
* param_parser.c: Used for parsing boot paramaters passed by GRUB and other Multiboot bootloaders.
*
- * Written by Aaron Blakely <aaron@ephasic.org>
*/
#include "param_parser.h"
diff -ENwbur xnix/kernel/cpu/IA32/boot/prep/head.s Hilix/kernel/cpu/IA32/boot/prep/head.s
--- xnix/kernel/cpu/IA32/boot/prep/head.s 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/boot/prep/head.s 2014-07-16 14:56:32.288891290 +0200
@@ -1,7 +1,7 @@
-; xnix - boot code
+; hilix - boot code
; sets up memory and calls the kernel's main loop
;
-; Written by Aaron Blakely <aaron@ephasic.org>
+; Written by AIX Systems..Ltd
[GLOBAL start]
[EXTERN code]
@@ -34,15 +34,14 @@
section .text
[GLOBAL start]
-[EXTERN xnix_main]
+[EXTERN hilix_main]
start:
push esp
push ebx
cli
- call xnix_main ; Enter Night. Exit Light. Take my hand...
- ; Off to never-never land. Start the kernel.
+ call hilix_main ; Entering the Kernel..
cli ; disable interrupts
.hang:
diff -ENwbur xnix/kernel/cpu/IA32/descriptors.c Hilix/kernel/cpu/IA32/descriptors.c
--- xnix/kernel/cpu/IA32/descriptors.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/descriptors.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,12 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- * This is an abstraction layer built ontop of the code found in
- * idt/ and gdt/. -- See those.
- *
- */
-
#include <stdint.h>
#include "gdt/gdt.h"
#include "idt/idt.h"
diff -ENwbur xnix/kernel/cpu/IA32/gdt/gdt.c Hilix/kernel/cpu/IA32/gdt/gdt.c
--- xnix/kernel/cpu/IA32/gdt/gdt.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/gdt/gdt.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "gdt.h"
#include <iomem.h>
#include <stdint.h>
@@ -32,8 +26,8 @@
void gdt_install()
{
- printc("Installing ", BLACK, LIGHT_GREEN);
- printc("GDT\n", BLACK, LIGHT_RED);
+ printc("Installing ", BLACK, LIGHT_CYAN);
+ printc("GDT\n", BLACK, WHITE);
gp.limit = (sizeof(gdt_entry_t) * 6) - 1;
gp.base = (u32int)&gdt;
diff -ENwbur xnix/kernel/cpu/IA32/handlers.c Hilix/kernel/cpu/IA32/handlers.c
--- xnix/kernel/cpu/IA32/handlers.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/handlers.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "handlers.h"
#include <stdint.h>
#include <stdio.h>
@@ -24,7 +18,7 @@
void interrupt_install_handler(u8int n, isr_t handler, char *msg)
{
- printc("Installing handler: ", BLACK, LIGHT_GREEN);
+ printc("Installing Handler: ", BLACK, LIGHT_CYAN);
printf("%s\n", msg);
interrupt_handlers[n] = handler;
@@ -48,7 +42,7 @@
}
else
{
- panic("Encountered unmaskable interrupt!", &r);
+ panic("Encountered unfoundable interrupt!", &r);
}
}
}
diff -ENwbur xnix/kernel/cpu/IA32/idt/idt.c Hilix/kernel/cpu/IA32/idt/idt.c
--- xnix/kernel/cpu/IA32/idt/idt.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/idt/idt.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "idt.h"
#include <stdint.h>
#include <iomem.h>
@@ -27,8 +21,8 @@
void idt_install()
{
- printc("Installing ", BLACK, LIGHT_GREEN);
- printc("IDT\n", BLACK, LIGHT_RED);
+ printc("Installing ", BLACK, LIGHT_CYAN);
+ printc("IDT\n", BLACK, WHITE);
idtp.limit = (sizeof (struct idt_entry) * 256) - 1;
idtp.base = (u32int)&idt;
diff -ENwbur xnix/kernel/cpu/IA32/irqs/irqs.c Hilix/kernel/cpu/IA32/irqs/irqs.c
--- xnix/kernel/cpu/IA32/irqs/irqs.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/irqs/irqs.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a tiny play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "irqs.h"
#include <stdint.h>
#include <iomem.h>
@@ -15,8 +9,8 @@
void irq_install()
{
- printc("Installing ", BLACK, LIGHT_GREEN);
- printc("IRQs\n", BLACK, LIGHT_RED);
+ printc("Installing ", BLACK, LIGHT_CYAN);
+ printc("IRQs\n", BLACK, WHITE);
idt_set_gate(32, (u32int)irq0, 0x08, 0x8E);
idt_set_gate(33, (u32int)irq1, 0x08, 0x8E);
diff -ENwbur xnix/kernel/cpu/IA32/isrs/isrs.c Hilix/kernel/cpu/IA32/isrs/isrs.c
--- xnix/kernel/cpu/IA32/isrs/isrs.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/isrs/isrs.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a tiny play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "isrs.h"
#include <stdint.h>
#include <iomem.h>
@@ -30,8 +24,8 @@
void isrs_install()
{
- printc("Installing ", BLACK, LIGHT_GREEN);
- printc("ISRs\n", BLACK, LIGHT_RED);
+ printc("Installing ", BLACK, LIGHT_CYAN);
+ printc("ISRs\n", BLACK, WHITE);
irq_remap();
diff -ENwbur xnix/kernel/cpu/IA32/pic/pic.c Hilix/kernel/cpu/IA32/pic/pic.c
--- xnix/kernel/cpu/IA32/pic/pic.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/pic/pic.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "pic.h"
#include <iomem.h>
#include <cpu/IA32/IA32.h>
diff -ENwbur xnix/kernel/cpu/IA32/tss/tss.c Hilix/kernel/cpu/IA32/tss/tss.c
--- xnix/kernel/cpu/IA32/tss/tss.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/cpu/IA32/tss/tss.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "tss.h"
#include <iomem.h>
#include <stdint.h>
diff -ENwbur xnix/kernel/fs/fs.c Hilix/kernel/fs/fs.c
--- xnix/kernel/fs/fs.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/fs/fs.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "fs.h"
#include <stdint.h>
diff -ENwbur xnix/kernel/fs/initrd.c Hilix/kernel/fs/initrd.c
--- xnix/kernel/fs/initrd.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/fs/initrd.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "initrd.h"
#include "fs.h"
#include <stdint.h>
diff -ENwbur xnix/kernel/hilix.c Hilix/kernel/hilix.c
--- xnix/kernel/hilix.c 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/kernel/hilix.c 2014-07-16 14:56:32.288891290 +0200
@@ -0,0 +1,46 @@
+/*
+ * Hilix a simple kernel
+ * Created by AIX Systems Team..Ltd
+ *
+ */
+
+#include "hilix.h"
+
+#define halt() for(;;);
+extern u32int start_esp;
+
+int hilix_main(struct multiboot *mboot_ptr, u32int initial_stack)
+{
+ extern u32int placement_address;
+ int kernel_ticks = 0;
+ start_esp = initial_stack;
+
+
+ init_console();
+ print("HiliX 0.1.2 (by AIXEL Systems Team..Ltd)\n\n");
+
+ init_descriptors();
+
+ ASSERT(mboot_ptr->mods_count > 0);
+ u32int initrd_location = *((u32int*)mboot_ptr->mods_addr);
+ u32int initrd_end = *(u32int*)(mboot_ptr->mods_addr+4);
+
+ placement_address = initrd_end;
+
+ timer_install(50); // set the PIT to run at 50Hz.
+ keyboard_install(); // install the keboard
+
+ asm volatile("sti"); // re-enable interrupts
+
+ init_paging();
+ initialise_tasking();
+
+ fs_root = initialise_initrd(initrd_location);
+
+ init_syscalls();
+
+ switch_to_user_mode();
+
+ // loop forever to keep the system alive
+ for (;;);
+}
diff -ENwbur xnix/kernel/hilix.h Hilix/kernel/hilix.h
--- xnix/kernel/hilix.h 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/kernel/hilix.h 2014-07-16 14:56:32.288891290 +0200
@@ -0,0 +1,24 @@
+#ifndef XNIX_H
+
+#include <iomem.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <panic.h>
+#include <boot/multiboot.h>
+#include <boot/param_parser.h>
+#include <tty/console.h>
+#include <tty/spinner.h>
+#include <tty/colors.h>
+#include <cpu/IA32/IA32.h>
+#include <cpu/IA32/descriptors.h>
+#include <io/kb/kb.h>
+#include <io/pit/pit.h>
+#include <mem/paging.h>
+#include <mem/malloc.h>
+#include <fs/fs.h>
+#include <fs/initrd.h>
+#include <proc/task.h>
+#include <sys/callhandler.h>
+#include <io/rtc/rtc.h>
+
+#endif
diff -ENwbur xnix/kernel/io/iomem.c Hilix/kernel/io/iomem.c
--- xnix/kernel/io/iomem.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/io/iomem.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include <iomem.h>
#include <stdint.h>
diff -ENwbur xnix/kernel/io/kb/kb.c Hilix/kernel/io/kb/kb.c
--- xnix/kernel/io/kb/kb.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/io/kb/kb.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "kb.h"
#include "map.h"
#include "kbbuffer.h"
diff -ENwbur xnix/kernel/io/pit/pit.c Hilix/kernel/io/pit/pit.c
--- xnix/kernel/io/pit/pit.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/io/pit/pit.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "pit.h"
#include <iomem.h>
#include <stdio.h>
diff -ENwbur xnix/kernel/io/rtc/rtc.c Hilix/kernel/io/rtc/rtc.c
--- xnix/kernel/io/rtc/rtc.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/io/rtc/rtc.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,7 +1,7 @@
/*
* rtc.c: CMOS Real Time Clock driver
*
- * Written by Aaron Blakely <aaron@ephasic.org>
+ * Written by AIXE System..Ltd
*/
#include "rtc.h"
diff -ENwbur xnix/kernel/lib/panic.c Hilix/kernel/lib/panic.c
--- xnix/kernel/lib/panic.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/lib/panic.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "panic.h"
#include <iomem.h>
#include <stdio.h>
diff -ENwbur xnix/kernel/lib/stdio.c Hilix/kernel/lib/stdio.c
--- xnix/kernel/lib/stdio.c 2014-07-16 14:56:10.848272295 +0200
+++ Hilix/kernel/lib/stdio.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a tiny play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "stdint.h"
#include "stdio.h"
#include "stdlib.h"
diff -ENwbur xnix/kernel/lib/stdlib.c Hilix/kernel/lib/stdlib.c
--- xnix/kernel/lib/stdlib.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/lib/stdlib.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasoc.org>
- *
- */
-
#include "stdlib.h"
#include <stdint.h>
#include <stdio.h>
diff -ENwbur xnix/kernel/mem/heap.c Hilix/kernel/mem/heap.c
--- xnix/kernel/mem/heap.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/mem/heap.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "heap.h"
#include "ordered_array.h"
#include "malloc.h"
diff -ENwbur xnix/kernel/mem/malloc.c Hilix/kernel/mem/malloc.c
--- xnix/kernel/mem/malloc.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/mem/malloc.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "malloc.h"
#include "paging.h"
#include "heap.h"
diff -ENwbur xnix/kernel/mem/ordered_array.c Hilix/kernel/mem/ordered_array.c
--- xnix/kernel/mem/ordered_array.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/mem/ordered_array.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "ordered_array.h"
#include <stdint.h>
#include <iomem.h>
diff -ENwbur xnix/kernel/mem/paging.c Hilix/kernel/mem/paging.c
--- xnix/kernel/mem/paging.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/mem/paging.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "paging.h"
#include "heap.h"
#include "malloc.h"
diff -ENwbur xnix/kernel/proc/task.c Hilix/kernel/proc/task.c
--- xnix/kernel/proc/task.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/proc/task.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "task.h"
#include <mem/paging.h>
#include <mem/heap.h>
@@ -37,7 +31,7 @@
current_task->kernel_stack = xmalloc_a(KERNEL_STACK_SIZE);
asm volatile("sti");
- printf("Multitasking enabled.\n");
+ printf("Multitasking has enabled.\n");
}
int fork()
diff -ENwbur xnix/kernel/sys/callhandler.c Hilix/kernel/sys/callhandler.c
--- xnix/kernel/sys/callhandler.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/sys/callhandler.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "callhandler.h"
#include "stdint.h"
#include "stdio.h"
diff -ENwbur xnix/kernel/sys/syscall.c Hilix/kernel/sys/syscall.c
--- xnix/kernel/sys/syscall.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/sys/syscall.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,8 +1,3 @@
-/* syscall.c: System Call implementations
- *
- * Written by Aaron Blakely <aaron@ephasic.org>
- */
-
#include "callhandler.h"
#include "syscall.h"
#include <stdint.h>
diff -ENwbur xnix/kernel/tty/console.c Hilix/kernel/tty/console.c
--- xnix/kernel/tty/console.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/tty/console.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a tiny play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "console.h"
#include <tty/colors.h>
#include <tty/spinner.h>
diff -ENwbur xnix/kernel/tty/spinner.c Hilix/kernel/tty/spinner.c
--- xnix/kernel/tty/spinner.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/tty/spinner.c 2014-07-16 14:56:32.288891290 +0200
@@ -1,9 +1,3 @@
-/*
- * xnix: a small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
#include "spinner.h"
#include <stdio.h>
#include <stdint.h>
diff -ENwbur xnix/kernel/xnix.c Hilix/kernel/xnix.c
--- xnix/kernel/xnix.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/xnix.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-/*
- * xnix: small play kernel
- * Written by Aaron Blakely <aaron@ephasic.org>
- *
- */
-
-#include "xnix.h"
-
-#define halt() for(;;);
-extern u32int start_esp;
-
-int xnix_main(struct multiboot *mboot_ptr, u32int initial_stack)
-{
- extern u32int placement_address;
- int kernel_ticks = 0;
- start_esp = initial_stack;
-
-
- init_console();
- print("xnix 0.0.2 (by Aaron Blakely)\n\n");
-
- init_descriptors();
-
- ASSERT(mboot_ptr->mods_count > 0);
- u32int initrd_location = *((u32int*)mboot_ptr->mods_addr);
- u32int initrd_end = *(u32int*)(mboot_ptr->mods_addr+4);
-
- placement_address = initrd_end;
-
- timer_install(50); // set the PIT to run at 50Hz.
- keyboard_install(); // install the keboard
-
- asm volatile("sti"); // re-enable interrupts
-
- init_paging();
- initialise_tasking();
-
- fs_root = initialise_initrd(initrd_location);
-
- init_syscalls();
-
- switch_to_user_mode();
-
- // loop forever to keep the system alive
- for (;;);
-}
diff -ENwbur xnix/kernel/xnix.h Hilix/kernel/xnix.h
--- xnix/kernel/xnix.h 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/kernel/xnix.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#ifndef XNIX_H
-
-#include <iomem.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <panic.h>
-#include <boot/multiboot.h>
-#include <boot/param_parser.h>
-#include <tty/console.h>
-#include <tty/spinner.h>
-#include <tty/colors.h>
-#include <cpu/IA32/IA32.h>
-#include <cpu/IA32/descriptors.h>
-#include <io/kb/kb.h>
-#include <io/pit/pit.h>
-#include <mem/paging.h>
-#include <mem/malloc.h>
-#include <fs/fs.h>
-#include <fs/initrd.h>
-#include <proc/task.h>
-#include <sys/callhandler.h>
-#include <io/rtc/rtc.h>
-
-#endif
diff -ENwbur xnix/LICENSE Hilix/LICENSE
--- xnix/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/LICENSE 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ {one line to give the program's name and a brief idea of what it does.}
+ Copyright (C) {year} {name of author}
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ {project} Copyright (C) {year} {fullname}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff -ENwbur xnix/Makefile Hilix/Makefile
--- xnix/Makefile 2014-07-16 14:56:10.828271717 +0200
+++ Hilix/Makefile 2014-07-16 14:56:32.268890712 +0200
@@ -1,5 +1,3 @@
-# xnix makefile
-# Written by Aaron Blakely <aaron@ephasic.org>
CC = i586-elf-gcc
AS = nasm
@@ -16,7 +14,7 @@
@mkdir -p build
@mkdir -p build/objects
@echo "Compiling the kernel..."
- @$(CC) -m32 -c kernel/xnix.c $(CFLAGS) -o $(OBJDIR)/xnix.o
+ @$(CC) -m32 -c kernel/hilix.c $(CFLAGS) -o $(OBJDIR)/hilix.o
@$(CC) -m32 -c kernel/io/iomem.c $(CFLAGS) -o $(OBJDIR)/iomem.o
@$(CC) -m32 -c kernel/tty/console.c $(CFLAGS) -o $(OBJDIR)/xnixconsole.o
@$(CC) -m32 -c kernel/lib/stdio.c $(CFLAGS) -o $(OBJDIR)/stdio.o
@@ -45,7 +43,7 @@
@$(CC) -m32 -c kernel/io/rtc/rtc.c $(CFLAGS) -o $(OBJDIR)/rtc.o
# TODO: @$(CC) -m32 -c kernel/boot/param_parser.c $(CFLAGS) -o $(OBJDIR)/param_parser.o
- @echo "Running the assembler..."
+ @echo "Compiling the parts of the Assemblers."
@$(AS) $(ASFLAGS) kernel/cpu/IA32/boot/prep/head.s -o $(OBJDIR)/head.o
@$(AS) $(ASFLAGS) kernel/cpu/IA32/gdt/gdt.s -o $(OBJDIR)/gdtasm.o
@$(AS) $(ASFLAGS) kernel/cpu/IA32/idt/idt.s -o $(OBJDIR)/idtasm.o
@@ -58,6 +56,15 @@
@$(LK) $(LDFLAGS) -o build/kernel.bin $(OBJECTS)
@echo "Build succuessful: kernel=build/kernel.bin"
+help:
+ @echo "NOTE: HiliX is kernel that built mostly from scratch. Do not complain why the kernel has the same code to others."
+ @echo "List of commands for building the kernel"
+ @echo " "
+ @echo "make clean --- Cleaning the build files"
+ @echo "make floppy --- Making the floppy image"
+ @echo "make --- Making the kernel"
+ @echo "make github --- Upload your build to the repository"
+ @echo " "
github: all
@rm -rf build/kernel.bin
@@ -78,7 +85,9 @@
@sudo mount /dev/loop0 /mnt2
@sudo cp build/kernel.bin /mnt2/kernel
@sudo cp build/initrd.img /mnt2/initrd
+ @sleep 1
@sudo umount /dev/loop0
+ @sleep 1
@sudo /sbin/losetup -d /dev/loop0
@cp etc/floppy.img build/floppy.img
diff -ENwbur xnix/README Hilix/README
--- xnix/README 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/README 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,67 @@
+Welcome to the `` Hilix Kernel ``
+Authored by: Ian Sapelino
+Founder: Ian Sapelino
+
+
+
+
+
+What is Hilix Kernel?
+
+
+
+ The Hilix Kernel
+ Hilix Kernel(HLX) is a kernel that mean't to be a hobby kernel.
+ It is built "mostly" from scratch. Since 2014 Ian Sapelino wanted
+ to make an OS for his taste. He wanted to build something special
+ for just a hobby. He stop wasting his time from
+ playing games and stuff. So he took a pen and write some scripts
+ before he will do this kernel.
+
+
+
+What is the Hilix Kernel's License?
+
+ It's License
+ The Hilix Kernel use GNU/GPL v3 License for an Opensource software.
+
+
+How to make HiliX?
+
+ Making HiliX
+
+ Type . Extras/tools/mkcrosscompiler.sh to download the
+ compilers and utilities to build HiliX
+
+
+
+How Hilix was made?
+
+ How?
+ The Author of Hilix used Linux as his build environment.
+
+ Programming C, C++ and Assembler is my lifestyle.
+
+
+
+
+
+
+Where to join the AIXEL Team?
+
+ AIXEL TEAM
+ The AIXEL Team is currently recruiting members who are
+ willing to spend half of their time for HiliX.
+
+ I(Ian Sapelino) currently making a forums for developers
+ like you.
+
+
+
+Addons and New Features:
+
+Hilix 0.1.2:
+
+--- Added CMOS Drivers
+--- Added pipes
+
diff -ENwbur xnix/README.md Hilix/README.md
--- xnix/README.md 2014-07-16 14:56:10.828271717 +0200
+++ Hilix/README.md 2014-07-16 14:56:32.268890712 +0200
@@ -1,28 +1,80 @@
-# xnix
+Hilix
+=====
-A small micro-kernel for meant for learning. Might find some use for it one day.
-Written by Aaron Blakely <aaron@ephasic.org>
+ Welcome to the Hilix Kernel
+ Author: Ian Sapelino
+ Founder: Ian Sapelino
-## Cross-Compiler
+### Note:
-xnix builds with a i586 gcc cross compiler, if you don't have one just run tools/mkcrosscompiler.sh
+#### What is the term of Hilix?
+--------------------------
-## Building
+Hilix means Hilarious + Unix because I just made this kernel for just a hobby and I am so happy that I made it.
-*NOTE:* KVM/QUEMU support is dodgy. I recommend using bochs, or actual hardware.
+#### What is Hilix Kernel?
-You'll need to make an initrd, to do so compile tools/mkinitrd/mkinitrd.c and run it,
-then coppy the initrd.img file to the kernel dir.
-### Make Targets
-| Target | Descripton |
-|:---------|:-------------------------------------------|
-| default | Builds a kernel.bin binary. |
-| test | Builds and runs in KVM. |
-| floppy | Builds and creates floppy image. |
-| bochs | Creates floppy image and runs in bochs. |
+ The Hilix Kernel
+ Hilix Kernel(HLX) is a kernel that mean't to be a hobby kernel.
+ It is built "mostly" from scratch. Since 2014 Ian Sapelino wanted
+ to make an OS for his taste. He wanted to build something special
+ for just a hobby. He stop wasting his time from
+ playing games and stuff. So he took a pen and write some scripts
+ before he will do this kernel.
-## Support
-Hop in our IRC channel: irc.alphachat.net #ephasic
+
+#### What is the Hilix Kernel's License?
+
+ It's License
+ The Hilix Kernel use GNU/GPL v3 License for an Opensource software.
+
+
+#### How to make HiliX?
+
+ Making HiliX
+
+ Type . Extras/tools/mkcrosscompiler.sh to download the
+ compilers and utilities to build HiliX
+
+
+
+#### How Hilix was made?
+
+ How?
+ The Author of Hilix used Linux as his build environment.
+
+ Programming C, C++ and Assembler is my lifestyle.
+
+
+
+
+
+
+#### Where to join the AIXEL Team?
+
+ AIXEL TEAM
+ The AIXEL Team is currently recruiting members who are
+ willing to spend half of their time for HiliX.
+
+ I(Ian Sapelino) currently making a forums for developers
+ like you.
+
+
+
+### Third Party Softwares
+
+The Hilix kernel has third party softwares that use to make the kernel.
+Here are the list:
+
+ `gcc` -- GNU C and C++ Compiler
+ `binutils` -- Binutils
+
+
+### Addons and New Features:
+
+Hilix 0.1.2:
+--- Added CMOS Drivers
+--- Added pipes
diff -ENwbur xnix/TODO Hilix/TODO
--- xnix/TODO 1970-01-01 01:00:00.000000000 +0100
+++ Hilix/TODO 2014-07-16 14:56:32.268890712 +0200
@@ -0,0 +1,7 @@
+Future Plans:
+
+
+-- Virtual Directories
+-- User-Space
+-- Graphical User Interface
+-- Harddisk Filesystems(ext2 and FAT)
diff -ENwbur xnix/tools/mkcrosscompiler.sh Hilix/tools/mkcrosscompiler.sh
--- xnix/tools/mkcrosscompiler.sh 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/tools/mkcrosscompiler.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-#!/bin/bash
-# Because I am tired of doing this manually.
-#
-# Written by Aaron Blakely <aaron@ephasic.org>
-
-if [ `whoami` != "root" ]; then
- echo "Error: Need to run as root."
- exit
-fi
-
-GCCURL="http://ftp.gnu.org/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2"
-BINUTILSURL="http://ftp.gnu.org/gnu/binutils/binutils-2.22.tar.gz"
-
-# By default this will install the cross compiler
-# and binutils to /usr/local/cross
-#
-PREFIX="/usr/local/cross"
-TARGET="i586-elf"
-
-# Release teh dragons!
-cd /usr/src
-mkdir build-binutils build-gcc
-
-echo "Downloading gcc 4.2.1... :)"
-wget $GCCURL
-echo "Done! Now contacting the mothership..."
-sleep 3s
-echo "The mothership requires binutils. Downloading..."
-wget $BINUTILSURL
-
-echo "Extracting the DNA from the seeds."
-tar xvf `basename $BINUTILSURL`
-tar xvjf `basename $GCCURL`
-
-########################################################
-# Start the binutils install
-########################################################
-
-cd /usr/src/build-binutils
-/usr/src/`basename $BINUTILSURL .tar.gz`/configure --target=${TARGET} --prefix=${PREFIX} --disable-nls
-make all
-make install
-echo "Done installing binutils."
-
-#######################################################
-# Start the gcc install
-#######################################################
-
-cd /usr/src/build-gcc/
-export PATH=$PATH:$PREFIX/bin
-/usr/src/`basename $GCCURL .tar.bz2`/configure --target=${TARGET} --prefix=${PREFIX} --disable-nls --enable-languages=c,c++ --without-headers
-make all-gcc
-make install-gcc
-echo "Done installing gcc."
-
-######################################################
-
-echo "Your environment should now have a working i586-elf cross compiler tool chain!"
-echo 'But first, you need to do this:'
-echo ' export PATH=$PATH:/usr/local/cross/bin'
-echo " "
-echo "Also make sure you have a working nasm assembler."
-
diff -ENwbur xnix/tools/mkusb/mkusb.c Hilix/tools/mkusb/mkusb.c
--- xnix/tools/mkusb/mkusb.c 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/tools/mkusb/mkusb.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[])
-{
- if (!argv[1]) {
- printf("usage: %s <device>\n\n", argv[0]);
- printf("NOTE: Don't run this on a partition. Use it on the device itself.\n");
- printf("The xnix team is not responable for any damage done to your computer or storage devices\n");
- printf("by incorrect usage of this tool.\n");
- exit(-1);
- }
-
- printf("%s: creating bootable USB of xnix (device=%s)\n", argv[0], argv[1]);
- printf("%s: building the floppy image.", argv[0]);
- system("cd ..;make floppy");
- char *syscmd;
- sprintf(syscmd, "cd ..;dd if=build/kernel.bin of=%s", argv[1]);
- printf("%s: copying image to device with dd.", argv[0]);
- system(syscmd);
- printf("%s: done.\n", argv[0]);
- return 0;
-}
diff -ENwbur xnix/tools/mkusb/mkusb.txt Hilix/tools/mkusb/mkusb.txt
--- xnix/tools/mkusb/mkusb.txt 2014-07-16 14:56:10.851605724 +0200
+++ Hilix/tools/mkusb/mkusb.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-The tool (mkusb) is used for copying the floppy image
-to a usb drive.
-
-To build it use:
- gcc -o mkusb mkusb.c
-
-Usage:
- ./mkusb <device>
-
-Note:
- Don't use it on a partition.
- MAKE SURE YOUR DATA IS BACKED UP!
- Don't use it on your system drive, unless you're in a live distro and
- are wanting to install xnix (not sure why but...)
-
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment