Allow first push ebp/rbp statement when debugging

Author: Dman95

debugger.cpp

@@ -624,7 +624,7 @@ void Debugger::run()
     //put \n after commands!
     //b main and run before others!
     if (dbgSymbols)
-        doInput(QString("b main\n"), none);
+        doInput(QString("b *main\n"), none);
     else {
         doInput("b *0x" + QString::number(entryPoint, 16) + "\n", none);
     }

fasm.cpp

@@ -176,15 +176,15 @@ void FASM::putDebugString(CodeEditor *code)
         index = code->toPlainText().indexOf(QChar(':'), index);
         if (isx86()) {
             if (code->toPlainText().indexOf(
-                        QRegExp("\\s+[Mm][Oo][Vv] +[Ee][Bb][Pp] *, *[Ee][Ss][Pp]"), index + 1) != index + 1) {
+                        QRegExp("\\s+([Pp][Uu][Ss][Hh] +[Ee][Bb][Pp]\\s+)?[Mm][Oo][Vv] +[Ee][Bb][Pp] *, *[Ee][Ss][Pp]"), index + 1) != index + 1) {
                 QTextCursor cursor = code->textCursor();
                 cursor.movePosition(QTextCursor::Start);
                 cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);
                 cursor.insertText(QString("\n    mov ebp, esp; for correct debugging"));
             }
         } else {
             if (code->toPlainText().indexOf(
-                        QRegExp("\\s+[Mm][Oo][Vv] +[Rr][Bb][Pp] *, *[Rr][Ss][Pp]"), index + 1) != index + 1) {
+                        QRegExp("\\s+([Pp][Uu][Ss][Hh] +[Rr][Bb][Pp]\\s+)?[Mm][Oo][Vv] +[Rr][Bb][Pp] *, *[Rr][Ss][Pp]"), index + 1) != index + 1) {
                 QTextCursor cursor = code->textCursor();
                 cursor.movePosition(QTextCursor::Start);
                 cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);

gas.cpp

@@ -152,15 +152,15 @@ void GAS::putDebugString(CodeEditor *code)
         if (intelIndex == -1 || attIndex > intelIndex) { //AT&T syntax
             if (isx86()) {
                 if (code->toPlainText().indexOf(
-                            QRegExp("\\s+[Mm][Oo][Vv][Ll] +%?[Ee][Ss][Pp] *, *%?[Ee][Bb][Pp]"), index + 1) != index + 1) {
+                            QRegExp("\\s+([Pp][Uu][Ss][Hh][Ll]? +%?[Ee][Bb][Pp]\\s+)?[Mm][Oo][Vv][Ll] +%?[Ee][Ss][Pp] *, *%?[Ee][Bb][Pp]"), index + 1) != index + 1) {
                     QTextCursor cursor = code->textCursor();
                     cursor.movePosition(QTextCursor::Start);
                     cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);
                     cursor.insertText(QString("\n    movl %esp, %ebp #for correct debugging"));
                 }
             } else {
                 if (code->toPlainText().indexOf(
-                            QRegExp("\\s+[Mm][Oo][Vv][Qq] +%?[Rr][Ss][Pp] *, *%?[Rr][Bb][Pp]"), index + 1) != index + 1) {
+                            QRegExp("\\s+([Pp][Uu][Ss][Hh][Qq]? +%?[Rr][Bb][Pp]\\s+)?[Mm][Oo][Vv][Qq] +%?[Rr][Ss][Pp] *, *%?[Rr][Bb][Pp]"), index + 1) != index + 1) {
                     QTextCursor cursor = code->textCursor();
                     cursor.movePosition(QTextCursor::Start);
                     cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);
@@ -170,15 +170,15 @@ void GAS::putDebugString(CodeEditor *code)
         } else { //Intel syntax
             if (isx86()) {
                 if (code->toPlainText().indexOf(
-                            QRegExp("\\s+[Mm][Oo][Vv] +%?[Ee][Bb][Pp] *, *%?[Ee][Ss][Pp]"), index + 1) != index + 1) {
+                            QRegExp("\\s+([Pp][Uu][Ss][Hh][Ll]? +%?[Ee][Bb][Pp]\\s+)?[Mm][Oo][Vv] +%?[Ee][Bb][Pp] *, *%?[Ee][Ss][Pp]"), index + 1) != index + 1) {
                     QTextCursor cursor = code->textCursor();
                     cursor.movePosition(QTextCursor::Start);
                     cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);
                     cursor.insertText(QString("\n    mov %ebp, %esp #for correct debugging"));
                 }
             } else {
                 if (code->toPlainText().indexOf(
-                            QRegExp("\\s+[Mm][Oo][Vv] +%?[Rr][Bb][Pp] *, *%?[Rr][Ss][Pp]"), index + 1) != index + 1) {
+                            QRegExp("\\s+([Pp][Uu][Ss][Hh][Qq]? +%?[Rr][Bb][Pp]\\s+)?[Mm][Oo][Vv] +%?[Rr][Bb][Pp] *, *%?[Rr][Ss][Pp]"), index + 1) != index + 1) {
                     QTextCursor cursor = code->textCursor();
                     cursor.movePosition(QTextCursor::Start);
                     cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);

nasm.cpp

@@ -175,15 +175,15 @@ void NASM::putDebugString(CodeEditor *code)
         index = code->toPlainText().indexOf(QChar(':'), index);
         if (isx86()) {
             if (code->toPlainText().indexOf(
-                        QRegExp("\\s+[Mm][Oo][Vv] +[Ee][Bb][Pp] *, *[Ee][Ss][Pp]"), index + 1) != index + 1) {
+                        QRegExp("\\s+([Pp][Uu][Ss][Hh] +[Ee][Bb][Pp]\\s+)?[Mm][Oo][Vv] +[Ee][Bb][Pp] *, *[Ee][Ss][Pp]"), index + 1) != index + 1) {
                 QTextCursor cursor = code->textCursor();
                 cursor.movePosition(QTextCursor::Start);
                 cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);
                 cursor.insertText(QString("\n    mov ebp, esp; for correct debugging"));
             }
         } else {
             if (code->toPlainText().indexOf(
-                        QRegExp("\\s+[Mm][Oo][Vv] +[Rr][Bb][Pp] *, *[Rr][Ss][Pp]"), index + 1) != index + 1) {
+                        QRegExp("\\s+([Pp][Uu][Ss][Hh] +[Rr][Bb][Pp]\\s+)?[Mm][Oo][Vv] +[Rr][Bb][Pp] *, *[Rr][Ss][Pp]"), index + 1) != index + 1) {
                 QTextCursor cursor = code->textCursor();
                 cursor.movePosition(QTextCursor::Start);
                 cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, index + 1);