Changeset 106

Timestamp:

Dec 10, 2003, 12:25:10 AM (21 years ago)

Author:

Gary Byers

Message:

Don't reference tlb_pointer until we're sure it's big enough.

File:

• trunk/ccl/lisp-kernel/spentry.s (modified) (7 diffs)

trunk/ccl/lisp-kernel/spentry.s

@@ -16 +16 @@
 */
 
-
+/*
+  $Log$
+  Revision 1.5  2003/12/10 08:25:10  gb
+  Don't reference tlb_pointer until we're sure it's big enough.
+
+*/       
         
         include(lisp.s)
@@ -4196 +4201 @@
         __(ldr(imm3,svar.idx(temp0)))
         __(ldr(imm0,tcr.tlb_limit(rcontext)))
-        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(cmpri(imm3,0))
         __(trlle(imm0,imm3))           /* tlb too small */
+        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
+        __(ldr(imm1,tcr.db_link(rcontext)))
         __(ldrx(temp1,imm2,imm3))
-        __(ldr(imm1,tcr.db_link(rcontext)))
         __(beq 9f)
         __(vpush(temp1))
@@ -4218 +4223 @@
         __(ldr(imm3,svar.idx(temp0)))
         __(ldr(imm0,tcr.tlb_limit(rcontext)))
-        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(cmpri(imm3,0))
         __(trlle(imm0,imm3))           /* tlb too small */
+        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
+        __(ldr(imm1,tcr.db_link(rcontext)))
         __(ldrx(temp1,imm2,imm3))
-        __(ldr(imm1,tcr.db_link(rcontext)))
         __(cmpri(cr1,temp1,no_thread_local_binding_marker))
         __(ldr(arg_y,svar.symbol(temp0)))
@@ -4246 +4251 @@
         __(ldr(imm0,tcr.tlb_limit(rcontext)))
         __(cmpri(imm3,0))
-        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(beq- 9f)
         __(trlle(imm0,imm3))           /* tlb too small */
+        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(ldrx(temp1,imm2,imm3))
         __(ldr(imm1,tcr.db_link(rcontext)))
@@ -4266 +4271 @@
         __(ldr(imm3,svar.idx(temp0)))
         __(ldr(imm0,tcr.tlb_limit(rcontext)))
-        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(cmpri(imm3,0))
         __(trlle(imm0,imm3))           /* tlb too small */
+        __(ldr(imm2,tcr.tlb_pointer(rcontext)))
         __(ldrx(temp1,imm2,imm3))
         __(ldr(imm1,tcr.db_link(rcontext)))
@@ -4403 +4408 @@
         __(mr temp4,arg_y)
         __(ldr(imm1,tcr.db_link(rcontext)))
-        __(ldr(imm4,tcr.tlb_pointer(rcontext)))
         __(ldr(imm3,tcr.tlb_limit(rcontext)))
 3:
@@ -4411 +4415 @@
         __(_cdr(temp4,temp4))
         __(trlle(imm3,imm0))
+        __(ldr(imm4,tcr.tlb_pointer(rcontext))) /* Need to reload after trap */
         __(ldrx(temp3,imm4,imm0))
         __(cmpri(cr0,temp4,nil_value))