Changeset 9d5e23c in mainline

Timestamp:

2005-12-07T23:52:25Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ac0cb2a

Parents:

f62355a

Message:

Fixed bug in Intel32/AMD64 boot, that could cause page fault on boot.
Fixes of configuration program.

Files:

• arch/amd64/src/mm/page.c (modified) (2 diffs)
• arch/ia32/include/mm/frame.h (modified) (1 diff)
• arch/ia32/src/mm/page.c (modified) (2 diffs)
• kernel.config (modified) (1 diff)
• tools/amd64/decpt.py (added)
• tools/config.py (modified) (4 diffs)

arch/amd64/src/mm/page.c

@@ -36 +36 @@
 #include <memstr.h>
 
-__address bootstrap_dba; 
+static __address bootstrap_dba; 
 
 void page_arch_init(void)
@@ -60 +60 @@
         }
         else {
-                /*
-                 * Application processors need to create their own view of the
-                 * virtual address space. Because of that, each AP copies
-                 * already-initialized paging information from the bootstrap
-                 * processor and adjusts it to fulfill its needs.
-                 */
-
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
-                memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
-                write_cr3(KA2PA(dba));
+                write_cr3(KA2PA(bootstrap_dba));
         }
 }

arch/ia32/include/mm/frame.h

@@ -34 +34 @@
 #define FRAME_SIZE      4096
 
-extern __address bootstrap_dba;
 extern __address last_frame;
 

arch/ia32/src/mm/page.c

@@ -41 +41 @@
 #include <print.h>
 
-__address bootstrap_dba; 
+static __address bootstrap_dba; 
 
 void page_arch_init(void)
@@ -64 +64 @@
         }
         else {
-                /*
-                 * Application processors need to create their own view of the
-                 * virtual address space. Because of that, each AP copies
-                 * already-initialized paging information from the bootstrap
-                 * processor and adjusts it to fulfill its needs.
-                 */
-
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
-                memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
-                write_cr3(KA2PA(dba));
+                write_cr3(KA2PA(bootstrap_dba));
         }
 

kernel.config

@@ -79 +79 @@
 @ [ARCH=ia32|ARCH=amd64] "fpu/fpu1" Intel fpu test 1
 @ [ARCH=ia32|ARCH=amd64] "fpu/sse1" Intel Sse test 1
-@ [ARCH=mips] "fpu/mips1" Mips FPU test 1
+@ [ARCH=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=msim4kc] "fpu/mips1" Mips FPU test 1
 @ "print/print1" Printf test 1
 @ "thread/trhead1" Thread test 1

tools/config.py

@@ -266 +266 @@
 def parse_config(input, output, dlg, defaults={}, askonly=None):
     "Parse configuration file and create Makefile.config on the fly"
-    def ask_the_question():
+    def ask_the_question(dialog):
         "Ask question based on the type of variables to ask"
         # This is quite a hack, this thingy is written just to
         # have access to local variables..
         if vartype == 'y/n':
-            return dlg.yesno(comment, default)
+            return dialog.yesno(comment, default)
         elif vartype == 'n/y':
-            return dlg.noyes(comment, default)
+            return dialog.noyes(comment, default)
         elif vartype == 'choice':
             defopt = None
@@ -281 +281 @@
                         defopt = i
                         break
-            return dlg.choice(comment, choices, defopt)
+            return dialog.choice(comment, choices, defopt)
         else:
             raise RuntimeError("Bad method: %s" % vartype)
@@ -317 +317 @@
                     if arg.startswith('$'):
                         args[i] = defaults[arg[1:]]
-
-                subc = os.popen(' '.join(args),'r')
-                data = subc.read().strip()
-                if subc.close():
+                data,status = commands.getstatusoutput(' '.join(args))
+                if status:
                     raise RuntimeError('Error running: %s' % ' '.join(args))
-                outf.write('%s = %s\n' % (varname,data))
+                outf.write('%s = %s\n' % (varname,data.strip()))
             continue
             
@@ -348 +346 @@
 
             if default is None or not askonly or askonly == varname:
-                default = ask_the_question()
+                default = ask_the_question(dlg)
+            else:
+                default = ask_the_question(DefaultDialog(dlg))
 
             outf.write('%s = %s\n' % (varname, default))