Merge branch 'master' into patch-axel-1

seL4 · Jun 27, 2023 · 093b61b · 093b61b
2 parents 95ff43e + b7bce1f
commit 093b61b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/apps/sel4test-tests/src/tests/faults.c b/apps/sel4test-tests/src/tests/faults.c
@@ -86,11 +86,11 @@ do_read_fault(void)
     );
 #elif defined(CONFIG_ARCH_AARCH64)
     asm volatile(
-        "mov x0, %[val]\n\t"
+        "mov w0, %w[val]\n\t"
         "read_fault_address:\n\t"
         "ldr x0, [%[addrreg]]\n\t"
         "read_fault_restart_address:\n\t"
-        "mov %[val], x0\n\t"
+        "mov %w[val], w0\n\t"
         : [val] "+r"(val)
         : [addrreg] "r"(x)
         : "x0"
@@ -144,11 +144,11 @@ do_write_fault(void)
     );
 #elif defined(CONFIG_ARCH_AARCH64)
     asm volatile(
-        "mov x0, %[val]\n\t"
+        "mov w0, %w[val]\n\t"
         "write_fault_address:\n\t"
         "str x0, [%[addrreg]]\n\t"
         "write_fault_restart_address:\n\t"
-        "mov %[val], x0\n\t"
+        "mov %w[val], w0\n\t"
         : [val] "+r"(val)
         : [addrreg] "r"(x)
         : "x0"
@@ -200,10 +200,10 @@ do_instruction_fault(void)
     );
 #elif defined(CONFIG_ARCH_AARCH64)
     asm volatile(
-        "mov x0, %[val]\n\t"
+        "mov w0, %w[val]\n\t"
         "blr %[addrreg]\n\t"
         "instruction_fault_restart_address:\n\t"
-        "mov %[val], x0\n\t"
+        "mov %w[val], w0\n\t"
         : [val] "+r"(val)
         : [addrreg] "r"(x)
         : "x0", "x30"
@@ -259,11 +259,11 @@ do_bad_syscall(void)
 #elif defined(CONFIG_ARCH_AARCH64)
     asm volatile(
         "mov x7, %[scno]\n\t"
-        "mov x0, %[val]\n\t"
+        "mov w0, %w[val]\n\t"
         "bad_syscall_address:\n\t"
         "svc %[scno]\n\t"
         "bad_syscall_restart_address:\n\t"
-        "mov %[val], x0\n\t"
+        "mov %w[val], w0\n\t"
         : [val] "+r"(val)
         : [addrreg] "r"(x),
         [scno] "i"(BAD_SYSCALL_NUMBER)

diff --git a/apps/sel4test-tests/src/tests/scheduler.c b/apps/sel4test-tests/src/tests/scheduler.c
@@ -1113,9 +1113,9 @@ DEFINE_TEST(SCHED0013, "Test two periodic threads", test_two_periodic_threads,
 int test_ordering_periodic_threads(env_t env)
 {
     /*
-     * Set up 3 periodic threads with different budgets.
-     * All 3 threads increment global counters,
-     * check their increments are inline with their budgets.
+     * Set up 3 periodic threads with same budget and different periods.
+     * All 3 threads increment global counters.
+     * We check that their increments are in line with their budgets.
      */
 
     const int num_threads = 3;