Changeset d764ddc in mainline

Timestamp:

2006-03-16T12:12:58Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2ba7810

Parents:

b6b576c

Message:

update for the use of more init tasks

Location:

arch

Files:

• amd64/src/boot/boot.S (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)

arch/amd64/src/boot/boot.S

@@ -152 +152 @@
                 movl %ecx, e801memorysize
                 
-                bt $3, %eax                                                             # mbi->flags[3] (mods_count, mods_addr valid)   
+                bt $3, %eax                                                             # mbi->flags[3] (mods_count, mods_addr valid)
                 jc mods_valid
                         
                         xorl %ecx, %ecx
-                        xorl %edx, %edx
-                        jmp mods_invalid
+                        movl %ecx, init
+                        jmp mods_end
                 
                 mods_valid:
+                
+                xorq %rcx, %rcx
                 movl 20(%ebx), %ecx                                             # mbi->mods_count
+                movl %ecx, init
+                
                 cmpl $0, %ecx
-                je mods_invalid
-                
-                xorq %rdx, %rdx
-                movq %rdx, %rcx
+                je mods_end
+                
                 movl 24(%ebx), %esi                                             # mbi->mods_addr
-                movl 0(%esi), %edx                                              # mods->mod_start
-                movl 4(%esi), %ecx                                              # mods->mod_end
-                subl %edx, %ecx
-                addq $0xffffffff80000000, %rdx
-                
-                mods_invalid:
-#               movq %rcx, init_size
-#               movq %rdx, init_addr
+                movq $init, %rdi
+                
+                mods_loop:
+                        
+                        xorq %rdx, %rdx
+                        movl 0(%esi), %edx                                      # mods->mod_start
+                        addq $0xffffffff80000000, %rdx
+                        movq %rdx, 4(%rdi)
+                        
+                        xorq %rdx, %rdx
+                        movl 4(%esi), %edx
+                        subl 0(%esi), %edx                                      # mods->mod_end - mods->mod_start
+                        movq %rdx, 12(%rdi)
+                        
+                        addl $16, %esi
+                        addq $16, %rdi
+                        
+                        loop mods_loop
+                        
+                mods_end:
                 
                 bt $6, %eax                                                             # mbi->flags[6] (mmap_length, mmap_addr valid)  

arch/ia64/src/ia64.c

@@ -51 +51 @@
         ski_init_console();
         it_init();
-        config.init_addr = INIT_ADDRESS;
-        config.init_size = INIT_SIZE;
+        
+        /* Setup usermode */
+        init.cnt = 1;
+        init.tasks[0].addr = INIT_ADDRESS;
+        init.tasks[0].size = INIT_SIZE;
 }