summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlmuHS <almuhs@github.com>2019-06-26 17:41:07 +0200
committerAlmuHS <almuhs@github.com>2019-06-26 17:41:07 +0200
commitaa45581182895936f5884cba18c5dafb1524b7b8 (patch)
treecf74062c47413d7507ac056cbf55be730dd5548c
parent3e0099cf424302a9d37051c9579bbe6ba6b0aaaf (diff)
experiment: hardcoded cr0
-rw-r--r--i386/i386/cpuboot.S5
-rw-r--r--kern/startup.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S
index d3a547ee..f0af9cf9 100644
--- a/i386/i386/cpuboot.S
+++ b/i386/i386/cpuboot.S
@@ -118,8 +118,9 @@ nopae:
* page-level write protection works in kernel mode.
*/
//set_cr0(get_cr0() | CR0_PG | CR0_WP);
- movl %cr0, %eax
- orl $(CR0_PG | CR0_WP), %eax
+ //movl %cr0, %eax
+ //orl $(CR0_PG | CR0_WP), %eax
+ movl $0x8001003b, %eax
movl %eax, %cr0
//set_cr0(get_cr0() & ~(CR0_CD | CR0_NW));
diff --git a/kern/startup.c b/kern/startup.c
index d87d7c9e..941f51ea 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -246,7 +246,7 @@ void start_kernel_threads(void)
*/
start_other_cpus();
- while(1);
+ //while(1);
#endif /* NCPUS > 1 */
/*