From 02b64497d516f7f28f757b5a0463b4c53101b5ea Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sun, 12 Feb 2023 18:13:24 +0800 Subject: [PATCH] - enhancement: Keyword completion for asm/GAS files. --- NEWS.md | 2 +- RedPandaIDE/editor.cpp | 71 +- RedPandaIDE/editor.h | 3 +- RedPandaIDE/syntaxermanager.cpp | 6 +- RedPandaIDE/systemconsts.cpp | 2 + RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 8 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 776 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 8 + libs/qsynedit/qsynedit/syntaxer/asm.cpp | 277 +++++-- libs/qsynedit/qsynedit/syntaxer/asm.h | 7 +- libs/qsynedit/qsynedit/syntaxer/syntaxer.h | 1 + 11 files changed, 694 insertions(+), 467 deletions(-) diff --git a/NEWS.md b/NEWS.md index 6ea92e6f..82720ad4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,7 +9,7 @@ Red Panda C++ Version 2.12 - enhancement: Generate debug info for nasm files in Linux/MacOS. - enhancement: Compile/Run/Debug GAS source files. - enhancement: Compile/Debug GAS source files in project. - + - enhancement: Keyword completion for asm/GAS files. Red Panda C++ Version 2.11 diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 4044e333..5aa2d0de 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -931,13 +931,16 @@ void Editor::keyPressEvent(QKeyEvent *event) } } else if (syntaxer()) { //show keywords + processCommand(QSynedit::EditCommand::Char,ch,nullptr); showCompletion("",false,CodeCompletionType::KeywordsOnly); + handled=true; + return; } } } else { if (pSettings->codeCompletion().enabled() && pSettings->codeCompletion().showCompletionWhileInput() ) { - if (mParser) { + if (syntaxer() && syntaxer()->language()==QSynedit::ProgrammingLanguage::CPP) { //preprocessor ? if ((mLastIdCharPressed==0) && (ch=='#') && lineText().isEmpty()) { mLastIdCharPressed++; @@ -955,6 +958,21 @@ void Editor::keyPressEvent(QKeyEvent *event) handled=true; return; } + } else if (syntaxer() && syntaxer()->language()==QSynedit::ProgrammingLanguage::ATTAssembly) { + if ((mLastIdCharPressed==0) && (ch=='.')) { + mLastIdCharPressed++; + processCommand(QSynedit::EditCommand::Char,ch,nullptr); + showCompletion("",false,CodeCompletionType::KeywordsOnly); + handled=true; + return; + } + if ((mLastIdCharPressed==0) && (ch=='%')) { + mLastIdCharPressed++; + processCommand(QSynedit::EditCommand::Char,ch,nullptr); + showCompletion("",false,CodeCompletionType::KeywordsOnly); + handled=true; + return; + } } } mLastIdCharPressed = 0; @@ -3222,6 +3240,12 @@ void Editor::showCompletion(const QString& preWord,bool autoComplete, CodeComple if (!word.startsWith('@')) { return; } + } else if ( + (attr->tokenType() == QSynedit::TokenType::String) && + (attr->tokenType() != QSynedit::TokenType::Character)) { + return; + } else if (type==CodeCompletionType::KeywordsOnly && syntaxer() && syntaxer()->language()==QSynedit::ProgrammingLanguage::ATTAssembly) { + word = getWordAtPosition(this,caretXY(),pBeginPos,pEndPos, WordPurpose::wpATTASMKeywords); } else if ( (attr->tokenType() != QSynedit::TokenType::Operator) && (attr->tokenType() != QSynedit::TokenType::Space) && @@ -3273,21 +3297,18 @@ void Editor::showCompletion(const QString& preWord,bool autoComplete, CodeComple mCompletionPopup->show(); // Scan the current function body - QSet keywords; if (syntaxer()) { if (syntaxer()->language() != QSynedit::ProgrammingLanguage::CPP ) { - if (syntaxer()->language()==QSynedit::ProgrammingLanguage::Assembly) { - keywords = QSynedit::ASMSyntaxer::Directives; - foreach(const QString& keyword, QSynedit::ASMSyntaxer::Registers) { - keywords.insert(keyword); - } - foreach(const QString& keyword, QSynedit::ASMSyntaxer::Instructions) { - keywords.insert(keyword); - } - } else { + if (syntaxer()->language()==QSynedit::ProgrammingLanguage::ATTAssembly) { + if (word.startsWith(".")) + keywords = QSynedit::ASMSyntaxer::ATTDirectives; + else if (word.startsWith("%")) + keywords = QSynedit::ASMSyntaxer::ATTRegisters; + else + keywords = QSynedit::ASMSyntaxer::Instructions; + } else keywords = syntaxer()->keywords(); - } } else { if (mUseCppSyntax) { foreach (const QString& keyword, CppKeywords.keys()) { @@ -3508,6 +3529,11 @@ void Editor::completionInsert(bool appendFunc) // delete the part of the word that's already been typed ... QSynedit::BufferCoord p = wordEnd(); QSynedit::BufferCoord pStart = wordStart(); + if (syntaxer() && syntaxer()->language()==QSynedit::ProgrammingLanguage::ATTAssembly) { + if (statement->command.startsWith(".") + || statement->command.startsWith("#")) + pStart.ch--; + } setCaretAndSelection(pStart,pStart,p); // if we are inserting a function, @@ -3612,7 +3638,9 @@ bool Editor::onCompletionKeyPressed(QKeyEvent *event) return false; QString oldPhrase = mCompletionPopup->memberPhrase(); WordPurpose purpose = WordPurpose::wpCompletion; - if (oldPhrase.startsWith('#')) { + if (syntaxer() && syntaxer()->language()==QSynedit::ProgrammingLanguage::ATTAssembly) { + purpose = WordPurpose::wpATTASMKeywords; + } else if (oldPhrase.startsWith('#')) { purpose = WordPurpose::wpDirective; } else if (oldPhrase.startsWith('@')) { purpose = WordPurpose::wpJavadoc; @@ -4429,6 +4457,23 @@ QString getWordAtPosition(QSynedit::QSynEdit *editor, const QSynedit::BufferCoor } } + + // Copy backward until % . + if (purpose == Editor::WordPurpose::wpATTASMKeywords) { + while ((wordBegin >= 0) && (wordBegin < len)) { + if (editor->isIdentChar(s[wordBegin])) + wordBegin--; + else if (s[wordBegin] == '%') { + wordBegin--; + break; + } else if (s[wordBegin] == '.') { + wordBegin--; + break; + } else + break; + } + } + // Copy backward until # if (purpose == Editor::WordPurpose::wpDirective) { while ((wordBegin >= 0) && (wordBegin < len)) { diff --git a/RedPandaIDE/editor.h b/RedPandaIDE/editor.h index 89f1e04b..43fbb249 100644 --- a/RedPandaIDE/editor.h +++ b/RedPandaIDE/editor.h @@ -95,7 +95,8 @@ public: wpHeaderCompletionStart, // walk backwards over path, including start '<' or '"' wpDirective, // preprocessor wpJavadoc, //javadoc - wpInformation // walk backwards over words, array, functions, parents, forwards over words + wpInformation, // walk backwards over words, array, functions, parents, forwards over words + wpATTASMKeywords, }; enum class TipType { diff --git a/RedPandaIDE/syntaxermanager.cpp b/RedPandaIDE/syntaxermanager.cpp index 16cf775e..0b9d1d55 100644 --- a/RedPandaIDE/syntaxermanager.cpp +++ b/RedPandaIDE/syntaxermanager.cpp @@ -40,6 +40,8 @@ QSynedit::PSyntaxer SyntaxerManager::getSyntaxer(QSynedit::ProgrammingLanguage l return std::make_shared(); case QSynedit::ProgrammingLanguage::Assembly: return std::make_shared(); + case QSynedit::ProgrammingLanguage::ATTAssembly: + return std::make_shared(true); case QSynedit::ProgrammingLanguage::Makefile: return std::make_shared(); case QSynedit::ProgrammingLanguage::GLSL: @@ -62,8 +64,10 @@ QSynedit::PSyntaxer SyntaxerManager::getSyntaxer(const QString &filename) return getSyntaxer(QSynedit::ProgrammingLanguage::CPP); } else if (suffix == "vs" || suffix == "fs" || suffix == "frag") { return getSyntaxer(QSynedit::ProgrammingLanguage::GLSL); - } else if (suffix == "s" || suffix == "asm") { + } else if (suffix == "asm") { return getSyntaxer(QSynedit::ProgrammingLanguage::Assembly); + } else if (suffix == "s" || suffix == "S") { + return getSyntaxer(QSynedit::ProgrammingLanguage::ATTAssembly); } else if (basename.compare("makefile", Qt::CaseInsensitive)==0) { return getSyntaxer(QSynedit::ProgrammingLanguage::Makefile); } else if (suffix.isEmpty()) { diff --git a/RedPandaIDE/systemconsts.cpp b/RedPandaIDE/systemconsts.cpp index 24ff466a..6c6c4032 100644 --- a/RedPandaIDE/systemconsts.cpp +++ b/RedPandaIDE/systemconsts.cpp @@ -35,6 +35,8 @@ SystemConsts::SystemConsts(): mDefaultFileFilters() addDefaultFileFilter(QObject::tr("C files"),"*.c"); addDefaultFileFilter(QObject::tr("C++ files"),"*.cpp *.cc *.cxx"); addDefaultFileFilter(QObject::tr("Header files"),"*.h *.hh *.hpp"); + addDefaultFileFilter(QObject::tr("GAS files"),"*.s *.S"); + addDefaultFileFilter(QObject::tr("ASM files"),"*.asm"); addFileFilter(mIconFileFilters, QObject::tr("Icon files"), "*.ico"); diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index b175c0df..7830c27a 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -6503,6 +6503,14 @@ Do you really want to remove "%1"? + + GAS files + + + + ASM files + + RegisterModel diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index ef3386c6..b902fd99 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1405,10 +1405,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1457,34 +1457,34 @@ Are you really want to continue? 文件%1已经被打开！ - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 @@ -1493,27 +1493,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -2843,39 +2843,39 @@ Are you really want to continue? - + Can't delete the old executable file "%1". 无法删除旧的可执行文件"%1". - + Can't find the compiler for file %1 Can't the compiler for file %1 找不到适合文件%1的编译器 - + The Compiler '%1' doesn't exists! 编译器程序"%1"不存在！ - + Please check the "program" page of compiler settings. 请检查编译器设置中的“程序”页。 - + Processing %1 source file: 正在处理%1源程序文件: - + %1 Compiler: %2 %1编译器: %2 - + Command: %1 %2 命令: %1 %2 @@ -4170,18 +4170,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4255,7 +4255,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4389,8 +4389,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4467,9 +4467,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4480,7 +4480,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4491,8 +4491,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4618,38 +4618,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4697,7 +4697,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4705,21 +4705,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4779,15 +4779,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5029,7 +5029,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5250,7 +5250,7 @@ Are you really want to continue? - + New File 新建文件 @@ -5291,7 +5291,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5312,13 +5312,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5587,7 +5587,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5597,32 +5597,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5636,17 +5636,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5659,75 +5659,75 @@ Are you really want to continue? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - - - - + + + + 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. 无法启动调试器 - - + + Enable debugging 启用调试参数 @@ -5736,54 +5736,54 @@ Are you really want to continue? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + 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 请在调试前改正设置。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5792,60 +5792,60 @@ 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 打开源代码文件 - - + + 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已存在。是否覆盖？ @@ -5853,9 +5853,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5871,7 +5871,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5892,68 +5892,70 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + + Rebuild Project 重新构建项目 - - + + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + 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: 描述： @@ -5962,65 +5964,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 重命名 @@ -6029,167 +6031,167 @@ Are you really want to continue? 您没有使用DEBUG编译配置。 - - + + Do you want to set it now? 要现在去修改设置吗？ - + 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 - + 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 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + Newline 换行符 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -6198,17 +6200,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 导出时出错 @@ -6218,7 +6220,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6231,68 +6233,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%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? 你真的想要那么做吗？ @@ -6301,12 +6303,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6315,78 +6317,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'? @@ -6395,28 +6397,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 选择期望输出文件 @@ -6428,59 +6430,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! 提交信息不能为空！ @@ -6489,22 +6491,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? 同时从硬盘上删除文件？ @@ -6513,129 +6515,129 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - - + + You are not using a Debug compiler setting. 您没有使用Debug编译器设置。 - + Please use a Debug compiler set, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler settings. 请在工具栏中选择Debug编译器配置集，或者在编译器配置集设置中启用“生成调试信息(-g3)”并禁用“剥除附加信息(-s)”选项。 - + Please choose a Debug compiler set in the toolbar, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler set settings's "settings" page. 请在工具栏中选择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. 本操作会删除此试题的所有案例。 - + 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 @@ -6646,14 +6648,14 @@ Are you really want to continue? - - - - - - - - + + + + + + + + Error 错误 @@ -6663,96 +6665,96 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + 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 确认转换 - - - - + + + + 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个文件） @@ -7155,105 +7157,105 @@ Are you really want to continue? 无法保存文件'%1'. - + Error Load File 载入文件错误 - - + + Error 错误 - + Can't create folder %1 无法创建文件夹%1 - + Warning 警告 - - + + Can't save file %1 无法保存文件%1 - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Headers 头文件 - + Sources 源文件 - + Others 其他文件 - + Settings need update 设置需要更新 - + The compiler settings format of Red Panda C++ has changed. The compiler settings format of Dev-C++ has changed. 小熊猫C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda C++ IDE Developed using the Red Panda Dev-C++ IDE 使用小熊猫C++编辑器开发 @@ -7378,42 +7380,42 @@ Are you really want to continue? - 资源文件: %1 - + Compiling project changes... 正在编译项目修改... - + - Project Filename: %1 - 项目文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - + Make program '%1' doesn't exists! Make程序“%1”不存在！ - + Please check the "program" page of compiler settings. 请检查编译器配置中的“程序”页。 - + Processing makefile: 正在处理makefile... - + - makefile processer: %1 - makefile处理器: %1 - + - Command: %1 %2 - 命令: %1 %2 @@ -7755,32 +7757,32 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - + Remove failed 删除失败 - + Failed to remove file '%1' 无法删除文件'%1' - + Rename failed 改名失败 - + Failed to rename file '%1' to '%2' 无法将文件'%1'改名为'%2' @@ -8070,8 +8072,18 @@ Are you really want to continue? Header files 头文件 + + + GAS files + GAS文件 + + ASM files + ASM文件 + + + Icon files 图标文件 @@ -8397,22 +8409,22 @@ Are you really want to continue? 下标"%1"越界 - + bytes 字节 - + KB KB - + MB MB - + GB GB @@ -9445,18 +9457,18 @@ Are you really want to continue? 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler @@ -9468,7 +9480,7 @@ Are you really want to continue? 自动链接 - + @@ -9545,15 +9557,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 6180b817..64e54cc0 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -6148,6 +6148,14 @@ Do you really want to remove "%1"? + + GAS files + + + + ASM files + + RegisterModel diff --git a/libs/qsynedit/qsynedit/syntaxer/asm.cpp b/libs/qsynedit/qsynedit/syntaxer/asm.cpp index 4e476fa9..a1831c13 100644 --- a/libs/qsynedit/qsynedit/syntaxer/asm.cpp +++ b/libs/qsynedit/qsynedit/syntaxer/asm.cpp @@ -25,73 +25,169 @@ const QSet ASMSyntaxer::Registers { "bh","bl","bx","ebx", "ch","cl","cx","ecx", "dh","dl","dx","edx", - "rax","rbx","rcx","rdx","rsi","rdi","rbp", - "rsp","r8","r9","r10","r11","r12","r13","r14","r15", - "r8h","r8l","r8w","r8d", - "r9h","r9l","r9w","r9d", - "r10h","r10l","r10w","r10d", - "r11h","r11l","r11w","r11d", - "r12h","r12l","r12w","r12d", - "r13h","r13l","r13w","r13d", - "r14h","r14l","r14w","r14d", - "r15h","r15l","r15w","r15d" + "spl","sp","esp", + "bpl","bp","ebp", + "sil","si","esi", + "dil","di","edi", + "r8b","r8w","r8d", + "r9b","r9w","r9d", + "r10b","r10w","r10d", + "r11b","r11w","r11d", + "r12b","r12w","r12d", + "r13b","r13w","r13d", + "r14b","r14w","r14d", + "r15b","r15w","r15d", + "rax","rbx","rcx","rdx","rsp","rbp","rsi","rdi", + "r8","r9","r10","r11","r12","r13","r14","r15", + "ip","eip","rip", + "flags","eflags","rflags", + "cs","ds","ss","es","fs","gs", + "st0","st1","st2","st3","st4","st5","st6","st7", + "xmm0","xmm1","xmm2","xmm3", + "xmm4","xmm5","xmm6","xmm7", + "xmm8","xmm9","xmm10","xmm11", + "xmm12","xmm13","xmm14","xmm15", +}; + +const QSet ASMSyntaxer::ATTRegisters { + "%ah","%al","%ax","%eax", + "%bh","%bl","%bx","%ebx", + "%ch","%cl","%cx","%ecx", + "%dh","%dl","%dx","%edx", + "%spl","%sp","%esp", + "%bpl","%bp","%ebp", + "%sil","%si","%esi", + "%dil","%di","%edi", + "%r8b","%r8w","%r8d", + "%r9b","%r9w","%r9d", + "%r10b","%r10w","%r10d", + "%r11b","%r11w","%r11d", + "%r12b","%r12w","%r12d", + "%r13b","%r13w","%r13d", + "%r14b","%r14w","%r14d", + "%r15b","%r15w","%r15d", + "%rax","%rbx","%rcx","%rdx","%rsp","%rbp","%rsi","%rdi", + "%r8","%r9","%r10","%r11","%r12","%r13","%r14","%r15", + "%ip","%eip","%rip", + "%flags","%eflags","%rflags", + "%cs","%ds","%ss","%es","%fs","%gs", + "%st0","%st1","%st2","%st3","%st4","%st5","%st6","%st7", + "%xmm0","%xmm1","%xmm2","%xmm3", + "%xmm4","%xmm5","%xmm6","%xmm7", + "%xmm8","%xmm9","%xmm10","%xmm11", + "%xmm12","%xmm13","%xmm14","%xmm15", }; const QSet ASMSyntaxer::Instructions { - "movb","movw","movl","movq", - "leab","leaw","leal","leaq", - "incb","incw","incl","incq", - "decb","decw","decl","decq", - "addb","addw","addl","addq", - "subb","subw","subl","subq", - "imulb","imulw","imull","imulq", - "divb","divw","divl","divq", - "xorb","xorw","xorl","xorq", - "orb","orw","orl","orq", - "andb","andw","andl","andq", - "salb","salw","sall","salq", - "shlb","shlw","shll","shlq", - "sarb","sarw","sarl","sarq", - "shrb","shrw","shrl","shrq", - "cmpb","cmpw","cmpl","cmpq", - "testb","testw","testl","testq", - "pushq","popq", - "cmove", "cmovz", "cmovne", "cmovnz", - "cmovs", "cmovns", "cmovg", "cmovge", - "cmovl", "cmovle", "cmova", "cmovae", - "cmovb", "cmovbe", "cmovnbe","cmovnb", - "cmovnae","cmovna", - "aaa","aad","aam","adc","add","and","arpl","bound","bsf","bsr","bswap","bt","btc","btr","bts", - "call","cbw","cdq","clc","cld","cli","clts","cmc","cmp","cmps","cmpsb","cmpsd","cmpsw", - "cmpxchg","cwd","cwde","daa","das","dec","div","emms","enter","f2xm1","fabs","fadd","faddp","fbld", - "fbstp","fchs","fclex","fcmovb","fcmovbe","fcmove","fcmovnb","fcmovnbe","fcmovne","fcmovnu", - "fcmovu","fcom","fcomi","fcomip","fcomp","fcompp","fcos","fdecstp","fdiv","fdivp","fdivr", - "fdivrp","femms","ffree","fiadd","ficom","ficomp","fidiv","fidivr","fild","fimul","fincstp", - "finit","fist","fistp","fisub","fisubr","fld","fld1","fldcw","fldenv","fldl2e","fldl2t","fldlg2", - "fldln2","fldpi","fldz","fmul","fmulp","fnclex","fninit","fnop","fnsave","fnstcw","fnstenv", - "fnstsw","fpatan","fprem1","fptan","frndint","frstor","fsave","fscale","fsin","fsincos", - "fsqrt","fst","fstcw","fstenv","fstp","fstsw","fsub","fsubp","fsubr","fsubrp","ftst", - "fucom","fucomi","fucomip","fucomp","fucompp","fwait","fxch","fxtract","fyl2xp1","hlt","idiv", - "imul","in","inc","ins","insb","insd","insw","int","into","invd","invlpg","iret","iretd","iretw", - "ja","jae","jb","jbe","jc","jcxz","je","jecxz","jg","jge","jl","jle","jmp","jna","jnae","jnb","jnbe","jnc", - "jne","jng","jnge","jnl","jnle","jno","jnp","jns","jnz","jo","jp","jpe","jpo","js","jz","lahf","lar","lds", - "lea","leave","les","lfs","lgdt","lgs","lidt","lldt","lmsw","lock","lods","lodsb","lodsd","lodsw", - "loop","loope","loopne","loopnz","loopz","lsl","lss","ltr","mov","movd","movq","movs","movsb", - "movsd","movsw","movsx","movzx","mul","neg","nop","not","or","out","outs","outsb","outsd","outsw", - "packssdw","packsswb","packuswb","paddb","paddd","paddsb","paddsw","paddusb","paddusw", - "paddw","pand","pandn","pavgusb","pcmpeqb","pcmpeqd","pcmpeqw","pcmpgtb","pcmpgtd","pcmpgtw", - "pf2id","pfacc","pfadd","pfcmpeq","pfcmpge","pfcmpgt","pfmax","pfmin","pfmul","pfrcp", - "pfrcpit1","pfrcpit2","pfrsqit1","pfrsqrt","pfsub","pfsubr","pi2fd","pmaddwd","pmulhrw", - "pmulhw","pmullw","pop","popa","popad","popaw","popf","popfd","popfw","por","prefetch","prefetchw", - "pslld","psllq","psllw","psrad","psraw","psrld","psrlq","psrlw","psubb","psubd","psubsb", - "psubsw","psubusb","psubusw","psubw","punpckhbw","punpckhdq","punpckhwd","punpcklbw", - "punpckldq","punpcklwd","push","pusha","pushad","pushaw","pushf","pushfd","pushfw","pxor", - "rcl","rcr","rep","repe","repne","repnz","repz","ret","rol","ror","sahf","sal","sar","sbb","scas", - "scasb","scasd","scasw","seta","setae","setb","setbe","setc","sete","setg","setge","setl","setle", - "setna","setnae","setnb","setnbe","setnc","setne","setng","setnge","setnl","setnle","setno", - "setnp","setns","setnz","seto","setp","setpo","sets","setz","sgdt","shl","shld","shr","shrd","sidt", - "sldt","smsw","stc","std","sti","stos","stosb","stosd","stosw","str","sub","test","verr","verw", - "wait","wbinvd","xadd","xchg","xlat","xlatb","xor", + "aaa","aad","aam","aas","adc","adcx","add","addpd","addps", + "addsd","addss","addsubpd","addsubps","adox","aesdec","aesdec128kl","aesdec256kl","aesdeclast","aesdecwide128kl", + "aesdecwide256kl","aesenc","aesenc128kl","aesenc256kl","aesenclast","aesencwide128kl","aesencwide256kl","aesimc","aeskeygenassist","and", + "andn","andnpd","andnps","andpd","andps","arpl","bextr","blendpd","blendps","blendvpd", + "blendvps","blsi","blsmsk","blsr","bndcl","bndcn","bndcu","bndldx","bndmk","bndmov", + "bndstx","bound","bsf","bsr","bswap","bt","btc","btr","bts","bzhi", + "call","cbw","cdq","cdqe","clac","clc","cld","cldemote","clflush","clflushopt", + "cli","clrssbsy","clts","clwb","cmc","cmova","cmovae","cmovb","cmovbe","cmovc", + "cmove","cmovg","cmovge","cmovl","cmovle","cmovna","cmovnae","cmovnb","cmovnbe","cmovnc", + "cmovne","cmovng","cmovnge","cmovnl","cmovnle","cmovno","cmovnp","cmovns","cmovnz","cmovo", + "cmovp","cmovpe","cmovpo","cmovs","cmovz","cmp","cmppd","cmpps","cmps","cmpsb", + "cmpsd","cmpsq","cmpss","cmpsw","cmpxchg","cmpxchg16b","cmpxchg8b","comisd","comiss","cpuid", + "cqo","crc32","cvtdq2pd","cvtdq2ps","cvtpd2dq","cvtpd2pi","cvtpd2ps","cvtpi2pd","cvtpi2ps","cvtps2dq", + "cvtps2pd","cvtps2pi","cvtsd2si","cvtsd2ss","cvtsi2sd","cvtsi2ss","cvtss2sd","cvtss2si","cvttpd2dq","cvttpd2pi", + "cvttps2dq","cvttps2pi","cvttsd2si","cvttss2si","cwd","cwde","daa","das","dec","div", + "divpd","divps","divsd","divss","dppd","dpps","emms","encodekey128","encodekey256","endbr32", + "endbr64","enter","extractps","f2xm1","fabs","fadd","faddp","fbld","fbstp","fchs", + "fclex","fcmovb","fcmove","fcmovbe","fcmovu","fcmovnb","fcmovne","fcmovnbe","fcmovnu","fcom", + "fcomi","fcomip","fcomp","fcompp","fcos","fdecstp","fdiv","fdivp","fdivr","fdivrp", + "ffree","fiadd","ficom","ficomp","fidiv","fidivr","fild","fimul","fincstp","finit", + "fist","fistp","fisttp","fisub","fisubr","fld","fld1","fldcw","fldenv","fldl2e", + "fldl2t","fldlg2","fldln2","fldpi","fldz","fmul","fmulp","fnclex","fninit","fnop", + "fnsave","fnstcw","fnstenv","fnstsw","fpatan","fprem","fprem1","fptan","frndint","frstor", + "fsave","fscale","fsin","fsincos","fsqrt","fst","fstcw","fstenv","fstp","fstsw", + "fsub","fsubp","fsubr","fsubrp","ftst","fucom","fucomi","fucomip","fucomp","fucompp", + "fwait","fxam","fxch","fxrstor","fxsave","fxtract","fyl2x","fyl2xp1","gf2p8affineinvqb","gf2p8affineqb", + "gf2p8mulb","haddpd","haddps","hlt","hreset","hsubpd","hsubps","idiv","imul","in", + "inc","incsspd","incsspq","ins","insb","insd","insertps","insw","int n","int1", + "int3","into","invd","invlpg","invpcid","iret","iretd","iretq","jmp","ja", + "jae","jb","jbe","jc","jcxz","je","jecxz","jg","jge","jl", + "jle","jna","jnae","jnb","jnbe","jnc","jne","jng","jnge","jnl", + "jnle","jno","jnp","jns","jnz","jo","jp","jpe","jpo","jrcxz", + "js","jz","kaddb","kaddd","kaddq","kaddw","kandb","kandd","kandnb","kandnd", + "kandnq","kandnw","kandq","kandw","kmovb","kmovd","kmovq","kmovw","knotb","knotd", + "knotq","knotw","korb","kord","korq","kortestb","kortestd","kortestq","kortestw","korw", + "kshiftlb","kshiftld","kshiftlq","kshiftlw","kshiftrb","kshiftrd","kshiftrq","kshiftrw","ktestb","ktestd", + "ktestq","ktestw","kunpckbw","kunpckdq","kunpckwd","kxnorb","kxnord","kxnorq","kxnorw","kxorb", + "kxord","kxorq","kxorw","lahf","lar","lddqu","ldmxcsr","lds","lea","leave", + "les","lfence","lfs","lgdt","lgs","lidt","lldt","lmsw","loadiwkey","lock", + "lods","lodsb","lodsd","lodsq","lodsw","loop","loope","loopne","lsl","lss", + "ltr","lzcnt","maskmovdqu","maskmovq","maxpd","maxps","maxsd","maxss","mfence","minpd", + "minps","minsd","minss","monitor","mov","movapd","movaps","movbe","movd","movddup", + "movdir64b","movdiri","movdq2q","movdqa","movdqu","movhlps","movhpd","movhps","movlhps","movlpd", + "movlps","movmskpd","movmskps","movntdq","movntdqa","movnti","movntpd","movntps","movntq","movq", + "movq2dq","movs","movsb","movsd","movshdup","movsldup","movsq","movss","movsw","movsx", + "movsxd","movupd","movups","movzx","mpsadbw","mul","mulpd","mulps","mulsd","mulss", + "mulx","mwait","neg","nop","not","or","orpd","orps","out","outs", + "outsb","outsd","outsw","pabsb","pabsd","pabsq","pabsw","packssdw","packsswb","packusdw", + "packuswb","paddb","paddd","paddq","paddsb","paddsw","paddusb","paddusw","paddw","palignr", + "pand","pandn","pause","pavgb","pavgw","pblendvb","pblendw","pclmulqdq","pcmpeqb","pcmpeqd", + "pcmpeqq","pcmpeqw","pcmpestri","pcmpestrm","pcmpgtb","pcmpgtd","pcmpgtq","pcmpgtw","pcmpistri","pcmpistrm", + "pconfig","pdep","pext","pextrb","pextrd","pextrq","pextrw","phaddd","phaddsw","phaddw", + "phminposuw","phsubd","phsubsw","phsubw","pinsrb","pinsrd","pinsrq","pinsrw","pmaddubsw","pmaddwd", + "pmaxsb","pmaxsd","pmaxsq","pmaxsw","pmaxub","pmaxud","pmaxuq","pmaxuw","pminsb","pminsd", + "pminsq","pminsw","pminub","pminud","pminuq","pminuw","pmovmskb","pmovsx","pmovzx","pmuldq", + "pmulhrsw","pmulhuw","pmulhw","pmulld","pmullq","pmullw","pmuludq","pop","popa","popad", + "popcnt","popf","popfd","popfq","por","prefetchw","prefetchh","psadbw","pshufb","pshufd", + "pshufhw","pshuflw","pshufw","psignb","psignd","psignw","pslld","pslldq","psllq","psllw", + "psrad","psraq","psraw","psrld","psrldq","psrlq","psrlw","psubb","psubd","psubq", + "psubsb","psubsw","psubusb","psubusw","psubw","ptest","ptwrite","punpckhbw","punpckhdq","punpckhqdq", + "punpckhwd","punpcklbw","punpckldq","punpcklqdq","punpcklwd","push","pusha","pushad","pushf","pushfd", + "pushfq","pxor","rcl","rcpps","rcpss","rcr","rdfsbase","rdgsbase","rdmsr","rdpid", + "rdpkru","rdpmc","rdrand","rdseed","rdsspd","rdsspq","rdtsc","rdtscp","rep","repe", + "repne","repnz","repz","ret","rol","ror","rorx","roundpd","roundps","roundsd", + "roundss","rsm","rsqrtps","rsqrtss","rstorssp","sahf","sal","sar","sarx","saveprevssp", + "sbb","scas","scasb","scasd","scasw","serialize","setssbsy","seta","setae","setb", + "setbe","setc","sete","setg","setge","setl","setle","setna","setnae","setnb", + "setnbe","setnc","setne","setng","setnge","setnl","setnle","setno","setnp","setns", + "setnz","seto","setp","setpe","setpo","sets","setz","sfence","sgdt","sha1msg1", + "sha1msg2","sha1nexte","sha1rnds4","sha256msg1","sha256msg2","sha256rnds2","shl","shld","shlx","shr", + "shrd","shrx","shufpd","shufps","sidt","sldt","smsw","sqrtpd","sqrtps","sqrtsd", + "sqrtss","stac","stc","std","sti","stmxcsr","stos","stosb","stosd","stosq", + "stosw","str","sub","subpd","subps","subsd","subss","swapgs","syscall","sysenter", + "sysexit","sysret","test","tpause","tzcnt","ucomisd","ucomiss","ud","umonitor","umwait", + "unpckhpd","unpckhps","unpcklpd","unpcklps","valignd","valignq","vblendmpd","vblendmps","vbroadcast","vcompresspd", + "vcompressps","vcompressw","vcvtne2ps2bf16","vcvtneps2bf16","vcvtpd2qq","vcvtpd2udq","vcvtpd2uqq","vcvtph2ps","vcvtps2ph","vcvtps2qq", + "vcvtps2udq","vcvtps2uqq","vcvtqq2pd","vcvtqq2ps","vcvtsd2usi","vcvtss2usi","vcvttpd2qq","vcvttpd2udq","vcvttpd2uqq","vcvttps2qq", + "vcvttps2udq","vcvttps2uqq","vcvttsd2usi","vcvttss2usi","vcvtudq2pd","vcvtudq2ps","vcvtuqq2pd","vcvtuqq2ps","vcvtusi2sd","vcvtusi2ss", + "vdbpsadbw","vdpbf16ps","verr","verw","vexpandpd","vexpandps","vextractf128","vextractf32x4","vextractf32x8","vextractf64x2", + "vextractf64x4","vextracti128","vextracti32x4","vextracti32x8","vextracti64x2","vextracti64x4","vfixupimmpd","vfixupimmps","vfixupimmsd","vfixupimmss", + "vfmadd132pd","vfmadd132ps","vfmadd132sd","vfmadd132ss","vfmadd213pd","vfmadd213ps","vfmadd213sd","vfmadd213ss","vfmadd231pd","vfmadd231ps", + "vfmadd231sd","vfmadd231ss","vfmaddsub132pd","vfmaddsub132ps","vfmaddsub213pd","vfmaddsub213ps","vfmaddsub231pd","vfmaddsub231ps","vfmsub132pd","vfmsub132ps", + "vfmsub132sd","vfmsub132ss","vfmsub213pd","vfmsub213ps","vfmsub213sd","vfmsub213ss","vfmsub231pd","vfmsub231ps","vfmsub231sd","vfmsub231ss", + "vfmsubadd132pd","vfmsubadd132ps","vfmsubadd213pd","vfmsubadd213ps","vfmsubadd231pd","vfmsubadd231ps","vfnmadd132pd","vfnmadd132ps","vfnmadd132sd","vfnmadd132ss", + "vfnmadd213pd","vfnmadd213ps","vfnmadd213sd","vfnmadd213ss","vfnmadd231pd","vfnmadd231ps","vfnmadd231sd","vfnmadd231ss","vfnmsub132pd","vfnmsub132ps", + "vfnmsub132sd","vfnmsub132ss","vfnmsub213pd","vfnmsub213ps","vfnmsub213sd","vfnmsub213ss","vfnmsub231pd","vfnmsub231ps","vfnmsub231sd","vfnmsub231ss", + "vfpclasspd","vfpclassps","vfpclasssd","vfpclassss","vgatherdpd","vgatherdps","vgatherqpd","vgatherqps","vgetexppd","vgetexpps", + "vgetexpsd","vgetexpss","vgetmantpd","vgetmantps","vgetmantsd","vgetmantss","vinsertf128","vinsertf32x4","vinsertf32x8","vinsertf64x2", + "vinsertf64x4","vinserti128","vinserti32x4","vinserti32x8","vinserti64x2","vinserti64x4","vmaskmov","vmovdqa32","vmovdqa64","vmovdqu16", + "vmovdqu32","vmovdqu64","vmovdqu8","vp2intersectd","vp2intersectq","vpblendd","vpblendmb","vpblendmd","vpblendmq","vpblendmw", + "vpbroadcast","vpbroadcastb","vpbroadcastd","vpbroadcastm","vpbroadcastq","vpbroadcastw","vpcmpb","vpcmpd","vpcmpq","vpcmpub", + "vpcmpud","vpcmpuq","vpcmpuw","vpcmpw","vpcompressb","vpcompressd","vpcompressq","vpconflictd","vpconflictq","vpdpbusd", + "vpdpbusds","vpdpwssd","vpdpwssds","vperm2f128","vperm2i128","vpermb","vpermd","vpermi2b","vpermi2d","vpermi2pd", + "vpermi2ps","vpermi2q","vpermi2w","vpermilpd","vpermilps","vpermpd","vpermps","vpermq","vpermt2b","vpermt2d", + "vpermt2pd","vpermt2ps","vpermt2q","vpermt2w","vpermw","vpexpandb","vpexpandd","vpexpandq","vpexpandw","vpgatherdd", + "vpgatherdq","vpgatherqd","vpgatherqq","vplzcntd","vplzcntq","vpmadd52huq","vpmadd52luq","vpmaskmov","vpmovb2m","vpmovd2m", + "vpmovdb","vpmovdw","vpmovm2b","vpmovm2d","vpmovm2q","vpmovm2w","vpmovq2m","vpmovqb","vpmovqd","vpmovqw", + "vpmovsdb","vpmovsdw","vpmovsqb","vpmovsqd","vpmovsqw","vpmovswb","vpmovusdb","vpmovusdw","vpmovusqb","vpmovusqd", + "vpmovusqw","vpmovuswb","vpmovw2m","vpmovwb","vpmultishiftqb","vpopcnt","vprold","vprolq","vprolvd","vprolvq", + "vprord","vprorq","vprorvd","vprorvq","vpscatterdd","vpscatterdq","vpscatterqd","vpscatterqq","vpshld","vpshldv", + "vpshrd","vpshrdv","vpshufbitqmb","vpsllvd","vpsllvq","vpsllvw","vpsravd","vpsravq","vpsravw","vpsrlvd", + "vpsrlvq","vpsrlvw","vpternlogd","vpternlogq","vptestmb","vptestmd","vptestmq","vptestmw","vptestnmb","vptestnmd", + "vptestnmq","vptestnmw","vrangepd","vrangeps","vrangesd","vrangess","vrcp14pd","vrcp14ps","vrcp14sd","vrcp14ss", + "vreducepd","vreduceps","vreducesd","vreducess","vrndscalepd","vrndscaleps","vrndscalesd","vrndscaless","vrsqrt14pd","vrsqrt14ps", + "vrsqrt14sd","vrsqrt14ss","vscalefpd","vscalefps","vscalefsd","vscalefss","vscatterdpd","vscatterdps","vscatterqpd","vscatterqps", + "vshuff32x4","vshuff64x2","vshufi32x4","vshufi64x2","vtestpd","vtestps","vzeroall","vzeroupper","wait","wbinvd", + "wbnoinvd","wrfsbase","wrgsbase","wrmsr","wrpkru","wrssd","wrssq","wrussd","wrussq","xabort", + "xacquire","xadd","xbegin","xchg","xend","xgetbv","xlat","xlatb","xor","xorpd", + "xorps","xrelease","xrstor","xrstors","xsave","xsavec","xsaveopt","xsaves","xsetbv","xtest", }; const QSet ASMSyntaxer::Directives { @@ -101,9 +197,37 @@ const QSet ASMSyntaxer::Directives { "equ","times","word","dword","byte","tword" }; +const QSet ASMSyntaxer::ATTDirectives { + ".abort",".align",".altmacro",".ascii", + ".asciz",".attach",".balign",".bss", + ".bundle",".byte",".comm",".data", + ".dc",".dcb",".ds",".def", ".desc", + ".dim","double",".eject",".else", + ".elseif",".end",".endef","endfunc", + ".endif",".equ",".equiv",".eqy", + ".err",".error",".exitm",".extern", + ".fail",".file",".fill", ".float", + ".func",".global",".gnu",".hidden", + ".hword",".ident",".if", ".incbin", + ".inclue", ".int", ".internal", ".irp", + ".irpc",".lcomm",".lflags",".line",".linkonce", + ".list", ".ln", ".loc",".local",".macro", + ".mri",".noaltmacro",".nolist",".nop",".nops", + ".octa",".offset",".org",".p2align",".popsection", + ".previous",".print",".protected",".psize", + ".purgem",".pushsection",".quad",".reloc", + ".rept", ".sbttl", ".scl", ".section", + ".set", ".short", ".single", ".size", + ".skip", ".sleb128", ".space_size", ".stabd", + ".stabn", ".stabs", ".string", ".string8", ".string16", + ".struct", ".subsection", ".symver", ".tag", ".text", + ".title", ".tls", ".type", ".uleb128", ".val",".version", + ".vtable", ".warning",".weak",".weakref",".word", + ".zero",".2byte",".4byte",".8byte" +}; - -ASMSyntaxer::ASMSyntaxer() +ASMSyntaxer::ASMSyntaxer(bool isATT): + mATT(isATT) { mNumberAttribute = std::make_shared(SYNS_AttrNumber, TokenType::Number); addAttribute(mNumberAttribute); @@ -125,6 +249,16 @@ const PTokenAttribute &ASMSyntaxer::registerAttribute() const return mRegisterAttribute; } +bool ASMSyntaxer::isATT() const +{ + return mATT; +} + +void ASMSyntaxer::setATT(bool newATT) +{ + mATT = newATT; +} + void ASMSyntaxer::CommentProc() { mTokenID = TokenId::Comment; @@ -311,6 +445,8 @@ QString ASMSyntaxer::languageName() ProgrammingLanguage ASMSyntaxer::language() { + if (isATT()) + return ProgrammingLanguage::ATTAssembly; return ProgrammingLanguage::Assembly; } @@ -470,8 +606,13 @@ void ASMSyntaxer::resetState() QSet ASMSyntaxer::keywords() const { QSet result=Instructions; - result.unite(Directives); - result.unite(Registers); + if (!isATT()) { + result.unite(Directives); + result.unite(Registers); + } else { + result.unite(ATTDirectives); + result.unite(ATTRegisters); + } return result; } diff --git a/libs/qsynedit/qsynedit/syntaxer/asm.h b/libs/qsynedit/qsynedit/syntaxer/asm.h index 787e242c..a84d6f3c 100644 --- a/libs/qsynedit/qsynedit/syntaxer/asm.h +++ b/libs/qsynedit/qsynedit/syntaxer/asm.h @@ -44,7 +44,7 @@ class ASMSyntaxer : public Syntaxer }; public: - explicit ASMSyntaxer(); + explicit ASMSyntaxer(bool isATT=false); ASMSyntaxer(const ASMSyntaxer&)=delete; ASMSyntaxer& operator=(const ASMSyntaxer&)=delete; @@ -55,7 +55,9 @@ public: static const QSet Instructions; static const QSet Registers; + static const QSet ATTRegisters; static const QSet Directives; + static const QSet ATTDirectives; private: QChar* mLine; QString mLineString; @@ -70,6 +72,7 @@ private: PTokenAttribute mDirectiveAttribute; PTokenAttribute mRegisterAttribute; PTokenAttribute mLabelAttribute; + bool mATT; private: void CommentProc(); @@ -113,6 +116,8 @@ public: public: QSet keywords() const override; + bool isATT() const; + void setATT(bool newATT); }; } diff --git a/libs/qsynedit/qsynedit/syntaxer/syntaxer.h b/libs/qsynedit/qsynedit/syntaxer/syntaxer.h index 54c6324a..cdcd8f72 100644 --- a/libs/qsynedit/qsynedit/syntaxer/syntaxer.h +++ b/libs/qsynedit/qsynedit/syntaxer/syntaxer.h @@ -95,6 +95,7 @@ enum class ProgrammingLanguage { DecideBySuffix, Composition, Assembly, + ATTAssembly, CPP, GLSL, Makefile,