X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/4669e0d8c208e772b7003603ff590d630432059b..e27f08e7509c28359f4708f57c59d8f784414a7b:/src/debugger/callstackbrowser.cpp

diff --git a/src/debugger/callstackbrowser.cpp b/src/debugger/callstackbrowser.cpp
index 0d30213..241d47b 100644
--- a/src/debugger/callstackbrowser.cpp
+++ b/src/debugger/callstackbrowser.cpp
@@ -5,12 +5,13 @@
 //
 // JPM = Jean-Paul Mari <djipi.mari@gmail.com>
 //
-// Who  When        What
-// ---  ----------  -----------------------------------------------------------
-// JPM  08/31/2018  Created this file
-// JPM  09/12/2018  Added a status bar and better status report
-// JPM  10/20/2018  Added the return address information in the call stack
-// JPM  08/09/2019  Prevent crash in case of call stack is out of range
+// Who  When (M/D/Y)  What
+// ---  ------------  -----------------------------------------------------------
+// JPM  08/31/2018    Created this file
+// JPM  09/12/2018    Added a status bar and better status report
+// JPM  10/20/2018    Added the return address information in the call stack
+// JPM  08/09/2019    Prevent crash in case of call stack is out of range
+// JPM  03/16/2020    Modified the layout window and added source filename from the called source line
 
 // STILL TO DO:
 // To set the information display at the right
@@ -48,10 +49,11 @@ layout(new QVBoxLayout)
 	layout->addWidget(text);
 #else
 	// Set the new layout with proper identation and readibility
-	model->setColumnCount(3);
-	model->setHeaderData(0, Qt::Horizontal, QObject::tr("Name"));
+	model->setColumnCount(4);
+	model->setHeaderData(0, Qt::Horizontal, QObject::tr("Function"));
 	model->setHeaderData(1, Qt::Horizontal, QObject::tr("Line"));
 	model->setHeaderData(2, Qt::Horizontal, QObject::tr("Return address"));
+	model->setHeaderData(3, Qt::Horizontal, QObject::tr("Filename"));
 	// Information table
 	TableView->setModel(model);
 	TableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -79,14 +81,15 @@ void CallStackBrowserWindow::RefreshContents(void)
 {
 	char msg[1024];
 	size_t Error = CS_NOERROR;
+	bool FilenameError;
 	unsigned int a6, Sa6, ret;
-	char *FuncName;
+	char *Name;
+	size_t NumError = 0;
 #ifdef CS_LAYOUTTEXTS
 	QString CallStack;
 	char string[1024];
 #else
 	int NbRaw = 0;
-	size_t NumError = 0;
 	QString FunctionName;
 #endif
 
@@ -104,26 +107,33 @@ void CallStackBrowserWindow::RefreshContents(void)
 					a6 = GET32(jaguarMainRAM, Sa6);
 					ret = GET32(jaguarMainRAM, Sa6 + 4);
 #ifdef CS_LAYOUTTEXTS
-					sprintf(string, "0x%06X | Ret: 0x%06X | From: %s - 0x%06X | Line: %s", Sa6, ret, (FuncName = DBGManager_GetFunctionName(ret)), (unsigned int)DBGManager_GetAdrFromSymbolName(FuncName), DBGManager_GetLineSrcFromAdr(ret, DBG_NO_TAG));
+					sprintf(string, "0x%06X | Ret: 0x%06X | From: %s - 0x%06X | Line: %s", Sa6, ret, (Name = DBGManager_GetFunctionName(ret)), (unsigned int)DBGManager_GetAdrFromSymbolName(Name), DBGManager_GetLineSrcFromAdr(ret, DBG_NO_TAG));
 					CallStack += QString(string);
 					if (a6)
 					{
 						CallStack += QString("<br>");
 					}
 #else
+					// insert line
 					model->insertRow(NbRaw);
-					model->setItem(NbRaw, 0, new QStandardItem(QString("%1").arg((FuncName = DBGManager_GetFunctionName(ret)) ? FuncName : "(N/A)")));
-					FunctionName = QString(FuncName = DBGManager_GetLineSrcFromAdr(ret, DBG_NO_TAG));
+					// display the function name
+					model->setItem(NbRaw, 0, new QStandardItem(QString("%1").arg((Name = DBGManager_GetFunctionName(ret)) ? Name : "(N/A)")));
+					// display the called line
+					FunctionName = QString(Name = DBGManager_GetLineSrcFromAdr(ret, DBG_NO_TAG));
 					FunctionName.replace("&nbsp;", " ");
-					model->setItem(NbRaw, 1, new QStandardItem(QString("%1").arg(FuncName ? FunctionName : "(N/A)")));
+					FunctionName = FunctionName.trimmed();
+					model->setItem(NbRaw, 1, new QStandardItem(QString("%1").arg(Name ? FunctionName : "(N/A)")));
+					// display the return address
 					sprintf(msg, "0x%06X", ret);
-					model->setItem(NbRaw++, 2, new QStandardItem(QString("%1").arg(msg)));
+					model->setItem(NbRaw, 2, new QStandardItem(QString("%1").arg(msg)));
+					// display the source filename from called source line
+					model->setItem(NbRaw++, 3, new QStandardItem(QString("%1").arg(((Name = DBGManager_GetFullSourceFilenameFromAdr(ret, &FilenameError)) && FilenameError) ? Name : "(N/A)")));
+#endif
 				}
 				else
 				{
 					NumError = 0x1;
 				}
-#endif
 			}
 #ifdef CS_LAYOUTTEXTS
 			text->clear();