diff --git a/config.cmake b/config.cmake index 7ee3348a7..6d48d32e6 100644 --- a/config.cmake +++ b/config.cmake @@ -364,7 +364,7 @@ config_option( config_choice( KernelBenchmarks KERNEL_BENCHMARK - "Enable benchamrks including logging and tracing info. \ + "Enable benchmarks including logging and tracing info. \ Setting this value > 1 enables a 1MB log buffer and functions for extracting data from it \ at user level. NOTE this is only tested on the sabre and will not work on platforms with < 512mb memory. \ This is not fully implemented for x86. \ @@ -386,7 +386,7 @@ else() config_set(KernelEnableBenchmarks ENABLE_BENCHMARKS OFF) endif() -# Reflect the existance of kernel Log buffer +# Reflect the existence of kernel Log buffer if(KernelBenchmarksTrackKernelEntries OR KernelBenchmarksTracepoints) config_set(KernelLogBuffer KERNEL_LOG_BUFFER ON) else() diff --git a/include/arch/riscv/arch/32/mode/hardware.h b/include/arch/riscv/arch/32/mode/hardware.h index e1c6e7b57..49e7fa880 100644 --- a/include/arch/riscv/arch/32/mode/hardware.h +++ b/include/arch/riscv/arch/32/mode/hardware.h @@ -95,7 +95,7 @@ static inline uint64_t riscv_read_cycle(void) "rdcycleh %2\n" : "=r"(nH1), "=r"(nL), "=r"(nH2)); if (nH1 != nH2) { - /* Ensure that the time is correct if there is a rollover in the + /* Ensure that the cycles are correct if there is a rollover in the * high bits between reading the low and high bits. */ asm volatile( "rdcycle %0\n" diff --git a/include/util.h b/include/util.h index 9a7d88a84..1e1822121 100644 --- a/include/util.h +++ b/include/util.h @@ -13,11 +13,11 @@ #ifdef __ASSEMBLER__ /* Provide a helper macro to define integer constants that are not of the - * default type 'ìnt', but 'unsigned long'. When such constants are shared - * between assembly and C code, some assemblers will fail because don't support - * C-style integer suffixes like 'ul'. Using a macro works around this, as the - * suffix is only applies when the C compiler is used and dropped when the - * assembler runs. + * default type 'ìnt', but 'unsigned long [long]'. When such constants are + * shared between assembly and C code, some assemblers will fail because they + * don't support C-style integer suffixes like 'ul'. Using a macro works around + * this, as the suffix is only applied when the C compiler is used and dropped + * when the assembler runs. */ #define UL_CONST(x) x #define ULL_CONST(x) x @@ -45,9 +45,9 @@ #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) -/* Time constants are define to use the 'unsigned long long'. Rationale is, that - * the C rules define the calculation result is determined by largest type - * involved. Enforcing the larges possible type C provides avoids pitfalls with +/* Time constants are defined to use the 'unsigned long long'. Rationale is, + * that the C rules define the calculation result is determined by largest type + * involved. Enforcing the largest possible type C provides avoids pitfalls with * 32-bit overflows when values are getting quite large. Keep in mind that even * 2^32 milli-seconds roll over within 50 days, which is an uptime that embedded * systems will reach easily and it resembles not even two months in a calendar diff --git a/src/kernel/boot.c b/src/kernel/boot.c index 7f8692dbb..53edbfddd 100644 --- a/src/kernel/boot.c +++ b/src/kernel/boot.c @@ -820,7 +820,7 @@ BOOT_CODE bool_t init_freemem(word_t n_available, const p_region_t *available, /* skip the entire region - it's empty now after trimming */ a++; } else if (reserved[r].end <= avail_reg[a].start) { - /* the reserved region is below the available region - skip it*/ + /* the reserved region is below the available region - skip it */ reserve_region(pptr_to_paddr_reg(reserved[r])); r++; } else if (reserved[r].start >= avail_reg[a].end) {