[Minios-devel] [UNIKRAFT PATCH v3 01/12] arch/*: Add STACK_MASK_TOP bit mask

[Costin Lupu <costin.lupu@xxxxxxxxx>]

STACK_MASK_TOP is used for getting the current stack address (e.g. sp &
STACK_MASK_TOP).

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
Reviewed-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
---
 include/uk/arch/limits.h        | 2 ++
 lib/ukdebug/print.c             | 2 +-
 lib/uksched/include/uk/thread.h | 2 +-
 plat/xen/x86/arch_events.c      | 2 +-
 plat/xen/x86/entry64.S          | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/uk/arch/limits.h b/include/uk/arch/limits.h
index f1b58318..b11bf7d8 100644
--- a/include/uk/arch/limits.h
+++ b/include/uk/arch/limits.h
@@ -38,6 +38,8 @@
 
 #include <uk/asm/limits.h>
 
+#define STACK_MASK_TOP           (~(__STACK_SIZE - 1))
+
 #ifndef __ASSEMBLY__
 
 #include <uk/asm/intsizes.h>
diff --git a/lib/ukdebug/print.c b/lib/ukdebug/print.c
index 27f03cb9..9c70a81f 100644
--- a/lib/ukdebug/print.c
+++ b/lib/ukdebug/print.c
@@ -96,7 +96,7 @@ static void _print_stack(struct _vprint_console *cons)
        char buf[BUFLEN];
        int len;
 
-       stackb = (ukarch_read_sp() & ~(__STACK_SIZE - 1)) + __STACK_SIZE;
+       stackb = (ukarch_read_sp() & STACK_MASK_TOP) + __STACK_SIZE;
 
        len = snprintf(buf, BUFLEN, "<%p> ", (void *) stackb);
        cons->cout((char *)buf, len);
diff --git a/lib/uksched/include/uk/thread.h b/lib/uksched/include/uk/thread.h
index 4ffb0027..e66a05b5 100644
--- a/lib/uksched/include/uk/thread.h
+++ b/lib/uksched/include/uk/thread.h
@@ -70,7 +70,7 @@ struct uk_thread *uk_thread_current(void)
        struct uk_thread **current;
        unsigned long sp = ukarch_read_sp();
 
-       current = (struct uk_thread **) (sp & ~(__STACK_SIZE - 1));
+       current = (struct uk_thread **) (sp & STACK_MASK_TOP);
 
        return *current;
 }
diff --git a/plat/xen/x86/arch_events.c b/plat/xen/x86/arch_events.c
index 5b88065d..1e165c81 100644
--- a/plat/xen/x86/arch_events.c
+++ b/plat/xen/x86/arch_events.c
@@ -49,7 +49,7 @@ void arch_init_events(void)
        cpu0_pda.irqcount = -1;
        cpu0_pda.irqstackptr =
                        (void *) (((unsigned long)irqstack + 2 * STACK_SIZE)
-                       & ~(STACK_SIZE - 1));
+                       & STACK_MASK_TOP);
 #endif
 }
 
diff --git a/plat/xen/x86/entry64.S b/plat/xen/x86/entry64.S
index 65401968..d34181be 100644
--- a/plat/xen/x86/entry64.S
+++ b/plat/xen/x86/entry64.S
@@ -63,7 +63,7 @@ _libxenplat_start:
 #endif
        cld
        movq stack_start(%rip),%rsp
-       andq $(~(__STACK_SIZE-1)), %rsp
+       andq $STACK_MASK_TOP, %rsp
        movq %rsi, %r8 /* esi contains pointer to start_info page */
        /* We will work on cr0 and cr4 multiple times.
         * We put cr0 into rsi and cr4 into rdi, because cpuid and
-- 
2.11.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel