修复格式化后导致某些变量声明中有奇怪空格的问题

Co-authored-by: wenxuanjun <41050170+wenxuanjun@users.noreply.github.com>

Author: xiaoyi1212

.clang-format

@@ -11,7 +11,7 @@ AlignAfterOpenBracket: BlockIndent
 AlignArrayOfStructures: Left
 AlignConsecutiveAssignments: Consecutive
 AlignConsecutiveBitFields: true
-AlignConsecutiveDeclarations: true
+AlignConsecutiveDeclarations: None
 AlignConsecutiveMacros: None
 AlignEscapedNewlines: Right
 AlignOperands: Align

src/arch/loongarch64/include/page_la64.h

@@ -53,11 +53,11 @@ typedef struct page_directory {
     page_table_t *table;
 } page_directory_t;
 
-void     arch_page_setup();
-void     unmap_page(page_directory_t *directory, uint64_t vaddr);
-void     page_map_to(page_directory_t *directory, uint64_t vaddr, uint64_t paddr, uint64_t flags);
+void arch_page_setup();
+void unmap_page(page_directory_t *directory, uint64_t vaddr);
+void page_map_to(page_directory_t *directory, uint64_t vaddr, uint64_t paddr, uint64_t flags);
 uint64_t get_arch_page_table_flags(uint64_t flags);
 uint64_t map_change_attribute(uint64_t *pgdir, uint64_t vaddr, uint64_t flags);
-void     free_page_directory(page_directory_t *dir);
+void free_page_directory(page_directory_t *dir);
 page_directory_t *clone_page_directory(page_directory_t *dir, bool all_copy);
-void              switch_page_directory0(page_directory_t *dir);
+void switch_page_directory0(page_directory_t *dir);

src/arch/riscv64/boot/early_mapper.c

@@ -35,7 +35,7 @@ typedef uint64_t pte_t;
 // 内核预留的页表空间（在数据段中）
 #define PAGE_TABLE_POOL_SIZE (4 * 1024 * 1024) // 4MB 用于页表
 static uint8_t page_table_pool[PAGE_TABLE_POOL_SIZE] __attribute__((aligned(PAGE_SIZE)));
-static size_t  page_table_pool_used = 0;
+static size_t page_table_pool_used = 0;
 
 // 辅助宏
 #ifndef ALIGN_UP

src/arch/riscv64/boot/open_sbi.c

@@ -2,10 +2,10 @@
 
 extern uintptr_t smp_entry;
 
-boot_memory_map_t  opensbi_memory_map;
+boot_memory_map_t opensbi_memory_map;
 boot_framebuffer_t opensbi_fb;
