启动AP的代码里关于gdtr_base和ap_code32_entry_address的不再在汇编里算了，在移动这段代码后由复制程序调整

diff --git a/boot/ap_boot.S b/boot/ap_boot.S
index 3ab0af3593c71598b648ff1a446ec7bc566030e8..7c57109601cc47114a2d00d8913b72e593b0d24d 100644 (file)
--- a/boot/ap_boot.S
+++ b/boot/ap_boot.S
@@ -8,8 +8,6 @@
  */
 
 .code16
-#.text
-#.section .ap_boot, "ax", @progbits
 .global ap_boot_bgn
 .global ap_boot_end
 .align 0x1000
@@ -50,18 +48,6 @@ ap_real_mode_entry:
     movl    %ebx, %esp
     addl    $0x1000, %esp
 
-    # 算出gdt的线性地址
-    leal    (ap_gdt - ap_realmode_base)(%ebx), %eax
-    # 把这个地址填入gdtr的base位置
-    movl    %eax, (ap_gdtr_base - ap_realmode_base)
-
-
-    # 算出ap_code32_entry的线性地址
-    leal    (ap_code32_entry - ap_realmode_base)(%ebx), %eax
-    # 把这个地址填入ap_code32_entry_address
-    mov     %eax, (ap_code32_entry_address - ap_realmode_base)
-
-
     lgdt    ap_gdtr - ap_realmode_base
 
     # enable PE
@@ -137,17 +123,24 @@ ap_code32_real_entry:
 
 
 .align 32
-ap_code32_entry_address:    .long 0x00000000 # 等待动态写入
+.global ap_code32_entry_address
+ap_code32_entry_address:    .long ap_code32_entry - ap_realmode_base # 在BSP复制代码的时候会动态调整
                             .word 0x0008, 0x0000
 
+.align 32
+.global ap_gdtr_base
+ap_gdtr:
+    ap_gdtr_limit: .word ap_gdt_end-ap_gdt
+    ap_gdtr_base:  .long ap_gdt - ap_realmode_base # 在BSP复制代码的时候会动态调整
+
 .align 32
 ap_gdt:
 empty:     .long    0x00000000, 0x00000000
 code_desc: .long    0x0000FFFF, 0x00CF9B00
 data_desc: .long    0x0000FFFF, 0x00CF9300
+pad0:      .long    0x00000000, 0x00000000
+pad1:      .long    0x00000000, 0x00000000
+pad2:      .long    0x00000000, 0x00000000
 ap_gdt_end:
-ap_gdtr:
-    ap_gdtr_limit: .word ap_gdt_end-ap_gdt
-    ap_gdtr_base:  .long 0 # 等待动态写入
 
 ap_boot_end:

diff --git a/kernel/apic.c b/kernel/apic.c
index 3643db0088fef7151adc33c7beedf1cbea5de9da..0c92c8ebb28216b5ab0d1dba35dd377b7e01f0d9 100644 (file)
--- a/kernel/apic.c
+++ b/kernel/apic.c
@@ -372,10 +372,24 @@ void prepare_ap_code(paddr_t paddr) {
     extern char ap_boot_bgn;
     extern char ap_boot_end;
     uint32_t bytes = &ap_boot_end - &ap_boot_bgn;
-    // memcpy((void*)paddr, &ap_boot_bgn, bytes);
+
     for(int i=0; i<bytes; i++) {
         ((uint8_t*)paddr)[i] = ((uint8_t*)&ap_boot_bgn)[i];
     }
+
+    // 修正代码里跳入保护模式的地址和gdtr里的gdt的base地址
+    extern uint8_t ap_code32_entry_address;
+    extern uint8_t ap_gdtr_base;
+
+    uint32_t *dst = 0;
+
+    //
+    dst = (uint32_t *)(paddr + (uint32_t)(&ap_code32_entry_address) - (uint32_t)(&ap_boot_bgn));
+    (*dst) += (paddr - KERNEL_VADDR_BASE);
+
+    //
+    dst = (uint32_t *)(paddr + (uint32_t)(&ap_gdtr_base) - (uint32_t)(&ap_boot_bgn));
+    (*dst) += (paddr - KERNEL_VADDR_BASE);
 }
 
 void wakeup_ap(paddr_t paddr) {