X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fstart.asm;h=8b3e18c51d63d8391ad0a8402dd7ee3626a45ccc;hb=e29b02ca55d580b2f7f10d1093c3d6ad1bc59458;hp=b1884aeff516ee77c5d897a2a955ac35d8d35c4a;hpb=88ad2daf974ce4c4c770307546a9b4968c6183c2;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/start.asm b/Kernel/arch/x86/start.asm
index b1884aef..8b3e18c5 100644
--- a/Kernel/arch/x86/start.asm
+++ b/Kernel/arch/x86/start.asm
@@ -10,30 +10,30 @@ KERNEL_BASE	equ 0xC0000000
 [extern gKernelEnd]
 [section .multiboot]
 mboot:
-    ; Multiboot macros to make a few lines later more readable
-    MULTIBOOT_PAGE_ALIGN	equ 1<<0
-    MULTIBOOT_MEMORY_INFO	equ 1<<1
-    MULTIBOOT_HEADER_MAGIC	equ 0x1BADB002
-    MULTIBOOT_HEADER_FLAGS	equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO
-    MULTIBOOT_CHECKSUM	equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
+	; Multiboot macros to make a few lines later more readable
+	MULTIBOOT_PAGE_ALIGN	equ 1<<0
+	MULTIBOOT_MEMORY_INFO	equ 1<<1
+	MULTIBOOT_HEADER_MAGIC	equ 0x1BADB002
+	MULTIBOOT_HEADER_FLAGS	equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO
+	MULTIBOOT_CHECKSUM	equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
 	
-    ; This is the GRUB Multiboot header. A boot signature
-    dd MULTIBOOT_HEADER_MAGIC
-    dd MULTIBOOT_HEADER_FLAGS
-    dd MULTIBOOT_CHECKSUM
+	; This is the GRUB Multiboot header. A boot signature
+	dd MULTIBOOT_HEADER_MAGIC
+	dd MULTIBOOT_HEADER_FLAGS
+	dd MULTIBOOT_CHECKSUM
 	dd mboot - KERNEL_BASE	;Location of Multiboot Header
 	
 ; Multiboot 2 Header
 mboot2:
-    MULTIBOOT2_HEADER_MAGIC	equ 0xE85250D6
-    MULTIBOOT2_HEADER_ARCH	equ 0
-    MULTIBOOT2_HEADER_LENGTH	equ (mboot2_end-mboot2)
-    MULTIBOOT2_CHECKSUM	equ -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH + MULTIBOOT2_HEADER_LENGTH)
+	MULTIBOOT2_HEADER_MAGIC	equ 0xE85250D6
+	MULTIBOOT2_HEADER_ARCH	equ 0
+	MULTIBOOT2_HEADER_LENGTH	equ (mboot2_end-mboot2)
+	MULTIBOOT2_CHECKSUM	equ -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH + MULTIBOOT2_HEADER_LENGTH)
 	
-    dd MULTIBOOT2_HEADER_MAGIC
-    dd MULTIBOOT2_HEADER_ARCH
-    dd MULTIBOOT2_HEADER_LENGTH
-    dd MULTIBOOT2_CHECKSUM
+	dd MULTIBOOT2_HEADER_MAGIC
+	dd MULTIBOOT2_HEADER_ARCH
+	dd MULTIBOOT2_HEADER_LENGTH
+	dd MULTIBOOT2_CHECKSUM
 	; MBoot2 Address Header
 	dw	2, 0
 	dd	8 + 16
@@ -148,29 +148,24 @@ GetEIP:
 	mov eax, [esp]
 	ret
 
-[extern Proc_Clone]
-[extern Threads_Exit]
-[global SpawnTask]
-SpawnTask:
-	; Call Proc_Clone with Flags=0
-	xor eax, eax
-	push eax
+; int CallWithArgArray(void *Ptr, int NArgs, Uint *Args)
+; Call a function passing the array as arguments
+[global CallWithArgArray]
+CallWithArgArray:
+	push ebp
+	mov ebp, esp
+	mov ecx, [ebp+12]	; Get NArgs
+	mov edx, [ebp+16]
+
+.top:
+	mov eax, [edx+ecx*4-4]
 	push eax
-	call Proc_Clone
-	add esp, 8	; Remove arguments from stack
-	
-	test eax, eax
-	jnz .parent
-	
-	; In child, so now set up stack frame
-	mov ebx, [esp+4]	; Child Function
-	mov edx, [esp+8]	; Argument
-	; Child
-	push edx	; Argument
-	call ebx	; Function
-	call Threads_Exit	; Kill Thread
+	loop .top
 	
-.parent:
+	mov eax, [ebp+8]
+	call eax
+	lea esp, [ebp]
+	pop ebp
 	ret
 
 [section .initpd]