Changeset 7df54df in mainline

Timestamp:

2005-09-02T14:00:48Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

32f6e1bd

Parents:

73838ed

Message:

Fixed stack settings in boot.S in real mode.
Added ia32 memmap support.
Added cpuid support.

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/include/cpuid.h (added)
• arch/amd64/src/amd64.c (modified) (2 diffs)
• arch/amd64/src/asm_utils.S (modified) (1 diff)
• arch/amd64/src/boot/boot.S (modified) (3 diffs)
• arch/amd64/src/boot/memmap.S (deleted)
• arch/amd64/src/dummy.s (modified) (1 diff)
• arch/mips/include/debug.h (added)
• src/build.amd64 (modified) (1 diff)
• src/main/main.c (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -33 +33 @@
         arch/mm/tlb.c \
         arch/asm_utils.S \
-        arch/fmath.c
+        arch/fmath.c \
+        arch/mm/memory_init.c

arch/amd64/src/amd64.c

@@ -39 +39 @@
 
 #include <arch/bios/bios.h>
+#include <arch/mm/memory_init.h>
 
 void arch_pre_mm_init(void)
@@ -65 +66 @@
         }
 }
+
+void arch_late_init(void)
+{
+        if (config.cpu_active == 1) {
+                memory_print_map();
+                
+                #ifdef __SMP__
+                acpi_init();
+                #endif /* __SMP__ */
+        }
+}
+
+void calibrate_delay_loop(void)
+{
+        return;
+        i8254_calibrate_delay_loop();
+        i8254_normal_operation();
+}

arch/amd64/src/asm_utils.S

@@ -44 +44 @@
         movq $halt, (%rsp)
         jmp printf
+
+.global has_cpuid
+.global rdtsc
+
+
+## Determine CPUID support
+#
+# Return 0 in EAX if CPUID is not support, 1 if supported.
+#
+has_cpuid:
+        pushq %rbx
+        
+        pushfq                  # store flags
+        popq %rax               # read flags
+        movq %rax,%rbx          # copy flags
+        btcl $21,%ebx           # swap the ID bit
+        pushq %rbx
+        popfq                   # propagate the change into flags
+        pushfq
+        popq %rbx               # read flags    
+        andl $(1<<21),%eax      # interested only in ID bit
+        andl $(1<<21),%ebx
+        xorl %ebx,%eax          # 0 if not supported, 1 if supported
+        
+        popq %rbx
+        ret
+
+
+rdtsc:
+        xorq %rax,%rax
+        rdtsc
+        ret
+        
 
 # Push all general purpose registers on stack except %rbp, %rsp

arch/amd64/src/boot/boot.S

@@ -34 +34 @@
 
 #define START_STACK     0x7c00  
-#define START_STACK_64  $0xffffffff80007c00
+#define START_STACK_64  0xffffffff80007c00
                                         
 #
@@ -52 +52 @@
         movw %ax,%ds
         movw %ax,%ss            # initialize stack segment register
-        movl START_STACK,%esp   # initialize stack pointer
+        movl $(START_STACK),%esp        # initialize stack pointer
         
-#       call memmap_arch_init
+        call memmap_arch_init
         
         movl $0x80000000, %eax  
@@ -117 +117 @@
 .code64
 start64:
-        movq START_STACK_64, %rsp
+        movq $(START_STACK_64), %rsp
         
         call main_bsp   # never returns

arch/amd64/src/dummy.s

@@ -35 +35 @@
 .global cpu_sleep
 .global cpu_print_report
-.global arch_late_init
-.global calibrate_delay_loop
 .global dummy
-.global rdtsc
 .global reset_TS_flag
 .global fpu_init
         
-.global memory_print_map
-.global get_memory_size
-
-get_memory_size:
-        movq $4*1024*1024, %rax
-        ret
-
-rdtsc:
 before_thread_runs_arch:
 userspace:
-calibrate_delay_loop:
 cpu_identify:
 cpu_arch_init:
 cpu_sleep:
 cpu_print_report:
-arch_late_init:
-calibrate_delay_loop:
 reset_TS_flag:
 fpu_init:
-memory_print_map:       
         
 dummy:

src/build.amd64

@@ -5 +5 @@
 (cd ../arch/amd64/src;make gencontext;./gencontext)
 # Create links to ia32 architecture
-for a in drivers bios; do
-  ln -sf ../../ia32/src/$a ../arch/amd64/src/
-done
-for a in frame.c tlb.c; do
-  ln -sf ../../../ia32/src/mm/$a ../arch/amd64/src/mm
+
+(
+set -e
+cd ../arch
+for a in drivers bios mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S; do
+  echo ln -sf `pwd`/ia32/src/$a amd64/src/$a
+  ln -sf `pwd`/ia32/src/$a amd64/src/$a
 done
 
-for a in ega.h i8042.h i8259.h i8254.h cpuid.h interrupt.h bios; do
-  ln -sf ../../ia32/include/$a ../arch/amd64/include/
+for a in ega.h i8042.h i8259.h i8254.h interrupt.h bios mm/memory_init.h; do
+  echo ln -sf `pwd`/ia32/include/$a amd64/include/$a
+  ln -sf `pwd`/ia32/include/$a amd64/include/$a
 done
-ln -sf ../../../ia32/include/mm/memory_init.h ../arch/amd64/include/mm/
-
+)
 make dist-clean ARCH=ia32
 make all ARCH=amd64

src/main/main.c

@@ -187 +187 @@
                 panic("can't create kinit thread\n");
         thread_ready(t);
-
         /*
          * This call to scheduler() will return to kinit,