Version 3.2.0

1) ability to build programs without running linker
2) new FASM 1.71.39
3) fix of some debug problems (with "ret" instruction in MASM and with
some non-standard GDB configurations).

Author: Dman95

Windows/FASM/fasm.exe

@@ -198,7 +198,7 @@ <H4>Windows</H4>
 Еще в программу включен отладчик gdb версии 7.4 из пакета MinGW (gdb 7.6 из MinGW64 в режиме x64) и немного измененная с учетом требований отладки библиотека макросов ввода-вывода.
 </P>
 <P>
-Также в SASM, начиная с версии 3.0, включены fasm 1.71.21 и gas 2.23.1 из MinGW (gas 2.23.2 из MinGW64).
+Также в SASM, начиная с версии 3.0, включены fasm 1.71.39 и gas 2.23.1 из MinGW (gas 2.23.2 из MinGW64).
 </P>
 <P>
 Ассемблер MASM невозможно было включить в сборку из-за его лицензии. Чтобы им воспользоваться, Вы должны установить MASM на Ваш компьютер с сайта <A HREF="http://www.masm32.com/">http://www.masm32.com/</A> и указать пути до ассемблера (ml.exe, путь обычно "C:/masm32/bin/ml.exe") и до компоновщика (link.exe, путь обычно "C:/masm32/bin/link.exe") в соответствующих полях на вкладке "Построение".

help.html

@@ -172,7 +172,7 @@ <H4>Windows</H4>
 <P>As NASM compiler used nasm 2.11.02, as linker - gcc 4.6.2 from MinGW (gcc 4.8.1 from MinGW64 in x64 mode) or ld 2.22 from MinGW (ld 2.23.2 from MinGW64 in x64 mode).
 </P>
 <P>
-Also SASM 3.0 and greater contains fasm 1.71.21 and gas 2.23.1 from MinGW (gas 2.23.2 from MinGW64).
+Also SASM 3.0 and greater contains fasm 1.71.39 and gas 2.23.1 from MinGW (gas 2.23.2 from MinGW64).
 </P>
 <P>
 Also SASM contains gdb debugger from MinGW and "io.inc" macro library. 

helpENG.html

@@ -102,6 +102,13 @@ MainWindow::MainWindow(const QStringList &args, QWidget *parent)
     }
 }
 
