diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2016-07-01 21:11:58 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-08-17 13:47:12 -0400 |
| commit | 28943ea5d8afe937cbad9b55a46d9a750cfa32d2 (patch) | |
| tree | 1c175f484a5e1df2278824adf373e88d4683e639 /src/build/debug | |
| parent | bd71f391570091e77e87df20e81ebd59ea6aef05 (diff) | |
| download | talos-hostboot-28943ea5d8afe937cbad9b55a46d9a750cfa32d2.tar.gz talos-hostboot-28943ea5d8afe937cbad9b55a46d9a750cfa32d2.zip | |
VPO updates for constrained mem, hbbl, simics
Change-Id: I2302776822f9aa599adb3d134514149c4468f32e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26577
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/build/debug')
| -rwxr-xr-x | src/build/debug/Hostboot/PageMgr.pm | 12 | ||||
| -rwxr-xr-x | src/build/debug/vpo-debug-framework.pl | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/build/debug/Hostboot/PageMgr.pm b/src/build/debug/Hostboot/PageMgr.pm index cf6424199..d0d73f3d8 100755 --- a/src/build/debug/Hostboot/PageMgr.pm +++ b/src/build/debug/Hostboot/PageMgr.pm @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2012,2016 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,7 +32,7 @@ our @EXPORT_OK = ('main'); use constant PAGEMGR_INSTANCE_NAME => "Singleton<PageManager>::instance()::instance"; -use constant PAGEMGR_CORE_OFFSET => 3 * 8; +use constant PAGEMGR_CORE_OFFSET => 5 * 8; use constant PAGEMGR_PAGES_AVAIL_OFFSET => 0; use constant PAGEMGR_BUCKETS_OFFSET => 8; use constant PAGEMGR_NUMBER_OF_BUCKETS => 16; @@ -102,7 +104,8 @@ sub countItemsInStack return 0 if (0 == $stack); - return 1 + countItemsInStack(::read64($stack)); + #only read bottom 32 bits of ptr to handle AbaPtr + return 1 + countItemsInStack(::read32($stack + 4)); } sub showPagesInStack @@ -115,7 +118,8 @@ sub showPagesInStack ::userDisplay(sprintf "..mem=0x%.16X..0x%.16X : %d\n", $stack, $stack+4096*$bucketsize, $bucketsize ); - return 1 + showPagesInStack(::read64($stack),$bucketsize); + #only read bottom 32 bits of ptr to handle AbaPtr + return 1 + showPagesInStack(::read32($stack+4),$bucketsize); } sub helpInfo diff --git a/src/build/debug/vpo-debug-framework.pl b/src/build/debug/vpo-debug-framework.pl index 24aa306e3..cf6e2f9fa 100755 --- a/src/build/debug/vpo-debug-framework.pl +++ b/src/build/debug/vpo-debug-framework.pl @@ -460,7 +460,6 @@ sub stopInstructions print "--- stopInstructions: run $command\n"; } - die "ERROR: cannot stop instructions" if (system("$command") != 0); } # Start instructions |
