From 343622d4e5be0c112e7cbcca7b636b80b30ffe6d Mon Sep 17 00:00:00 2001 From: "Justin C. Miller" Date: Sun, 30 Jan 2022 20:52:43 -0800 Subject: [PATCH] [kernel] Fix up formatting Two minor issues: scheduler::prune wasn't formatted correctly, and j6/caps.h was not using the ull prefix when shifting 64 bit numbers. (It's doubtful an object would get more than 32 caps any time soon, but better to be correct.) --- src/kernel/scheduler.cpp | 3 ++- src/libraries/j6/include/j6/caps.h.cog | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kernel/scheduler.cpp b/src/kernel/scheduler.cpp index 454f3ac..b7f1101 100644 --- a/src/kernel/scheduler.cpp +++ b/src/kernel/scheduler.cpp @@ -116,7 +116,8 @@ scheduler::add_thread(TCB *t) t->time_left = quantum(t->priority); } -void scheduler::prune(run_queue &queue, uint64_t now) +void +scheduler::prune(run_queue &queue, uint64_t now) { // Find processes that are ready or have exited and // move them to the appropriate lists. diff --git a/src/libraries/j6/include/j6/caps.h.cog b/src/libraries/j6/include/j6/caps.h.cog index 84262c2..e5f8d9c 100644 --- a/src/libraries/j6/include/j6/caps.h.cog +++ b/src/libraries/j6/include/j6/caps.h.cog @@ -18,11 +18,11 @@ for obj in syscalls.exposes: for cap in obj.caps: name = f"j6_cap_{obj.name}_{cap}" - cog.outl(f"#define {name:<30} (1 << {i})") + cog.outl(f"#define {name:<30} (1ull << {i})") i += 1 name = f"j6_cap_{obj.name}_all" - cog.outl(f"#define {name:<30} ((1<<{i})-1)") + cog.outl(f"#define {name:<30} ((1ull<<{i})-1)") cog.outl() ]]]*/ /// [[[end]]]