From 6690599d60ef9d7202fb39915ea78e58fa0a218b Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Mon, 21 Aug 2023 11:48:23 +0800 Subject: [PATCH] fix: options are ignored when compile add more compiler options for sdcc Support text input for compiler options --- RedPandaIDE/compiler/compiler.cpp | 18 +- RedPandaIDE/compiler/compilerinfo.cpp | 39 +- RedPandaIDE/compiler/compilerinfo.h | 21 + RedPandaIDE/compiler/sdccfilecompiler.cpp | 10 +- RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 48 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 842 ++++++++++-------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 48 + .../widgets/compileargumentswidget.cpp | 45 +- 8 files changed, 656 insertions(+), 415 deletions(-) diff --git a/RedPandaIDE/compiler/compiler.cpp b/RedPandaIDE/compiler/compiler.cpp index 5b3c7110..b65b3939 100644 --- a/RedPandaIDE/compiler/compiler.cpp +++ b/RedPandaIDE/compiler/compiler.cpp @@ -410,8 +410,10 @@ QString Compiler::getCCompileArguments(bool checkSyntax) continue; PCompilerOption pOption = CompilerInfoManager::getCompilerOption(compilerSet()->compilerType(), key); if (pOption && pOption->isC && !pOption->isLinker) { - if (pOption->choices.isEmpty()) + if (pOption->type == CompilerOptionType::Checkbox) result += " " + pOption->setting; + else if (pOption->type == CompilerOptionType::Input) + result += " " + pOption->setting + " " + compileOptions[key]; else { result += " " + pOption->setting + compileOptions[key]; } @@ -453,10 +455,13 @@ QString Compiler::getCppCompileArguments(bool checkSyntax) continue; PCompilerOption pOption = CompilerInfoManager::getCompilerOption(compilerSet()->compilerType(), key); if (pOption && pOption->isCpp && !pOption->isLinker) { - if (pOption->choices.isEmpty()) + if (pOption->type == CompilerOptionType::Checkbox) result += " " + pOption->setting; - else + else if (pOption->type == CompilerOptionType::Input) + result += " " + pOption->setting + " " + compileOptions[key]; + else { result += " " + pOption->setting + compileOptions[key]; + } } } if (compilerSet()->useCustomCompileParams() && !compilerSet()->customCompileParams().isEmpty()) { @@ -560,10 +565,13 @@ QString Compiler::getLibraryArguments(FileType fileType) continue; PCompilerOption pOption = CompilerInfoManager::getCompilerOption(compilerSet()->compilerType(), key); if (pOption && pOption->isLinker) { - if (pOption->choices.isEmpty()) + if (pOption->type == CompilerOptionType::Checkbox) result += " " + pOption->setting; - else + else if (pOption->type == CompilerOptionType::Input) + result += " " + pOption->setting + " " + compileOptions[key]; + else { result += " " + pOption->setting + compileOptions[key]; + } } } diff --git a/RedPandaIDE/compiler/compilerinfo.cpp b/RedPandaIDE/compiler/compilerinfo.cpp index e3082a9f..d2a7a5f5 100644 --- a/RedPandaIDE/compiler/compilerinfo.cpp +++ b/RedPandaIDE/compiler/compilerinfo.cpp @@ -1,5 +1,6 @@ #include "compilerinfo.h" #include +#include CompilerInfo::CompilerInfo(const QString &name): mName(name) @@ -31,8 +32,11 @@ bool CompilerInfo::supportSyntaxCheck() return true; } -void CompilerInfo::addOption(const QString &key, const QString &name, const QString section, bool isC, bool isCpp, bool isLinker, const QString &setting, const CompileOptionChoiceList &choices) +void CompilerInfo::addOption(const QString &key, const QString &name, + const QString section, bool isC, bool isCpp, bool isLinker, const QString &setting, + CompilerOptionType type, const CompileOptionChoiceList &choices) { + Q_ASSERT(choices.isEmpty() || type == CompilerOptionType::Choice); PCompilerOption pOption = std::make_shared(); pOption->key = key; pOption->name = name; @@ -41,6 +45,7 @@ void CompilerInfo::addOption(const QString &key, const QString &name, const QStr pOption->isCpp = isCpp; pOption->isLinker = isLinker; pOption->setting= setting; + pOption->type = type; pOption->choices = choices; mCompilerOptions.insert(key,pOption); mCompilerOptionList.append(pOption); @@ -70,7 +75,7 @@ void CompilerInfo::prepareCompilerOptions() sl.append(QPair("Highest (-Ofast)","fast")); sl.append(QPair("Size (-Os)","s")); sl.append(QPair("Debug (-Og)","g")); - addOption(CC_CMD_OPT_OPTIMIZE, QObject::tr("Optimization level (-Ox)"), groupName, true, true, false, "-O", sl); + addOption(CC_CMD_OPT_OPTIMIZE, QObject::tr("Optimization level (-Ox)"), groupName, true, true, false, "-O", CompilerOptionType::Choice, sl); // C++ Language Standards sl.clear(); @@ -86,7 +91,7 @@ void CompilerInfo::prepareCompilerOptions() sl.append(QPair("GNU C++17","gnu++17")); sl.append(QPair("GNU C++20","gnu++2a")); sl.append(QPair("GNU C++23","gnu++2b")); - addOption(CC_CMD_OPT_STD, QObject::tr("C++ Language standard (-std)"), groupName, false, true, false, "-std=", sl); + addOption(CC_CMD_OPT_STD, QObject::tr("C++ Language standard (-std)"), groupName, false, true, false, "-std=",CompilerOptionType::Choice, sl); sl.clear(); sl.append(QPair("ISO C90","c90")); @@ -97,7 +102,7 @@ void CompilerInfo::prepareCompilerOptions() sl.append(QPair("GNU C99","gnu99")); sl.append(QPair("GNU C11","gnu11")); sl.append(QPair("GNU C17","gnu17")); - addOption(C_CMD_OPT_STD, QObject::tr("C Language standard (-std)"), groupName, true, false, false, "-std=", sl); + addOption(C_CMD_OPT_STD, QObject::tr("C Language standard (-std)"), groupName, true, false, false, "-std=", CompilerOptionType::Choice, sl); // Optimization for cpu type // sl.clear(); @@ -147,13 +152,13 @@ void CompilerInfo::prepareCompilerOptions() sl.append(QPair("FMA4","fma4")); sl.append(QPair("XOP","xop")); sl.append(QPair("AES","aes")); - addOption(CC_CMD_OPT_INSTRUCTION,QObject::tr("Enable use of specific instructions (-mx)"), groupName, true, true, false, "-m", sl); + addOption(CC_CMD_OPT_INSTRUCTION,QObject::tr("Enable use of specific instructions (-mx)"), groupName, true, true, false, "-m", CompilerOptionType::Choice, sl); // 32bit/64bit sl.clear(); sl.append(QPair("32bit","32")); sl.append(QPair("64bit","64")); - addOption(CC_CMD_OPT_POINTER_SIZE, QObject::tr("Compile with the following pointer size (-mx)"), groupName, true, true, true, "-m", sl); + addOption(CC_CMD_OPT_POINTER_SIZE, QObject::tr("Compile with the following pointer size (-mx)"), groupName, true, true, true, "-m", CompilerOptionType::Choice, sl); addOption(CC_CMD_OPT_DEBUG_INFO, QObject::tr("Generate debugging information (-g3)"), groupName, true, true, false, "-g3"); addOption(CC_CMD_OPT_PROFILE_INFO, QObject::tr("Generate profiling info for analysis (-pg)"), groupName, true, true, true, "-pg"); @@ -171,14 +176,14 @@ void CompilerInfo::prepareCompilerOptions() sl.append(QPair("Normal"," ")); sl.append(QPair("Strong","-strong")); sl.append(QPair("All","-all")); - addOption(CC_CMD_OPT_STACK_PROTECTOR , QObject::tr("Check for stack smashing attacks (-fstack-protector)"), groupName, false, false, true, "-fstack-protector",sl); + addOption(CC_CMD_OPT_STACK_PROTECTOR , QObject::tr("Check for stack smashing attacks (-fstack-protector)"), groupName, false, false, true, "-fstack-protector", CompilerOptionType::Choice, sl); #if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) sl.clear(); sl.append(QPair("Address","address")); sl.append(QPair("Thread","thread")); sl.append(QPair("Leak","leak")); sl.append(QPair("Undefined","undefined")); - addOption(CC_CMD_OPT_ADDRESS_SANITIZER , QObject::tr("Enable Sanitizer (-fsanitize=)"), groupName, true, true, true, "-fsanitize=",sl); + addOption(CC_CMD_OPT_ADDRESS_SANITIZER , QObject::tr("Enable Sanitizer (-fsanitize=)"), groupName, true, true, true, "-fsanitize=",CompilerOptionType::Choice,sl); #endif // Output @@ -425,7 +430,7 @@ void SDCCCompilerInfo::prepareCompilerOptions() sl.append(QPair("Padauk processors-13bit width memory","pdk13")); sl.append(QPair("Padauk processors-14bit width memory","pdk14")); sl.append(QPair("Padauk processors-15bit width memory","pdk15")); - addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Processor (-m)"), groupName, true, false, false, "-m", sl); + addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Processor (-m)"), groupName, true, false, false, "-m", CompilerOptionType::Choice,sl); // C++ Language Standards sl.clear(); @@ -439,8 +444,22 @@ void SDCCCompilerInfo::prepareCompilerOptions() sl.append(QPair("SDCC C11","sdcc11")); sl.append(QPair("SDCC C17","sdcc17")); sl.append(QPair("SDCC C2x","sdcc2x")); - addOption(SDCC_CMD_OPT_STD, QObject::tr("Language standard (--std)"), groupName, true, false, false, "--std-", sl); + addOption(SDCC_CMD_OPT_STD, QObject::tr("Language standard (--std)"), groupName, true, false, false, "--std-", CompilerOptionType::Choice,sl); + addOption(SDCC_OPT_XSTACK, QObject::tr("Use external stack"),groupName,true,false,false,"--xstack"); + addOption(SDCC_OPT_XRAM_MOVC, QObject::tr("Use movc instead of movx to read from external ram"),groupName,true,false,false,"--xram-movc"); + addOption(SDCC_OPT_NO_XINIT_OPT, QObject::tr("Don't memcpy initialized xram from code"),groupName,true,false,false,"--no-xinit-opt"); addOption(SDCC_OPT_NOSTARTUP, QObject::tr("Don't generate startup code"),groupName,false,false,false,"nostartup"); + + groupName = QObject::tr("MCU Specification"); + + addOption(SDCC_OPT_IRAM_SIZE, QObject::tr("Internal ram size"), groupName, false, false, true, "--iram-size",CompilerOptionType::Input); + addOption(SDCC_OPT_XRAM_LOC, QObject::tr("External ram start location"), groupName, false, false, true, "--xram-loc",CompilerOptionType::Input); + addOption(SDCC_OPT_XRAM_SIZE, QObject::tr("External ram size"), groupName, false, false, true, "--xram-size",CompilerOptionType::Input); + addOption(SDCC_OPT_STACK_LOC, QObject::tr("Stack pointer initial value"), groupName, false, false, true, "--stack-loc",CompilerOptionType::Input); + addOption(SDCC_OPT_XSTACK_LOC, QObject::tr("External stack start location"), groupName, false, false, true, "--xstack-loc",CompilerOptionType::Input); + addOption(SDCC_OPT_DATA_LOC, QObject::tr("Direct data start location"), groupName, false, false, true, "--data-loc",CompilerOptionType::Input); + addOption(SDCC_OPT_CODE_LOC, QObject::tr("Code segment location"), groupName, false, false, true, "--code-loc",CompilerOptionType::Input); + addOption(SDCC_OPT_CODE_SIZE, QObject::tr("Code segment size"), groupName, false, false, true, "--code-size",CompilerOptionType::Input); } #endif diff --git a/RedPandaIDE/compiler/compilerinfo.h b/RedPandaIDE/compiler/compilerinfo.h index 18b3ce0d..13240eea 100644 --- a/RedPandaIDE/compiler/compilerinfo.h +++ b/RedPandaIDE/compiler/compilerinfo.h @@ -51,6 +51,19 @@ #ifdef ENABLE_SDCC #define SDCC_CMD_OPT_PROCESSOR "sdcc_cmd_opt_processor" #define SDCC_CMD_OPT_STD "sdcc_cmd_opt_std" +#define SDCC_OPT_XSTACK "sdcc_opt_xstack" +#define SDCC_OPT_XRAM_MOVC "sdcc_opt_xram_movc" +#define SDCC_OPT_NO_XINIT_OPT "sdcc_opt_no_xinit_opt" + +#define SDCC_OPT_NOSTARTUP "sdcc_opt_nostartup" +#define SDCC_OPT_IRAM_SIZE "sdcc_opt_iram_size" +#define SDCC_OPT_XRAM_SIZE "sdcc_opt_xram_size" +#define SDCC_OPT_XRAM_LOC "sdcc_opt_xram_loc" +#define SDCC_OPT_XSTACK_LOC "sdcc_opt_xstack_loc" +#define SDCC_OPT_CODE_LOC "sdcc_opt_code_loc" +#define SDCC_OPT_CODE_SIZE "sdcc_opt_code_size" +#define SDCC_OPT_STACK_LOC "sdcc_opt_stack_loc" +#define SDCC_OPT_DATA_LOC "sdcc_opt_data_loc" #define SDCC_OPT_NOSTARTUP "sdcc_opt_nostartup" #endif @@ -67,6 +80,12 @@ enum class CompilerType { Unknown }; +enum class CompilerOptionType { + Checkbox, + Choice, + Input +}; + using CompileOptionChoiceList = QList>; typedef struct { @@ -77,6 +96,7 @@ typedef struct { bool isCpp; // True (C++ option?) - can be both C and C++ option... bool isLinker; // Is it a linker param QString setting; // "-g3" + CompilerOptionType type; CompileOptionChoiceList choices; // replaces "Yes/No" standard choices (max 30 different choices) } CompilerOption; @@ -110,6 +130,7 @@ protected: bool isCpp, bool isLinker, const QString& setting, + CompilerOptionType type = CompilerOptionType::Checkbox, const CompileOptionChoiceList& choices = CompileOptionChoiceList()); virtual void prepareCompilerOptions(); protected: diff --git a/RedPandaIDE/compiler/sdccfilecompiler.cpp b/RedPandaIDE/compiler/sdccfilecompiler.cpp index cec0c795..1873eafa 100644 --- a/RedPandaIDE/compiler/sdccfilecompiler.cpp +++ b/RedPandaIDE/compiler/sdccfilecompiler.cpp @@ -58,7 +58,6 @@ bool SDCCFileCompiler::prepareForCompile() mArguments += getCCompileArguments(false); mArguments += getCIncludeArguments(); mArguments += getProjectIncludeArguments(); - mArguments += getLibraryArguments(FileType::CSource); if (!fileExists(mCompiler)) { throw CompileError( @@ -74,14 +73,15 @@ bool SDCCFileCompiler::prepareForCompile() mNoStartup = (val==COMPILER_OPTION_ON); if (mNoStartup) { mRelFilename = changeFileExt(mFilename,SDCC_REL_SUFFIX); - mArguments = QString(" -c \"%1\"").arg(mFilename); + mArguments += QString(" -c \"%1\"").arg(mFilename); mExtraCompilersList.append(mCompiler); - QString args; - args = QString(" -o \"%1\" \"%2\" ").arg(mIhxFilename, mRelFilename); + QString args = getLibraryArguments(FileType::CSource); + args += QString(" -o \"%1\" \"%2\" ").arg(mIhxFilename, mRelFilename); mExtraArgumentsList.append(args); mExtraOutputFilesList.append(""); } else { - mArguments = QString(" \"%1\"").arg(mFilename); + mArguments += getLibraryArguments(FileType::CSource); + mArguments += QString(" \"%1\"").arg(mFilename); mArguments+=QString(" -o \"%1\"").arg(mIhxFilename); } diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 537d8075..079a0ce0 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -6969,6 +6969,54 @@ Don't generate startup code + + Use external stack + + + + Use movc instead of movx to read from external ram + + + + Don't memcpy initialized xram from code + + + + MCU Specification + + + + Internal ram size + + + + External ram start location + + + + External ram size + + + + Stack pointer initial value + + + + External stack start location + + + + Direct data start location + + + + Code segment location + + + + Code segment size + + RegisterModel diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 7740bf99..7ee06c2d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -607,12 +607,12 @@ p, li { white-space: pre-wrap; } [说明] - + Can't open file "%1" for write! 无法写入文件“%1”。 - + The compiler process for '%1' failed to start. 无法启动编译器进程'%1'。 @@ -621,27 +621,27 @@ p, li { white-space: pre-wrap; } 无法启动编译进程。 - + The compiler process crashed after starting successfully. 编译进程启动后崩溃。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the compiler process. 在向编译进程输入内容时出错。 - + An error occurred when attempting to read from the compiler process. 在从编译进程读取内容时出错。 - + An unknown error occurred. 发生了未知错误。 @@ -4401,18 +4401,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4486,7 +4486,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4562,7 +4562,7 @@ Are you really want to continue? 工具栏2 - + New 新建 @@ -4695,9 +4695,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4708,7 +4708,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4719,8 +4719,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4844,38 +4844,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4923,7 +4923,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4931,21 +4931,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -5005,15 +5005,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5264,7 +5264,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5628,7 +5628,7 @@ Are you really want to continue? 保存为模板... - + New File 新建文件 @@ -5669,7 +5669,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5690,13 +5690,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5965,42 +5965,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - + - + + Debugging 正在调试 - - + - + + Running 正在运行 - - + - + + Compiling 正在编译 @@ -6014,17 +6014,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -6041,7 +6041,7 @@ Are you really want to continue? 确认 - + Source file is not compiled. 源文件尚未编译。 @@ -6058,39 +6058,39 @@ Are you really want to continue? 重新编译？ - - - - + + + + Wrong Compiler Settings 错误的编译器设置 - - - - + + + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 @@ -6111,33 +6111,33 @@ Are you really want to continue? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - - + + Please correct this before start debugging 请在调试前改正设置。 @@ -6146,8 +6146,8 @@ Are you really want to continue? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -6156,37 +6156,37 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - - + + Load last open info error 载入上次打开信息失败 - - + + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - - + + + Correct compile settings for debug 纠正调试用编译设置 - - + + The generated executable won't have debug symbol infos, and can't be debugged. 生成的可执行文件中会缺少调试符号信息，因此无法编译。 @@ -6194,82 +6194,82 @@ Are you really want to continue? If you are using the Release compiler set, please use the Debug compiler set instead. 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - - - Or you can manually change the following settings in the options dialog's compiler set page: - 您也可以手动在选项对话框的编译器设置页中修正下列选项： - - - Turned on the "Generate debug info (-g3)" option. - - 打开“生成调试信息(-g3)"选项. + Or you can manually change the following settings in the options dialog's compiler set page: + 您也可以手动在选项对话框的编译器设置页中修正下列选项： - - Turned off the "Strip executable (-s)" option. - - 关闭"剥除附加信息(-s)"选项. + - Turned on the "Generate debug info (-g3)" option. + - 打开“生成调试信息(-g3)"选项. - - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. + - Turned off the "Strip executable (-s)" option. + - 关闭"剥除附加信息(-s)"选项. - - You should recompile after change the compiler set or it's settings. - 在更换编译器设置集或修改其设置后，需要重新编译. + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". + - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. + + You should recompile after change the compiler set or it's settings. + 在更换编译器设置集或修改其设置后，需要重新编译. + + + + + Do you want to mannually change the compiler set settings now? 您现在就要手动修改编译器设置集的设置吗？ - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ @@ -6277,25 +6277,25 @@ Are you really want to continue? - - - + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -6324,56 +6324,56 @@ Are you really want to continue? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -6382,65 +6382,65 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 @@ -6453,22 +6453,22 @@ Are you really want to continue? 要现在去修改设置吗？ - + Rename Problem Set 修改试题集名称 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Rename Problem 修改试题名称 - + Line: %1 Col: %2 Lines: %3 行: %1 列: %2 总行数: %3 @@ -6493,12 +6493,12 @@ Are you really want to continue? 是否现在去改正? - + Missing Project Files 项目文件缺失 - + The following files is missing, can't build the project: 下列项目文件缺失，无法构建项目: @@ -6515,187 +6515,187 @@ Are you really want to continue? 请取消该设置，重新编译然后重新启动调试。 - + Goto Url 跳转到试题网址 - + Add Problem Case 添加试题案例 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + In current file 仅当前文件 - + In current project 整个项目 - - + + New Folder 新建文件夹 - + Rename 重命名 - - - - - + + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在文件资源管理器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + Newline 换行符 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + Watchpoint hitted 变量断点被触发 - + Value of "%1" has changed: "%1"的值发生了变化: - + New value: %1 新值: %1 - + Project folder removed. 项目文件夹被删除 - + Folder for project '%1' was removed. 项目"%1"的文件夹已被外部程序删除. - + It will be closed. 项目将被关闭. - + Save settings failed! 保存设置失败 - + Watchpoint variable name 被监控的变量 - + Stop execution when the following variable is modified (it must be visible from the currect scope): 当下面的变量被修改时暂停执行（该变量必须可以从当前程序处访问）： @@ -6704,17 +6704,17 @@ Are you really want to continue? 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6724,7 +6724,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6737,13 +6737,13 @@ Are you really want to continue? 无标题%1 - - + + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ @@ -6756,7 +6756,7 @@ Are you really want to continue? 变量"%1"有改动： - + Old value: %1 旧值: %1 @@ -6765,63 +6765,63 @@ Are you really want to continue? 新值: %1 - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - - - + + + New Project File? 新建项目文件? - - - + + + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - - + + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -6830,12 +6830,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6844,78 +6844,78 @@ Are you really want to continue? 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? @@ -6924,28 +6924,28 @@ Are you really want to continue? 正在删除试题... - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -6957,59 +6957,59 @@ Are you really want to continue? - + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -7018,22 +7018,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -7042,27 +7042,27 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 @@ -7079,12 +7079,12 @@ Are you really want to continue? 请在工具栏中选择Debug编译器配置集，或者在“编译器配置集”设置的“编译/链接选项”页中<b>启用</b>“生成调试信息(-g3)”、<b>禁用</b>“剥除附件信息(-3)”。 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 @@ -7093,7 +7093,7 @@ Are you really want to continue? 调试失败 - + The executable doesn't have symbol table, and can't be debugged. 可执行文件中没有符号表信息，无法调试。 @@ -7118,122 +7118,122 @@ Are you really want to continue? 您也可以删除所有断点，打开“CPU信息窗口”，然后调试汇编代码。 - + Failed to generate the executable. 未能生成可执行文件。 - + Please check detail info in "Tools Output" panel. 请查看“工具输出”面板中的详细信息。 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - - - + + + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - - + + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 - - - - - - - - - - - - - - + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 @@ -7242,8 +7242,8 @@ Are you really want to continue? 编译生成的可执行文件中没有符号表，无法被调试。 - - + + Version Control 版本控制 @@ -7252,102 +7252,102 @@ Are you really want to continue? 请在工具栏中选用Debug编译器配置集，或者在选项对话框的编辑器配置集页中勾选“生成调试信息(-g3)"选项。 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - - + + Compile Failed 编译失败 - + Run Failed 运行失败 - - - - + + + + Confirm Convertion 确认转换 - + Exact 完全一致 - + Ignore leading/trailing spaces 忽略行首/行尾空格 - + Ignore spaces 忽略多余空格 - - - + + + If you are using the Release compiler set, please use choose the Debug version from toolbar. 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - - + + + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -8727,13 +8727,13 @@ Are you really want to continue? QObject - + Save 保存 - + Save changes to %1? 将修改保存到"%1"？ @@ -8866,8 +8866,8 @@ Are you really want to continue? 模仿传统C预处理器行为(-traditional-cpp) - - + + Code Generation 代码生成 @@ -8880,22 +8880,22 @@ Are you really want to continue? 完整兼容特定机器，较少优化(-tune) - + Enable use of specific instructions (-mx) 启用特定指令集(-mx) - + Optimization level (-Ox) 优化级别(-Ox) - + Compile with the following pointer size (-mx) 使用下列指针大小编译(-mx) - + Processor (-m) 处理器类型(-m) @@ -8908,22 +8908,22 @@ Are you really want to continue? 性能分析 - + Generate debugging information (-g3) 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ - + Generate profiling info for analysis (-pg) 生成性能分析信息(-pg) - + Warnings 代码警告 @@ -8932,12 +8932,12 @@ Are you really want to continue? 当前CPU - + C++ Language standard (-std) C++语言标准 (-std) - + C Language standard (-std) C语言标准 (-std) @@ -8946,66 +8946,126 @@ Are you really want to continue? 启用 - + Check for stack smashing attacks (-fstack-protector) 检查栈溢出(stack smashing)错误 (-fstack-protector) - + Enable Sanitizer (-fsanitize=) 启用地址消毒(-fsanitize=) - + Inhibit all warning messages (-w) 忽略所有警告信息(-w) - + Show most warnings (-Wall) 启用常见问题警告(-Wall) - + Show some more warnings (-Wextra) 启用更多问题警告(-Wextra) - + Check ISO C/C++ conformance (-pedantic) 检查是否严格遵守ISO C/C++标准 - + Language standard (--std) C语言标准(--std) - + + Use external stack + 使用外部栈空间 + + + + Use movc instead of movx to read from external ram + 使用movc代替movx访问外部RAM + + + + Don't memcpy initialized xram from code + Don't memcpy initialized xram from code + + + Don't generate startup code 无main函数时不生成起始代码(用于edsim51模拟器) + + + MCU Specification + 微处理器参数 + + + + Internal ram size + 内部RAM大小 + + + + External ram start location + 外部RAM起始地址 + + + + External ram size + 外部RAM大小 + + + + Stack pointer initial value + 栈指针寄存器初始地址 + + + + External stack start location + 外部栈空间起始地址 + + + + Direct data start location + 内部数据区起始地址 + + + + Code segment location + 代码段起始地址 + + + + Code segment size + 代码段大小 + Check ISO C/C++/C++0x conformance (-pedantic) 检查ISO C/C++/C++0x语法一致性(-pedantic) - + Only check the code for syntax errors (-fsyntax-only) 只进行语法检查（不编译）(-fsyntax-only) - + Make all warnings into errors (-Werror) 将警告作为错误处理(-Werror) - + Abort compilation on first error (-Wfatal-errors) 遇到第一个错误后立即中止编译(-Wfatal-errors) - + Linker 链接器 @@ -9014,17 +9074,17 @@ Are you really want to continue? 链接Objective-C程序 (-lobjc) - + Do not use standard system libraries (-nostdlib) 不使用标准库和系统启动文件(-nostdlib) - + Do not create a console window (-mwindows) 不产生控制台窗口(-mwindows) - + Strip executable (-s) 剥除附加信息(-s) @@ -9045,7 +9105,7 @@ Are you really want to continue? 仅预处理（-E) - + Use pipes instead of temporary files during compilation (-pipe) 编译时使用管道而不是临时文件(-pipe) @@ -9054,7 +9114,7 @@ Are you really want to continue? 只生成汇编代码(-S) - + Confirm 确认 @@ -9075,13 +9135,13 @@ Are you really want to continue? 如果仍然保留这些设置，可能会导致编译错误。<br /><br />请选择“是”，除非您清楚的知道选择“否”的后果， - - + + Compiler set not configuared. 未配置编译器设置。 - + Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'? 您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2 @@ -9961,12 +10021,12 @@ Are you really want to continue? 找不到文件"%1". - + The Compiler '%1' doesn't exists! 找不到编译器'%1'. - + Please check the "program" page of compiler settings. 请检查编译器设置页中的“程序”页。 @@ -10642,18 +10702,18 @@ Are you really want to continue? 性能 - - - - + + + + Compiler Set 编译器配置集 - - + + Compiler @@ -10665,7 +10725,7 @@ Are you really want to continue? 自动链接 - + @@ -10741,15 +10801,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -10808,8 +10868,8 @@ Are you really want to continue? 项目选项 - - + + diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index bc147095..bd1b3827 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -6494,6 +6494,54 @@ Don't generate startup code + + Use external stack + + + + Use movc instead of movx to read from external ram + + + + Don't memcpy initialized xram from code + + + + MCU Specification + + + + Internal ram size + + + + External ram start location + + + + External ram size + + + + Stack pointer initial value + + + + External stack start location + + + + Direct data start location + + + + Code segment location + + + + Code segment size + + RegisterModel diff --git a/RedPandaIDE/widgets/compileargumentswidget.cpp b/RedPandaIDE/widgets/compileargumentswidget.cpp index c3cd7320..5fe4ca9d 100644 --- a/RedPandaIDE/widgets/compileargumentswidget.cpp +++ b/RedPandaIDE/widgets/compileargumentswidget.cpp @@ -20,6 +20,7 @@ #include #include #include +#include CompileArgumentsWidget::CompileArgumentsWidget(QWidget *parent) : QTabWidget(parent) @@ -45,7 +46,9 @@ QMap CompileArgumentsWidget::arguments( bool includeUnset) con PCompilerOption pOption = CompilerInfoManager::getCompilerOption(mCompilerType,key); if (!pOption) continue; - if (pOption->choices.isEmpty()) { + switch (pOption->type) { + case CompilerOptionType::Checkbox: + { QCheckBox* pCheckbox = static_cast(pLayout->itemAtPosition(j,1)->widget()); if (pCheckbox->isChecked()) { args.insert(key,COMPILER_OPTION_ON); @@ -55,7 +58,10 @@ QMap CompileArgumentsWidget::arguments( bool includeUnset) con else args.remove(key); } - } else { + } + break; + case CompilerOptionType::Choice: + { QComboBox* pCombo = static_cast(pLayout->itemAtPosition(j,2)->widget()); if (!pCombo->currentData().toString().isEmpty()) { args.insert(key,pCombo->currentData().toString()); @@ -66,6 +72,22 @@ QMap CompileArgumentsWidget::arguments( bool includeUnset) con args.remove(key); } } + break; + case CompilerOptionType::Input: + { + QLineEdit* pText = static_cast(pLayout->itemAtPosition(j,2)->widget()); + QString t=pText->text().trimmed(); + if (!t.isEmpty()) + args.insert(key,t); + else { + if (includeUnset) + args.insert(key,""); + else + args.remove(key); + } + } + break; + } } } } @@ -105,12 +127,17 @@ void CompileArgumentsWidget::resetUI(Settings::PCompilerSet pSet, const QMapkey,pWidget); keyLabel->setVisible(false); pLayout->addWidget(keyLabel,row,0); - if (pOption->choices.isEmpty()) { + switch(pOption->type) { + case CompilerOptionType::Checkbox: + { QCheckBox* pCheckbox = new QCheckBox(pWidget); pCheckbox->setText(pOption->name); pCheckbox->setChecked(options.value(pOption->key,"")==COMPILER_OPTION_ON); pLayout->addWidget(pCheckbox,row,1,1,2); - } else { + } + break; + case CompilerOptionType::Choice: + { pLayout->addWidget(new QLabel(pOption->name,pWidget),row,1); QComboBox* pCombo = new QComboBox(pWidget); pCombo->addItem("",""); @@ -122,6 +149,16 @@ void CompileArgumentsWidget::resetUI(Settings::PCompilerSet pSet, const QMapaddWidget(pCombo,row,2); } + break; + case CompilerOptionType::Input: + { + pLayout->addWidget(new QLabel(pOption->name,pWidget),row,1); + QLineEdit* pInput = new QLineEdit(pWidget); + pInput->setText(options.value(pOption->key,"")); + pLayout->addWidget(pInput,row,2); + } + break; + } } for (int i=0;icount();i++) { QWidget* pWidget = pTab->widget(i);