diff options
| author | Frans Kaashoek <[email protected]> | 2011-08-08 13:30:08 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-08-08 13:30:08 -0400 |
| commit | a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2 (patch) | |
| tree | 9d049eae2080a7c330fb7ac3ec9ff6e557a310e4 /bootother.S | |
| parent | 11b7438b1046eecca6135b52ddbe686008099fa5 (diff) | |
| download | xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.gz xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.bz2 xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.zip | |
One definition of several macros and constants
Diffstat (limited to 'bootother.S')
| -rw-r--r-- | bootother.S | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/bootother.S b/bootother.S index 2c97207..7b0b815 100644 --- a/bootother.S +++ b/bootother.S @@ -1,6 +1,7 @@ #include "asm.h" #include "memlayout.h" - +#include "mmu.h" + # Each non-boot CPU ("AP") is started up in response to a STARTUP # IPI from the boot CPU. Section B.4.2 of the Multi-Processor # Specification says that the AP will start in real mode with CS:IP @@ -20,13 +21,6 @@ # - it uses the address at start-4 for the %esp # - it jumps to the address at start-8 instead of calling bootmain -#define SEG_KCODE 1 -#define SEG_KDATA 2 - -#define CR0_PE 1 - -#define RELOC1(x) ((x) + KERNBASE) // same as V2P, but without casts - .code16 .globl start start: @@ -56,10 +50,10 @@ start32: movw %ax, %gs # switch to the stack allocated by bootothers() - movl RELOC1(start-4), %esp + movl P2V_WO(start-4), %esp # call mpmain() - call *(RELOC1(start)-8) + call *(P2V_WO(start)-8) movw $0x8a00, %ax movw %ax, %dx |