Changeset e291e5d in mainline

Timestamp:

2005-08-31T12:27:26Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

94f0ae4

Parents:

8f91729

Message:

arch_pre_init_mm now working.

Files:

• arch/amd64/src/dummy.s (modified) (2 diffs)
• arch/amd64/src/pm.c (modified) (3 diffs)
• src/clean.amd64 (modified) (1 diff)

arch/amd64/src/dummy.s

@@ -58 +58 @@
 .global nm_fault
 .global ss_fault
-.global tss_p
 .global interrupt_handlers
 .global memcpy
@@ -67 +66 @@
 gp_fault:
 nm_fault:
-ss_fault:
-tss_p:  
-        
+ss_fault:       
 eoi_function:
 syscall:        

arch/amd64/src/pm.c

@@ -109 +109 @@
 };
 
-struct ptr_16_64 gdtr = {.limit = sizeof(gdtr), .base= (__u64) &gdtr };
+struct ptr_16_64 gdtr = {.limit = sizeof(gdtr), .base= (__u64)KA2PA(&gdt) };
 
 struct idescriptor idt[IDT_ITEMS];
 
 static struct tss tss;
+struct tss *tss_p = NULL;
 
 /* TODO: Does not compile correctly if it does not exist ???? */
@@ -217 +218 @@
 {
         struct descriptor *gdt_p = (struct descriptor *) PA2KA(gdtr.base);
-        struct tss_descriptor *tss_d;
+        struct tss_descriptor *tss_desc;
 
         /*
@@ -240 +241 @@
         tss_initialize(tss_p);
 
-        tss_d = (struct tss_descriptor *) &gdt_p[TSS_DES];
-        tss_d[TSS_DES].present = 1;
-        tss_d[TSS_DES].type = AR_TSS;
-        tss_d[TSS_DES].dpl = PL_KERNEL;
+        tss_desc = (struct tss_descriptor *) (&gdt_p[TSS_DES]);
+        tss_desc->present = 1;
+        tss_desc->type = AR_TSS;
+        tss_desc->dpl = PL_KERNEL;
         
         gdt_tss_setbase(&gdt_p[TSS_DES], (__address) tss_p);

src/clean.amd64

@@ -6 +6 @@
 find ../arch/amd64 -type l | xargs rm
 rm ../arch/amd64/src/context_offset.h
+rm ../arch/amd64/src/gencontext