zzy/scc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(log): 统一日志系统并添加链接器实现

Browse Source 
- 为所有模块添加统一的 scc_*_log.h 日志头文件，删除旧的 lexer_log.h/c
- 将运行时日志从 scc_utils 迁移到 scc_core 目录，统一日志管理
- 在解析器表达式/语句/类型解析中添加 LOG_TRACE 调试日志
- 实现 SCCF 链接器 (sccf_linker) 支持多目标文件链接
- 重构 CLI 主程序 (main.c/config.c)，新增 cmd_log.h 调试支持
- 优化 x86 指令编码操作数对齐检查
- 修复预处理器的指令处理和宏展开逻辑
This commit is contained in:
zzy
2026-06-05 13:07:41 +08:00
parent 0acea43e4e
commit 88846d7479
70 changed files with 1497 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/log/include/log.c
View File

@@ -25,8 +25,8 @@ int log_default_handler(logger_t *module, log_level_t level, const char *file,
case LOG_LEVEL_TRACE: level_str = "TRACE"; break;
default: level_str = "NOTSET"; break;
}
/// @note: 定义 __LOG_NO_COLOR__ 会取消颜色输出
#ifndef __LOG_NO_COLOR__
/// @note: 定义 __LOG_NO_COLOR__ 会取消颜色输出
#ifndef __LOG_NO_COLOR__
const char *color_code;
switch (level) {
case LOG_LEVEL_DEBUG: color_code = ANSI_FG_CYAN; break;
@@ -54,7 +54,6 @@ int log_default_handler(logger_t *module, log_level_t level, const char *file,
}
va_end(args);
log_puts(module->buf);
log_puts("\n");
// for clangd warning
// clang-analyzer-deadcode.DeadStores
(void)color_code;

26
runtime/log/include/log.h
View File

@@ -74,9 +74,12 @@ typedef int (*log_handler)(logger_t *module, log_level_t level,
* 每个日志器实例维护独立的配置和缓冲区
*/
struct logger {
const char *name; ///< 日志器名称（用于模块区分）
log_level_t level; ///< 当前设置的日志级别
log_handler handler; ///< 日志处理回调函数
const char *name; ///< 日志器名称（用于模块区分）
log_level_t level; ///< 当前设置的日志级别
union {
log_handler handler;
void *user_handler;
}; ///< 日志处理回调函数
void *user_data; ///< 用户自定义数据
char buf[LOGGER_MAX_BUF_SIZE]; ///< 格式化缓冲区
};
@@ -84,6 +87,9 @@ struct logger {
int log_default_handler(logger_t *module, log_level_t level, const char *file,
int line, const char *func, const char *fmt, ...);
extern logger_t __default_logger_root;
#ifndef LOG_DEFAULT_HANDLER
#define LOG_DEFAULT_HANDLER &__default_logger_root
#endif
/**
* @brief 初始化日志实例 其余参数设置为默认值
@@ -135,13 +141,13 @@ void log_set_handler(logger_t *logger, log_handler handler);
/// @name 快捷日志宏
/// @{
#define LOG_NOTSET(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_NOTSET, __VA_ARGS__) ///< 未分类日志
#define LOG_DEBUG(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_DEBUG, __VA_ARGS__) ///< 调试日志（需启用DEBUG级别）
#define LOG_INFO(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_INFO, __VA_ARGS__) ///< 信息日志（常规运行日志）
#define LOG_WARN(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_WARN, __VA_ARGS__) ///< 警告日志（潜在问题）
#define LOG_ERROR(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_ERROR, __VA_ARGS__) ///< 错误日志（可恢复错误）
#define LOG_FATAL(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_FATAL, __VA_ARGS__) ///< 致命错误日志（程序终止前）
#define LOG_TRACE(...) SCC_LOG_IMPL(&__default_logger_root, LOG_LEVEL_TRACE, __VA_ARGS__) ///< 追踪日志（调用栈跟踪）
#define LOG_NOTSET(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_NOTSET, __VA_ARGS__) ///< 未分类日志
#define LOG_DEBUG(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_DEBUG, __VA_ARGS__) ///< 调试日志（需启用DEBUG级别）
#define LOG_INFO(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_INFO, __VA_ARGS__) ///< 信息日志（常规运行日志）
#define LOG_WARN(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_WARN, __VA_ARGS__) ///< 警告日志（潜在问题）
#define LOG_ERROR(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_ERROR, __VA_ARGS__) ///< 错误日志（可恢复错误）
#define LOG_FATAL(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_FATAL, __VA_ARGS__) ///< 致命错误日志（程序终止前）
#define LOG_TRACE(...) SCC_LOG_IMPL(LOG_DEFAULT_HANDLER, LOG_LEVEL_TRACE, __VA_ARGS__) ///< 追踪日志（调用栈跟踪）
/// @}
/* clang-format on */

2
runtime/scc_core/include/scc_core_log.h
View File

@@ -6,7 +6,7 @@
#endif
#ifndef log_puts
#define log_puts(str) scc_printf("%s", str)
#define log_puts(str) scc_printf("%s\n", str)
#endif
#ifndef log_abort

35
runtime/scc_core/include/scc_log.h Normal file
View File

@@ -0,0 +1,35 @@
#ifndef __SCC_POS_LOG_H__
#define __SCC_POS_LOG_H__
#include "scc_pos.h"
#include <scc_core.h>
int scc_log_handler(logger_t *module, log_level_t level, const char *file,
int line, int col, const char *fmt, ...);
typedef int (*scc_log_fn_t)(logger_t *module, log_level_t level,
const char *file, int line, int col,
const char *fmt, ...);
extern logger_t __scc_pos_log;
#define SCC_POS_LOG(logger, level, pos, fmt, ...) \
do { \
((scc_log_fn_t)(logger)->user_handler)( \
(logger), (level), scc_pos_pnt_val(pos), (fmt), ##__VA_ARGS__); \
} while (0)
#ifndef SCC_LOG_HANDLER
#define SCC_LOG_HANDLER &__scc_pos_log
#endif
#define SCC_DEBUG(pos, fmt, ...) \
SCC_POS_LOG(SCC_LOG_HANDLER, LOG_LEVEL_DEBUG, pos, fmt, ##__VA_ARGS__)
#define SCC_INFO(pos, fmt, ...) \
SCC_POS_LOG(SCC_LOG_HANDLER, LOG_LEVEL_INFO, pos, fmt, ##__VA_ARGS__)
#define SCC_WARN(pos, fmt, ...) \
SCC_POS_LOG(SCC_LOG_HANDLER, LOG_LEVEL_WARN, pos, fmt, ##__VA_ARGS__)
#define SCC_ERROR(pos, fmt, ...) \
SCC_POS_LOG(SCC_LOG_HANDLER, LOG_LEVEL_ERROR, pos, fmt, ##__VA_ARGS__)
#define SCC_FATAL(pos, fmt, ...) \
SCC_POS_LOG(SCC_LOG_HANDLER, LOG_LEVEL_FATAL, pos, fmt, ##__VA_ARGS__)
#endif /* __SCC_POS_LOG_H__ */

39
runtime/scc_utils/src/scc_pos_log.c → runtime/scc_core/src/scc_log.c
View File

@@ -1,21 +1,17 @@
#include <scc_pos_log.h>
static int pos_log_handler(logger_t *module, log_level_t level,
const char *file, int line, const char *func,
const char *fmt, ...) {
#include <scc_log.h>
int scc_log_handler(logger_t *module, log_level_t level, const char *file,
int line, int col, const char *fmt, ...) {
/* clang-format off */
(void) module, (void)file, (void)line, (void)func; // 不再使用
const char *level_str = nullptr;
switch (level) {
case LOG_LEVEL_DEBUG: level_str = "DEBUG"; break;
case LOG_LEVEL_INFO: level_str = "INFO "; break;
case LOG_LEVEL_WARN: level_str = "WARN "; break;
case LOG_LEVEL_ERROR: level_str = "ERROR"; break;
case LOG_LEVEL_FATAL: level_str = "FATAL"; break;
case LOG_LEVEL_TRACE: level_str = "TRACE"; break;
default: level_str = "NOTSET"; break;
case LOG_LEVEL_DEBUG: level_str = "debug"; break;
case LOG_LEVEL_INFO: level_str = "info "; break;
case LOG_LEVEL_WARN: level_str = "warn "; break;
case LOG_LEVEL_ERROR: level_str = "error"; break;
case LOG_LEVEL_FATAL: level_str = "fatal"; break;
case LOG_LEVEL_TRACE: level_str = "trace"; break;
default: level_str = "notset"; break;
}
/// @note: 定义 __LOG_NO_COLOR__ 会取消颜色输出
#ifndef __LOG_NO_COLOR__
@@ -32,18 +28,19 @@ static int pos_log_handler(logger_t *module, log_level_t level,
#endif
/* clang-format on */
char buf[LOGGER_MAX_BUF_SIZE];
int off = scc_snprintf(buf, sizeof(buf), "%s[%s]%s ",
color_code ? color_code : "", level_str,
color_code ? ANSI_NONE : "");
int offset =
scc_snprintf(module->buf, sizeof(module->buf), "%s[%s] %s - %s:%d:%d%s",
color_code ? color_code : "", level_str, module->name,
file, line, col, color_code ? ANSI_NONE : "");
va_list args;
va_start(args, fmt);
scc_vsnprintf(buf + off, sizeof(buf) - off, fmt, args);
scc_vsnprintf(module->buf + offset, sizeof(module->buf) - offset, fmt,
args);
va_end(args);
log_puts(buf);
log_puts("\n");
if (level == LOG_LEVEL_FATAL) {
log_abort();
}
@@ -52,6 +49,6 @@ static int pos_log_handler(logger_t *module, log_level_t level,
logger_t __scc_pos_log = {
.name = "pos_log",
.handler = pos_log_handler,
.user_handler = scc_log_handler,
.level = LOG_LEVEL_ALL,
};

31
runtime/scc_utils/include/scc_pos_log.h
View File

@@ -1,31 +0,0 @@
#ifndef __SCC_POS_LOG_H__
#define __SCC_POS_LOG_H__
#include "scc_pos.h"
#include <scc_core.h>
extern logger_t __scc_pos_log;
#define SCC_POS_LOG(level, pos, fmt, ...) \
do { \
char _full_msg[LOGGER_MAX_BUF_SIZE]; \
int _n = scc_snprintf(_full_msg, sizeof(_full_msg), \
scc_pos_pnt_fmt ": ", scc_pos_pnt_val(pos)); \
scc_snprintf(_full_msg + _n, sizeof(_full_msg) - _n, fmt, \
##__VA_ARGS__); \
__scc_pos_log.handler(&__scc_pos_log, level, nullptr, 0, nullptr, \
"%s", _full_msg); \
} while (0)
#define SCC_DEBUG(pos, fmt, ...) \
SCC_POS_LOG(LOG_LEVEL_DEBUG, pos, fmt, ##__VA_ARGS__)
#define SCC_INFO(pos, fmt, ...) \
SCC_POS_LOG(LOG_LEVEL_INFO, pos, fmt, ##__VA_ARGS__)
#define SCC_WARN(pos, fmt, ...) \
SCC_POS_LOG(LOG_LEVEL_WARN, pos, fmt, ##__VA_ARGS__)
#define SCC_ERROR(pos, fmt, ...) \
SCC_POS_LOG(LOG_LEVEL_ERROR, pos, fmt, ##__VA_ARGS__)
#define SCC_FATAL(pos, fmt, ...) \
SCC_POS_LOG(LOG_LEVEL_FATAL, pos, fmt, ##__VA_ARGS__)
#endif /* __SCC_POS_LOG_H__ */

7
runtime/scc_utils/src/hashtable.c
View File

@@ -45,7 +45,8 @@ void scc_hashtable_usize_init(scc_hashtable_t *ht) {
}
static usize next_power_of_two(usize n) {
if (n == 0) return 32;
if (n == 0)
return 32;
n--;
n |= n >> 1;
n |= n >> 2;
@@ -56,8 +57,8 @@ static usize next_power_of_two(usize n) {
return n + 1;
}
static scc_hashtable_entry_t *find_entry(scc_hashtable_t *ht, const void *key,
u32 hash) {
static scc_hashtable_entry_t *find_entry(const scc_hashtable_t *ht,
const void *key, u32 hash) {
if (ht->entries.cap == 0)
return nullptr;