-char              *kernel_cmdline = NULL;
-extern uintptr_t   opensbi_dtb_vaddr;
+char *kernel_cmdline = NULL;
+extern uintptr_t opensbi_dtb_vaddr;
 
 uint64_t boot_get_hhdm_offset() {
     return 0xffff800000000000;

src/arch/riscv64/boot/start.c

@@ -4,13 +4,13 @@
 
 extern uint8_t _bss_start[], _bss_end[];
 
-extern boot_memory_map_t  opensbi_memory_map;
+extern boot_memory_map_t opensbi_memory_map;
 extern boot_framebuffer_t opensbi_fb;
-extern char              *kernel_cmdline;
-void                     *opensbi_dtb_vaddr;
+extern char *kernel_cmdline;
+void *opensbi_dtb_vaddr;
 
 static bool fdt_getprop_u64(const void *fdt, int node, const char *name, int idx, uint64_t *out) {
-    int            len;
+    int len;
     const fdt64_t *p = fdt_getprop(fdt, node, name, &len);
     if (!p || len < ((idx + 1) * sizeof(uint64_t)))
         return false;
@@ -21,8 +21,8 @@ static bool fdt_getprop_u64(const void *fdt, int node, const char *name, int idx
 static void setup_framebuffer(boot_framebuffer_t *fb) {
     memset(fb, 0, sizeof(*fb));
 
-    void *fdt    = opensbi_dtb_vaddr;
-    int   fb_off = fdt_path_offset(fdt, "/framebuffer");
+    void *fdt  = opensbi_dtb_vaddr;
+    int fb_off = fdt_path_offset(fdt, "/framebuffer");
 
     // 如果找不到 /framebuffer，尝试按 compatible 查找 simple-framebuffer
     if (fb_off < 0) {
@@ -41,7 +41,7 @@ static void setup_framebuffer(boot_framebuffer_t *fb) {
 
     // 获取基本属性
     const fdt32_t *prop32;
-    uint32_t       width = 0, height = 0, stride = 0;
+    uint32_t width = 0, height = 0, stride = 0;
 
     prop32 = fdt_getprop(fdt, fb_off, "width", NULL);
     if (!prop32)
@@ -141,7 +141,7 @@ static void setup_framebuffer(boot_framebuffer_t *fb) {
     }
 
     // 获取 reg 属性
-    int            reg_len;
+    int reg_len;
     const fdt64_t *reg = fdt_getprop(fdt, fb_off, "reg", &reg_len);
     if (!reg || reg_len < 16)
         goto no_fb;
@@ -194,7 +194,7 @@ static void setup_memmap(
         if (!name)
             continue;
         if (strncmp(name, "memory@", 7) == 0 || strcmp(name, "memory") == 0) {
-            int            reg_len;
+            int reg_len;
             const fdt64_t *reg =
                 (const fdt64_t *)fdt_getprop(opensbi_dtb_vaddr, offset, "reg", &reg_len);
             if (reg && reg_len >= (int)sizeof(uint64_t) * 2
@@ -214,12 +214,12 @@ static void setup_memmap(
     /* 2) 收集保留区域（reserved list） */
     typedef struct {
         uint64_t base, size;
-        int      type; /* 使用你的 enum 常量 */
+        int type; /* 使用你的 enum 常量 */
     } reserved_region_t;
 
     /* 预留数组大小合理上限 */
     reserved_region_t reserved[256];
-    int               reserved_count = 0;
+    int reserved_count = 0;
 
     /* 2.1 内核区域作为 RESERVED（这里把内核标记为可执行与模块区，如果你要 kernel_module 可改） */
     if (kernel_end > kernel_start && reserved_count < (int)sizeof(reserved) / sizeof(reserved[0])) {
@@ -246,7 +246,7 @@ static void setup_memmap(
         /* 遍历 reserved-memory 的子节点 */
         for (child = fdt_first_subnode(opensbi_dtb_vaddr, resmem_off); child >= 0;
              child = fdt_next_subnode(opensbi_dtb_vaddr, child)) {
-            int            reg_len;
+            int reg_len;
             const fdt64_t *reg =
                 (const fdt64_t *)fdt_getprop(opensbi_dtb_vaddr, child, "reg", &reg_len);
             if (!reg || reg_len < (int)sizeof(uint64_t) * 2)
@@ -264,7 +264,7 @@ static void setup_memmap(
     int chosen_off = fdt_path_offset(opensbi_dtb_vaddr, "/chosen");
     if (chosen_off >= 0 && reserved_count < (int)sizeof(reserved) / sizeof(reserved[0])) {
         uint64_t initrd_start = 0, initrd_end = 0;
-        bool     has_start =
+        bool has_start =
             fdt_getprop_u64(opensbi_dtb_vaddr, chosen_off, "linux,initrd-start", 0, &initrd_start);
         bool has_end =
             fdt_getprop_u64(opensbi_dtb_vaddr, chosen_off, "linux,initrd-end", 0, &initrd_end);
@@ -388,7 +388,7 @@ static const char *fdt_kernel_cmdline(void *fdt) {
     if (chosen_off < 0)
         return NULL;
 
-    int         len      = 0;
+    int len              = 0;
     const char *bootargs = fdt_getprop(fdt, chosen_off, "bootargs", &len);
     if (!bootargs || len <= 0)
         return NULL;
@@ -397,10 +397,10 @@ static const char *fdt_kernel_cmdline(void *fdt) {
 }
 
 uint64_t fdt_get_initrd(const void *fdt, size_t *out_size) {
-    int         chosen;
+    int chosen;
     const void *prop;
-    int         len;
-    uint64_t    start = 0, end = 0;
+    int len;
+    uint64_t start = 0, end = 0;
 
     if (!fdt)
         return 0;

src/arch/riscv64/driver/ns16550.c

@@ -10,8 +10,8 @@ static inline uint32_t uart_calc_offset(uart_device_t *uart, uint8_t reg) {
 
 /* 读寄存器 - 支持不同访问宽度 */
 static uint32_t uart_read_reg(uart_device_t *uart, uint8_t reg) {
-    uint32_t       offset = uart_calc_offset(uart, reg);
-    volatile void *addr   = (volatile char *)uart->base_addr + offset;
+    uint32_t offset     = uart_calc_offset(uart, reg);
+    volatile void *addr = (volatile char *)uart->base_addr + offset;
 
     switch (uart->access_width) {
     case UART_ACCESS_8BIT:
@@ -27,8 +27,8 @@ static uint32_t uart_read_reg(uart_device_t *uart, uint8_t reg) {
 
 /* 写寄存器 - 支持不同访问宽度 */
 static void uart_write_reg(uart_device_t *uart, uint8_t reg, uint32_t value) {
-    uint32_t       offset = uart_calc_offset(uart, reg);
-    volatile void *addr   = (volatile char *)uart->base_addr + offset;
+    uint32_t offset     = uart_calc_offset(uart, reg);
+    volatile void *addr = (volatile char *)uart->base_addr + offset;
 
     switch (uart->access_width) {
     case UART_ACCESS_8BIT:

src/arch/riscv64/driver/serial.c

@@ -6,11 +6,11 @@
 #include "mem/frame.h"
 #include "mem/page.h"
 
-extern void             *opensbi_dtb_vaddr; // start.c
+extern void *opensbi_dtb_vaddr; // start.c
 struct fdt_serial_device fdt_serial;
-bool                     serial_initialized = false;
-uart_device_t            uart0;
-uart_config_t            config;
+bool serial_initialized = false;
+uart_device_t uart0;
+uart_config_t config;
 
 static const char *serial_compatibles[] = {
     "ns16550a", "snps,dw-apb-uart", "sifive,uart0", "riscv,uart0", "uart0", NULL,
@@ -20,14 +20,14 @@ static int find_serial_chosem(struct fdt_serial_device *device) {
     int chosen_off = fdt_path_offset(opensbi_dtb_vaddr, "/chosen");
     if (chosen_off < 0)
         return -ENODEV;
-    int         len         = 0;
+    int len                 = 0;
     const char *stdout_path = fdt_getprop(opensbi_dtb_vaddr, chosen_off, "stdout-path", &len);
     if (!stdout_path || len <= 0)
         return -ENODEV;
     char path_buf[128];
 
-    const char *colon    = strchr(stdout_path, ':');
-    size_t      path_len = colon ? (size_t)(colon - stdout_path) : strlen(stdout_path);
+    const char *colon = strchr(stdout_path, ':');
+    size_t path_len   = colon ? (size_t)(colon - stdout_path) : strlen(stdout_path);
     if (path_len >= sizeof(path_buf))
         return -ENAMETOOLONG;
     memcpy(path_buf, stdout_path, path_len);
@@ -64,7 +64,7 @@ static int find_serial_chosem(struct fdt_serial_device *device) {
 
 int find_serial_by_compatible(struct fdt_serial_device *serial) {
     void *fdt = opensbi_dtb_vaddr;
-    int   node;
+    int node;
 
     memset(serial, 0, sizeof(*serial));
 
@@ -77,7 +77,7 @@ int find_serial_by_compatible(struct fdt_serial_device *serial) {
         // 匹配已知串口类型
         for (int i = 0; serial_compatibles[i]; i++) {
             if (strstr(compatible, serial_compatibles[i])) {
-                int            len;
+                int len;
                 const fdt64_t *reg = fdt_getprop(fdt, node, "reg", &len);
                 if (reg && len >= sizeof(fdt64_t)) {
                     serial->base_addr = fdt64_to_cpu(reg[0]);
@@ -157,8 +157,8 @@ int init_serial() {
             | ARCH_PT_FLAG_DIRTY
     );
     uart_init(&uart0, (volatile void *)virt, NULL);
-    tty_device_t       *device = alloc_tty_device(TTY_DEVICE_SERIAL);
-    struct tty_serial_ *data   = malloc(sizeof(struct tty_serial_));
+    tty_device_t *device     = alloc_tty_device(TTY_DEVICE_SERIAL);
+    struct tty_serial_ *data = malloc(sizeof(struct tty_serial_));
 
     device->private_data = data;
     device->ops.read     = serial_read;

src/arch/riscv64/include/arch_context.h

@@ -34,13 +34,13 @@ typedef struct fpu_context {
 } fpu_context_t;
 
 struct arch_context_ {
-    uint64_t        ra;
-    uint64_t        sp;
+    uint64_t ra;
+    uint64_t sp;
     struct pt_regs *ctx;
-    fpu_context_t   fpu_ctx;
-    bool            dead;
-    uint64_t        user_stack;
-    uint64_t        user_stack_top;
+    fpu_context_t fpu_ctx;
+    bool dead;
+    uint64_t user_stack;
+    uint64_t user_stack_top;
 };
 
 #define switch_to(prev, next)                                                                      \

src/arch/riscv64/include/driver/ns16550.h

@@ -48,21 +48,21 @@ typedef enum {
 /* UART配置结构体 */
 typedef struct {
     uint32_t baudrate;
-    uint8_t  data_bits;
-    uint8_t  stop_bits;
-    uint8_t  parity;
-    bool     fifo_enable;
+    uint8_t data_bits;
+    uint8_t stop_bits;
+    uint8_t parity;
+    bool fifo_enable;
 } uart_config_t;
 
 /* UART设备结构体（支持GAS）*/
 typedef struct {
-    volatile void      *base_addr;    // 基地址
-    uart_addr_space_t   addr_space;   // 地址空间类型
+    volatile void *base_addr;         // 基地址
+    uart_addr_space_t addr_space;     // 地址空间类型
     uart_access_width_t access_width; // 访问宽度
-    uint32_t            reg_shift;    // 寄存器偏移位移（字节间距 = 1 << reg_shift）
-    uint32_t            reg_stride;   // 寄存器步进（优先使用）
-    uint32_t            clock_freq;   // 时钟频率
-    uart_config_t       config;       // 配置参数
+    uint32_t reg_shift;               // 寄存器偏移位移（字节间距 = 1 << reg_shift）
+    uint32_t reg_stride;              // 寄存器步进（优先使用）
+    uint32_t clock_freq;              // 时钟频率
+    uart_config_t config;             // 配置参数
 } uart_device_t;
 
 /* 函数声明 */
@@ -77,4 +77,4 @@ char uart_getc(uart_device_t *uart);
 bool uart_data_available(uart_device_t *uart);
 bool uart_is_transmit_empty(uart_device_t *uart);
 void uart_puts(uart_device_t *uart, const char *str);
-int  uart_try_getc(uart_device_t *uart, char *c);
+int uart_try_getc(uart_device_t *uart, char *c);

src/arch/riscv64/include/driver/serial.h

@@ -8,7 +8,7 @@ struct fdt_serial_device {
     uint32_t reg_shift;
     uint32_t clock_freq;
     uint32_t reg_io_width;
-    int      found;
+    int found;
 };
 
 int init_serial();