Fix the support of the DRAM size limit option in the heap allocation window

diff --git a/docs/vj_HistoryNotes.txt b/docs/vj_HistoryNotes.txt
index 93a7cc9..16a719b 100644 (file)
--- a/docs/vj_HistoryNotes.txt
+++ b/docs/vj_HistoryNotes.txt
@@ -87,6 +87,7 @@ Git commit: TBD
 50) The -d command line option, dedicated to the debugger, has been renamed to avoid duplication with the dsp one
 -- -d has been renamed by -D because another -d was also used for the dsp command line option
 51) Removed the sorting filter in the all watches window
 50) The -d command line option, dedicated to the debugger, has been renamed to avoid duplication with the dsp one
 -- -d has been renamed by -D because another -d was also used for the dsp command line option
 51) Removed the sorting filter in the all watches window

+52) Fix the support of the DRAM size limit option in the heap allocation window

 
 Release 3 (13th November 2017)
 ------------------------------
 
 Release 3 (13th November 2017)
 ------------------------------

diff --git a/src/debugger/heapallocatorbrowser.cpp b/src/debugger/heapallocatorbrowser.cpp
index 024a9cf..1431fd9 100644 (file)
--- a/src/debugger/heapallocatorbrowser.cpp
+++ b/src/debugger/heapallocatorbrowser.cpp
@@ -5,14 +5,11 @@
 //\r
 // JPM = Jean-Paul Mari <djipi.mari@gmail.com>\r
 //\r
 //\r
 // JPM = Jean-Paul Mari <djipi.mari@gmail.com>\r
 //\r

-// Who  When        What\r
-// ---  ----------  -----------------------------------------------------------\r
-// JPM  01/08/2017  Created this file\r
-// JPM  09/05/2018  Support of the DRAM size limit option\r
-// JPM  09/05/2018  Use definitions for error instead of hard values\r
-// JPM  09/05/2018  Detect if heap allocation shares space with SP (Stack)\r
-// JPM  09/06/2018  Added a status bar and better status report\r
-// JPM  09/07/2018  Set information values in a tab\r
+// Who  When (MM/DD/YY)       What\r
+// ---  ---------------       -----------------------------------------------------------\r
+// JPM  01/08/2017            Created this file\r
+// JPM  Sept./2018            Support of the DRAM size limit option, use definitions for error instead of hard values, detect if heap allocation shares space with SP (Stack), added a status bar and better status report, and set information values in a tab\r
+// JPM  07/04/2019            Fix the support of the DRAM size limit option\r

 //\r
 \r
 // STILL TO DO:\r
 //\r
 \r
 // STILL TO DO:\r


@@ -189,7 +186,7 @@ void HeapAllocatorBrowserWindow::RefreshContents(void)
                        {\r
                                if (Adr68K = DBGManager_GetGlobalVariableAdrFromName((char *)"alloc"))\r
                                {\r
                        {\r
                                if (Adr68K = DBGManager_GetGlobalVariableAdrFromName((char *)"alloc"))\r
                                {\r

-                                       if (!(Adr68K = (jaguarMainRAM[Adr68K] << 24) + (jaguarMainRAM[Adr68K + 1] << 16) + (jaguarMainRAM[Adr68K + 2] << 8) + (jaguarMainRAM[Adr68K + 3])) || ((Adr68K < 0x4000) || (Adr68K >= 0x200000)))\r
+                                       if (!(Adr68K = (jaguarMainRAM[Adr68K] << 24) + (jaguarMainRAM[Adr68K + 1] << 16) + (jaguarMainRAM[Adr68K + 2] << 8) + (jaguarMainRAM[Adr68K + 3])) || ((Adr68K < 0x4000) || (Adr68K >= vjs.DRAM_size)))\r

                                        {\r
                                                sprintf(msg, "Memory allocator not yet initialised");\r
                                                Error = HA_MEMORYALLOCATORNOTINITIALIZED;\r
                                        {\r
                                                sprintf(msg, "Memory allocator not yet initialised");\r
                                                Error = HA_MEMORYALLOCATORNOTINITIALIZED;\r