diff options
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/debug/Hostboot/Dump.pm | 12 | ||||
| -rwxr-xr-x | src/build/debug/fsp-memdump.sh | 20 | ||||
| -rw-r--r-- | src/build/debug/simics-debug-framework.py | 4 |
3 files changed, 26 insertions, 10 deletions
diff --git a/src/build/debug/Hostboot/Dump.pm b/src/build/debug/Hostboot/Dump.pm index e7c1c78de..cf1b684a7 100755 --- a/src/build/debug/Hostboot/Dump.pm +++ b/src/build/debug/Hostboot/Dump.pm @@ -36,7 +36,7 @@ use constant MEMSTATE_NO_MEM => 0x0; use constant MEMSTATE_HALF_CACHE => 0x4; use constant MEMSTATE_REDUCED_CACHE => 0x8; use constant MEMSTATE_FULL_CACHE => 0xa; -use constant MEMSTATE_MS_32MEG => 0x20; +use constant MEMSTATE_MS_48MEG => 0x30; use constant _KB => 1024; use constant _MB => 1024 * 1024; @@ -71,9 +71,9 @@ our %memory_maps = ( [ 8 * _MB, 1 * _MB, 9 * _MB, 1 * _MB ], - MEMSTATE_MS_32MEG() => - # Add next 22MB after we expand to memory. - [ 10 * _MB, 22 * _MB + MEMSTATE_MS_48MEG() => + # Add next 38MB after we expand to memory. + [ 10 * _MB, 38 * _MB ] ); @@ -88,9 +88,9 @@ our %memory_states = ( MEMSTATE_FULL_CACHE() => [ MEMSTATE_NO_MEM, MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE, MEMSTATE_FULL_CACHE ], - MEMSTATE_MS_32MEG() => [ MEMSTATE_NO_MEM, + MEMSTATE_MS_48MEG() => [ MEMSTATE_NO_MEM, MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE, - MEMSTATE_FULL_CACHE, MEMSTATE_MS_32MEG ] + MEMSTATE_FULL_CACHE, MEMSTATE_MS_48MEG ] ); sub main diff --git a/src/build/debug/fsp-memdump.sh b/src/build/debug/fsp-memdump.sh index 49e57fa9a..89f48c015 100755 --- a/src/build/debug/fsp-memdump.sh +++ b/src/build/debug/fsp-memdump.sh @@ -85,7 +85,7 @@ discover() limit_memory() { case ${STATE} in - 20) + 30) STATE=08 ;; *) @@ -147,7 +147,7 @@ do dump 9437184 1048576 STATE=08 ;; - 20) + 30) dump 10485760 1048576 dump 11534336 1048576 dump 12582912 1048576 @@ -170,6 +170,22 @@ do dump 30408704 1048576 dump 31457280 1048576 dump 32505856 1048576 + dump 33554432 1048576 + dump 34603008 1048576 + dump 35651584 1048576 + dump 36700160 1048576 + dump 37748736 1048576 + dump 38797312 1048576 + dump 39845888 1048576 + dump 40894464 1048576 + dump 41943040 1048576 + dump 42991616 1048576 + dump 44040192 1048576 + dump 45088768 1048576 + dump 46137344 1048576 + dump 47185920 1048576 + dump 48234496 1048576 + dump 49283072 1048576 STATE=0A ;; discover) # Call discover function to determine state. diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index 26cc90176..1dc342adb 100644 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -614,10 +614,10 @@ def magic_instruction_callback(user_arg, cpu, arg): # 0=base, 1=name, 4=size 5=mirrored target, 6=priority #print ">> %d:%s" % (entry[0], entry[1]) #check if base == hrmor, or if memory space encompasses the - #entire base memory which is: hrmor + 0x2000000 (32 MB) + #entire base memory which is: hrmor + 0x3000000 (48 MB) if ((entry[0] == hb_hrmor) or ((entry[0] < hb_hrmor) and - (entry[0] + entry[4] >= hb_hrmor + 0x2000000) or + (entry[0] + entry[4] >= hb_hrmor + 0x3000000) or (entry[0] == 134217728) or (entry[0] == 136314880))): #0x8000000 or 0x8200000 target = entry[5] |
