Changeset 283 for trunk

Timestamp:

Jul 27, 2017, 11:22:39 AM (7 years ago)

Author:

max@…

Message:

horror

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -290 +290 @@
                 }
 
-                smp_stkva = (vaddr_t)cpudata[i].boot_stack + STKSIZE;
+                smp_stkva = ((vaddr_t)&cpudata[i].boot_stack + STKSIZE) & ~0xF;
 
                 cpuN_booted = 0;
@@ -611 +611 @@
 
         /* tss->tss_rsp0 */
-        tss->tss_ist[0] = (uint64_t)data->intr_stack[lid] + STKSIZE;
-        tss->tss_ist[1] = (uint64_t)data->dbfl_stack[lid] + STKSIZE;
-        tss->tss_ist[2] = (uint64_t)data->nmfl_stack[lid] + STKSIZE;
+        tss->tss_ist[0] = ((uint64_t)&data->intr_stack + STKSIZE) & ~0xF;
+        tss->tss_ist[1] = ((uint64_t)&data->dbfl_stack + STKSIZE) & ~0xF;
+        tss->tss_ist[2] = ((uint64_t)&data->nmfl_stack + STKSIZE) & ~0xF;
         tss->tss_iobase = IOMAP_INVALOFF << 16;
         sel = tss_alloc(tss, lid);