+void MainWindow::enableOrDisableLinkingEdit(int disableLinkingCheckboxState)
+{
+    bool enabled = (disableLinkingCheckboxState == Qt::Unchecked);
+    settingsUi.linkingOptionsEdit->setEnabled(enabled);
+    settingsUi.linkerPathEdit->setEnabled(enabled);
+}
+
 void MainWindow::initUi()
 {
     //Resize
@@ -868,23 +875,28 @@ void MainWindow::buildProgram(bool debugMode)
         gccMProcess.start(gcc, gccMArguments);
         gccMProcess.waitForFinished();
     #endif
+
     //final linking
-    QStringList linkerArguments = linkerOptions.split(QChar(' '));
-    linkerArguments.replaceInStrings("$PROGRAM.OBJ$", Common::pathInTemp("program.o"));
-    linkerArguments.replaceInStrings("$MACRO.OBJ$", stdioMacros);
-    linkerArguments.replaceInStrings("$PROGRAM$", Common::pathInTemp("SASMprog.exe"));
-    linkerArguments.replaceInStrings("$SOURCE$", Common::pathInTemp("program.asm"));
-    linkerArguments.replaceInStrings("$LSTOUTPUT$", Common::pathInTemp("program.lst"));
-    QProcess linkerProcess;
-    QString linkerOutput = Common::pathInTemp("linkererror.txt");
-    linkerProcess.setStandardOutputFile(linkerOutput);
-    linkerProcess.setStandardErrorFile(linkerOutput, QIODevice::Append);
-    linkerProcess.start(linker, linkerArguments);
-    linkerProcess.waitForFinished();
-
-    if (linkerProcess.error() != QProcess::UnknownError) {
-        printLogWithTime(tr("Unable to start linker. Check your settings.") + '\n', Qt::red);
-        return;
+    bool disableLinking = settings.value("disablelinking", false).toBool();
+    QString linkerOutput;
+    if (!disableLinking) {
+        QStringList linkerArguments = linkerOptions.split(QChar(' '));
+        linkerArguments.replaceInStrings("$PROGRAM.OBJ$", Common::pathInTemp("program.o"));
+        linkerArguments.replaceInStrings("$MACRO.OBJ$", stdioMacros);
+        linkerArguments.replaceInStrings("$PROGRAM$", Common::pathInTemp("SASMprog.exe"));
+        linkerArguments.replaceInStrings("$SOURCE$", Common::pathInTemp("program.asm"));
+        linkerArguments.replaceInStrings("$LSTOUTPUT$", Common::pathInTemp("program.lst"));
+        QProcess linkerProcess;
+        linkerOutput = Common::pathInTemp("linkererror.txt");
+        linkerProcess.setStandardOutputFile(linkerOutput);
+        linkerProcess.setStandardErrorFile(linkerOutput, QIODevice::Append);
+        linkerProcess.start(linker, linkerArguments);
+        linkerProcess.waitForFinished();
+
+        if (linkerProcess.error() != QProcess::UnknownError) {
+            printLogWithTime(tr("Unable to start linker. Check your settings.") + '\n', Qt::red);
+            return;
+        }
     }
 
     QFile logFile;
@@ -913,24 +925,28 @@ void MainWindow::buildProgram(bool debugMode)
 
         //print errors
         printLog(logText, Qt::red);
-        logFile.setFileName(linkerOutput);
-        logFile.open(QIODevice::ReadOnly);
-        QTextStream logLinker(&logFile);
-        logText = logLinker.readAll();
-        logFile.close();
-        printLog(logText, Qt::red);
+        if (!disableLinking) {
+            logFile.setFileName(linkerOutput);
+            logFile.open(QIODevice::ReadOnly);
+            QTextStream logLinker(&logFile);
+            logText = logLinker.readAll();
+            logFile.close();
+            printLog(logText, Qt::red);
+        }
 
         //QMessageBox::critical(0, tr("Warning!"), tr("Errors have occurred in the build!"));
     } else {
         printLogWithTime(tr("Built successfully.") + '\n', Qt::darkGreen);
         //print warnings
         printLog(logText, Qt::red);
-        logFile.setFileName(linkerOutput);
-        logFile.open(QIODevice::ReadOnly);
-        QTextStream logLinker(&logFile);
-        logText = logLinker.readAll();
-        logFile.close();
-        printLog(logText, Qt::red);
+        if (!disableLinking) {
+            logFile.setFileName(linkerOutput);
+            logFile.open(QIODevice::ReadOnly);
+            QTextStream logLinker(&logFile);
+            logText = logLinker.readAll();
+            logFile.close();
+            printLog(logText, Qt::red);
+        }
         programIsBuilded = true;
     }
 }
@@ -1585,6 +1601,8 @@ void MainWindow::openSettings()
         connect(settingsUi.buttonBox->button(QDialogButtonBox::Cancel),
                 SIGNAL(clicked()), this, SLOT(restoreSettingsAndExit()));
         connect(settingsUi.resetAllButton, SIGNAL(clicked()), this, SLOT(resetAllSettings()));
+        connect(settingsUi.disableLinkingCheckbox, SIGNAL(stateChanged(int)),
+                this, SLOT(enableOrDisableLinkingEdit(int)));
 
         //colors
         colorSignalMapper = new QSignalMapper(this);
@@ -1725,6 +1743,8 @@ void MainWindow::initAssemblerSettings(bool firstOpening)
     QString linkerOptions = assembler->getLinkerOptions();
     settingsUi.linkingOptionsEdit->setText(settings.value("linkingoptions", linkerOptions).toString());
 
+    settingsUi.disableLinkingCheckbox->setChecked(settings.value("disablelinking", false).toBool());
+
     QString assemblerPath = assembler->getAssemblerPath();
     settingsUi.assemblerPathEdit->setText(settings.value("assemblerpath", assemblerPath).toString());
 
