diff options
| author | Miguel <m.i@gmx.at> | 2018-09-02 15:47:29 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-02 15:47:29 +0200 |
| commit | fd5a9b87e47bc072aa63fcaf5735232a37338303 (patch) | |
| tree | a4a15617e540af1f77a326875be84164043aa707 /asm | |
| parent | 300fb2f088d8530b630e01ef24ce032710a2f8b9 (diff) | |
cleanup filenames
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/gdt.s | 2 | ||||
| -rw-r--r-- | asm/int.s | 3 | ||||
| -rw-r--r-- | asm/mp.asm | 23 | ||||
| -rw-r--r-- | asm/mp.h | 3 | ||||
| -rw-r--r-- | asm/start.s | 3 | ||||
| -rw-r--r-- | asm/task.h | 1 |
6 files changed, 18 insertions, 17 deletions
@@ -39,6 +39,4 @@ asm_setup_gdt: ret - - ret @@ -61,8 +61,6 @@ pop %eax // load original .endm - - .macro intx ack num func /* @@ -174,4 +172,3 @@ exc15: excx exception_handle_15 exc16: excx exception_handle_16 exc17: excx exception_handle_17 exc18: excx exception_handle_18 - @@ -1,7 +1,8 @@ -global smp_go +global smp_start +extern smp_main ; master boot record for application processors ;[org 0x7000] -smp_go: +smp_start: [bits 16] cli ;switch off interrupts! @@ -34,15 +35,19 @@ init_pm: call boot_32_pm ;continue booting in 32-bit protected mode boot_32_pm: - - mov eax, 1 ; semaphore - xchg eax, [LLOCK] - cmp eax,1 hlt - je $ - jmp $ ; loop forever here + jmp boot_32_pm + + ;mov eax, 1 ; semaphore + ;xchg eax, [LLOCK] + ;cmp eax,1 + ;hlt + ;je $ + ;jmp $ ; loop forever here + + ;call [0x8010] ;kernel_ap ;jump into our Kernel! + call smp_main - call [0x8010] ;kernel_ap ;jump into our Kernel! jmp $ ; should never be reached @@ -1 +1,2 @@ -void smp_go(); +/** Application processors */ +void smp_start(); diff --git a/asm/start.s b/asm/start.s index 1d881b4..26464a7 100644 --- a/asm/start.s +++ b/asm/start.s @@ -19,8 +19,7 @@ .section .smp .code16 _start_smp: -jmp . -//call smp_go # TODO: align later before going C +call smp_start # TODO: align later before going C # Declare a header as in the Multiboot Standard. We put this into a special # section so we can force the header to be in the start of the final program. diff --git a/asm/task.h b/asm/task.h new file mode 100644 index 0000000..40a8c17 --- /dev/null +++ b/asm/task.h @@ -0,0 +1 @@ +/* empty */ |