Changeset f4a61ef in mainline

Timestamp:

2005-08-20T21:52:58Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3526da33

Parents:

b07769b6

Message:

Add type cast to address in vm_create().
This seems to fix the problem with userspace.
Looks like KA2PA() returned wrong address when applied on pte_t *.

Uncomment panic() in gp_fault().
Get rid of cli and sti in userspace code.

Files:

• arch/ia32/src/asm.S (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (1 diff)
• src/mm/vm.c (modified) (2 diffs)

arch/ia32/src/asm.S

@@ -380 +380 @@
         mov %ax,%gs;
 0:
-#       movl $0xdeadbeaf, %eax
-  int $48
-        cli;
-        sti;
+        int $48
         jmp 0b
         # not reached

arch/ia32/src/interrupt.c

@@ -83 +83 @@
         printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
         printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
-        //panic("general protection fault\n");
+        panic("general protection fault\n");
         stack[1]++;
 }

src/mm/vm.c

@@ -49 +49 @@
 {
         vm_t *m;
-        
+
         m = (vm_t *) malloc(sizeof(vm_t));
         if (m) {
@@ -59 +59 @@
                  * It is either passed one or it has to allocate and set one up.
                  */
-                if (!(m->ptl0 = ptl0)) {
+                m->ptl0 = ptl0;
+                if (!m->ptl0) {
                         pte_t *src_ptl0, *dst_ptl0;
                 
-                        src_ptl0 = (pte_t *) PA2KA(GET_PTL0_ADDRESS());
+                        src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
                         dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
-                        memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
-                        memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
-                        m->ptl0 = (pte_t *) KA2PA(dst_ptl0);
+//                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
+//                      memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
+                        memcopy(PA2KA((__address) GET_PTL0_ADDRESS()), (__address) dst_ptl0, PAGE_SIZE);
+                        m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
                 }
         }
-        
+
         return m;
 }