diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ToolchainKit/src/Linker.cc | 17 | ||||
| -rw-r--r-- | dev/ToolchainKit/src/String.cc | 9 |
2 files changed, 12 insertions, 14 deletions
diff --git a/dev/ToolchainKit/src/Linker.cc b/dev/ToolchainKit/src/Linker.cc index 5486b82..0a0819d 100644 --- a/dev/ToolchainKit/src/Linker.cc +++ b/dev/ToolchainKit/src/Linker.cc @@ -49,13 +49,13 @@ enum { - eABIStart = 0x1010, /* Invalid ABI start of ABI list. */ - eABINewOS = 0x5046, /* PF (ZKA PEF ABI) */ - eABIInvalid = 0xFFFF, + kABITypeStart = 0x1010, /* Invalid ABI start of ABI list. */ + kABITypeZKA = 0x5046, /* PF (ZKA PEF ABI) */ + kABITypeInvalid = 0xFFFF, }; static ToolchainKit::String kOutput = ""; -static Int32 kAbi = eABINewOS; +static Int32 kAbi = kABITypeZKA; static Int32 kSubArch = kPefNoSubCpu; static Int32 kArch = ToolchainKit::kPefArchInvalid; static Bool kFatBinaryEnable = false; @@ -76,17 +76,14 @@ static uintptr_t kMIBCount = 8; #define kPrintF printf #define kLinkerSplash() kPrintF(kWhite kLinkerVersion, kDistVersion) -/*** - @brief ZKA linker main -*/ - +/// @brief ZKA 64-bit Linker. +/// @note This linker is made for PEF executable, thus ZKA based OSes. TOOLCHAINKIT_MODULE(ZKALinkerMain) { bool is_executable = true; /** - * @brief parse flags and such. - * + * @brief parse flags and trigger options. */ for (size_t linker_arg = 1; linker_arg < argc; ++linker_arg) { diff --git a/dev/ToolchainKit/src/String.cc b/dev/ToolchainKit/src/String.cc index 70b1e91..34e309f 100644 --- a/dev/ToolchainKit/src/String.cc +++ b/dev/ToolchainKit/src/String.cc @@ -117,8 +117,9 @@ namespace ToolchainKit memset(ret, 0, ret_len); - CharType result[8]; - if (!to_str(result, sizeof(int), i)) + CharType result[sizeof(int64_t)]; + + if (!to_str(result, sizeof(int64_t), i)) { delete[] ret; return ("-1"); @@ -133,9 +134,9 @@ namespace ToolchainKit { SizeType result_cnt = idx; - for (auto y_idx = idx; y_idx < res_len; ++y_idx) + for (auto y_idx = 0; y_idx < res_len; ++y_idx) { - ret[result_cnt] = result[y_idx]; + ret[y_idxcnt] = result[result_idx]; ++result_cnt; } |