X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Fthreads%2Floader.S;h=c60e8dd6bd3347551b30f727617b113b88494388;hp=18086ede8993c44805e6ebe742c64bd2cdc5c524;hb=44d0fa6a2b24a84e5eb0d54959ed91c1d4f15343;hpb=4ba2bcacdde59e70754df916dcee39e45d564441

diff --git a/src/threads/loader.S b/src/threads/loader.S
index 18086ed..c60e8dd 100644
--- a/src/threads/loader.S
+++ b/src/threads/loader.S
@@ -153,6 +153,13 @@ read_sector:
 	movl %eax, %cr0
 	jmp 1f
 1:
+
+##### Turn on EM bit in CR0, forcing most floating-point instructions
+##### to trap.  We don't support floating-point or MMX.
+
+	movl %cr0, %eax
+	orl $CR0_EM, %eax
+	movl %eax, %cr0
 	
 ##### Jump to kernel entry point.