fixed linux bug

Author: ge69dal

Linux/share/sasm/NASM/macro.c

@@ -56,7 +56,7 @@ void update(char* data){
  for(int j = 0; j < needed_bytes; j+=8184){
  for(int i = 0; i < min(8184, needed_bytes-j); i++)
  message.mesg_text[i] = data[i+j];
- msgsnd(msgid_snd, &message, sizeof(message), 0);
+ //msgsnd(msgid_snd, &message, sizeof(message), 0);
  }
 }
 

Linux/share/sasm/include/io.inc

@@ -43,6 +43,49 @@ CEXTERN fflush
 CEXTERN get_stdin
 CEXTERN get_stdout
 
+CEXTERN update
+%macro updateDisplay 1.nolist
+ sasmMacroFunc
+ push eax
+ push ecx
+ push edx
+ push esi
+ push edi
+ ALIGN_STACK 4
+ push %1
+ call update
+ UNALIGN_STACK
+ pop edi
+ pop esi
+ pop edx
+ pop ecx
+ pop eax
+ sasmMacroFuncE
+%endmacro
+
+CEXTERN setup
+%macro setupDisplay 4.nolist
+ sasmMacroFunc
+ push eax
+ push ecx
+ push edx
+ push esi
+ push edi
+ ALIGN_STACK 16
+ push %4
+ push %3
+ push %2
+ push %1
+ call setup
+ UNALIGN_STACK
+ pop edi
+ pop esi
+ pop edx
+ pop ecx
+ pop eax
+ sasmMacroFuncE
+%endmacro
+
 ; Make stack be 16 bytes aligned after pushing %1 bytes
 %macro ALIGN_STACK 1.nolist
  enter 0, 0

Windows/include/io.inc

@@ -65,7 +65,7 @@ CEXTERN update
  push ecx
  push edx
  ALIGN_STACK 4
-push %1
+ push %1
  call update
  UNALIGN_STACK
  pop edx
@@ -81,10 +81,10 @@ CEXTERN setup
  push ecx
  push edx
  ALIGN_STACK 16
-push %4
-push %3
-push %2
-push %1
+ push %4
+ push %3
+ push %2
+ push %1
  call setup
  UNALIGN_STACK
  pop edx

displayWindow.cpp

@@ -150,7 +150,8 @@ void DisplayWindow::changeDisplay(int msgid){
 #else
 while(1){
  // msgrcv to receive message
- msgrcv(msgid, &message, sizeof(message), 0, 0);
+ size_t t = msgrcv(msgid, &message, sizeof(message), 0, 0);
+	emit printLog("t: "+QString::number(t)+" type: "+QString::number(message.mesg_type)+"\n");
 
  if (message.mesg_type == 2){ // type = 1 (default) -> normal message | -> 2 finish | -> 3 setup
  break;
@@ -169,9 +170,10 @@ void DisplayWindow::changeDisplay(int msgid){
  else
  buffer.resize(res_x*res_y);
  displayPicture = new QImage(res_x, res_y, QImage::Format_RGB32);
- displayPicture->fill(qRgb(0, 0, 0));
+ displayPicture->fill(qRgb(255, 255, 255));
+ scrollAreaWidgetContents->setFixedSize(res_x*zoom+26, res_y*zoom+26);
+ this->setFixedSize(QSize(res_x+60, res_y+92));
  displayImageLabel->setPixmap(QPixmap::fromImage(displayPicture->scaled(res_x*zoom,res_y*zoom)));
- this->setFixedSize(QSize(res_x+60, res_y+92));
  continue;
 	}
  // display the message and print on display
@@ -182,7 +184,7 @@ void DisplayWindow::changeDisplay(int msgid){
  memcpy(buffer.data()+i, &message.mesg_text[0], std::min(8184, needed_bytes-i));
 	}
  updateDisplay();
-qint64 elapsed_time = programExecutionTime.elapsed();
+qint64 elapsed_time = programExecutionTime.elapsed();
  if(elapsed_time < 1000/fps)
  usleep(1000/fps - elapsed_time);
  displayImageLabel->setPixmap(QPixmap::fromImage(displayPicture->scaled(res_x*zoom,res_y*zoom)));
@@ -194,35 +196,8 @@ void DisplayWindow::changeDisplay(int msgid){
 }
 
 void DisplayWindow::finish(int msgid){
-this->msgid = msgid;
+ this->msgid = msgid;
  #ifdef Q_OS_WIN32
-/*char c[8184];
-c[0] = 2;
-HANDLE hFile = CreateFileW(
- L"\\\\.\\pipe\\SASMPIPE",
-GENERIC_WRITE,
-FILE_SHARE_READ | FILE_SHARE_WRITE,
-NULL,
-OPEN_EXISTING,
-0,
-NULL);
-if(hFile == INVALID_HANDLE_VALUE){
-emit printLog(QString("Could not create file object (")+QString::number(GetLastError())+")\n", Qt::red);
-return;
-}
-DWORD dwNoBytesWrote = 0;
-BOOL writeSuccess = WriteFile(
-hFile,
-c,
-sizeof(c),
-&dwNoBytesWrote,
-NULL);
-if(!writeSuccess){
-emit printLog(QString("Could not write to file (")+QString::number(GetLastError())+")\n", Qt::red);
-}
-if(!FlushFileBuffers(hFile)){
-emit printLog(QString("Could not flush the file (")+QString::number(GetLastError())+")\n", Qt::red);
-}*/
  #else
  mesg_buffer end;
  end.mesg_type = 2;
@@ -233,9 +208,8 @@ void DisplayWindow::finish(int msgid){
 
 void DisplayWindow::zoomSettingsChanged(int value){
  zoom = std::pow(2, value);
- updateDisplay();
-scrollAreaWidgetContents->setFixedSize(res_x*zoom+26, res_y*zoom+26);
-this->setFixedSize(QSize(res_x+60, res_y+92));
+ scrollAreaWidgetContents->setFixedSize(res_x*zoom+26, res_y*zoom+26);
+ this->setFixedSize(QSize(res_x+60, res_y+92));
  displayImageLabel->setPixmap(QPixmap::fromImage(displayPicture->scaled(res_x*zoom, res_y*zoom)));
 }