From b649b6d8ad62262517b7e0da90fbfd81283f4764 Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Mon, 24 Jun 2013 12:35:57 -0500
Subject: Enhance hb-dump to support full memory extraction.

Change-Id: I74823572a4935d3c8c4d7999d8c00c0286de1523
RTC: 50233
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5170
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/kernel/misc.C      | 8 +++++---
 src/kernel/terminate.C | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/kernel')

diff --git a/src/kernel/misc.C b/src/kernel/misc.C
index 6d7e866f6..542e34c64 100644
--- a/src/kernel/misc.C
+++ b/src/kernel/misc.C
@@ -35,10 +35,12 @@
 #include <kernel/vmmmgr.H>              // INITIAL_MEM_SIZE
 #include <kernel/memstate.H>
 #include <kernel/intmsghandler.H>
+#include <kernel/hbdescriptor.H>
 
 extern "C"
     void kernel_shutdown(size_t, uint64_t, uint64_t, uint64_t) NO_RETURN;
 
+extern HB_Descriptor kernel_hbDescriptor;
 
 namespace KernelMisc
 {
@@ -438,7 +440,6 @@ namespace KernelMisc
 
 namespace KernelMemState
 {
-
     void setMemScratchReg(MemLocation i_location,
                          MemSize i_size)
     {
@@ -448,11 +449,12 @@ namespace KernelMemState
         l_MemData.reserved = 0;
         l_MemData.memSize = i_size;
 
+        isync();
+        kernel_hbDescriptor.kernelMemoryState = l_MemData.Scratch6Data;
         KernelMisc::updateScratchReg(MMIO_SCRATCH_MEMORY_STATE,
                                    l_MemData.Scratch6Data);
+        lwsync();
 
     }
 
-
-
 };
diff --git a/src/kernel/terminate.C b/src/kernel/terminate.C
index bbb8d4aa9..0bfd5e8dd 100644
--- a/src/kernel/terminate.C
+++ b/src/kernel/terminate.C
@@ -41,7 +41,8 @@ HB_TI_DataArea kernel_TIDataArea;
 HB_Descriptor kernel_hbDescriptor =
 {
     &kernel_TIDataArea,
-    &KernelIpc::ipc_data_area
+    &KernelIpc::ipc_data_area,
+    0
 };
 
 
-- 
cgit v1.2.1