@@ -1840,10 +1860,12 @@ void MainWindow::recreateAssembler(bool start)
     if (!start) {
         settingsUi.assemblyOptionsEdit->setText(assembler->getAssemblerOptions());
         settingsUi.linkingOptionsEdit->setText(assembler->getLinkerOptions());
+        settingsUi.disableLinkingCheckbox->setChecked(false);
         settingsUi.assemblerPathEdit->setText(assembler->getAssemblerPath());
         settingsUi.linkerPathEdit->setText(assembler->getLinkerPath());
         settings.setValue("assemblyoptions", assembler->getAssemblerOptions());
         settings.setValue("linkingoptions", assembler->getLinkerOptions());
+        settings.setValue("disablelinking", false);
         settings.setValue("assemblerpath", assembler->getAssemblerPath());
         settings.setValue("linkerpath", assembler->getLinkerPath());
         changeStartText();
@@ -1864,6 +1886,7 @@ void MainWindow::backupSettings()
     backupAssemblerOptions = settings.value("assemblyoptions", assembler->getAssemblerOptions()).toString();
     backupAssemblerPath = settings.value("assemblerpath", assembler->getAssemblerPath()).toString();
     backupLinkerOptions = settings.value("linkingoptions", assembler->getLinkerOptions()).toString();
+    backupDisableLinking = settings.value("disablelinking", false).toBool();
     backupStartText = settings.value("starttext", assembler->getStartText()).toString();
     backupLinkerPath = settings.value("linkerpath", assembler->getLinkerPath()).toString();
 }
@@ -1876,6 +1899,7 @@ void MainWindow::restoreSettingsAndExit()
     settings.setValue("assemblyoptions", backupAssemblerOptions);
     settings.setValue("assemblerpath", backupAssemblerPath);
     settings.setValue("linkingoptions", backupLinkerOptions);
+    settings.setValue("disablelinking", backupDisableLinking);
     settings.setValue("starttext", backupStartText);
     settings.setValue("linkerpath", backupLinkerPath);
     settingsWindow->close();
@@ -1916,6 +1940,7 @@ void MainWindow::saveSettings()
 
     settings.setValue("assemblyoptions", settingsUi.assemblyOptionsEdit->text());
     settings.setValue("linkingoptions", settingsUi.linkingOptionsEdit->text());
+    settings.setValue("disablelinking", settingsUi.disableLinkingCheckbox->isChecked());
     settings.setValue("assemblerpath", settingsUi.assemblerPathEdit->text());
     settings.setValue("linkerpath", settingsUi.linkerPathEdit->text());
     settings.setValue("starttext", settingsStartTextEditor->document()->toPlainText());

language_ru.qm

@@ -74,7 +74,7 @@
 #include "signallocker.h"
 #include "masm.h"
 
-#define SASM_VERSION "3.1.4"
+#define SASM_VERSION "3.2.0"
 
 class MainWindow : public QMainWindow
 {
@@ -196,6 +196,7 @@ class MainWindow : public QMainWindow
     QString backupMode;
     QString backupAssemblerOptions;
     QString backupLinkerOptions;
+    bool backupDisableLinking;
     QString backupAssemblerPath;
     QString backupStartText;
     QString backupLinkerPath;
@@ -274,6 +275,7 @@ public slots:
     void backupSettings();
     void restoreSettingsAndExit();
     void printMasmInfo();
+    void enableOrDisableLinkingEdit(int disableLinkingCheckboxState);
 
     //closing
     bool deleteTab(int index, bool saveFileName = false);

language_ru.ts

@@ -144,8 +144,8 @@ void MASM::parseLstFile(QFile &lst, QVector<Assembler::LineNum> &lines, quint64
                 continue;
             }
 
-            //check if ret
-            if (line.contains("ret", Qt::CaseInsensitive)) {
+            //check if return
+            if (line.contains("return", Qt::CaseInsensitive)) {
                 macroInstruction = line;
                 if (macro.exactMatch(macroInstruction))
                     continue;

mainwindow.cpp

@@ -41,7 +41,7 @@
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <property name="elideMode">
       <enum>Qt::ElideNone</enum>
@@ -1833,6 +1833,9 @@
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
         <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+         </property>
          <item row="0" column="0">
           <widget class="QLabel" name="modeLabel">
            <property name="text">
@@ -1990,6 +1993,23 @@
          <item row="5" column="1">
           <widget class="QLineEdit" name="linkerPathEdit"/>
          </item>
+         <item row="6" column="0">
+          <widget class="QLabel" name="disableLinkingLabel">
+           <property name="text">
+            <string>Disable linking:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QCheckBox" name="disableLinkingCheckbox">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>
@@ -2025,8 +2045,8 @@
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup_3"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>